* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphinstatusbar.cpp

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index eabbc77b107c85c2f6bd4e05d431cace747860d4..7a9b5dc8a834fc88005504e28790f9319bcbf494 100644 (file)
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -19,18 +19,23 @@
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"
  ***************************************************************************/
 
 #include "dolphinstatusbar.h"

-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"

 #include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 #include "zoomlevelinfo.h"
 
 #include "dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 #include "zoomlevelinfo.h"
 

-#include <QtGui/QLabel>
-#include <QtGui/QProgressBar>
-#include <QtCore/QTimer>
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QToolButton>
+#include <QTimer>

 
 #include <kiconloader.h>
 
 #include <kiconloader.h>

+#include <kicon.h>
+#include <klocale.h>

 #include <kvbox.h>
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
 #include <kvbox.h>
 
 DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :


@@ -38,10 +43,14 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_view(view),
     m_messageLabel(0),
     m_spaceInfo(0),
     m_view(view),
     m_messageLabel(0),
     m_spaceInfo(0),

+    m_zoomWidget(0),
+    m_zoomOut(0),

     m_zoomSlider(0),
     m_zoomSlider(0),

+    m_zoomIn(0),

     m_progressBar(0),
     m_progress(100)
 {
     m_progressBar(0),
     m_progress(100)
 {

+    setMargin(0);

     setSpacing(4);
 
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),
     setSpacing(4);
 
     connect(m_view, SIGNAL(urlChanged(const KUrl&)),


@@ -51,25 +60,44 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 

-    // initialize space information
-    m_spaceInfo = new StatusBarSpaceInfo(this);
-    m_spaceInfo->setUrl(m_view->url());
-    

     // initialize zoom slider
     // initialize zoom slider

-    m_zoomSlider = new QSlider(Qt::Horizontal, this);
+    m_zoomWidget = new QWidget(this);
+
+    m_zoomOut = new QToolButton(m_zoomWidget);
+    m_zoomOut->setIcon(KIcon("zoom-out"));
+    m_zoomOut->setAutoRaise(true);
+
+    m_zoomSlider = new QSlider(Qt::Horizontal, m_zoomWidget);

     m_zoomSlider->setPageStep(1);
     m_zoomSlider->setPageStep(1);

-    
+

     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());
     const int min = ZoomLevelInfo::minimumLevel();
     const int max = ZoomLevelInfo::maximumLevel();
     m_zoomSlider->setRange(min, max);
     m_zoomSlider->setValue(view->zoomLevel());

-    
-    connect(m_zoomSlider, SIGNAL(sliderMoved(int)),
-            this, SLOT(setZoomLevel(int)));
-    connect(m_view, SIGNAL(zoomLevelChanged(int)),
-            m_zoomSlider, SLOT(setValue(int)));
-            
-    // initialize progress informatino
+    updateZoomSliderToolTip(view->zoomLevel());
+
+    m_zoomIn = new QToolButton(m_zoomWidget);
+    m_zoomIn->setIcon(KIcon("zoom-in"));
+    m_zoomIn->setAutoRaise(true);
+
+    QHBoxLayout* zoomWidgetLayout = new QHBoxLayout(m_zoomWidget);
+    zoomWidgetLayout->setSpacing(0);
+    zoomWidgetLayout->setMargin(0);
+    zoomWidgetLayout->addWidget(m_zoomOut);
+    zoomWidgetLayout->addWidget(m_zoomSlider);
+    zoomWidgetLayout->addWidget(m_zoomIn);
+
+    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int)));
+    connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(showZoomSliderToolTip(int)));
+    connect(m_view, SIGNAL(zoomLevelChanged(int)), m_zoomSlider, SLOT(setValue(int)));
+    connect(m_zoomOut, SIGNAL(clicked()), this, SLOT(zoomOut()));
+    connect(m_zoomIn, SIGNAL(clicked()), this, SLOT(zoomIn()));
+
+    // initialize space information
+    m_spaceInfo = new StatusBarSpaceInfo(this);
+    m_spaceInfo->setUrl(m_view->url());
+
+    // initialize progress information

     m_progressText = new QLabel(this);
     m_progressText->hide();
 
     m_progressText = new QLabel(this);
     m_progressText->hide();
 


@@ -77,20 +105,18 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent, DolphinView* view) :
     m_progressBar->hide();
 
     // initialize sizes
     m_progressBar->hide();
 
     // initialize sizes

-    const int contentHeight = QFontMetrics(m_messageLabel->font()).height() + 4;
-    const int barHeight = contentHeight + 4;
+    const int fontHeight = QFontMetrics(m_messageLabel->font()).height();
+    const int zoomWidgetHeight = m_zoomWidget->minimumSizeHint().height();
+    const int contentHeight = (fontHeight < zoomWidgetHeight) ? zoomWidgetHeight : fontHeight;

 
 

-    setMinimumHeight(barHeight);
-    m_messageLabel->setMinimumTextHeight(barHeight);
+    m_messageLabel->setMinimumTextHeight(contentHeight);

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

-    m_progressBar->setFixedHeight(contentHeight);
-    m_progressBar->setMaximumWidth(200);
-    m_zoomSlider->setMaximumWidth(100);
-    
+    m_progressBar->setFixedSize(200, contentHeight);
+    m_zoomWidget->setFixedSize(150, contentHeight);
+

     setExtensionsVisible(true);
 }
 
     setExtensionsVisible(true);
 }
 

