Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

[dolphin.git] / src / settings / contextmenu / contextmenusettingspage.cpp

diff --git a/src/settings/contextmenu/contextmenusettingspage.cpp b/src/settings/contextmenu/contextmenusettingspage.cpp
index a1fada2adc8c4dde1a6e2d6b29163be2ab18c95f..6046de4c687683e8cc4af4f6812d2d12c923584e 100644 (file)
--- a/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@ -110,6 +110,8 @@ bool ContextMenuSettingsPage::entryVisible(const QString &id)
         return ContextMenuSettings::showAddToPlaces();
     } else if (id == "sort") {
         return ContextMenuSettings::showSortBy();
         return ContextMenuSettings::showAddToPlaces();
     } else if (id == "sort") {
         return ContextMenuSettings::showSortBy();

+    } else if (id == "group") {
+        return ContextMenuSettings::showGroupBy();

     } else if (id == "view_mode") {
         return ContextMenuSettings::showViewMode();
     } else if (id == "open_in_new_tab") {
     } else if (id == "view_mode") {
         return ContextMenuSettings::showViewMode();
     } else if (id == "open_in_new_tab") {


@@ -138,6 +140,8 @@ void ContextMenuSettingsPage::setEntryVisible(const QString &id, bool visible)
         ContextMenuSettings::setShowAddToPlaces(visible);
     } else if (id == "sort") {
         ContextMenuSettings::setShowSortBy(visible);
         ContextMenuSettings::setShowAddToPlaces(visible);
     } else if (id == "sort") {
         ContextMenuSettings::setShowSortBy(visible);

+    } else if (id == "group") {
+        ContextMenuSettings::setShowGroupBy(visible);

     } else if (id == "view_mode") {
         ContextMenuSettings::setShowViewMode(visible);
     } else if (id == "open_in_new_tab") {
     } else if (id == "view_mode") {
         ContextMenuSettings::setShowViewMode(visible);
     } else if (id == "open_in_new_tab") {


@@ -166,7 +170,7 @@ void ContextMenuSettingsPage::applySettings()
     }
 
     KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
     }
 
     KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);

-    KConfigGroup showGroup = config.group("Show");
+    KConfigGroup showGroup = config.group(QStringLiteral("Show"));

 
     QStringList enabledPlugins;
 
 
     QStringList enabledPlugins;
 


@@ -181,7 +185,7 @@ void ContextMenuSettingsPage::applySettings()
             }
         } else if (service == QLatin1String(DeleteService)) {
             KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);
             }
         } else if (service == QLatin1String(DeleteService)) {
             KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::NoGlobals);

-            KConfigGroup configGroup(globalConfig, "KDE");
+            KConfigGroup configGroup(globalConfig, QStringLiteral("KDE"));

             configGroup.writeEntry("ShowDeleteCommand", checked);
             configGroup.sync();
         } else if (service == QLatin1String(CopyToMoveToService)) {
             configGroup.writeEntry("ShowDeleteCommand", checked);
             configGroup.sync();
         } else if (service == QLatin1String(CopyToMoveToService)) {


@@ -241,7 +245,7 @@ void ContextMenuSettingsPage::showEvent(QShowEvent *event)
 
         // Add "Show 'Delete' command" as service
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);
 
         // Add "Show 'Delete' command" as service
         KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::IncludeGlobals);

-        KConfigGroup configGroup(globalConfig, "KDE");
+        KConfigGroup configGroup(globalConfig, QStringLiteral("KDE"));

         addRow(QStringLiteral("edit-delete"), i18nc("@option:check", "Delete"), DeleteService, configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
 
         // Add "Show 'Copy To' and 'Move To' commands" as service
         addRow(QStringLiteral("edit-delete"), i18nc("@option:check", "Delete"), DeleteService, configGroup.readEntry("ShowDeleteCommand", ShowDeleteDefault));
 
         // Add "Show 'Copy To' and 'Move To' commands" as service


@@ -270,7 +274,7 @@ void ContextMenuSettingsPage::showEvent(QShowEvent *event)
 void ContextMenuSettingsPage::loadServices()
 {
     const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);
 void ContextMenuSettingsPage::loadServices()
 {
     const KConfig config(QStringLiteral("kservicemenurc"), KConfig::NoGlobals);

-    const KConfigGroup showGroup = config.group("Show");
+    const KConfigGroup showGroup = config.group(QStringLiteral("Show"));

 
     // Load generic services
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);
 
     // Load generic services
     const auto locations = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kio/servicemenus"), QStandardPaths::LocateDirectory);


@@ -306,7 +310,6 @@ void ContextMenuSettingsPage::loadServices()
     }
 
     m_sortModel->sort(Qt::DisplayRole);
     }
 
     m_sortModel->sort(Qt::DisplayRole);

-    m_searchLineEdit->setFocus(Qt::OtherFocusReason);

 }
 
 void ContextMenuSettingsPage::loadVersionControlSystems()
 }
 
 void ContextMenuSettingsPage::loadVersionControlSystems()