allow to change the order of columns in the details view

[dolphin.git] / src / dolphindetailsview.cpp

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index ad362914aec896948bdd6e2bf00a2aeb9a1600ce..69fe5760f0ea5e376d44666b80bc6b5585b4d3a7 100644 (file)
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -168,14 +168,8 @@ DolphinDetailsView::~DolphinDetailsView()
 bool DolphinDetailsView::event(QEvent* event)
 {
     if (event->type() == QEvent::Polish) {
-        QHeaderView* headerView = header();
-        headerView->setResizeMode(QHeaderView::Interactive);
-        headerView->setMovable(false);
-
+        header()->setResizeMode(QHeaderView::Interactive);
         updateColumnVisibility();
-
-        hideColumn(DolphinModel::Rating);
-        hideColumn(DolphinModel::Tags);
     }
 
     return QTreeView::event(event);
@@ -429,9 +423,7 @@ void DolphinDetailsView::wheelEvent(QWheelEvent* event)
 void DolphinDetailsView::currentChanged(const QModelIndex& current, const QModelIndex& previous)
 {
     QTreeView::currentChanged(current, previous);
-    if (current.isValid() && !m_autoScroller->isActive()) {
-        scrollTo(current);
-    }
+    m_autoScroller->handleCurrentIndexChange(current, previous);
 
     // Stay consistent with QListView: When changing the current index by key presses,
     // also change the selection.
@@ -568,13 +560,15 @@ void DolphinDetailsView::configureSettings(const QPoint& pos)
 
     // add checkbox items for each column
     QHeaderView* headerView = header();
-    for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+    const int columns = model()->columnCount();
+    for (int i = 0; i < columns; ++i) {
         const int logicalIndex = headerView->logicalIndex(i);
-        const QString text = model()->headerData(i, Qt::Horizontal).toString();
+        const QString text = model()->headerData(logicalIndex, Qt::Horizontal).toString();
         QAction* action = popup.addAction(text);
         action->setCheckable(true);
         action->setChecked(!headerView->isSectionHidden(logicalIndex));
-        action->setData(i);
+        action->setData(logicalIndex);
+        action->setEnabled(logicalIndex != DolphinModel::Name);
     }
     popup.addSeparator();
 
@@ -602,16 +596,41 @@ void DolphinDetailsView::configureSettings(const QPoint& pos)
 
 void DolphinDetailsView::updateColumnVisibility()
 {
+    QHeaderView* headerView = header();
+    disconnect(headerView, SIGNAL(sectionMoved(int, int, int)),
+               this, SLOT(saveColumnPositions()));
+
+    const DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+    const QList<int> columnPositions = settings->columnPositions();
+    
     const KFileItemDelegate::InformationList list = m_controller->dolphinView()->additionalInfo();
-    for (int i = DolphinModel::Size; i <= DolphinModel::Type; ++i) {
+    for (int i = DolphinModel::Name; i <= DolphinModel::Version; ++i) {
         const KFileItemDelegate::Information info = infoForColumn(i);
-        const bool hide = !list.contains(info);
+        const bool hide = !list.contains(info) && (i != DolphinModel::Name);
         if (isColumnHidden(i) != hide) {
             setColumnHidden(i, hide);
         }
+        
+        const int from = headerView->visualIndex(i);
+        headerView->moveSection(from, columnPositions[i]);
     }
-
+    
     resizeColumns();
+
+    connect(headerView, SIGNAL(sectionMoved(int, int, int)),
+            this, SLOT(saveColumnPositions()));
+
+}
+
+void DolphinDetailsView::saveColumnPositions()
+{
+    QList<int> columnPositions;
+    for (int i = DolphinModel::Name; i <= DolphinModel::Version; ++i) {
+        columnPositions.append(header()->visualIndex(i));
+    }
+
+    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+    settings->setColumnPositions(columnPositions);
 }
 
 void DolphinDetailsView::slotHeaderSectionResized(int logicalIndex, int oldSize, int newSize)
@@ -904,13 +923,14 @@ void DolphinDetailsView::resizeColumns()
     QHeaderView* headerView = header();
     QFontMetrics fontMetrics(viewport()->font());
 
-    int columnWidth[KDirModel::ColumnCount];
-    columnWidth[KDirModel::Size] = fontMetrics.width("00000 Items");
-    columnWidth[KDirModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
-    columnWidth[KDirModel::Permissions] = fontMetrics.width("xxxxxxxxxx");
-    columnWidth[KDirModel::Owner] = fontMetrics.width("xxxxxxxxxx");
-    columnWidth[KDirModel::Group] = fontMetrics.width("xxxxxxxxxx");
-    columnWidth[KDirModel::Type] = fontMetrics.width("XXXX Xxxxxxx");
+    int columnWidth[DolphinModel::Version + 1];
+    columnWidth[DolphinModel::Size] = fontMetrics.width("00000 Items");
+    columnWidth[DolphinModel::ModifiedTime] = fontMetrics.width("0000-00-00 00:00");
+    columnWidth[DolphinModel::Permissions] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[DolphinModel::Owner] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[DolphinModel::Group] = fontMetrics.width("xxxxxxxxxx");
+    columnWidth[DolphinModel::Type] = fontMetrics.width("XXXX Xxxxxxx");
+    columnWidth[DolphinModel::Version] = fontMetrics.width("xxxxxxxx");
 
     int requiredWidth = 0;
     for (int i = KDirModel::Size; i <= KDirModel::Type; ++i) {