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

[dolphin.git] / src / selectiontoggle.cpp

diff --git a/src/selectiontoggle.cpp b/src/selectiontoggle.cpp
index fa10c7559a6bcf4ccf5e84c448b85e7e1d9c4b49..01cfed0f3d80c49c239cb27d7c35eed9b28c87d6 100644 (file)
--- a/src/selectiontoggle.cpp
+++ b/src/selectiontoggle.cpp
@@ -44,6 +44,8 @@ SelectionToggle::SelectionToggle(QWidget* parent) :
     setIconOverlay(isChecked());
     connect(this, SIGNAL(toggled(bool)),
             this, SLOT(setIconOverlay(bool)));
     setIconOverlay(isChecked());
     connect(this, SIGNAL(toggled(bool)),
             this, SLOT(setIconOverlay(bool)));

+    connect(KGlobalSettings::self(), SIGNAL(iconChanged(int)),
+            this, SLOT(refreshIcon()));

 }
 
 SelectionToggle::~SelectionToggle()
 }
 
 SelectionToggle::~SelectionToggle()


@@ -87,9 +89,27 @@ void SelectionToggle::setVisible(bool visible)
 
 bool SelectionToggle::eventFilter(QObject* obj, QEvent* event)
 {
 
 bool SelectionToggle::eventFilter(QObject* obj, QEvent* event)
 {

-    if ((obj == parent()) && (event->type() == QEvent::Leave)) {
-        hide();
+    if (obj == parent()) {
+        switch (event->type()) {
+        case QEvent::Leave:
+            hide();
+            break;
+
+        case QEvent::MouseMove:
+            if (m_isHovered) {
+                // Don't forward mouse move events to the viewport,
+                // otherwise a rubberband selection will be shown when
+                // clicking on the selection toggle and moving the mouse
+                // above the viewport.
+                return true;
+            }
+            break;
+
+        default:
+            break;
+        }

     }
     }

+

     return QAbstractButton::eventFilter(obj, event);
 }
 
     return QAbstractButton::eventFilter(obj, event);
 }
 


@@ -177,12 +197,17 @@ void SelectionToggle::setIconOverlay(bool checked)
     update();
 }
 
     update();
 }
 

+void SelectionToggle::refreshIcon()
+{
+    setIconOverlay(isChecked());
+}
+

 void SelectionToggle::startFading()
 {
     Q_ASSERT(m_fadingTimeLine == 0);
 
     const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects;
 void SelectionToggle::startFading()
 {
     Q_ASSERT(m_fadingTimeLine == 0);
 
     const bool animate = KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects;

-    const int duration = animate ? 1500 : 1;
+    const int duration = animate ? 600 : 1;

 
     m_fadingTimeLine = new QTimeLine(duration, this);
     connect(m_fadingTimeLine, SIGNAL(frameChanged(int)),
 
     m_fadingTimeLine = new QTimeLine(duration, this);
     connect(m_fadingTimeLine, SIGNAL(frameChanged(int)),