Check if the item supports sequencing before looking for sequence pixmaps

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

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 0f0068108f065ad984a6937cf86a43b8ced8257f..983a7b80db22dcc864c29ef508a80c688a6dabbb 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -8,29 +8,31 @@
 
 #include "settings/viewmodes/viewsettingstab.h"
 
 
 #include "settings/viewmodes/viewsettingstab.h"
 

+#include <KCModule>

 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KLocalizedString>
 #include <KPluginFactory>

-#include <KCModule>

 
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QIcon>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QIcon>

+#include <QTabBar>

 #include <QTabWidget>
 #include <QVBoxLayout>
 
 K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json")
 
 DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data)
 #include <QTabWidget>
 #include <QVBoxLayout>
 
 K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json")
 
 DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data)

-    : KCModule(qobject_cast<QWidget *>(parent), data)
+    : KCModule(parent, data)

     , m_tabs()
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 
     , m_tabs()
 {
     setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
 

-    const auto parentWidget = qobject_cast<QWidget *>(parent);
-    QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
+    QVBoxLayout *topLayout = new QVBoxLayout(widget());

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

-    QTabWidget *tabWidget = new QTabWidget(parentWidget);
+    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);


@@ -60,7 +62,7 @@ DolphinViewModesConfigModule::~DolphinViewModesConfigModule()
 
 void DolphinViewModesConfigModule::save()
 {
 
 void DolphinViewModesConfigModule::save()
 {

-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {

         tab->applySettings();
     }
     reparseConfiguration();
         tab->applySettings();
     }
     reparseConfiguration();


@@ -68,8 +70,8 @@ void DolphinViewModesConfigModule::save()
 
 void DolphinViewModesConfigModule::defaults()
 {
 
 void DolphinViewModesConfigModule::defaults()
 {

-    for (ViewSettingsTab *tab : qAsConst(m_tabs)) {
-        tab->restoreDefaultSettings();
+    for (ViewSettingsTab *tab : std::as_const(m_tabs)) {
+        tab->restoreDefaults();

     }
     reparseConfiguration();
 }
     }
     reparseConfiguration();
 }


@@ -87,3 +89,5 @@ void DolphinViewModesConfigModule::viewModeChanged()
 }
 
 #include "kcmdolphinviewmodes.moc"
 }
 
 #include "kcmdolphinviewmodes.moc"

+
+#include "moc_kcmdolphinviewmodes.cpp"