Move "Show in Groups" toggle action into Sort menu

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

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 0d4d4277bb133d6d822765bd9d7502fb35de0214..c0aa14efb65851e880ff1a0ed242f61e70328041 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -7,14 +7,15 @@
 #include "viewsettingspage.h"
 
 #include "contentdisplaytab.h"
 #include "viewsettingspage.h"
 
 #include "contentdisplaytab.h"

+#include "generalviewsettingspage.h"

 #include "viewsettingstab.h"
 #include "viewsettingstab.h"

-

 #include <KLocalizedString>
 
 #include <KLocalizedString>
 

+#include <QTabBar>

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

-ViewSettingsPage::ViewSettingsPage(QWidget *parent)
+ViewSettingsPage::ViewSettingsPage(const QUrl &url, QWidget *parent)

     : SettingsPageBase(parent)
     , m_tabs()
 {
     : SettingsPageBase(parent)
     , m_tabs()
 {


@@ -22,6 +23,13 @@ ViewSettingsPage::ViewSettingsPage(QWidget *parent)
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     tabWidget = new QTabWidget(this);
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     tabWidget = new QTabWidget(this);

+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);
+
+    // General View tab
+    GeneralViewSettingsPage *generalViewPage = new GeneralViewSettingsPage(url, tabWidget);
+    tabWidget->addTab(generalViewPage, QIcon::fromTheme(QStringLiteral("description")), i18nc("@title:tab General View settings", "General"));
+    connect(generalViewPage, &GeneralViewSettingsPage::changed, this, &ViewSettingsPage::changed);

 
     // Content Display Tab
     contentDisplayTab = new ContentDisplayTab(tabWidget);
 
     // Content Display Tab
     contentDisplayTab = new ContentDisplayTab(tabWidget);


@@ -45,6 +53,8 @@ ViewSettingsPage::ViewSettingsPage(QWidget *parent)
     tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details"));
     connect(detailsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);
 
     tabWidget->addTab(detailsTab, QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@title:tab", "Details"));
     connect(detailsTab, &ViewSettingsTab::changed, this, &ViewSettingsPage::changed);
 

+    m_tabs.append(generalViewPage);
+    m_tabs.append(contentDisplayTab);

     m_tabs.append(iconsTab);
     m_tabs.append(compactTab);
     m_tabs.append(detailsTab);
     m_tabs.append(iconsTab);
     m_tabs.append(compactTab);
     m_tabs.append(detailsTab);


@@ -58,23 +68,16 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
 
 void ViewSettingsPage::applySettings()
 {

-    contentDisplayTab->applySettings();
-
-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (SettingsPageBase *tab : std::as_const(m_tabs)) {

         tab->applySettings();
     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {
         tab->applySettings();
     }
 }
 
 void ViewSettingsPage::restoreDefaults()
 {

-    if (tabWidget->currentWidget() == contentDisplayTab) {
-        contentDisplayTab->restoreDefaults();
-        return;
-    }
-
-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (SettingsPageBase *tab : std::as_const(m_tabs)) {

         if (tabWidget->currentWidget() == tab) {
         if (tabWidget->currentWidget() == tab) {

-            tab->restoreDefaultSettings();
+            tab->restoreDefaults();

             return;
         }
     }
             return;
         }
     }