use sort proxy model

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e86ad13fac289f7fd62b5699be0e774ea6fb802b..8d877495bce501c3ca56b1fb8b22feb711b2c68e 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -704,6 +704,11 @@ void DolphinMainWindow::setDetailsView()
     m_activeView->setMode(DolphinView::DetailsView);\r
 }\r
 \r
+void DolphinMainWindow::setColumnView()\r
+{\r
+    m_activeView->setMode(DolphinView::ColumnView);\r
+}\r
+\r
 void DolphinMainWindow::sortByName()\r
 {\r
     m_activeView->setSorting(DolphinView::SortByName);\r
@@ -1078,7 +1083,7 @@ void DolphinMainWindow::setupActions()
     m_newMenu = new DolphinNewMenu(this);\r
     KMenu* menu = m_newMenu->menu();\r
     menu->setTitle(i18n("Create New..."));\r
-    menu->setIcon(SmallIcon("document-new"));\r
+    menu->setIcon(KIcon("document-new"));\r
     connect(menu, SIGNAL(aboutToShow()),\r
             this, SLOT(updateNewMenu()));\r
 \r
@@ -1152,9 +1157,16 @@ void DolphinMainWindow::setupActions()
     detailsView->setIcon(KIcon("fileview-text"));\r
     connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView()));\r
 \r
+    KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");\r
+    columnView->setText(i18n("Columns"));\r
+    columnView->setShortcut(Qt::CTRL | Qt::Key_3);\r
+    columnView->setIcon(KIcon("view-tree"));\r
+    connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));\r
+\r
     QActionGroup* viewModeGroup = new QActionGroup(this);\r
     viewModeGroup->addAction(iconsView);\r
     viewModeGroup->addAction(detailsView);\r
+    viewModeGroup->addAction(columnView);\r
 \r
     KToggleAction* sortByName = actionCollection()->add<KToggleAction>("by_name");\r
     sortByName->setText(i18n("By Name"));\r
@@ -1414,6 +1426,9 @@ void DolphinMainWindow::updateViewActions()
         case DolphinView::DetailsView:\r
             action = actionCollection()->action("details");\r
             break;\r
+        case DolphinView::ColumnView:\r
+            action = actionCollection()->action("columns");\r
+            break;\r
         default:\r
             break;\r
     }\r