Bug fixes

Switching between tabs should work properly now.
Refactored MainWindowTabBar (was WebViewTabBar)

10 files changed, 76 insertions, 62 deletions

diff --git a/BUGS b/BUGS
new file mode 100644
index 0000000..1a75136
--- /dev/null
+++ b/BUGS
@@ -0,0 +1,3 @@
+Switching between tabs with keyboard shortcuts doesn't always work.
+Closing sometimes causes the program to crash (much mystery).
+MainWindow doesn't save size on close
diff --git a/docs/manual/Contributing.Style.md b/docs/manual/Contributing.Style.md
index 4d7ef1b..7f3a052 100644
--- a/docs/manual/Contributing.Style.md
+++ b/docs/manual/Contributing.Style.md
@@ -4,7 +4,6 @@
 * Use generic formats
 * Where possible, use QVector over QList: http://lists.qt-project.org/pipermail/development/2017-March
 /029040.html
-* Check pointers with Q_CHECK_PTR before returning them
 
 ## Versioning
 
@@ -17,6 +16,11 @@
 * next - next stable release preparation, mostly for bugfixes
 * development - development branch, anything goes there
 
+## Qt
+* Check pointers with ´´´Q_CHECK_PTR´´´ before returning them
+* Avoid using connect SIGNAL and SLOT. Instead use &Class::method. This way,
+connects are checked during the compile, not at runtime.
+
 ## clazy
 You can use [clazy](https://github.com/KDE/clazy) to check Qt semantics. 
 Requires clang.
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index b506347..9c47f91 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -41,11 +41,11 @@ prepare() {
 
 build() {
     cd smolbote
-    qbs build --settings-dir ../config -d ../build  profile:qt release
+    qbs build --settings-dir ../config -d ../build -p poi profile:qt release
 }
 
 package() {
     cd smolbote
-    qbs install --settings-dir ../config -d ../build --install-root "${pkgdir}${_iroot}" profile:qt release
+    qbs install --settings-dir ../config -d ../build -p poi --install-root "${pkgdir}${_iroot}" profile:qt release
 }
 
diff --git a/smolbote.qbs b/smolbote.qbs
index d74dffe..c3af913 100644
--- a/smolbote.qbs
+++ b/smolbote.qbs
@@ -109,8 +109,8 @@ Project {
                 "src/widgets/loadingbar.h",
                 "src/widgets/mainwindowmenubar.cpp",
                 "src/widgets/mainwindowmenubar.h",
-                "src/widgets/webviewtabbar.cpp",
-                "src/widgets/webviewtabbar.h",
+                "src/widgets/mainwindowtabbar.cpp",
+                "src/widgets/mainwindowtabbar.h",
             ]
         }
 
diff --git a/src/browser.cpp b/src/browser.cpp
index ab244fd..db535f3 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -70,13 +70,13 @@ void Browser::loadProfiles()
     const QStringList profileList = profileDir.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
     for(const QString &name : profileList) {
-        WebEngineProfile *profile = new WebEngineProfile(name, profileDir.absoluteFilePath(name), this);
+        std::shared_ptr<WebEngineProfile> profile = std::make_shared<WebEngineProfile>(name, profileDir.absoluteFilePath(name), this);
         profile->setRequestInterceptor(m_urlRequestInterceptor.get());
         m_profiles.insert(name, profile);
     }
 
     // Also add the Off-the-record profile
-    WebEngineProfile *otr = new WebEngineProfile(this);
+    std::shared_ptr<WebEngineProfile> otr = std::make_shared<WebEngineProfile>(this);
     otr->setRequestInterceptor(m_urlRequestInterceptor.get());
     m_profiles.insert("", otr);
 
@@ -142,7 +142,7 @@ MainWindow *Browser::createWindow()
     return window;
 }
 
-WebEngineProfile* Browser::profile(const QString name)
+std::shared_ptr<WebEngineProfile> Browser::profile(const QString name)
 {
     return m_profiles[name];
 }
diff --git a/src/browser.h b/src/browser.h
index a1557b4..89931e8 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -42,7 +42,7 @@ public:
     void setConfiguration(std::shared_ptr<Configuration> &config);
 
     void loadProfiles();
-    WebEngineProfile *profile(const QString name);
+    std::shared_ptr<WebEngineProfile> profile(const QString name);
     //    QStringList profiles();
 
 //    std::shared_ptr<BookmarksWidget>& bookmarks();
