From a63e28b5d51166d656ec1ed8eec0a4d094a99749 Mon Sep 17 00:00:00 2001
From: Ximi1970 <ximi.github@gmail.com>
Date: Tue, 24 Oct 2023 22:42:56 +0200
Subject: [PATCH] Replace theme with invert icon

---
 app/SysTray-X/SysTray-X-app/preferences.ui | 315 +++++++++++----------
 webext/_locales/de/messages.json           |  16 +-
 webext/_locales/el/messages.json           |  16 +-
 webext/_locales/en-US/messages.json        |  16 +-
 webext/_locales/it/messages.json           |  16 +-
 webext/_locales/nl/messages.json           |  16 +-
 webext/_locales/pt-BR/messages.json        |  16 +-
 webext/_locales/ru/messages.json           |  16 +-
 webext/background.js                       |  18 +-
 webext/css/options.css                     |   1 -
 webext/options.html                        |  34 +--
 webext/options.js                          |  47 ++-
 12 files changed, 220 insertions(+), 307 deletions(-)

diff --git a/app/SysTray-X/SysTray-X-app/preferences.ui b/app/SysTray-X/SysTray-X-app/preferences.ui
index c63bfa1..a04b401 100644
--- a/app/SysTray-X/SysTray-X-app/preferences.ui
+++ b/app/SysTray-X/SysTray-X-app/preferences.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>541</width>
+    <width>556</width>
     <height>424</height>
    </rect>
   </property>
@@ -343,162 +343,171 @@
          </layout>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="1" rowspan="2">
         <widget class="QGroupBox" name="iconTypeGroupBox">
          <property name="title">
           <string>Mail notification icon</string>
          </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
+         <layout class="QVBoxLayout" name="verticalLayout_7">
           <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_3">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
+           <widget class="QGroupBox" name="groupBox_8">
+            <property name="title">
+             <string>Icon</string>
             </property>
-            <item>
-             <widget class="QRadioButton" name="blankIconRadioButton">
-              <property name="text">
-               <string>Blank icon</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetFixedSize</enum>
-            </property>
-            <item>
-             <widget class="QRadioButton" name="newMailIconRadioButton">
-              <property name="text">
-               <string>New mail icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <property name="sizeConstraint">
-             <enum>QLayout::SetMaximumSize</enum>
-            </property>
-            <item>
-             <widget class="QRadioButton" name="customIconRadioButton">
-              <property name="text">
-               <string>Custom icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="imageLabel">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="chooseCustomButton">
-              <property name="text">
-               <string>Choose</string>
-              </property>
-              <property name="flat">
-               <bool>false</bool>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
-            <item>
-             <widget class="QRadioButton" name="noIconRadioButton">
-              <property name="text">
-               <string>No icon</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_11">
-            <item>
-             <widget class="QRadioButton" name="tbIconRadioButton">
-              <property name="text">
-               <string>Default Thunderbird</string>
-              </property>
-              <attribute name="buttonGroup">
-               <string notr="true">iconTypeGroup</string>
-              </attribute>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_5">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
+            <layout class="QVBoxLayout" name="verticalLayout">
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_3">
+               <property name="sizeConstraint">
+                <enum>QLayout::SetFixedSize</enum>
+               </property>
+               <item>
+                <widget class="QRadioButton" name="blankIconRadioButton">
+                 <property name="text">
+                  <string>Blank icon</string>
+                 </property>
+                 <property name="checked">
+                  <bool>true</bool>
+                 </property>
+                 <attribute name="buttonGroup">
+                  <string notr="true">iconTypeGroup</string>
+                 </attribute>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_2">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_2">
+               <property name="sizeConstraint">
+                <enum>QLayout::SetFixedSize</enum>
+               </property>
+               <item>
+                <widget class="QRadioButton" name="newMailIconRadioButton">
+                 <property name="text">
+                  <string>New mail icon</string>
+                 </property>
+                 <attribute name="buttonGroup">
+                  <string notr="true">iconTypeGroup</string>
+                 </attribute>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <property name="sizeConstraint">
+                <enum>QLayout::SetMaximumSize</enum>
+               </property>
+               <item>
+                <widget class="QRadioButton" name="customIconRadioButton">
+                 <property name="text">
+                  <string>Custom icon</string>
+                 </property>
+                 <attribute name="buttonGroup">
+                  <string notr="true">iconTypeGroup</string>
+                 </attribute>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLabel" name="imageLabel">
+                 <property name="text">
+                  <string/>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="chooseCustomButton">
+                 <property name="text">
+                  <string>Choose</string>
+                 </property>
+                 <property name="flat">
+                  <bool>false</bool>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_8">
+               <item>
+                <widget class="QRadioButton" name="noIconRadioButton">
+                 <property name="text">
+                  <string>No icon</string>
+                 </property>
+                 <attribute name="buttonGroup">
+                  <string notr="true">iconTypeGroup</string>
+                 </attribute>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_3">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_11">
+               <item>
+                <widget class="QRadioButton" name="tbIconRadioButton">
+                 <property name="text">
+                  <string>Default Thunderbird</string>
+                 </property>
+                 <attribute name="buttonGroup">
+                  <string notr="true">iconTypeGroup</string>
+                 </attribute>
+                </widget>
+               </item>
+               <item>
+                <spacer name="horizontalSpacer_5">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+            </layout>
+           </widget>
           </item>
           <item>
            <widget class="QCheckBox" name="invertIconCheckBox">
