Create the new architecture for KCategorizedView. Now DolphinModel is created, inheri...

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index 3672fe18c0209271d72165606899214f40634b8b..defe93192fc6cc377405fd1253f3ea4368fcbb95 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -20,6 +20,7 @@
 
 #include "dolphindetailsview.h"
 
 
 #include "dolphindetailsview.h"
 

+#include "dolphinmodel.h"

 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphincontroller.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"


@@ -27,8 +28,6 @@
 
 #include "dolphin_detailsmodesettings.h"
 
 
 #include "dolphin_detailsmodesettings.h"
 

-#include <kdirmodel.h>
-

 #include <QApplication>
 #include <QHeaderView>
 #include <QRubberBand>
 #include <QApplication>
 #include <QHeaderView>
 #include <QRubberBand>


@@ -52,6 +51,7 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     setSelectionBehavior(SelectItems);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);
     setSelectionBehavior(SelectItems);
     setDragDropMode(QAbstractItemView::DragDrop);
     setDropIndicatorShown(false);

+    setAlternatingRowColors(true);

 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);
 
     setMouseTracking(true);
     viewport()->setAttribute(Qt::WA_Hover);


@@ -68,15 +68,17 @@ DolphinDetailsView::DolphinDetailsView(QWidget* parent, DolphinController* contr
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 
     connect(parent, SIGNAL(sortOrderChanged(Qt::SortOrder)),
             this, SLOT(setSortIndicatorOrder(Qt::SortOrder)));
 

+    // TODO: Connecting to the signal 'activated()' is not possible, as kstyle
+    // does not forward the single vs. doubleclick to it yet (KDE 4.1?). Hence it is
+    // necessary connecting the signal 'singleClick()' or 'doubleClick' and to handle the
+    // RETURN-key in keyPressEvent().

     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),
     if (KGlobalSettings::singleClick()) {
         connect(this, SIGNAL(clicked(const QModelIndex&)),

-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(slotItemActivated(const QModelIndex&)));

     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),
     } else {
         connect(this, SIGNAL(doubleClicked(const QModelIndex&)),

-                controller, SLOT(triggerItem(const QModelIndex&)));
+                this, SLOT(slotItemActivated(const QModelIndex&)));

     }
     }

-    connect(this, SIGNAL(activated(const QModelIndex&)),
-            controller, SLOT(triggerItem(const QModelIndex&)));

     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),
     connect(this, SIGNAL(entered(const QModelIndex&)),
             this, SLOT(slotEntered(const QModelIndex&)));
     connect(this, SIGNAL(viewportEntered()),


@@ -119,23 +121,23 @@ bool DolphinDetailsView::event(QEvent* event)
         const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         Q_ASSERT(settings != 0);
         if (!settings->showDate()) {
         const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
         Q_ASSERT(settings != 0);
         if (!settings->showDate()) {

-            hideColumn(KDirModel::ModifiedTime);
+            hideColumn(DolphinModel::ModifiedTime);

         }
 
         if (!settings->showPermissions()) {
         }
 
         if (!settings->showPermissions()) {

-            hideColumn(KDirModel::Permissions);
+            hideColumn(DolphinModel::Permissions);

         }
 
         if (!settings->showOwner()) {
         }
 
         if (!settings->showOwner()) {

-            hideColumn(KDirModel::Owner);
+            hideColumn(DolphinModel::Owner);

         }
 
         if (!settings->showGroup()) {
         }
 
         if (!settings->showGroup()) {

-            hideColumn(KDirModel::Group);
+            hideColumn(DolphinModel::Group);

         }
 
         if (!settings->showType()) {
         }
 
         if (!settings->showType()) {

-            hideColumn(KDirModel::Type);
+            hideColumn(DolphinModel::Type);

         }
     }
 
         }
     }
 


