Fix includes

[dolphin.git] / src / settings / viewmodes / viewsettingspage.cpp

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 6d9a704667b6872a56063a8b507a0c5d47bd4bbd..2b657c264dae4a01a37a6642c9bbe8d45758032d 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -20,20 +20,18 @@
 
 #include "viewsettingspage.h"
 
 
 #include "viewsettingspage.h"
 

-#include "columnviewsettingspage.h"
-#include "iconsviewsettingspage.h"
-#include "detailsviewsettingspage.h"
+#include <views/dolphinview.h>
+#include "viewsettingstab.h"

 
 #include <QVBoxLayout>
 
 #include <KDialog>
 
 #include <QVBoxLayout>
 
 #include <KDialog>

-#include <KLocale>
-#include <KIconLoader>
-#include <ktabwidget.h>
+#include <KLocalizedString>
+#include <KTabWidget>

 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
 
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),

-    m_pages()
+    m_tabs()

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


@@ -41,24 +39,24 @@ ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
 
     KTabWidget* tabWidget = new KTabWidget(this);
 
 
     KTabWidget* tabWidget = new KTabWidget(this);
 

-    // initialize 'Icons' tab
-    IconsViewSettingsPage* iconsPage = new IconsViewSettingsPage(tabWidget);
-    tabWidget->addTab(iconsPage, KIcon("view-list-icons"), i18nc("@title:tab", "Icons"));
-    connect(iconsPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    // Initialize 'Icons' tab
+    ViewSettingsTab* iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
+    tabWidget->addTab(iconsTab, QIcon::fromTheme("view-list-icons"), i18nc("@title:tab", "Icons"));
+    connect(iconsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);

 
 

-    // initialize 'Details' tab
-    DetailsViewSettingsPage* detailsPage = new DetailsViewSettingsPage(tabWidget);
-    tabWidget->addTab(detailsPage, KIcon("view-list-details"), i18nc("@title:tab", "Details"));
-    connect(detailsPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    // Initialize 'Compact' tab
+    ViewSettingsTab* compactTab = new ViewSettingsTab(ViewSettingsTab::CompactMode, tabWidget);
+    tabWidget->addTab(compactTab, QIcon::fromTheme("view-list-details"), i18nc("@title:tab", "Compact"));
+    connect(compactTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);

 
 

-    // initialize 'Column' tab
-    ColumnViewSettingsPage* columnPage = new ColumnViewSettingsPage(tabWidget);
-    tabWidget->addTab(columnPage, KIcon("view-file-columns"), i18nc("@title:tab", "Column"));
-    connect(columnPage, SIGNAL(changed()), this, SIGNAL(changed()));
+    // Initialize 'Details' tab
+    ViewSettingsTab* detailsTab = new ViewSettingsTab(ViewSettingsTab::DetailsMode, tabWidget);
+    tabWidget->addTab(detailsTab, QIcon::fromTheme("view-list-tree"), i18nc("@title:tab", "Details"));
+    connect(detailsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);

 
 

-    m_pages.append(iconsPage);
-    m_pages.append(detailsPage);
-    m_pages.append(columnPage);
+    m_tabs.append(iconsTab);
+    m_tabs.append(compactTab);
+    m_tabs.append(detailsTab);

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


@@ -69,16 +67,15 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
 
 void ViewSettingsPage::applySettings()
 {

-    foreach (ViewSettingsPageBase* page, m_pages) {
-        page->applySettings();
+    foreach (ViewSettingsTab* tab, m_tabs) {
+        tab->applySettings();

     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {
     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {

-    foreach (ViewSettingsPageBase* page, m_pages) {
-        page->restoreDefaults();
+    foreach (ViewSettingsTab* tab, m_tabs) {
+        tab->restoreDefaultSettings();

     }
 }
 
     }
 }
 

-#include "viewsettingspage.moc"