fixed some activation issues in combination with split views

[dolphin.git] / src / viewsettingspage.cpp

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index 654a09f28ec71fa1f3a5e46e171d22ec44effcfc..c98ba75d61d0f781f0254f81ff2a669c95b9fb9d 100644 (file)
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -19,14 +19,16 @@
  ***************************************************************************/
 
 #include "viewsettingspage.h"
  ***************************************************************************/
 
 #include "viewsettingspage.h"

+
+#include "columnviewsettingspage.h"
+#include "detailsviewsettingspage.h"

 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"
 #include "generalviewsettingspage.h"
 #include "iconsviewsettingspage.h"

-#include "detailsviewsettingspage.h"

 
 

-#include <QVBoxLayout>
-#include <QTabWidget>
-#include <QLayout>
-#include <QLabel>
+#include <QtGui/QBoxLayout>
+#include <QtGui/QTabWidget>
+#include <QtGui/QLayout>
+#include <QtGui/QLabel>

 
 #include <kdialog.h>
 #include <klocale.h>
 
 #include <kdialog.h>
 #include <klocale.h>


@@ -37,7 +39,8 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
     SettingsPageBase(parent),
     m_generalPage(0),
     m_iconsPage(0),
     SettingsPageBase(parent),
     m_generalPage(0),
     m_iconsPage(0),

-    m_detailsPage(0)
+    m_detailsPage(0),
+    m_columnPage(0)

 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);


@@ -51,13 +54,17 @@ ViewSettingsPage::ViewSettingsPage(DolphinMainWindow* mainWindow,
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(mainWindow, tabWidget);

-    tabWidget->addTab(m_iconsPage, KIcon("view-icon"), i18n("Icons"));
+    tabWidget->addTab(m_iconsPage, KIcon("fileview-icon"), i18n("Icons"));

 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);
 
     // initialize 'Details' tab
     m_detailsPage = new DetailsViewSettingsPage(mainWindow, tabWidget);

-    tabWidget->addTab(m_detailsPage, KIcon("fileview-text"), i18n("Details"));
+    tabWidget->addTab(m_detailsPage, KIcon("fileview-detailed"), i18n("Details"));
+
+    // initialize 'Column' tab
+    m_columnPage = new ColumnViewSettingsPage(mainWindow, tabWidget);
+    tabWidget->addTab(m_columnPage, KIcon("fileview-column"), i18n("Column"));

 
 

-    topLayout->addWidget(tabWidget, 0, 0 );
+    topLayout->addWidget(tabWidget, 0, 0);

 }
 
 ViewSettingsPage::~ViewSettingsPage()
 }
 
 ViewSettingsPage::~ViewSettingsPage()


@@ -69,6 +76,15 @@ void ViewSettingsPage::applySettings()
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
     m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();

+    m_columnPage->applySettings();
+}
+
+void ViewSettingsPage::restoreDefaults()
+{
+    m_generalPage->restoreDefaults();
+    m_iconsPage->restoreDefaults();
+    m_detailsPage->restoreDefaults();
+    m_columnPage->restoreDefaults();

 }
 
 #include "viewsettingspage.moc"
 }
 
 #include "viewsettingspage.moc"