Merge remote-tracking branch 'origin/Applications/17.04'

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

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 79355fb55f4efa37792e8f381e3032dab9f05584..38b7ad4ddc2cafd731dda1f89d8675b6ca9fb7bb 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -21,11 +21,9 @@
 
 #include "dolphin_generalsettings.h"
 
-#include <KIconLoader>
-#include <KIcon>
-#include <KLocale>
-#include <KMenu>
-#include <KVBox>
+#include <QIcon>
+#include <KLocalizedString>
+#include <QMenu>
 
 #include "statusbarspaceinfo.h"
 
@@ -33,10 +31,12 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QProgressBar>
-#include <QTextDocument>
 #include <QToolButton>
 #include <QTime>
 #include <QTimer>
+#include <QSlider>
+#include <QTextDocument>
+#include <QHelpEvent>
 
 #include <views/dolphinview.h>
 #include <views/zoomlevelinfo.h>
@@ -73,6 +73,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     m_zoomSlider->setRange(ZoomLevelInfo::minimumLevel(), ZoomLevelInfo::maximumLevel());
 
     connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::zoomLevelChanged);
+    connect(m_zoomSlider, &QSlider::valueChanged, this, &DolphinStatusBar::updateZoomSliderToolTip);
     connect(m_zoomSlider, &QSlider::sliderMoved, this, &DolphinStatusBar::showZoomSliderToolTip);
 
     // Initialize space information
@@ -80,7 +81,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
 
     // Initialize progress information
     m_stopButton = new QToolButton(this);
-    m_stopButton->setIcon(KIcon("process-stop"));
+    m_stopButton->setIcon(QIcon::fromTheme(QStringLiteral("process-stop")));
     m_stopButton->setAccessibleName(i18n("Stop"));
     m_stopButton->setAutoRaise(true);
     m_stopButton->setToolTip(i18nc("@tooltip", "Stop loading"));
@@ -108,18 +109,19 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
     const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();
     const int contentHeight = qMax(fontHeight, zoomSliderHeight);
 
+    QFontMetrics fontMetrics(m_label->font());
+
     m_label->setFixedHeight(contentHeight);
     m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
-    m_zoomSlider->setFixedHeight(contentHeight);
-    m_zoomSlider->setMaximumWidth(150);
+    m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
 
     m_spaceInfo->setFixedHeight(contentHeight);
-    m_spaceInfo->setMaximumWidth(150);
+    m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
     m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_progressBar->setFixedHeight(contentHeight);
-    m_progressBar->setMaximumWidth(150);
+    m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 25);
 
     QHBoxLayout* topLayout = new QHBoxLayout(this);
     topLayout->setMargin(0);
@@ -226,12 +228,12 @@ QString DolphinStatusBar::defaultText() const
     return m_defaultText;
 }
 
-void DolphinStatusBar::setUrl(const KUrl& url)
+void DolphinStatusBar::setUrl(const QUrl& url)
 {
     m_spaceInfo->setUrl(url);
 }
 
-KUrl DolphinStatusBar::url() const
+QUrl DolphinStatusBar::url() const
 {
     return m_spaceInfo->url();
 }
@@ -240,7 +242,6 @@ void DolphinStatusBar::setZoomLevel(int zoomLevel)
 {
     if (zoomLevel != m_zoomSlider->value()) {
         m_zoomSlider->setValue(zoomLevel);
-        updateZoomSliderToolTip(zoomLevel);
     }
 }
 
@@ -258,7 +259,7 @@ void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event)
 {
     Q_UNUSED(event);
 
-    KMenu menu(this);
+    QMenu menu(this);
 
     QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider"));
     showZoomSliderAction->setCheckable(true);
@@ -338,6 +339,12 @@ void DolphinStatusBar::slotResetToDefaultText()
     updateLabelText();
 }
 
+void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
+{
+    const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);
+    m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
+}
+
 void DolphinStatusBar::setExtensionsVisible(bool visible)
 {
     bool showSpaceInfo = visible;
@@ -350,10 +357,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
     m_zoomSlider->setVisible(showZoomSlider);
 }
 
-void DolphinStatusBar::updateZoomSliderToolTip(int zoomLevel)
-{
-    const int size = ZoomLevelInfo::iconSizeForZoomLevel(zoomLevel);
-    m_zoomSlider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
-}
-
-#include "dolphinstatusbar.moc"