Initial version for a column view support (thanks a lot to Benjamin Meyer for QColumnView in Qt4.3!). Currently there is a problem when using the DolphinSortFilterProxyModel: some items get duplicated, but I doubt it's an issue in QColumnView (the same issue occurs when using QTreeView) -> further investigations necessary...

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

1 files changed, 15 insertions, 0 deletions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e86ad13fa..278d63c97 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -704,6 +704,11 @@ void DolphinMainWindow::setDetailsView()
     m_activeView->setMode(DolphinView::DetailsView);

 }

 

+void DolphinMainWindow::setColumnView()

+{

+    m_activeView->setMode(DolphinView::ColumnView);

+}

+

 void DolphinMainWindow::sortByName()

 {

     m_activeView->setSorting(DolphinView::SortByName);

@@ -1152,9 +1157,16 @@ void DolphinMainWindow::setupActions()
     detailsView->setIcon(KIcon("fileview-text"));

     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));

 

+    KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");

+    columnView->setText(i18n("Columns"));

+    columnView->setShortcut(Qt::CTRL | Qt::Key_3);

+    columnView->setIcon(KIcon("view-tree"));

+    connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));

+

     QActionGroup* viewModeGroup = new QActionGroup(this);

     viewModeGroup->addAction(iconsView);

     viewModeGroup->addAction(detailsView);

+    viewModeGroup->addAction(columnView);

 

     KToggleAction* sortByName = actionCollection()->add<KToggleAction>("by_name");

     sortByName->setText(i18n("By Name"));

@@ -1414,6 +1426,9 @@ void DolphinMainWindow::updateViewActions()
         case DolphinView::DetailsView:

             action = actionCollection()->action("details");

             break;

+        case DolphinView::ColumnView:

+            action = actionCollection()->action("columns");

+            break;

         default:

             break;

     }