@@ -60,8 +60,8 @@ private:
     std::shared_ptr<Configuration> m_config;
 
     QVector<MainWindow *> m_windows;
-    QHash<QString, WebEngineProfile *> m_profiles;
-    WebEngineProfile* m_defaultProfile;
+    QHash<QString, std::shared_ptr<WebEngineProfile>> m_profiles;
+    std::shared_ptr<WebEngineProfile> m_defaultProfile;
 
     std::shared_ptr<UrlRequestInterceptor> m_urlRequestInterceptor;
     std::shared_ptr<BookmarksWidget> m_bookmarksManager;
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3dbcbdf..4433948 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -44,7 +44,7 @@
 MainWindow::MainWindow(std::shared_ptr<Configuration> config, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MainWindow),
-    tabBar(new WebViewTabBar(config, nullptr, this)),
+    tabBar(new MainWindowTabBar(config, this)),
     menuBar(new MainWindowMenuBar(config, this)),
     m_addressBar(new UrlLineEdit(this)),
     m_progressBar(new LoadingBar(this))
@@ -88,7 +88,7 @@ MainWindow::MainWindow(std::shared_ptr<Configuration> config, QWidget *parent) :
     QToolButton *homepageButton = new QToolButton(this);
     homepageButton->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     connect(homepageButton, &QToolButton::clicked, this, [&]() {
-        tabBar->currentView()->load(tabBar->profile()->homepage());
+        tabBar->currentView()->load(m_profile->homepage());
     });
 
     ui->navigationToolBar->addWidget(m_backButton);
@@ -181,14 +181,14 @@ void MainWindow::newTab(const QUrl &url)
         m_tabBarAdded = true;
         ui->mainToolBar->addWidget(tabBar);
     }
-    tabBar->addTab(url);
+    tabBar->addTab(createWebView(url, m_profile.get()));
 }
 
 void MainWindow::newWindow(const QUrl &url)
 {
     Browser *instance = static_cast<Browser*>(qApp->instance());
     MainWindow *window = instance->createWindow();
-    window->setProfile(tabBar->profile());
+    window->setProfile(m_profile);
     window->newTab(url);
 }
 
@@ -221,17 +221,18 @@ void MainWindow::showSettingsDialog()
     dlg->exec();
 }
 
-void MainWindow::setProfile(WebEngineProfile *profile)
+void MainWindow::setProfile(std::shared_ptr<WebEngineProfile> profile)
 {
-    Q_CHECK_PTR(profile);
-    tabBar->setProfile(profile);
+    Q_ASSERT(profile);
+    m_profile = profile;
+    tabBar->setProfile(profile.get());
     menuBar->setProfileName(profile->name());
 }
 
 WebEngineProfile *MainWindow::profile()
 {
-    Q_CHECK_PTR(tabBar->profile());
-    return tabBar->profile();
+    Q_ASSERT(m_profile);
+    return m_profile.get();
 }
 
 void MainWindow::setBookmarksWidget(std::shared_ptr<BookmarksWidget> &widget)
@@ -307,7 +308,7 @@ void MainWindow::handleTitleUpdated(const QString &title)
 {
     QString t = QString::fromStdString(m_config->value<std::string>("browser.window.title").value());
     t.replace("title", title);
-    t.replace("profile", tabBar->profile()->name());
+    t.replace("profile", m_profile->name());
     setWindowTitle(t);
     //setWindowTitle(browser->settings()->value("window.title").toString().replace("title", title).replace("profile", tabBar->profile()->name()));
 }
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1062d64..1852053 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -24,7 +24,7 @@
 #include <QMainWindow>
 #include "webengine/webengineprofile.h"
 #include <QUrl>
-#include "widgets/webviewtabbar.h"
+#include "widgets/mainwindowtabbar.h"
 #include "widgets/loadingbar.h"
 
 #include "navigation/navigationbutton.h"
@@ -59,7 +59,7 @@ public slots:
     void newTab(const QUrl &url = QUrl(""));
     void newWindow(const QUrl &url = QUrl(""));
 
-    void setProfile(WebEngineProfile *profile);
+    void setProfile(std::shared_ptr<WebEngineProfile> profile);
     WebEngineProfile *profile();
 
     void setBookmarksWidget(std::shared_ptr<BookmarksWidget> &widget);
@@ -79,7 +79,7 @@ private:
     Q_DISABLE_COPY(MainWindow)
 
     Ui::MainWindow *ui;
