Remove toolbar-spacer if the menu has been disabled

Aligning the control-button to the right of Dolphin has the problem
that sub-menus might be opened on the left of the menu if the Dolphin
window reaches the right of the desktop. So the toolbar-spacer has
been removed and a default label has been applied to the control-button
to increase the target-area for opening the menu.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index c2a548906..8bf761658 100644
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -456,11 +456,9 @@ private slots:
                          const KUrl& url,
                          const QList<QAction*>& customActions);
 
-    void updateToolBarMenu();
+    void updateControlMenu();
     void updateToolBar();
-    void slotToolBarSpacerDeleted();
-    void slotToolBarMenuButtonDeleted();
-    void slotToolBarIconSizeChanged(const QSize& iconSize);
+    void slotControlButtonDeleted();
 
 private:
     /**
@@ -482,8 +480,8 @@ private:
     void updateViewActions();
     void updateGoActions();
 
-    void createToolBarMenuButton();
-    void deleteToolBarMenuButton();
+    void createControlButton();
+    void deleteControlButton();
 
     /**
      * Adds the action \p action to the menu \p menu in
@@ -585,8 +583,7 @@ private:
     QWeakPointer<DolphinSettingsDialog> m_settingsDialog;
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
-    QWidget* m_toolBarSpacer;
-    QToolButton* m_openToolBarMenuButton;
+    QToolButton* m_controlButton;
     QTimer* m_updateToolBarTimer;
 
     KJob* m_lastHandleUrlStatJob;