@@ -523,7 +532,7 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="0">
+       <item row="1" column="0" rowspan="2">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -536,7 +545,7 @@
          </property>
         </spacer>
        </item>
-       <item row="1" column="1">
+       <item row="2" column="1">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/webext/_locales/de/messages.json b/webext/_locales/de/messages.json
index cac7396..1f6311f 100644
--- a/webext/_locales/de/messages.json
+++ b/webext/_locales/de/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Thema",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Licht",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Dunkel",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Symbol umkehren",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/el/messages.json b/webext/_locales/el/messages.json
index e20a553..c96980a 100644
--- a/webext/_locales/el/messages.json
+++ b/webext/_locales/el/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "θέμα",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "φως",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "σκοτάδι",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Αντιστρέψτε εικονίδιο",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/en-US/messages.json b/webext/_locales/en-US/messages.json
index 72c77a5..f9c7be4 100644
--- a/webext/_locales/en-US/messages.json
+++ b/webext/_locales/en-US/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Theme",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Light",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Dark",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Invert icon",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/it/messages.json b/webext/_locales/it/messages.json
index 3bc806f..6791184 100644
--- a/webext/_locales/it/messages.json
+++ b/webext/_locales/it/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Tema",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Leggero",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Scuro",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Icona inverti",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/nl/messages.json b/webext/_locales/nl/messages.json
index b1eeca5..06269c3 100644
--- a/webext/_locales/nl/messages.json
+++ b/webext/_locales/nl/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Thema",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Licht",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Donker",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Inverteer pictogram",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/pt-BR/messages.json b/webext/_locales/pt-BR/messages.json
index a338239..a1f79d5 100644
--- a/webext/_locales/pt-BR/messages.json
+++ b/webext/_locales/pt-BR/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Tema",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Claro",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Escuro",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Ícone inverter",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/_locales/ru/messages.json b/webext/_locales/ru/messages.json
index 761f870..3befdc5 100644
--- a/webext/_locales/ru/messages.json
+++ b/webext/_locales/ru/messages.json
@@ -204,19 +204,9 @@
     "description": "Unread Icon option 4"
   },
 
