From cbecf9ccf217aaead0d348928eb0bd76be87a3a6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 7 May 2021 00:05:18 +0200
Subject: [PATCH] Add an icon for every settings tab

---
 CMakeLists.txt                           | 2 +-
 plasmoid/lib/settingsdialog.cpp          | 4 ----
 tray/CMakeLists.txt                      | 3 +++
 widgets/CMakeLists.txt                   | 2 ++
 widgets/settings/autostartoptionpage.ui  | 3 +++
 widgets/settings/connectionoptionpage.ui | 5 +++--
 widgets/settings/launcheroptionpage.ui   | 4 ++++
 widgets/settings/systemdoptionpage.ui    | 3 +++
 widgets/settings/webviewoptionpage.ui    | 8 +++++++-
 9 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f08cea..bbd1299 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(META_APP_CATEGORIES "Network;FileTransfer")
 set(META_GUI_OPTIONAL false)
 set(META_VERSION_MAJOR 1)
 set(META_VERSION_MINOR 1)
-set(META_VERSION_PATCH 6)
+set(META_VERSION_PATCH 7)
 set(META_VERSION_EXACT_SONAME ON)
 set(META_ADD_DEFAULT_CPP_UNIT_TEST_APPLICATION ON)
 
diff --git a/plasmoid/lib/settingsdialog.cpp b/plasmoid/lib/settingsdialog.cpp
index 637b247..3cde427 100644
--- a/plasmoid/lib/settingsdialog.cpp
+++ b/plasmoid/lib/settingsdialog.cpp
@@ -132,12 +132,8 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet)
     // most startup options don't make much sense for a Plasmoid, so merge webview with startup
     auto *const webViewPage = new WebViewOptionPage;
     webViewPage->widget()->setWindowTitle(QCoreApplication::translate("Plasmoid::SettingsDialog", "Web view"));
-    webViewPage->widget()->setWindowIcon(
-        QIcon::fromTheme(QStringLiteral("internet-web-browser"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/internet-web-browser.svg"))));
 #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
     auto *const systemdPage = new SystemdOptionPage;
-    systemdPage->widget()->setWindowIcon(
-        QIcon::fromTheme(QStringLiteral("system-run"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/system-run.svg"))));
 #endif
 
     category = new OptionCategory;
diff --git a/tray/CMakeLists.txt b/tray/CMakeLists.txt
index 6b4d48e..69f7151 100644
--- a/tray/CMakeLists.txt
+++ b/tray/CMakeLists.txt
@@ -81,6 +81,9 @@ set(REQUIRED_ICONS
     preferences-desktop-icons
     preferences-desktop-locale
     preferences-desktop-notification
+    preferences-system-startup
+    preferences-system-startup
+    preferences-system-services
     preferences-other
     process-stop
     qtcreator
diff --git a/widgets/CMakeLists.txt b/widgets/CMakeLists.txt
index a169bf7..dc095b0 100644
--- a/widgets/CMakeLists.txt
+++ b/widgets/CMakeLists.txt
@@ -64,6 +64,8 @@ set(REQUIRED_ICONS
     edit-paste
     list-remove
     preferences-desktop-notification
+    preferences-system-startup
+    preferences-system-services
     view-refresh
     emblem-checked
     network-connect
diff --git a/widgets/settings/autostartoptionpage.ui b/widgets/settings/autostartoptionpage.ui
index ffb961f..2fb2baf 100644
--- a/widgets/settings/autostartoptionpage.ui
+++ b/widgets/settings/autostartoptionpage.ui
@@ -11,6 +11,9 @@
   <property name="windowTitle">
    <string>Autostart</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="preferences-system-startup"/>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QCheckBox" name="autostartCheckBox">
diff --git a/widgets/settings/connectionoptionpage.ui b/widgets/settings/connectionoptionpage.ui
index 9acdc94..b2782f8 100644
--- a/widgets/settings/connectionoptionpage.ui
+++ b/widgets/settings/connectionoptionpage.ui
@@ -12,8 +12,8 @@
    <string>Connection</string>
   </property>
   <property name="windowIcon">
-   <iconset theme="network-connect">
-    <normaloff>.</normaloff>.</iconset>
+   <iconset theme="network-connect" resource="../../tray/resources/syncthingtrayicons.qrc">
+    <normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</normaloff>:/icons/hicolor/scalable/actions/network-connect.svg</iconset>
   </property>
   <layout class="QFormLayout" name="formLayout">
    <property name="verticalSpacing">
@@ -583,6 +583,7 @@
   </customwidget>
  </customwidgets>
  <resources>
+  <include location="../../tray/resources/syncthingtrayicons.qrc"/>
   <include location="../resources/syncthingwidgetsicons.qrc"/>
  </resources>
  <connections>
diff --git a/widgets/settings/launcheroptionpage.ui b/widgets/settings/launcheroptionpage.ui
index 289c400..6ee4a50 100644
--- a/widgets/settings/launcheroptionpage.ui
+++ b/widgets/settings/launcheroptionpage.ui
@@ -5,6 +5,10 @@
   <property name="windowTitle">
    <string>Syncthing launcher</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="system-run" resource="../resources/syncthingwidgetsicons.qrc">
+    <normaloff>:/icons/hicolor/scalable/apps/system-run.svg</normaloff>:/icons/hicolor/scalable/apps/system-run.svg</iconset>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QCheckBox" name="enabledCheckBox">
diff --git a/widgets/settings/systemdoptionpage.ui b/widgets/settings/systemdoptionpage.ui
index c9fd247..1409f17 100644
--- a/widgets/settings/systemdoptionpage.ui
+++ b/widgets/settings/systemdoptionpage.ui
@@ -5,6 +5,9 @@
   <property name="windowTitle">
    <string>Systemd</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="preferences-system-services"/>
+  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QCheckBox" name="showButtonCheckBox">
diff --git a/widgets/settings/webviewoptionpage.ui b/widgets/settings/webviewoptionpage.ui
index b971438..393556f 100644
--- a/widgets/settings/webviewoptionpage.ui
+++ b/widgets/settings/webviewoptionpage.ui
@@ -11,6 +11,10 @@
   <property name="windowTitle">
    <string>General</string>
   </property>
+  <property name="windowIcon">
+   <iconset theme="internet-web-browser" resource="../resources/syncthingwidgetsicons.qrc">
+    <normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</normaloff>:/icons/hicolor/scalable/apps/internet-web-browser.svg</iconset>
+  </property>
   <layout class="QFormLayout" name="formLayout">
    <item row="1" column="0">
     <widget class="QLabel" name="usageLabel">
@@ -65,6 +69,8 @@
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="../resources/syncthingwidgetsicons.qrc"/>
+ </resources>
  <connections/>
 </ui>