Merge branch 'master' into kf6

3 files changed, 10 insertions, 72 deletions

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index efb9d40db..9d2004289 100644
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -6,9 +6,10 @@
 
 #include "kcmdolphingeneral.h"
 
-#include "settings/general/behaviorsettingspage.h"
-#include "settings/general/confirmationssettingspage.h"
-#include "settings/general/previewssettingspage.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>
@@ -30,10 +31,10 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KP
 
     QTabWidget *tabWidget = new QTabWidget(widget());
 
-    // 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
     PreviewsSettingsPage *previewsPage = new PreviewsSettingsPage(tabWidget);
@@ -44,7 +45,7 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KP
     ConfirmationsSettingsPage *confirmationsPage = new ConfirmationsSettingsPage(tabWidget);
     tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));
     connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &DolphinGeneralConfigModule::markAsChanged);
-    m_pages.append(behaviorPage);
+    m_pages.append(foldersTabsPage);
     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);
 
diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
deleted file mode 100644
index 8bf2cbfd8..000000000
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    "KPlugin": {
-        "Icon": "preferences-desktop-navigation",
-        "Name": "Navigation",
-        "Name[ar]": "التّنقّل",
-        "Name[az]": "Naviqasiya",
-        "Name[be]": "Навігацыя",
-        "Name[bg]": "Навигация",
-        "Name[ca@valencia]": "Navegació",
-        "Name[ca]": "Navegació",
-        "Name[cs]": "Navigace",
-        "Name[da]": "Navigation",
-        "Name[de]": "Navigation",
-        "Name[en_GB]": "Navigation",
-        "Name[eo]": "Navigado",
-        "Name[es]": "Navegación",
-        "Name[et]": "Liikumine",
-        "Name[eu]": "Nabigatzea",
-        "Name[fi]": "Selaus",
-        "Name[fr]": "Navigation",
-        "Name[gl]": "Navegación",
-        "Name[he]": "ניווט",
-        "Name[hi]": "संचालन",
-        "Name[hu]": "Navigálás",
-        "Name[ia]": "Navigation",
-        "Name[id]": "Navigasi",
-        "Name[ie]": "Navigation",
-        "Name[is]": "Skoðun",
-        "Name[it]": "Navigazione",
-        "Name[ja]": "ナビゲーション",
-        "Name[ka]": "ნავიგაცია",
-        "Name[ko]": "탐색",
-        "Name[lt]": "Naršymas",
-        "Name[lv]": "Navigācija",
-        "Name[ml]": "നാവിഗേഷന്‍",
-        "Name[my]": "လမ်းညွှန်",
-        "Name[nb]": "Navigasjon",
-        "Name[nl]": "Navigatie",
-        "Name[nn]": "Navigasjon",
-        "Name[pa]": "ਨੇਵੀਗੇਸ਼ਨ",
-        "Name[pl]": "Poruszanie się",
-        "Name[pt]": "Navegação",
-        "Name[pt_BR]": "Navegação",
-        "Name[ro]": "Navigare",
-        "Name[ru]": "Навигация",
-        "Name[se]": "Navigašuvdna",
-        "Name[sk]": "Navigácia",
-        "Name[sl]": "Krmarjenje",
-        "Name[sr@ijekavian]": "Навигација",
-        "Name[sr@ijekavianlatin]": "Navigacija",
-        "Name[sr@latin]": "Navigacija",
-        "Name[sr]": "Навигација",
-        "Name[sv]": "Navigering",
-        "Name[ta]": "உலாவல்",
-        "Name[tr]": "Dolaşım",
-        "Name[uk]": "Навігація",
-        "Name[vi]": "Điều hướng",
-        "Name[x-test]": "xxNavigationxx",
-        "Name[zh_CN]": "导航",
-        "Name[zh_TW]": "導覽"
-    },
-    "X-DocPath": "dolphin/configuring-dolphin.html#preferences-dialog-navigation"
-}
diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 41d12aa2c..b0e7a42a4 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -68,7 +68,7 @@ void DolphinViewModesConfigModule::save()
 void DolphinViewModesConfigModule::defaults()
 {
     for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
-        tab->restoreDefaultSettings();
+        tab->restoreDefaults();
     }
     reparseConfiguration();
 }