-    WebViewTabBar *tabBar;
+    MainWindowTabBar *tabBar;
     WebView *m_currentView;
 
     MainWindowMenuBar *menuBar;
@@ -90,6 +90,7 @@ private:
     LoadingBar *m_progressBar;
 
     bool m_tabBarAdded = false;
+    std::shared_ptr<WebEngineProfile> m_profile;
     std::shared_ptr<Configuration> m_config;
     std::shared_ptr<BookmarksWidget> m_bookmarksWidget;
     std::shared_ptr<DownloadsWidget> m_downloadsWidget;
diff --git a/src/widgets/webviewtabbar.cpp b/src/widgets/mainwindowtabbar.cpp
index 81851f3..cae42df 100644
--- a/src/widgets/webviewtabbar.cpp
+++ b/src/widgets/mainwindowtabbar.cpp
@@ -18,58 +18,58 @@
  **
  ******************************************************************************/
 
-#include "webviewtabbar.h"
+#include "mainwindowtabbar.h"
 #include <QAction>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <settings/configuration.h>
 #include <QShortcut>
 
-WebViewTabBar::WebViewTabBar(const std::shared_ptr<Configuration> &config, WebEngineProfile *profile, QWidget *parent) :
+#include "mainwindow.h"
+
+MainWindowTabBar::MainWindowTabBar(const std::shared_ptr<Configuration> &config, MainWindow *parent) :
     QTabBar(parent)
 {
-    m_profile = profile;
+    Q_CHECK_PTR(parent);
+    m_parent = parent;
 
     setElideMode(Qt::ElideRight);
     setTabsClosable(true);
     setMovable(true);
     setContextMenuPolicy(Qt::DefaultContextMenu);
-    connect(this, SIGNAL(tabCloseRequested(int)), this, SLOT(removeTab(int)));
-    connect(this, SIGNAL(currentChanged(int)), this, SLOT(handleCurrentChanged(int)));
-    connect(this, SIGNAL(tabMoved(int,int)), this, SLOT(updateVectorArrangement(int,int)));
 
-    QShortcut *tabCloseShortcut = new QShortcut(this);
+    connect(this, &MainWindowTabBar::tabCloseRequested, this, &MainWindowTabBar::removeTab);
+    connect(this, &MainWindowTabBar::currentChanged, this, &MainWindowTabBar::handleCurrentChanged);
+    connect(this, &MainWindowTabBar::tabMoved, this, &MainWindowTabBar::updateVectorArrangement);
+
+    QShortcut *tabCloseShortcut = new QShortcut(parent);
     tabCloseShortcut->setKey(QKeySequence(QString::fromStdString(config->value<std::string>("browser.shortcuts.tabClose").value())));
     connect(tabCloseShortcut, &QShortcut::activated, [this]() {
         this->removeTab(currentIndex());
     });
 
-    QShortcut *tabLeftShortcut = new QShortcut(this);
+    QShortcut *tabLeftShortcut = new QShortcut(parent);
     tabLeftShortcut->setKey(QKeySequence(QString::fromStdString(config->value<std::string>("browser.shortcuts.tabLeft").value())));
     connect(tabLeftShortcut, &QShortcut::activated, [this]() {
         this->setCurrentIndex(currentIndex()-1);
     });
 
-    QShortcut *tabRightShortcut = new QShortcut(this);
+    QShortcut *tabRightShortcut = new QShortcut(parent);
     tabRightShortcut->setKey(QKeySequence(QString::fromStdString(config->value<std::string>("browser.shortcuts.tabRight").value())));
     connect(tabRightShortcut, &QShortcut::activated, [this]() {
         this->setCurrentIndex(currentIndex()+1);
     });
 }
 
-WebViewTabBar::~WebViewTabBar()
+MainWindowTabBar::~MainWindowTabBar()
 {
     // cleanup
     qDeleteAll(m_views);
     m_views.clear();
 }
 
