Make settings tabbar expanding

Allow to use https://invent.kde.org/plasma/breeze/-/merge_requests/478
but even without the breeze MR, it look better and similar to what we do
with other settings page.

diff --git a/src/settings/interface/interfacesettingspage.cpp b/src/settings/interface/interfacesettingspage.cpp
index 3f8e69ada20092a41805cc75089c174edb26a4e6..beaf409c9d085f5bbe21df6451e9275e01daf380 100644 (file)
--- a/src/settings/interface/interfacesettingspage.cpp
+++ b/src/settings/interface/interfacesettingspage.cpp
@@ -17,6 +17,7 @@
 
 #include <KLocalizedString>
 
 
 #include <KLocalizedString>
 

+#include <QTabBar>

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


@@ -29,6 +30,7 @@ InterfaceSettingsPage::InterfaceSettingsPage(QWidget *parent)
 
     QTabWidget *tabWidget = new QTabWidget(this);
     tabWidget->setDocumentMode(true);
 
     QTabWidget *tabWidget = new QTabWidget(this);
     tabWidget->setDocumentMode(true);

+    tabWidget->tabBar()->setExpanding(true);

 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);
 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index b98eb86a1ca126cf4534f59a82edf7a19c19dc66..e34b52fce3ff90d3d1e33647c1ec4beb92aa7cea 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -15,6 +15,7 @@
 #include <KPluginFactory>
 #include <kconfigwidgets_version.h>
 
 #include <KPluginFactory>
 #include <kconfigwidgets_version.h>
 

+#include <QTabBar>

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


@@ -30,6 +31,8 @@ DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KP
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(widget());

+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);

 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);
 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index e4755a1c5e0d72a3f2166dd4f96e43b8498ed683..983a7b80db22dcc864c29ef508a80c688a6dabbb 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -15,6 +15,7 @@
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QIcon>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QIcon>

+#include <QTabBar>

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


@@ -30,6 +31,8 @@ DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, cons
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(widget());
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(widget());

+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);

 
     // Initialize 'Icons' tab
     ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);
 
     // Initialize 'Icons' tab
     ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index 8aa3c15976d71484352cc8551623996a9617ace9..c0aa14efb65851e880ff1a0ed242f61e70328041 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -11,6 +11,7 @@
 #include "viewsettingstab.h"
 #include <KLocalizedString>
 
 #include "viewsettingstab.h"
 #include <KLocalizedString>
 

+#include <QTabBar>

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


@@ -23,6 +24,7 @@ ViewSettingsPage::ViewSettingsPage(const QUrl &url, QWidget *parent)
 
     tabWidget = new QTabWidget(this);
     tabWidget->setDocumentMode(true);
 
     tabWidget = new QTabWidget(this);
     tabWidget->setDocumentMode(true);

+    tabWidget->tabBar()->setExpanding(true);

 
     // General View tab
     GeneralViewSettingsPage *generalViewPage = new GeneralViewSettingsPage(url, tabWidget);
 
     // General View tab
     GeneralViewSettingsPage *generalViewPage = new GeneralViewSettingsPage(url, tabWidget);