-  "icons_theme": {
-    "message": "Tема",
-    "description": "The theme"
-  },
-
-  "icons_theme_light": {
-    "message": "Светлая",
-    "description": "The light theme"
-  },
-
-  "icons_theme_dark": {
-    "message": "Темная",
-    "description": "The dark theme"
+  "icons_invert_icon": {
+    "message": "Инвертировать значок",
+    "description": "Invert icon"
   },
 
   "count": {
diff --git a/webext/background.js b/webext/background.js
index 5441f3f..dd5ec2a 100644
--- a/webext/background.js
+++ b/webext/background.js
@@ -570,7 +570,7 @@ SysTrayX.Messaging = {
         "iconType",
         "iconMime",
         "icon",
-        "theme",
+        "invertIcon",
         "showNumber",
         "showNewIndicator",
         "countType",
@@ -606,7 +606,7 @@ SysTrayX.Messaging = {
     const iconType = result.iconType || "0";
     const iconMime = result.iconMime || "image/png";
     const icon = result.icon || [];
-    const theme = result.theme || "0";
+    const invertIcon = result.invertIcon || "false";
     const showNumber = result.showNumber || "true";
     const showNewIndicator = result.showNewIndicator || "false";
     const countType = result.countType || "0";
@@ -627,12 +627,6 @@ SysTrayX.Messaging = {
     const closeApp = result.closeApp || "";
     const closeAppArgs = result.closeAppArgs || "";
 
-    if (theme == "0" && numberColor == "#ffffff") {
-      numberColor = "#000000";
-    } else if (theme == "1" && numberColor == "#000000") {
-      numberColor = "#ffffff";
-    }
-
     //  Send it to the app
     SysTrayX.Link.postSysTrayXMessage({
       preferences: {
@@ -649,7 +643,7 @@ SysTrayX.Messaging = {
         iconType,
         iconMime,
         icon,
-        theme,
+        invertIcon,
         showNumber,
         showNewIndicator,
         countType,
@@ -820,10 +814,10 @@ SysTrayX.Link = {
         });
       }
 
-      const theme = response["preferences"].theme;
-      if (theme) {
+      const invertIcon = response["preferences"].invertIcon;
+      if (invertIcon) {
         await storage().set({
-          theme: theme,
+          invertIcon: invertIcon,
         });
       }
 
diff --git a/webext/css/options.css b/webext/css/options.css
index 02b62fc..9a5a6cc 100644
--- a/webext/css/options.css
+++ b/webext/css/options.css
@@ -80,7 +80,6 @@ body {
 #defaulticonselect,
 #iconselect,
 #numberprops,
-#themeselect,
 #counttypeselect,
 #newindicatorselect,
 #storageselect,
diff --git a/webext/options.html b/webext/options.html
index f791a50..39ef51b 100644
--- a/webext/options.html
+++ b/webext/options.html
@@ -334,27 +334,19 @@
           </tr>
         </table>
         
-        <table id="themeselect">
-          <caption>
-            __MSG_icons_theme__
-          </caption>
-          <tr id="themeLight">
-            <td>
-              <input type="radio" name="theme" id="themeLight" value="0" />
-              <label for="themeLight" id="themeLightlabel"
-                >__MSG_icons_theme_light__</label
-              >
-            </td>
-          </tr>
-          <tr id="themeDark">
-            <td>
-              <input type="radio" name="theme" id="themeDark" value="1" />
-              <label for="themeDark" id="themeDarklabel"
-                >__MSG_icons_theme_dark__</label
-              >
-            </td>
-          </tr>
-        </table>
+        <div id="inverticon">
+          <div id="inputcheck">
+            <input
+              type="checkbox"
+              name="invertIcon"
+              id="invertIcon"
+              value=""
+            />
+            <label for="invertIcon" id="invertIconLabel"
+              >__MSG_icons_invert_icon__</label
+            >
+          </div>
+        </div>
       </form>
 
       <div
diff --git a/webext/options.js b/webext/options.js
index 9030727..459ca19 100644
--- a/webext/options.js
+++ b/webext/options.js
@@ -173,13 +173,13 @@ SysTrayX.SaveOptions = {
     });
 
     //
-    // Save theme preferences
+    // Save invert icon preferences
     //
-    const theme = document.querySelector('input[name="theme"]:checked').value;
+    const invertIcon = document.querySelector('input[name="invertIcon"]').checked;
 
-    //  Store theme preferences
+    //  Store invert icon preferences
     await storage().set({
-      theme: theme,
+      invertIcon: `${invertIcon}`,
     });
 
     //
@@ -226,14 +226,6 @@ SysTrayX.SaveOptions = {
     //  Save number color
     //
     let numberColor = document.querySelector('input[name="numberColor"]').value;
-
-    //  Force different color?
-    if (theme == "0" && numberColor == "#ffffff") {
-      numberColor = "#000000";
-    } else if (theme == "1" && numberColor == "#000000") {
-      numberColor = "#ffffff";
-    }
-
     await storage().set({
       numberColor: `${numberColor}`,
     });
@@ -455,13 +447,13 @@ SysTrayX.RestoreOptions = {
       );
 
     //
-    //  Restore theme
+    //  Restore invert icon
     //
     await storage()
-      .get("theme")
+      .get("invertIcon")
       .then(
-        SysTrayX.RestoreOptions.setTheme,
-        SysTrayX.RestoreOptions.onThemeError
+        SysTrayX.RestoreOptions.setInvertIcon,
+        SysTrayX.RestoreOptions.onInvertIconError
       );
 
     //
@@ -861,19 +853,17 @@ SysTrayX.RestoreOptions = {
   },
 
   //
-  //  Restore theme callbacks
+  //  Restore invert icon callbacks
   //
-  setTheme: function (result) {
-    const theme = result.theme || "0";
+  setInvertIcon: function (result) {
+    const invertIcon = result.invertIcon || "false";
 
-    const radioButton = document.querySelector(
-      `input[name="theme"][value="${theme}"]`
-    );
-    radioButton.checked = true;
+    const checkbox = document.querySelector(`input[name="invertIcon"]`);
+    checkbox.checked = invertIcon === "true";
   },
 
-  onThemeError: function (error) {
-    console.log(`Theme Error: ${error}`);
+  onInvertIconError: function (error) {
+    console.log(`invertIcon Error: ${error}`);
   },
 
   //
@@ -1263,9 +1253,9 @@ SysTrayX.StorageChanged = {
           hideDefaultIcon: changes[item].newValue,
         });
       }
-      if (item === "theme") {
-        SysTrayX.RestoreOptions.setTheme({
-          theme: changes[item].newValue,
+      if (item === "invertIcon") {
+        SysTrayX.RestoreOptions.setInvertIcon({
+          invertIcon: changes[item].newValue,
         });
       }
       if (item === "showNumber") {
@@ -1369,7 +1359,6 @@ SysTrayX.StorageChanged = {
     document.getElementById("minimizeselect").className = "active";
     document.getElementById("minimizeiconselect").className = "active";
     document.getElementById("closeselect").className = "active";
-    document.getElementById("themeselect").className = "active";
     document.getElementById("newindicatorselect").className = "active";
     document.getElementById("startappselect").className = "active";
     document.getElementById("closeappselect").className = "active";