-int WebViewTabBar::addTab(const QUrl &url)
+int MainWindowTabBar::addTab(WebView *view)
 {
-    WebView *view = new WebView(0);
-    QWebEnginePage *page = new QWebEnginePage(m_profile);
-    view->setPage(page);
-    page->load(url);
     m_views.append(view);
 
     connect(view, &QWebEngineView::titleChanged, [this, view](const QString &title) {
@@ -84,11 +84,10 @@ int WebViewTabBar::addTab(const QUrl &url)
     return QTabBar::addTab("New Tab");
 }
 
-void WebViewTabBar::setProfile(WebEngineProfile *profile)
+void MainWindowTabBar::setProfile(WebEngineProfile *profile)
 {
     Q_CHECK_PTR(profile);
 
-    m_profile = profile;
     for(auto view : qAsConst(m_views)) {
         QWebEnginePage *page = new QWebEnginePage(profile);
         page->load(view->url());
@@ -96,17 +95,12 @@ void WebViewTabBar::setProfile(WebEngineProfile *profile)
     }
 }
 
-WebEngineProfile *WebViewTabBar::profile()
-{
-    return m_profile;
-}
-
-WebView *WebViewTabBar::currentView()
+WebView *MainWindowTabBar::currentView()
 {
     return m_views.at(currentIndex());
 }
 
-void WebViewTabBar::contextMenuEvent(QContextMenuEvent *event)
+void MainWindowTabBar::contextMenuEvent(QContextMenuEvent *event)
 {
     int tabIndex = tabAt(event->pos());
     if(tabIndex < 0) {
@@ -121,22 +115,23 @@ void WebViewTabBar::contextMenuEvent(QContextMenuEvent *event)
     menu.exec(event->globalPos());
 }
 
-QSize WebViewTabBar::tabSizeHint(int index) const
+QSize MainWindowTabBar::tabSizeHint(int index) const
 {
     Q_UNUSED(index)
     return QSize(200, this->height());
 }
 
-void WebViewTabBar::handleCurrentChanged(int index)
+void MainWindowTabBar::handleCurrentChanged(int index)
 {
     if(index < 0) {
-        addTab(m_profile->newtab());
+        addTab(createWebView(m_parent->profile()->homepage(), m_parent->profile()));
         return;
     }
+
     emit currentTabChanged(m_views.at(index));
 }
 
-void WebViewTabBar::removeTab(int index)
+void MainWindowTabBar::removeTab(int index)
 {
     // remove the tab data from the index
     m_views.at(index)->deleteLater();
@@ -147,13 +142,23 @@ void WebViewTabBar::removeTab(int index)
     QTabBar::removeTab(index);
 }
 
-void WebViewTabBar::updateTabText(WebView *view, const QString &text)
+void MainWindowTabBar::updateTabText(WebView *view, const QString &text)
 {
     int index = m_views.indexOf(view);
     setTabText(index, text);
 }
 
-void WebViewTabBar::updateVectorArrangement(int from, int to)
+void MainWindowTabBar::updateVectorArrangement(int from, int to)
 {
     m_views.move(from, to);
 }
+
+WebView *createWebView(const QUrl &url, WebEngineProfile *profile)
+{
+    WebView *view = new WebView(nullptr);
+    QWebEnginePage *page = new QWebEnginePage(profile);
+    view->setPage(page);
+    page->load(url);
+
+    return view;
+}
diff --git a/src/widgets/webviewtabbar.h b/src/widgets/mainwindowtabbar.h
index 64bb6a2..1186695 100644
--- a/src/widgets/webviewtabbar.h
+++ b/src/widgets/mainwindowtabbar.h
@@ -27,24 +27,23 @@
 #include <memory>
 
 class Configuration;
-class WebViewTabBar : public QTabBar
+class MainWindow;
+class MainWindowTabBar : public QTabBar
 {
     Q_OBJECT
 
 public:
-    explicit WebViewTabBar(const std::shared_ptr<Configuration> &config, WebEngineProfile *profile = nullptr, QWidget *parent = 0);
-    ~WebViewTabBar();
+    explicit MainWindowTabBar(const std::shared_ptr<Configuration> &config, MainWindow *parent = nullptr);
+    ~MainWindowTabBar();
 
     void setProfile(WebEngineProfile *profile);
-    WebEngineProfile *profile();
-
     WebView *currentView();
 
 signals:
     void currentTabChanged(WebView *view);
 
 public slots:
-    int addTab(const QUrl &url);
+    int addTab(WebView *view);
     void removeTab(int index);
 
 protected:
@@ -60,8 +59,9 @@ private slots:
 private:
     // store all views in a vector since tabs can only store a QVariant, and that can't easily take a pointer
     QVector<WebView*> m_views;
-
-    WebEngineProfile *m_profile = nullptr;
+    MainWindow *m_parent;
 };
 
+WebView *createWebView(const QUrl &url, WebEngineProfile *profile);
+
 #endif // WEBVIEWTABBAR_H