MainMenu: Fix shortcuts for toggling sidebars

src/lib/app/browserwindow.cpp

@@ -949,6 +949,9 @@ void BrowserWindow::restoreWindowState(const RestoreManager::WindowData &d)
 
 void BrowserWindow::createToolbarsMenu(QMenu* menu)
 {
+    removeActions(menu->actions());
+    menu->clear();
+
     QAction* action;
 
 #ifndef Q_OS_MAC
@@ -970,6 +973,8 @@ void BrowserWindow::createToolbarsMenu(QMenu* menu)
     action = menu->addAction(tr("&Tabs on Top"), this, SLOT(toggleTabsOnTop(bool)));
     action->setCheckable(true);
     action->setChecked(qzSettings->tabsOnTop);
+
+    addActions(menu->actions());
 }
 
 void BrowserWindow::createSidebarsMenu(QMenu* menu)
@@ -1018,6 +1023,13 @@ void BrowserWindow::createEncodingMenu(QMenu* menu)
     createEncodingSubMenu(tr("Other"), otherCodecs, menu);
 }
 
+void BrowserWindow::removeActions(const QList<QAction *> &actions)
+{
+    foreach (QAction *action, actions) {
+        removeAction(action);
+    }
+}
+
 void BrowserWindow::addTab()
 {
     m_tabWidget->addView(QUrl(), Qz::NT_SelectedNewEmptyTab, true);

src/lib/app/browserwindow.h

@@ -82,6 +82,8 @@ public:
     void createSidebarsMenu(QMenu* menu);
     void createEncodingMenu(QMenu* menu);
 
+    void removeActions(const QList<QAction*> &actions);
+
     SideBar* addSideBar();
 
     QByteArray saveState(int version = 0) const;

src/lib/app/mainmenu.cpp

@@ -465,7 +465,6 @@ void MainMenu::aboutToShowSidebarsMenu()
     Q_ASSERT(menu);
 
     if (m_window) {
-        menu->clear();
         m_window->createSidebarsMenu(menu);
     }
 }

src/lib/sidebar/sidebar.cpp

@@ -93,6 +93,9 @@ SideBarManager::SideBarManager(BrowserWindow* parent)
 
 void SideBarManager::createMenu(QMenu* menu)
 {
+    m_window->removeActions(menu->actions());
+    menu->clear();
+
     QAction* act = menu->addAction(SideBar::tr("Bookmarks"), this, SLOT(slotShowSideBar()));
     act->setCheckable(true);
     act->setShortcut(QKeySequence("Ctrl+Shift+B"));
@@ -116,9 +119,6 @@ void SideBarManager::createMenu(QMenu* menu)
     }
 
     m_window->addActions(menu->actions());
-
-    // Menu is only valid until hidden
-    connect(menu, SIGNAL(aboutToHide()), this, SLOT(clearMenu()));
 }
 
 void SideBarManager::addSidebar(const QString &id, SideBarInterface* interface)
@@ -142,14 +142,6 @@ void SideBarManager::slotShowSideBar()
     }
 }
 
-void SideBarManager::clearMenu()
-{
-    QMenu* menu = qobject_cast<QMenu*>(sender());
-    Q_ASSERT(menu);
-
-    menu->clear();
-}
-
 void SideBarManager::showSideBar(const QString &id, bool toggle)
 {
     if (id == QLatin1String("None")) {

src/lib/sidebar/sidebar.h

@@ -72,7 +72,6 @@ public:
 
 private slots:
     void slotShowSideBar();
-    void clearMenu();
 
 private:
     BrowserWindow* m_window;