prevent deselection of current folder in inactive columns

svn path=/trunk/KDE/kdebase/apps/; revision=676787

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 7f5d569be050853b5226e079219fae918dda4722..32a8553f9c6bfd65efc1feb36f1f5fff61bd7607 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -62,8 +62,16 @@ protected:
     virtual void dragLeaveEvent(QDragLeaveEvent* event);
     virtual void dragMoveEvent(QDragMoveEvent* event);
     virtual void dropEvent(QDropEvent* event);
     virtual void dragLeaveEvent(QDragLeaveEvent* event);
     virtual void dragMoveEvent(QDragMoveEvent* event);
     virtual void dropEvent(QDropEvent* event);

+    virtual void mousePressEvent(QMouseEvent* event);

     virtual void paintEvent(QPaintEvent* event);
 
     virtual void paintEvent(QPaintEvent* event);
 

+private:
+    /** Used by ColumnWidget::setActive(). */
+    void activate();
+
+    /** Used by ColumnWidget::setActive(). */
+    void deactivate();
+

 private:
     bool m_active;
     KUrl m_url;
 private:
     bool m_active;
     KUrl m_url;


@@ -85,7 +93,6 @@ ColumnWidget::ColumnWidget(QWidget* parent,
     m_dropRect()
 {
     setAcceptDrops(true);
     m_dropRect()
 {
     setAcceptDrops(true);

-    setSelectionBehavior(SelectItems);

     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
 
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
 


@@ -105,6 +112,8 @@ ColumnWidget::ColumnWidget(QWidget* parent,
 
     const int iconSize = settings->iconSize();
     m_viewOptions.decorationSize = QSize(iconSize, iconSize);
 
     const int iconSize = settings->iconSize();
     m_viewOptions.decorationSize = QSize(iconSize, iconSize);

+
+    activate();

 }
 
 ColumnWidget::~ColumnWidget()
 }
 
 ColumnWidget::~ColumnWidget()


@@ -125,15 +134,11 @@ void ColumnWidget::setActive(bool active)
 
     m_active = active;
 
 
     m_active = active;
 

-    QColor bgColor = KColorScheme(KColorScheme::View).background();
-    if (!active) {
-        const QColor fgColor = KColorScheme(KColorScheme::View).foreground();
-        bgColor = KColorUtils::mix(bgColor, fgColor, 0.04);
+    if (active) {
+        activate();
+    } else {
+        deactivate();

     }
     }

-
-    QPalette palette = viewport()->palette();
-    palette.setColor(viewport()->backgroundRole(), bgColor);
-    viewport()->setPalette(palette);

 }
 
 const KUrl& ColumnWidget::url() const
 }
 
 const KUrl& ColumnWidget::url() const


@@ -188,6 +193,17 @@ void ColumnWidget::dropEvent(QDropEvent* event)
     m_dragging = false;
 }
 
     m_dragging = false;
 }
 

+void ColumnWidget::mousePressEvent(QMouseEvent* event)
+{
+    if (m_active || indexAt(event->pos()).isValid()) {
+        // Only accept the mouse press event in inactive views,
+        // if a click is done on an item. This assures that
+        // the current selection, which usually shows the
+        // the directory for next column, won't get deleted.
+        QListView::mousePressEvent(event);
+    }
+}
+

 void ColumnWidget::paintEvent(QPaintEvent* event)
 {
     QListView::paintEvent(event);
 void ColumnWidget::paintEvent(QPaintEvent* event)
 {
     QListView::paintEvent(event);


@@ -199,6 +215,29 @@ void ColumnWidget::paintEvent(QPaintEvent* event)
     }
 }
 
     }
 }
 

+void ColumnWidget::activate()
+{
+    const QColor bgColor = KColorScheme(KColorScheme::View).background();
+    QPalette palette = viewport()->palette();
+    palette.setColor(viewport()->backgroundRole(), bgColor);
+    viewport()->setPalette(palette);
+
+    setSelectionMode(MultiSelection);
+}
+
+void ColumnWidget::deactivate()
+{
+    QColor bgColor = KColorScheme(KColorScheme::View).background();
+    const QColor fgColor = KColorScheme(KColorScheme::View).foreground();
+    bgColor = KColorUtils::mix(bgColor, fgColor, 0.04);
+
+    QPalette palette = viewport()->palette();
+    palette.setColor(viewport()->backgroundRole(), bgColor);
+    viewport()->setPalette(palette);
+
+    setSelectionMode(SingleSelection);
+}
+

 // ---
 
 DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :
 // ---
 
 DolphinColumnView::DolphinColumnView(QWidget* parent, DolphinController* controller) :