Apply 1 suggestion(s) to 1 file(s)

[dolphin.git] / src / settings / kcm / kcmdolphingeneral.cpp

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index fd0044325260233bf62cc771d901c20f79ac8a06..e34b52fce3ff90d3d1e33647c1ec4beb92aa7cea 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -6,45 +6,49 @@
 
 #include "kcmdolphingeneral.h"
 
 
 #include "kcmdolphingeneral.h"
 

-#include "settings/general/behaviorsettingspage.h"
-#include "settings/general/previewssettingspage.h"
-#include "settings/general/confirmationssettingspage.h"
+#include "settings/interface/confirmationssettingspage.h"
+#include "settings/interface/folderstabssettingspage.h"
+#include "settings/interface/interfacesettingspage.h"
+#include "settings/interface/previewssettingspage.h"

 
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <kconfigwidgets_version.h>
 
 
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <kconfigwidgets_version.h>
 

+#include <QTabBar>

 #include <QTabWidget>
 #include <QVBoxLayout>
 
 #include <QTabWidget>
 #include <QVBoxLayout>
 

-K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>();)
+K_PLUGIN_CLASS_WITH_JSON(DolphinGeneralConfigModule, "kcmdolphingeneral.json")

 
 

-DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args) :
-    KCModule(parent, args),
-    m_pages()
+DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KPluginMetaData &data)
+    : KCModule(parent, data)
+    , m_pages()

 {
 {

-    setButtons(KCModule::Default | KCModule::Help);
+    setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);

 
 

-    QVBoxLayout* topLayout = new QVBoxLayout(this);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());

     topLayout->setContentsMargins(0, 0, 0, 0);
 
     topLayout->setContentsMargins(0, 0, 0, 0);
 

-    QTabWidget* tabWidget = new QTabWidget(this);
+    QTabWidget *tabWidget = new QTabWidget(widget());
+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);

 
 

-    // initialize 'Behavior' tab
-    BehaviorSettingsPage* behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget);
-    tabWidget->addTab(behaviorPage, i18nc("@title:tab Behavior settings", "Behavior"));
-    connect(behaviorPage, &BehaviorSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);
+    // initialize 'Folders & Tabs' tab
+    FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);
+    tabWidget->addTab(foldersTabsPage, i18nc("@title:tab Behavior settings", "Behavior"));
+    connect(foldersTabsPage, &FoldersTabsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);

 
     // initialize 'Previews' tab
 
     // initialize 'Previews' tab

-    PreviewsSettingsPage* previewsPage = new PreviewsSettingsPage(tabWidget);
+    PreviewsSettingsPage *previewsPage = new PreviewsSettingsPage(tabWidget);

     tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
     connect(previewsPage, &PreviewsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);
 
     // initialize 'Confirmations' tab
     tabWidget->addTab(previewsPage, i18nc("@title:tab Previews settings", "Previews"));
     connect(previewsPage, &PreviewsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);
 
     // initialize 'Confirmations' tab

-    ConfirmationsSettingsPage* confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
-    tabWidget->addTab(confirmationsPage,  i18nc("@title:tab Confirmations settings", "Confirmations"));
+    ConfirmationsSettingsPage *confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
+    tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));

     connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);
     connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);

-    m_pages.append(behaviorPage);
+    m_pages.append(foldersTabsPage);

     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);
 
     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);
 


@@ -57,16 +61,18 @@ DolphinGeneralConfigModule::~DolphinGeneralConfigModule()
 
 void DolphinGeneralConfigModule::save()
 {
 
 void DolphinGeneralConfigModule::save()
 {

-    for (SettingsPageBase* page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 }
 
 void DolphinGeneralConfigModule::defaults()
 {
         page->applySettings();
     }
 }
 
 void DolphinGeneralConfigModule::defaults()
 {

-    for (SettingsPageBase* page : qAsConst(m_pages)) {
+    for (SettingsPageBase *page : std::as_const(m_pages)) {

         page->applySettings();
     }
 }
 
 #include "kcmdolphingeneral.moc"
         page->applySettings();
     }
 }
 
 #include "kcmdolphingeneral.moc"

+
+#include "moc_kcmdolphingeneral.cpp"