@@ -150,7 +152,7 @@ QStyleOptionViewItem DolphinDetailsView::viewOptions() const
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);
 void DolphinDetailsView::contextMenuEvent(QContextMenuEvent* event)
 {
     QTreeView::contextMenuEvent(event);

-    m_controller->triggerContextMenuRequest(event->pos(), m_controller->url());
+    m_controller->triggerContextMenuRequest(event->pos());

 }
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
 }
 
 void DolphinDetailsView::mousePressEvent(QMouseEvent* event)


@@ -160,7 +162,7 @@ void DolphinDetailsView::mousePressEvent(QMouseEvent* event)
     QTreeView::mousePressEvent(event);
 
     const QModelIndex index = indexAt(event->pos());
     QTreeView::mousePressEvent(event);
 
     const QModelIndex index = indexAt(event->pos());

-    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+    if (!index.isValid() || (index.column() != DolphinModel::Name)) {

         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();
         const Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
         if (!(modifier & Qt::ShiftModifier) && !(modifier & Qt::ControlModifier)) {
             clearSelection();


@@ -224,7 +226,7 @@ void DolphinDetailsView::dragMoveEvent(QDragMoveEvent* event)
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     setDirtyRegion(m_dropRect);
     const QModelIndex index = indexAt(event->pos());
     // TODO: remove this code when the issue #160611 is solved in Qt 4.4
     setDirtyRegion(m_dropRect);
     const QModelIndex index = indexAt(event->pos());

-    if (!index.isValid() || (index.column() != KDirModel::Name)) {
+    if (!index.isValid() || (index.column() != DolphinModel::Name)) {

         m_dragging = false;
     } else {
         m_dragging = true;
         m_dragging = false;
     } else {
         m_dragging = true;


@@ -272,6 +274,20 @@ void DolphinDetailsView::paintEvent(QPaintEvent* event)
     }
 }
 
     }
 }
 

+void DolphinDetailsView::keyPressEvent(QKeyEvent* event)
+{
+    QTreeView::keyPressEvent(event);
+
+    const QItemSelectionModel* selModel = selectionModel();
+    const QModelIndex currentIndex = selModel->currentIndex();
+    const bool triggerItem = currentIndex.isValid()
+                             && (event->key() == Qt::Key_Return)
+                             && (selModel->selectedIndexes().count() <= 1);
+    if (triggerItem) {
+        m_controller->triggerItem(currentIndex);
+    }
+}
+

 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();
 void DolphinDetailsView::setSortIndicatorSection(DolphinView::Sorting sorting)
 {
     QHeaderView* headerView = header();


@@ -297,7 +313,7 @@ void DolphinDetailsView::synchronizeSortingState(int column)
 void DolphinDetailsView::slotEntered(const QModelIndex& index)
 {
     const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());
 void DolphinDetailsView::slotEntered(const QModelIndex& index)
 {
     const QPoint pos = viewport()->mapFromGlobal(QCursor::pos());

-    const int nameColumnWidth = header()->sectionSize(KDirModel::Name);
+    const int nameColumnWidth = header()->sectionSize(DolphinModel::Name);

     if (pos.x() < nameColumnWidth) {
         m_controller->emitItemEntered(index);
     }
     if (pos.x() < nameColumnWidth) {
         m_controller->emitItemEntered(index);
     }


@@ -392,4 +408,19 @@ QRect DolphinDetailsView::elasticBandRect() const
     return QRect(topLeft, m_elasticBandDestination).normalized();
 }
 
     return QRect(topLeft, m_elasticBandDestination).normalized();
 }
 

+static bool isValidNameIndex(const QModelIndex& index)
+{
+    return index.isValid() && (index.column() == KDirModel::Name);
+}
+
+void DolphinDetailsView::slotItemActivated(const QModelIndex& index)
+{
+    if (!isValidNameIndex(index)) {
+        clearSelection();
+        m_controller->emitItemEntered(index);
+    } else {
+        m_controller->triggerItem(index);
+    }
+}
+

 #include "dolphindetailsview.moc"
 #include "dolphindetailsview.moc"