1 files changed, 13 insertions, 16 deletions

diff --git a/src/mainwindow/menubar.cpp b/src/mainwindow/menubar.cpp
index 5fc039a..e479e8d 100644
--- a/src/mainwindow/menubar.cpp
+++ b/src/mainwindow/menubar.cpp
@@ -79,30 +79,30 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
     auto *actionBookmarks = window->addAction(tr("Bookmarks"), browser, [browser, parent]() {
         browser->showWidget(browser->bookmarks(), parent);
     });
-    conf.shortcut<QAction>(*actionBookmarks, "shortcuts.window.bookmarks.show");
+    conf.shortcut<QAction>(*actionBookmarks, "shortcuts/window.bookmarks.show");
 
     auto *actionDownloads = window->addAction(tr("Downloads"), browser, [browser, parent]() {
         browser->showWidget(browser->downloads(), parent);
     });
-    conf.shortcut<QAction>(*actionDownloads, "shortcuts.window.downloads.show");
+    conf.shortcut<QAction>(*actionDownloads, "shortcuts/window.downloads.show");
     window->addSeparator();
 
     auto *actionNewWindow = window->addAction(tr("New Window"), browser, [browser]() {
         const Session::MainWindow window_data;
         browser->open({ window_data }, false);
     });
-    conf.shortcut<QAction>(*actionNewWindow, "shortcuts.window.newwindow");
+    conf.shortcut<QAction>(*actionNewWindow, "shortcuts/window.newwindow");
 
     auto *actionNewSubwindow = window->addAction(tr("New Subwindow"), parent, [parent]() {
         const Session::SubWindow session;
         parent->createSubWindow(session);
     });
-    conf.shortcut<QAction>(*actionNewSubwindow, "shortcuts.window.newgroup");
+    conf.shortcut<QAction>(*actionNewSubwindow, "shortcuts/window.newgroup");
 
     auto *actionCloseSubwindow = window->addAction(tr("Close Subwindow"), parent, [parent]() {
         parent->currentSubWindow()->close();
     });
-    conf.shortcut<QAction>(*actionCloseSubwindow, "shortcuts.subwindow.close");
+    conf.shortcut<QAction>(*actionCloseSubwindow, "shortcuts/subwindow.close");
 
     window->addSeparator()->setText(tr("Toolbars"));
 
@@ -140,7 +140,7 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
                 _subwindow->setCurrentTab(index);
             });
         });
-        conf.shortcut<QAction>(*actionNewTab, "shortcuts.subwindow.newtab");
+        conf.shortcut<QAction>(*actionNewTab, "shortcuts/subwindow.newtab");
 
         subwindow->addSeparator();
 
@@ -150,7 +150,7 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
                 _subwindow->setCurrentTab(index);
             });
         });
-        conf.shortcut<QAction>(*actionRestoreTab, "shortcuts.subwindow.restoretab");
+        conf.shortcut<QAction>(*actionRestoreTab, "shortcuts/subwindow.restoretab");
 
         auto *restoreTabsMenu = subwindow->addMenu(tr("Restore previous tab"));
         connect(restoreTabsMenu, &QMenu::aboutToShow, parent, [parent, restoreTabsMenu]() {
@@ -200,28 +200,28 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
                 _subwindow->setCurrentTab(qMax(0, currentIdx - 1));
             });
         });
-        conf.shortcut<QAction>(*leftTab, "shortcuts.subwindow.tableft");
+        conf.shortcut<QAction>(*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);
             });
         });
-        conf.shortcut<QAction>(*moveTabLeft, "shortcuts.subwindow.movetableft");
+        conf.shortcut<QAction>(*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));
             });
         });
-        conf.shortcut<QAction>(*rightTab, "shortcuts.subwindow.tabright");
+        conf.shortcut<QAction>(*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);
             });
         });
-        conf.shortcut<QAction>(*moveTabRight, "shortcuts.subwindow.movetabright");
+        conf.shortcut<QAction>(*moveTabRight, "shortcuts/subwindow.movetabright");
 
         subwindow->addSeparator();
 
@@ -230,7 +230,7 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
                 _subwindow->closeTab(currentIdx);
             });
         });
-        conf.shortcut<QAction>(*closeTab, "shortcuts.subwindow.closetab");
+        conf.shortcut<QAction>(*closeTab, "shortcuts/subwindow.closetab");
 
         subwindow->addAction(tr("Close tabs to the left"), parent, [parent]() {
             run_if(parent->currentSubWindow(), [](SubWindow *_subwindow, int currentIdx) {
@@ -329,10 +329,7 @@ MenuBar::MenuBar(QMenu *appMenu, MainWindow *parent)
                 auto *printer = new QPrinter(QPrinterInfo::defaultPrinter());
                 QPrintDialog dlg(printer, parent);
                 if(dlg.exec() == QDialog::Accepted) {
-                    parent->currentView()->page()->print(printer, [printer](bool success) {
-                        Q_UNUSED(success);
-                        delete printer;
-                    });
+                    parent->currentView()->print(printer);
                 }
             }
         });