show column mode in viewport context menu (thanks to Thomas Georgiou for the patch)

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 654a09f28ec71fa1f3a5e46e171d22ec44effcfc..bef99bacc732b1ce525ab4d3b8b4e4165384767e 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -19,9 +19,11 @@
  ***************************************************************************/
 
 #include "viewsettingspage.h"
+
+#include "columnviewsettingspage.h"
+#include "detailsviewsettingspage.h"
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
-#include "detailsviewsettingspage.h"
 
 #include <QVBoxLayout>
 #include <QTabWidget>
@@ -34,10 +36,11 @@
 
 ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
                                    QWidget* parent) :
-    SettingsPageBase(parent),
-    m_generalPage(0),
-    m_iconsPage(0),
-    m_detailsPage(0)
+        SettingsPageBase(parent),
+        m_generalPage(0),
+        m_iconsPage(0),
+        m_detailsPage(0),
+        m_columnPage(0)
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
@@ -57,18 +60,22 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
     tabWidget->addTab(m_detailsPage, KIcon("fileview-text"), i18n("Details"));
 
-    topLayout->addWidget(tabWidget, 0, 0 );
+    // initialize 'Column' tab
+    m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_columnPage, KIcon("view-tree"), i18n("Column"));
+
+    topLayout->addWidget(tabWidget, 0, 0);
 }
 
 ViewSettingsPage::~ViewSettingsPage()
-{
-}
+{}
 
 void ViewSettingsPage::applySettings()
 {
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
+    m_columnPage->applySettings();
 }
 
 #include "viewsettingspage.moc"