Split off DownloadsWidget into library

Fixed bug with BookmarksWidget crashing the program on exit

1 files changed, 9 insertions, 2 deletions

diff --git a/src/widgets/mainwindowmenubar.cpp b/src/widgets/mainwindowmenubar.cpp
index 95cb280..964d9fd 100644
--- a/src/widgets/mainwindowmenubar.cpp
+++ b/src/widgets/mainwindowmenubar.cpp
@@ -47,12 +47,19 @@ MainWindowMenuBar::MainWindowMenuBar(MainWindow *parent) :
     // Tools menu
     QMenu *toolsMenu = new QMenu(tr("Tools"), this);
     addMenu(toolsMenu);
-    QAction *downloadsAction = toolsMenu->addAction(tr("Downloads"), Browser::instance()->downloads(), SLOT(show()));
+    QAction *downloadsAction = toolsMenu->addAction(tr("Downloads"));
     downloadsAction->setParent(parent);
     downloadsAction->setShortcut(QKeySequence::fromString(browser->settings()->value("downloads.dialogShortcut").toString()));
-    QAction *bookmarksAction = toolsMenu->addAction(tr("Bookmarks"), Browser::instance()->bookmarks(), SLOT(show()));
+    connect(downloadsAction, &QAction::triggered, this, [&]() {
+        m_parentWindow->addTabbedDock(Qt::RightDockWidgetArea, browser->downloads());
+    });
+
+    QAction *bookmarksAction = toolsMenu->addAction(tr("Bookmarks"));
     bookmarksAction->setParent(parent);
     bookmarksAction->setShortcut(QKeySequence(browser->settings()->value("bookmarks.dialogShortcut").toString()));
+    connect(bookmarksAction, &QAction::triggered, this, [&]() {
+        m_parentWindow->addTabbedDock(Qt::RightDockWidgetArea, browser->bookmarks());
+    });
     toolsMenu->addSeparator();
     toolsMenu->addAction(tr("Filter"), browser->blocklists(), SLOT(show()), QKeySequence::fromString(browser->settings()->value("blocker.shortcut").toString()));