Minor optimizations for the menu toolbar-item

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1f3e99f76f954ec06d8f615bd350466b81d95a17..1fb9b63e7aeb12f4b7acef2cb5f1cfb0d4f0ced3 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -53,6 +53,7 @@
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_searchsettings.h"
 
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_searchsettings.h"
 

+#include <KAcceleratorManager>

 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KAction>
 #include <KActionCollection>
 #include <KActionMenu>


@@ -71,7 +72,6 @@
 #include <KInputDialog>
 #include <KLocale>
 #include <KProtocolManager>
 #include <KInputDialog>
 #include <KLocale>
 #include <KProtocolManager>

-#include <KPushButton>

 #include <KMenu>
 #include <KMenuBar>
 #include <KMessageBox>
 #include <KMenu>
 #include <KMenuBar>
 #include <KMessageBox>


@@ -93,8 +93,8 @@
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>
 #include <QDBusMessage>
 #include <QKeyEvent>
 #include <QClipboard>

+#include <QToolButton>

 #include <QSplitter>
 #include <QSplitter>

-#include <kacceleratormanager.h>

 
 /*
  * Remembers the tab configuration if a tab has been closed.
 
 /*
  * Remembers the tab configuration if a tab has been closed.


@@ -1962,12 +1962,10 @@ void DolphinMainWindow::createToolBarMenuButton()
     Q_ASSERT(!m_openToolBarMenuButton);
 
     m_toolBarSpacer = new QWidget(this);
     Q_ASSERT(!m_openToolBarMenuButton);
 
     m_toolBarSpacer = new QWidget(this);

-    m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);

 
 

-    m_openToolBarMenuButton = new KPushButton(this);
-    m_openToolBarMenuButton->setFlat(true);
+    m_openToolBarMenuButton = new QToolButton(this);

     m_openToolBarMenuButton->setIcon(KIcon("configure"));
     m_openToolBarMenuButton->setIcon(KIcon("configure"));

-    m_openToolBarMenuButton->setMaximumWidth(m_openToolBarMenuButton->sizeHint().height());

 
     // Instead of using QPushButton::setMenu() the opening of the menu is done manually
     // to prevent the "clutter" of the down-arrow drawn by the style.
 
     // Instead of using QPushButton::setMenu() the opening of the menu is done manually
     // to prevent the "clutter" of the down-arrow drawn by the style.

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7d964cf5f03c4458c585ad24b091d3060b6f076a..a242a654605768a92e67266f14f2aab206c6f8ed 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -44,12 +44,12 @@ class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class KAction;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class KAction;

+class KJob;

 class KNewFileMenu;
 class KNewFileMenu;

-class KPushButton;

 class KTabBar;
 class KUrl;
 class QSplitter;
 class KTabBar;
 class KUrl;
 class QSplitter;

-class KJob;
+class QToolButton;

 
 /**
  * @short Main window for Dolphin.
 
 /**
  * @short Main window for Dolphin.


@@ -568,7 +568,7 @@ private:
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QWidget* m_toolBarSpacer;
 
     // Members for the toolbar menu that is shown when the menubar is hidden:
     QWidget* m_toolBarSpacer;

-    KPushButton* m_openToolBarMenuButton;
+    QToolButton* m_openToolBarMenuButton;

     QWeakPointer<KMenu> m_toolBarMenu;
     QTimer* m_updateToolBarTimer;
 
     QWeakPointer<KMenu> m_toolBarMenu;
     QTimer* m_updateToolBarTimer;