diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-02-14 17:55:00 +0100 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-02-14 17:55:00 +0100 |
| commit | 883a502cc1cee3b596cef9645a6832804d6cb67f (patch) | |
| tree | fa137ec26a2965ac6f16272841f75d4945e1f571 /src/mainwindow.cpp | |
| parent | Settings changes (diff) | |
| download | smolbote-883a502cc1cee3b596cef9645a6832804d6cb67f.tar.xz | |
Global bookmarks and downloads dialogs
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 29b7e66..45d0b55 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -34,9 +34,7 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) : QMainWindow(parent), - downloadManager(new DownloadDialog(this)), blocklistManager(new BlockerDialog(this)), - bookmarkManager(new BookmarksDialog(this)), ui(new Ui::MainWindow), navigationToolBar(new QToolBar(tr("Navigation"), this)), tabToolBar(new QToolBar(tr("Tab bar"), this)), @@ -65,9 +63,13 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) : // Tools menu QMenu *toolsMenu = new QMenu(tr("Tools"), ui->menuBar); ui->menuBar->addMenu(toolsMenu); - toolsMenu->addAction(tr("Downloads"), downloadManager, SLOT(show())); + toolsMenu->addAction(tr("Downloads"), Browser::instance()->downloads(), SLOT(show())); toolsMenu->addAction(tr("Blocker"), blocklistManager, SLOT(show())); - toolsMenu->addAction(tr("Bookmarks"), bookmarkManager, SLOT(show())); + QAction *bookmarksAction = toolsMenu->addAction(tr("Bookmarks")); + bookmarksAction->setShortcut(QKeySequence(settings.value("shortcuts/bookmarks").toString())); + connect(bookmarksAction, &QAction::triggered, [this](){ + Browser::instance()->bookmarks()->show(this); + }); // Profile menu QMenu *profileMenu = new QMenu(tr("Profile"), ui->menuBar); @@ -160,7 +162,7 @@ void MainWindow::loadProfile(const QString &name) UrlRequestInterceptor *interceptor = new UrlRequestInterceptor(this); interceptor->setSubscription(blocklistManager->subscription()); profile->setRequestInterceptor(interceptor); - connect(profile, SIGNAL(downloadRequested(QWebEngineDownloadItem*)), downloadManager, SLOT(addDownload(QWebEngineDownloadItem*))); + connect(profile, SIGNAL(downloadRequested(QWebEngineDownloadItem*)), Browser::instance()->downloads(), SLOT(addDownload(QWebEngineDownloadItem*))); } void MainWindow::loadProfileGUI() |