Use large colorful category icons in Dolphin settings

Summary:
{F7324074}
Ref task T10165
Depends on D23749

Test Plan: Open the Dolphin settings dialog.

Reviewers: #dolphin, #vdg, ndavis, ngraham

Reviewed By: #dolphin, #vdg, ndavis, ngraham

Subscribers: ngraham, ndavis, kfm-devel, #vdg, #dolphin

Tags: #dolphin

Maniphest Tasks: T10165

Differential Revision: https://phabricator.kde.org/D23750

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index f4da53c9df65095151eb2a73e06abb2724479c91..01cfd9f86a1ed2c1bbf7238bb3bd3fbf44f8828a 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -61,35 +61,35 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));
     GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
     KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
                                                     i18nc("@title:group General settings", "General"));

-    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
+    generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("system-file-manager")));

     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Startup
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
                                                     i18nc("@title:group", "Startup"));
     connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Startup
     StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
     KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
                                                     i18nc("@title:group", "Startup"));

-    startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
+    startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-launch-feedback")));

     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes
     ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
     KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));
     connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // View Modes
     ViewSettingsPage* viewSettingsPage = new ViewSettingsPage(this);
     KPageWidgetItem* viewSettingsFrame = addPage(viewSettingsPage,
                                                  i18nc("@title:group", "View Modes"));

-    viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-choose")));
+    viewSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-icons")));

     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));
     connect(viewSettingsPage, &ViewSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Navigation
     NavigationSettingsPage* navigationSettingsPage = new NavigationSettingsPage(this);
     KPageWidgetItem* navigationSettingsFrame = addPage(navigationSettingsPage,
                                                        i18nc("@title:group", "Navigation"));

-    navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("edit-select")));
+    navigationSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-navigation")));

     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));
     connect(navigationSettingsPage, &NavigationSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Services
     ServicesSettingsPage* servicesSettingsPage = new ServicesSettingsPage(this);
     KPageWidgetItem* servicesSettingsFrame = addPage(servicesSettingsPage,
                                                        i18nc("@title:group", "Services"));

-    servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("flag")));
+    servicesSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-system-services")));

     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash
     connect(servicesSettingsPage, &ServicesSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
 
     // Trash


@@ -97,7 +97,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent) :
     if (trashSettingsPage) {
         KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
                                                      i18nc("@title:group", "Trash"));
     if (trashSettingsPage) {
         KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
                                                      i18nc("@title:group", "Trash"));

-        trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
+        trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("user-trash")));

         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index ac3956144efca2bd479ca19375b6ca1906ba3abe..0d0a0c093f9c2ae227ed1ea3d4637a693ce144c2 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。
 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。
 
 [Desktop Entry]
 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。
 
 [Desktop Entry]

-Icon=system-run
+Icon=system-file-manager

 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphingeneral
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphingeneral

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index f6686fbc8c2eb7d109bcadcf01da1f20a88f8694..0018e056a9d89ac9d55f70e8152ff4a47ef6ffa7 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。
 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。
 
 [Desktop Entry]
 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。
 
 [Desktop Entry]

-Icon=input-mouse
+Icon=preferences-desktop-navigation

 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinnavigation
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinnavigation

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index 07ac89c526fbac71edecf404804876ffc9de0001..4f547d5a7ddccb758b7326e27fa88241cf28fa4b 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -44,7 +44,7 @@ Name[zh_CN]=Dolphin 服务
 Name[zh_TW]=Dolphin 服務
 
 [Desktop Entry]
 Name[zh_TW]=Dolphin 服務
 
 [Desktop Entry]

-Icon=services
+Icon=preferences-system-services

 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinservices
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinservices

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index c50fa3800ab879bf4470591abea1f4d7aa795fc9..15a789af136414523161bcd8feb794e711a08c59 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -89,7 +89,7 @@ Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。
 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。
 
 [Desktop Entry]
 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。
 
 [Desktop Entry]

-Icon=view-choose
+Icon=preferences-desktop-icons

 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinviewmodes
 Type=Service
 X-KDE-ServiceTypes=KCModule
 Exec=kcmshell5 kcmdolphinviewmodes