Merge remote-tracking branch 'origin/master' into frameworks

[dolphin.git] / src / statusbar / dolphinstatusbar.cpp

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 05055039680e75b78df1b1be3d05a9ccd715535c..5feeaa361cbc003766563d894b858bd280ea3b1b 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -24,7 +24,7 @@
 #include <KIconLoader>
 #include <QIcon>
 #include <KLocale>
 #include <KIconLoader>
 #include <QIcon>
 #include <KLocale>

-#include <KMenu>
+#include <QMenu>

 #include <KVBox>
 
 #include "statusbarspaceinfo.h"
 #include <KVBox>
 
 #include "statusbarspaceinfo.h"


@@ -114,14 +114,14 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     m_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 

-    m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+    m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

 
     m_spaceInfo->setFixedHeight(contentHeight);
 
     m_spaceInfo->setFixedHeight(contentHeight);

-    m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+    m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_progressBar->setFixedHeight(contentHeight);
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_progressBar->setFixedHeight(contentHeight);

-    m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
+    m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25);

 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->setMargin(0);
 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->setMargin(0);


@@ -259,7 +259,7 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {
     Q_UNUSED(event);
 
 {
     Q_UNUSED(event);
 

-    KMenu menu(this);
+    QMenu menu(this);

 
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);
 
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);