Fix for crash which was introduced by commit

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

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index ac4ed929678fd0662cb54b3d4661840f6cc37d82..12d4ce0e1744658c698067099d8865f30bed9f03 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -20,40 +20,43 @@
 
 #include "viewsettingspage.h"
 
 
 #include "viewsettingspage.h"
 

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

 
 #include <QVBoxLayout>
 
 #include <QVBoxLayout>

+#include <QTabWidget>

 
 #include <KDialog>
 
 #include <KDialog>

-#include <KLocale>
-#include <KIconLoader>
-#include <KTabWidget>
+#include <KLocalizedString>

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

-    m_pages()
+    m_tabs()

 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(KDialog::spacingHint());
 
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
     topLayout->setMargin(0);
     topLayout->setSpacing(KDialog::spacingHint());
 

-    KTabWidget* tabWidget = new KTabWidget(this);
+    QTabWidget* tabWidget = new QTabWidget(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);

 
 

-    // TODO: initialize 'Compact' tab
+    // 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 'Details' tab
-    DetailsViewSettingsPage* detailsPage = new DetailsViewSettingsPage(tabWidget);
-    tabWidget->addTab(detailsPage, KIcon("view-list-text"), i18nc("@title:tab", "Details"));
-    connect(detailsPage, 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_tabs.append(iconsTab);
+    m_tabs.append(compactTab);
+    m_tabs.append(detailsTab);

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


@@ -64,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"