-

 DolphinStatusBar::~DolphinStatusBar()
 {
 }
 DolphinStatusBar::~DolphinStatusBar()
 {
 }


@@ -98,6 +124,10 @@ DolphinStatusBar::~DolphinStatusBar()
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {
 void DolphinStatusBar::setMessage(const QString& msg,
                                   Type type)
 {

+    if ((msg == m_messageLabel->text()) && (type == m_messageLabel->type())) {
+        return;
+    }
+

     m_messageLabel->setMessage(msg, type);
 
     const int widthGap = m_messageLabel->widthGap();
     m_messageLabel->setMessage(msg, type);
 
     const int widthGap = m_messageLabel->widthGap();


@@ -172,6 +202,12 @@ const QString& DolphinStatusBar::defaultText() const
     return m_messageLabel->defaultText();
 }
 
     return m_messageLabel->defaultText();
 }
 

+void DolphinStatusBar::refresh()
+{
+    setExtensionsVisible(true);
+    assureVisibleText();
+}
+

 void DolphinStatusBar::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
 void DolphinStatusBar::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);


@@ -204,29 +240,55 @@ void DolphinStatusBar::updateSpaceInfoContent(const KUrl& url)
 
 void DolphinStatusBar::setZoomLevel(int zoomLevel)
 {
 
 void DolphinStatusBar::setZoomLevel(int zoomLevel)
 {

+    m_zoomOut->setEnabled(zoomLevel > m_zoomSlider->minimum());
+    m_zoomIn->setEnabled(zoomLevel < m_zoomSlider->maximum());

     m_view->setZoomLevel(zoomLevel);
     m_view->setZoomLevel(zoomLevel);

+    updateZoomSliderToolTip(zoomLevel);

 }
 
 void DolphinStatusBar::assureVisibleText()
 {
     const int widthGap = m_messageLabel->widthGap();
 }
 
 void DolphinStatusBar::assureVisibleText()
 {
     const int widthGap = m_messageLabel->widthGap();

-    const bool isProgressBarVisible = m_progressBar->isVisible();
-    
-    const int spaceInfoWidth  = m_spaceInfo->isVisible()  ? m_spaceInfo->width()  : 0;
-    const int zoomSliderWidth = m_zoomSlider->isVisible() ? m_zoomSlider->width() : 0;
-    const int widgetsWidth = spaceInfoWidth + zoomSliderWidth;
-
-    if (widgetsWidth > 0) {
-        // The space information and (or) the zoom slider are (is) shown.
+    if (m_spaceInfo->isVisible() || m_zoomWidget->isVisible()) {
+        // At least the space information or the zoom slider is shown.

         // Hide them if the status bar text does not fit into the available width.
         if (widthGap > 0) {
             setExtensionsVisible(false);
         }
         // Hide them if the status bar text does not fit into the available width.
         if (widthGap > 0) {
             setExtensionsVisible(false);
         }

-    } else if (!isProgressBarVisible && (widthGap + widgetsWidth <= 0)) {
-        setExtensionsVisible(true);
+    } else if (!m_progressBar->isVisible()) {
+        const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+        const int spaceInfoWidth  = settings->showSpaceInfo()  ? m_spaceInfo->minimumWidth()  : 0;
+        const int zoomWidgetWidth = settings->showZoomSlider() ? m_zoomWidget->minimumWidth() : 0;
+        const int widgetsWidth = spaceInfoWidth + zoomWidgetWidth;
+
+        if (widthGap + widgetsWidth <= 0) {
+            setExtensionsVisible(true);
+        }

     }
 }
 
     }
 }
 

+void DolphinStatusBar::zoomOut()
+{
+    const int value = m_zoomSlider->value();
+    m_zoomSlider->setValue(value - 1);
+}
+
+void DolphinStatusBar::zoomIn()
+{
+    const int value = m_zoomSlider->value();
+    m_zoomSlider->setValue(value + 1);
+}
+
+void DolphinStatusBar::showZoomSliderToolTip(int zoomLevel)
+{
+    updateZoomSliderToolTip(zoomLevel);
+
+    QPoint global = m_zoomSlider->rect().topLeft();
+    global.ry() += m_zoomSlider->height() / 2;
+    QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));
+    QApplication::sendEvent(m_zoomSlider, &toolTipEvent);
+}
+

 void DolphinStatusBar::setExtensionsVisible(bool visible)
 {
     bool spaceInfoVisible = visible;
 void DolphinStatusBar::setExtensionsVisible(bool visible)
 {
     bool spaceInfoVisible = visible;


@@ -236,9 +298,15 @@ void DolphinStatusBar::setExtensionsVisible(bool visible)
         spaceInfoVisible = settings->showSpaceInfo();
         zoomSliderVisible = settings->showZoomSlider();
     }
         spaceInfoVisible = settings->showSpaceInfo();
         zoomSliderVisible = settings->showZoomSlider();
     }

-    
+

     m_spaceInfo->setVisible(spaceInfoVisible);
     m_spaceInfo->setVisible(spaceInfoVisible);

-    m_zoomSlider->setVisible(zoomSliderVisible);
+    m_zoomWidget->setVisible(zoomSliderVisible);
+}
+
+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"
 }
 
 #include "dolphinstatusbar.moc"