Merge branch 'master' into kf6

diff --cc src/CMakeLists.txt
index fa7de5cc23c79abde02363fa1a0f3054fc6db72d,cd9abec81daef9ede99603c130200924bd995cab..1a229f6a7adb95415e25793635f53a3f811390c8
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -293,17 -288,17 +293,15 @@@ target_sources(dolphinstatic PRIVAT
      selectionmode/bottombar.cpp
      selectionmode/bottombarcontentscontainer.cpp
      selectionmode/topbar.cpp
-     settings/general/behaviorsettingspage.cpp
-     settings/general/confirmationssettingspage.cpp
-     settings/general/generalsettingspage.cpp
-     settings/general/previewssettingspage.cpp
-     settings/general/statusbarsettingspage.cpp
+     settings/interface/folderstabssettingspage.cpp
+     settings/interface/statusandlocationbarssettingspage.cpp
 -    settings/interface/configurepreviewplugindialog.cpp
+     settings/interface/confirmationssettingspage.cpp
+     settings/interface/interfacesettingspage.cpp
+     settings/interface/previewssettingspage.cpp
      settings/dolphinsettingsdialog.cpp
-     settings/navigation/navigationsettingspage.cpp
      settings/contextmenu/contextmenusettingspage.cpp
      settings/settingspagebase.cpp
 -    settings/serviceitemdelegate.cpp
      settings/servicemodel.cpp
-     settings/startup/startupsettingspage.cpp
      settings/trash/trashsettingspage.cpp
      settings/viewmodes/dolphinfontrequester.cpp
      settings/viewmodes/viewsettingspage.cpp
@@@ -351,17 -347,17 +350,15 @@@
      selectionmode/bottombar.h
      selectionmode/bottombarcontentscontainer.h
      selectionmode/topbar.h
-     settings/general/behaviorsettingspage.h
-     settings/general/confirmationssettingspage.h
-     settings/general/generalsettingspage.h
-     settings/general/previewssettingspage.h
-     settings/general/statusbarsettingspage.h
+     settings/interface/folderstabssettingspage.h
+     settings/interface/statusandlocationbarssettingspage.h
 -    settings/interface/configurepreviewplugindialog.h
+     settings/interface/confirmationssettingspage.h
+     settings/interface/interfacesettingspage.h
+     settings/interface/previewssettingspage.h
      settings/dolphinsettingsdialog.h
-     settings/navigation/navigationsettingspage.h
      settings/contextmenu/contextmenusettingspage.h
      settings/settingspagebase.h
 -    settings/serviceitemdelegate.h
      settings/servicemodel.h
-     settings/startup/startupsettingspage.h
      settings/trash/trashsettingspage.h
      settings/viewmodes/dolphinfontrequester.h
      settings/viewmodes/viewsettingspage.h
@@@ -516,28 -513,37 +514,33 @@@ if(NOT WIN32
          settings/viewmodes/viewsettingstab.h
          views/zoomlevelinfo.h)
  
-     target_sources(kcm_dolphinnavigation PRIVATE
-         settings/kcm/kcmdolphinnavigation.cpp
-         settings/navigation/navigationsettingspage.cpp
-         settings/settingspagebase.cpp
-         settings/kcm/kcmdolphinnavigation.h
-         settings/navigation/navigationsettingspage.h
-         settings/settingspagebase.h
-     )
- 
      target_sources(kcm_dolphingeneral PRIVATE
          settings/kcm/kcmdolphingeneral.cpp
-         settings/general/behaviorsettingspage.cpp
-         settings/general/previewssettingspage.cpp
-         settings/general/confirmationssettingspage.cpp
+         settings/interface/folderstabssettingspage.cpp
+         settings/interface/statusandlocationbarssettingspage.cpp
+         settings/interface/previewssettingspage.cpp
 -        settings/interface/configurepreviewplugindialog.cpp
+         settings/interface/confirmationssettingspage.cpp
          settings/settingspagebase.cpp
 -        settings/serviceitemdelegate.cpp
          settings/servicemodel.cpp
+         dolphin_generalsettings.cpp
+         dolphindebug.cpp
+         dolphinmainwindowinterface.cpp
+         views/viewproperties.cpp
+         dolphin_directoryviewpropertysettings.cpp
+         global.cpp
          settings/kcm/kcmdolphingeneral.h
-         settings/general/behaviorsettingspage.h
-         settings/general/previewssettingspage.h
-         settings/general/confirmationssettingspage.h
+         settings/interface/folderstabssettingspage.h
+         settings/interface/statusandlocationbarssettingspage.h
+         settings/interface/previewssettingspage.h
 -        settings/interface/configurepreviewplugindialog.h
+         settings/interface/confirmationssettingspage.h
          settings/settingspagebase.h
 -        settings/serviceitemdelegate.h
          settings/servicemodel.h
+         dolphin_generalsettings.h
+         dolphindebug.h
+         dolphinmainwindowinterface.h
+         views/viewproperties.h
+         dolphin_directoryviewpropertysettings.h
+         global.h
      )
  
      kconfig_add_kcfg_files(kcm_dolphinviewmodes

diff --cc src/dolphincontextmenu.cpp
Simple merge

diff --cc src/dolphintabwidget.cpp
Simple merge

diff --cc src/dolphinviewcontainer.cpp
index 1199da6c50e587afc6540ea5e8d8d2e41a60a1e3,ffd0d9b5eb0afba4ce7d4474714b757a7b2acb70..c0ef1997a6762ff4af04349b562bae409bacc3fd
--- 1/src/dolphinviewcontainer.cpp
--- 2/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@@ -23,9 -23,15 +23,10 @@@
  #if HAVE_KACTIVITIES
  #include <KActivities/ResourceInstance>
  #endif
++#include <KApplicationTrader>
  #include <KFileItemActions>
  #include <KFilePlacesModel>
 -#include <kio_version.h>
 -#if KIO_VERSION >= QT_VERSION_CHECK(5, 98, 0)
  #include <KIO/JobUiDelegateFactory>
 -#else
 -#include <KIO/JobUiDelegate>
 -#endif
 -#include <KApplicationTrader>
  #include <KIO/OpenUrlJob>
  #include <KLocalizedString>
  #include <KMessageWidget>

diff --cc src/kitemviews/kfileitemmodelrolesupdater.cpp
Simple merge

diff --cc src/settings/interface/folderstabssettingspage.cpp
index f92ead17956ab1b4056c77dc604ee4a167483ee2,d71ad2d96b01922c960ba400e22d1d787b235ba2..85a0e8e132d3886d1f6f35cc5142c0fb998ce8ba
--- 1/src/settings/startup/startupsettingspage.cpp
--- 2/src/settings/interface/folderstabssettingspage.cpp
+++ b/src/settings/interface/folderstabssettingspage.cpp
@@@ -133,9 -156,11 +156,11 @@@ void FoldersTabsSettingsPage::applySett
  {
      GeneralSettings *settings = GeneralSettings::self();
  
+     settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked());
+     settings->setCloseActiveSplitView(m_closeActiveSplitView->isChecked());
      const QUrl url(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile));
      if (url.isValid() && KProtocolManager::supportsListing(url)) {
 -        KIO::StatJob *job = KIO::statDetails(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);
 +        KIO::StatJob *job = KIO::stat(url, KIO::StatJob::SourceSide, KIO::StatDetail::StatBasic, KIO::JobFlag::HideProgressInfo);
          connect(job, &KJob::result, this, [this, settings, url](KJob *job) {
              if (job->error() == 0 && qobject_cast<KIO::StatJob *>(job)->statResult().isDir()) {
                  settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile));

diff --cc src/settings/interface/previewssettingspage.cpp
Simple merge

diff --cc src/settings/interface/previewssettingspage.h
Simple merge

diff --cc src/settings/kcm/kcmdolphingeneral.cpp
index efb9d40dba6c99472855b5d40e99aebefaa19ec4,32241d1123a38f8fac9088247ab0f54418631858..9d20042899773e18080060f7b7d0743b97de82f4
--- 1/src/settings/kcm/kcmdolphingeneral.cpp
--- 2/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@@ -25,15 -26,15 +26,15 @@@ DolphinGeneralConfigModule::DolphinGene
  {
      setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
  
 -    QVBoxLayout *topLayout = new QVBoxLayout(this);
 +    QVBoxLayout *topLayout = new QVBoxLayout(widget());
      topLayout->setContentsMargins(0, 0, 0, 0);
  
 -    QTabWidget *tabWidget = new QTabWidget(this);
 +    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);

diff --cc src/settings/kcm/kcmdolphinviewmodes.cpp
Simple merge

diff --cc src/views/dolphinview.cpp
Simple merge