diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-02-28 10:18:08 +0100 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2017-02-28 10:18:08 +0100 |
commit | 7f6c9b22d1016aa0dba709495fabf41397676039 (patch) | |
tree | 35898077b84be953c0645262aaa9470802b5267b /src/mainwindow.cpp | |
parent | Fixed crash when closing the first tab (diff) | |
download | smolbote-7f6c9b22d1016aa0dba709495fabf41397676039.tar.xz |
Blocker rewrites
Some code commenting
Moved Blocker files for src/blocker
Keyboard shortcut for Blocker dialog
Diffstat (limited to 'src/mainwindow.cpp')
-rw-r--r-- | src/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 18c1e14..f455fae 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -30,7 +30,7 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) : QMainWindow(parent), - blocklistManager(new BlockerDialog(this)), + blocklistManager(new BlockerManager(this)), ui(new Ui::MainWindow), navigationToolBar(new QToolBar(tr("Navigation"), this)), tabToolBar(new QToolBar(tr("Tab bar"), this)), @@ -62,7 +62,7 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) : QAction *bookmarksAction = toolsMenu->addAction(tr("Bookmarks"), Browser::instance()->bookmarks(), SLOT(show())); bookmarksAction->setShortcut(QKeySequence(sSettings->value("bookmarks.dialogShortcut").toString())); toolsMenu->addSeparator(); - toolsMenu->addAction(tr("Blocker"), blocklistManager, SLOT(show())); + toolsMenu->addAction(tr("Blocker"), blocklistManager, SLOT(show()), QKeySequence::fromString(sSettings->value("blocker.shortcut").toString())); // Profile menu QMenu *profileMenu = new QMenu(tr("Profile"), menuBar); @@ -181,7 +181,7 @@ void MainWindow::loadProfile(const QString &name) } UrlRequestInterceptor *interceptor = new UrlRequestInterceptor(this); - interceptor->setSubscription(blocklistManager->subscription()); + interceptor->setSubscription(blocklistManager); m_profile->setRequestInterceptor(interceptor); connect(m_profile, SIGNAL(downloadRequested(QWebEngineDownloadItem*)), Browser::instance()->downloads(), SLOT(addDownload(QWebEngineDownloadItem*))); } |