diff options
Diffstat (limited to 'src/mainwindow/menubar.cpp')
-rw-r--r-- | src/mainwindow/menubar.cpp | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp index 7b7d912..2ce87f7 100644 --- a/src/mainwindow/menubar.cpp +++ b/src/mainwindow/menubar.cpp @@ -67,7 +67,7 @@ inline QDialog *createDevToolsDialog(QWebEnginePage *page) return popup; } -MenuBar::MenuBar(const Configuration *config, MainWindow *parent) +MenuBar::MenuBar(MainWindow *parent) : QMenuBar(parent) { auto *browser = qobject_cast<Browser *>(qApp); @@ -108,30 +108,31 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) smolbote->addSeparator(); - const QString sessionPath = config->value<QString>("browser.session.path").value(); + Configuration conf; + const QString sessionPath = conf.value<QString>("session.path").value(); auto *actionSaveSession = smolbote->addAction(tr("Save Session"), parent, [sessionPath]() { auto *sessionDialog = new SaveSessionDialog(nullptr); if(sessionDialog->exec() == QDialog::Accepted) sessionDialog->save(sessionPath); }); - config->setShortcut(actionSaveSession, "mainwindow.shortcuts.saveSession"); + setShortcut(actionSaveSession, "shortcuts.session.save"); auto *actionOpenSession = smolbote->addAction(tr("Open Session"), parent, [parent]() { auto *sessionDialog = new SessionDialog(parent); sessionDialog->exec(); }); - config->setShortcut(actionOpenSession, "mainwindow.shortcuts.openSession"); + setShortcut(actionOpenSession, "shortcuts.session.open"); smolbote->addSeparator(); auto *actionBookmarks = smolbote->addAction(tr("Bookmarks"), browser, [browser, parent]() { browser->showWidget(browser->bookmarks(), parent); }); - config->setShortcut(actionBookmarks, "bookmarks.shortcut"); + setShortcut(actionBookmarks, "shortcuts.window.bookmarks.show"); auto *actionDownloads = smolbote->addAction(tr("Downloads"), browser, [browser, parent]() { browser->showWidget(browser->downloads(), parent); }); - config->setShortcut(actionDownloads, "downloads.shortcut"); + setShortcut(actionDownloads, "shortcuts.window.downloads.show"); smolbote->addSeparator(); smolbote->addAction(tr("Load Plugin"), browser, [browser]() { @@ -142,34 +143,31 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) pluginInsertLocation = smolbote->addSeparator(); auto *actionAbout = smolbote->addAction(tr("About"), browser, &Browser::about); - config->setShortcut(actionAbout, "mainwindow.shortcuts.about"); - -// smolbote->addAction(tr("Help")); -// smolbote->addAction(tr("Check for updates")); + setShortcut(actionAbout, "shortcuts.window.about"); smolbote->addSeparator(); auto *actionQuit = smolbote->addAction(tr("Quit"), qApp, &QApplication::quit); - config->setShortcut(actionQuit, "mainwindow.shortcuts.quit"); + setShortcut(actionQuit, "shortcuts.window.quit"); } window = this->addMenu(tr("&Window")); { auto *actionNewWindow = window->addAction(tr("New Window"), browser, &Browser::createWindow); - config->setShortcut(actionNewWindow, "mainwindow.shortcuts.newWindow"); + setShortcut(actionNewWindow, "shortcuts.window.newwindow"); auto *actionNewSubwindow = window->addAction(tr("New Subwindow"), parent, [parent]() { parent->createSubWindow(nullptr, true); }); - config->setShortcut(actionNewSubwindow, "mainwindow.shortcuts.newGroup"); + setShortcut(actionNewSubwindow, "shortcuts.window.newgroup"); window->addSeparator(); auto *actionTileSubwindows = window->addAction(tr("Tile Subwindows"), parent->mdiArea, &QMdiArea::tileSubWindows); - config->setShortcut(actionTileSubwindows, "mainwindow.shortcuts.tileWindows"); + setShortcut(actionTileSubwindows, "shortcuts.subwindow.tile"); auto *actionCascadeSubwindows = window->addAction(tr("Cascade Subwindows"), parent->mdiArea, &QMdiArea::cascadeSubWindows); - config->setShortcut(actionCascadeSubwindows, "mainwindow.shortcuts.cascadeWindows"); + setShortcut(actionCascadeSubwindows, "shortcuts.subwindow.cascade"); window->addSeparator()->setText(tr("Subwindows")); } @@ -182,7 +180,7 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) _subwindow->setCurrentTab(index); }); }); - config->setShortcut(actionNewTab, "subwindow.shortcuts.new"); + setShortcut(actionNewTab, "shortcuts.subwindow.newtab"); subwindow->addSeparator(); @@ -192,7 +190,7 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) _subwindow->setCurrentTab(index); }); }); - config->setShortcut(actionRestoreTab, "subwindow.shortcuts.restoreTab"); + setShortcut(actionRestoreTab, "shortcuts.subwindow.restoretab"); auto *restoreTabsMenu = subwindow->addMenu(tr("Restore previous tab")); connect(restoreTabsMenu, &QMenu::aboutToShow, parent, [parent, restoreTabsMenu]() { @@ -242,28 +240,28 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) _subwindow->setCurrentTab(qMax(0, currentIdx - 1)); }); }); - config->setShortcut(leftTab, "subwindow.shortcuts.left"); + setShortcut(leftTab, "shortcuts.subwindow.tableft"); auto *moveTabLeft = subwindow->addAction(tr("Move tab left"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->moveTab(currentIdx, currentIdx - 1); }); }); - config->setShortcut(moveTabLeft, "subwindow.shortcuts.moveLeft"); + setShortcut(moveTabLeft, "shortcuts.subwindow.movetableft"); auto *rightTab = subwindow->addAction(tr("Switch to tab on the right"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->setCurrentTab(qMin(currentIdx + 1, _subwindow->tabCount() - 1)); }); }); - config->setShortcut(rightTab, "subwindow.shortcuts.right"); + setShortcut(rightTab, "shortcuts.subwindow.tabright"); auto *moveTabRight = subwindow->addAction(tr("Move tab right"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { _subwindow->moveTab(currentIdx, currentIdx + 1); }); }); - config->setShortcut(moveTabRight, "subwindow.shortcuts.moveRight"); + setShortcut(moveTabRight, "shortcuts.subwindow.movetabright"); subwindow->addSeparator(); @@ -272,7 +270,7 @@ MenuBar::MenuBar(const Configuration *config, MainWindow *parent) _subwindow->closeTab(currentIdx); }); }); - config->setShortcut(closeTab, "subwindow.shortcuts.close"); + setShortcut(closeTab, "shortcuts.subwindow.closetab"); subwindow->addAction(tr("Close tabs to the left"), parent, [parent]() { run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) { |