Reorganized icons, reorganized code for managing app icons

LeoKlaus · Sep 17, 2024 · 9ddf416 · 9ddf416
1 parent 55feaa3
commit 9ddf416
Show file tree

Hide file tree

Showing 18 changed files with 122 additions and 94 deletions.
diff --git a/src/Resources/icons.qrc b/src/Resources/icons.qrc
@@ -1,14 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>icons/battery-charging-dark.png</file>
-        <file>icons/battery-level-full-dark.png</file>
-        <file>icons/battery-low-dark.png</file>
-        <file>icons/battery-medium-dark.png</file>
-        <file>icons/headphones-dark.png</file>
-        <file>icons/battery-charging-light.png</file>
-        <file>icons/battery-level-full-light.png</file>
-        <file>icons/battery-low-light.png</file>
-        <file>icons/battery-medium-light.png</file>
-        <file>icons/headphones-light.png</file>
+        <file>icons/dark/png/battery-charging.png</file>
+        <file>icons/dark/png/battery-level-full.png</file>
+        <file>icons/dark/png/battery-low.png</file>
+        <file>icons/dark/png/battery-medium.png</file>
+        <file>icons/dark/png/headphones.png</file>
+        <file>icons/dark/index.theme</file>
+        <file>icons/light/index.theme</file>
+        <file>icons/light/png/battery-charging.png</file>
+        <file>icons/light/png/battery-level-full.png</file>
+        <file>icons/light/png/battery-low.png</file>
+        <file>icons/light/png/battery-medium.png</file>
+        <file>icons/light/png/headphones.png</file>
     </qresource>
 </RCC>
diff --git a/src/Resources/icons/dark/index.theme b/src/Resources/icons/dark/index.theme
@@ -0,0 +1,13 @@
+[Icon Theme]
+Name=dark
+Comment=dark theme icons
+PanelDefault=22
+PanelSizes=22
+Directories=png
+
+[png]
+Size=512
+Context=Applications
+MinSize=16
+MaxSize=512
+Type=Fixed
diff --git a/...Resources/icons/battery-charging-dark.png → ...urces/icons/dark/png/battery-charging.png b/...Resources/icons/battery-charging-dark.png → ...urces/icons/dark/png/battery-charging.png
diff --git a/...sources/icons/battery-level-full-dark.png → ...ces/icons/dark/png/battery-level-full.png b/...sources/icons/battery-level-full-dark.png → ...ces/icons/dark/png/battery-level-full.png
diff --git a/src/Resources/icons/battery-low-dark.png → src/Resources/icons/dark/png/battery-low.png b/src/Resources/icons/battery-low-dark.png → src/Resources/icons/dark/png/battery-low.png
diff --git a/src/Resources/icons/battery-medium-dark.png → ...sources/icons/dark/png/battery-medium.png b/src/Resources/icons/battery-medium-dark.png → ...sources/icons/dark/png/battery-medium.png
diff --git a/src/Resources/icons/headphones-dark.png → src/Resources/icons/dark/png/headphones.png b/src/Resources/icons/headphones-dark.png → src/Resources/icons/dark/png/headphones.png
diff --git a/src/Resources/icons/light/index.theme b/src/Resources/icons/light/index.theme
@@ -0,0 +1,13 @@
+[Icon Theme]
+Name=light
+Comment=light theme icons
+PanelDefault=22
+PanelSizes=22
+Directories=png
+
+[png]
+Size=512
+Context=Applications
+MinSize=16
+MaxSize=512
+Type=Fixed
diff --git a/...esources/icons/battery-charging-light.png → ...rces/icons/light/png/battery-charging.png b/...esources/icons/battery-charging-light.png → ...rces/icons/light/png/battery-charging.png
diff --git a/...ources/icons/battery-level-full-light.png → ...es/icons/light/png/battery-level-full.png b/...ources/icons/battery-level-full-light.png → ...es/icons/light/png/battery-level-full.png
diff --git a/src/Resources/icons/battery-low-light.png → ...Resources/icons/light/png/battery-low.png b/src/Resources/icons/battery-low-light.png → ...Resources/icons/light/png/battery-low.png
diff --git a/src/Resources/icons/battery-medium-light.png → ...ources/icons/light/png/battery-medium.png b/src/Resources/icons/battery-medium-light.png → ...ources/icons/light/png/battery-medium.png
diff --git a/src/Resources/icons/headphones-light.png → src/Resources/icons/light/png/headphones.png b/src/Resources/icons/headphones-light.png → src/Resources/icons/light/png/headphones.png
diff --git a/src/Resources/tr/HeadsetControl_GUI_en.ts b/src/Resources/tr/HeadsetControl_GUI_en.ts
@@ -133,6 +133,7 @@ Model:</source>
     </message>
     <message>
         <location filename="../../UI/mainwindow.ui" line="994"/>
+        <location filename="../../UI/mainwindow.cpp" line="569"/>
         <source>None</source>
         <translation></translation>
     </message>
@@ -278,7 +279,7 @@ Model:</source>
     </message>
     <message>
         <location filename="../../UI/mainwindow.ui" line="1821"/>
-        <location filename="../../UI/mainwindow.cpp" line="749"/>
+        <location filename="../../UI/mainwindow.cpp" line="761"/>
         <source>Credits</source>
         <translation></translation>
     </message>
@@ -293,112 +294,112 @@ Model:</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="160"/>
+        <location filename="../../UI/mainwindow.cpp" line="172"/>
         <source>Hide/Show</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="161"/>
+        <location filename="../../UI/mainwindow.cpp" line="173"/>
         <source>Turn Lights On</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="164"/>
+        <location filename="../../UI/mainwindow.cpp" line="176"/>
         <source>Turn Lights Off</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="167"/>
+        <location filename="../../UI/mainwindow.cpp" line="179"/>
         <source>Exit</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="525"/>
+        <location filename="../../UI/mainwindow.cpp" line="535"/>
         <source>Headset Off</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="526"/>
+        <location filename="../../UI/mainwindow.cpp" line="536"/>
         <source>HeadsetControl <byte value="xd"/>
 Headset Off</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="529"/>
+        <location filename="../../UI/mainwindow.cpp" line="539"/>
         <source>% - Charging</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="530"/>
+        <location filename="../../UI/mainwindow.cpp" line="540"/>
         <source>HeadsetControl <byte value="xd"/>
 Battery Charging</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="533"/>
+        <location filename="../../UI/mainwindow.cpp" line="543"/>
         <source>% - Descharging</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="534"/>
+        <location filename="../../UI/mainwindow.cpp" line="544"/>
         <source>HeadsetControl <byte value="xd"/>
 Battery: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="544"/>
+        <location filename="../../UI/mainwindow.cpp" line="554"/>
         <source>Battery Alert!</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="545"/>
+        <location filename="../../UI/mainwindow.cpp" line="555"/>
         <source>The battery of your headset is running low</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="551"/>
+        <location filename="../../UI/mainwindow.cpp" line="561"/>
         <source>No battery info</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="568"/>
+        <location filename="../../UI/mainwindow.cpp" line="579"/>
         <source>Game</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="570"/>
+        <location filename="../../UI/mainwindow.cpp" line="581"/>
         <source>Chat</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="722"/>
+        <location filename="../../UI/mainwindow.cpp" line="734"/>
         <source>Check for updates</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="702"/>
-        <location filename="../../UI/mainwindow.cpp" line="703"/>
+        <location filename="../../UI/mainwindow.cpp" line="714"/>
+        <location filename="../../UI/mainwindow.cpp" line="715"/>
         <source>up-to date v</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="705"/>
-        <location filename="../../UI/mainwindow.cpp" line="712"/>
+        <location filename="../../UI/mainwindow.cpp" line="717"/>
+        <location filename="../../UI/mainwindow.cpp" line="724"/>
         <source>Newer version</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="733"/>
+        <location filename="../../UI/mainwindow.cpp" line="745"/>
         <source>About this program</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="734"/>
+        <location filename="../../UI/mainwindow.cpp" line="746"/>
         <source>You can find HeadsetControl-GUI source code on &lt;a href=&apos;https://github.com/LeoKlaus/HeadsetControl-GUI&apos;&gt;GitHub&lt;/a&gt;.&lt;br/&gt;Made by:&lt;br/&gt; - &lt;a href=&apos;https://github.com/LeoKlaus&apos;&gt;LeoKlaus&lt;/a&gt;&lt;br/&gt; - &lt;a href=&apos;https://github.com/nicola02nb&apos;&gt;nicola02nb&lt;/a&gt;&lt;br/&gt;Version: </source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="750"/>
+        <location filename="../../UI/mainwindow.cpp" line="762"/>
         <source>Big shout-out to:&lt;br/&gt; - &lt;a href=&apos;https://github.com/Sapd&apos;&gt;Sapd&lt;/a&gt; for &lt;a href=&apos;https://github.com/Sapd/HeadsetControl&apos;&gt;HeadsetCoontrol</source>
         <translation></translation>
     </message>

diff --git a/src/Resources/tr/HeadsetControl_GUI_it.ts b/src/Resources/tr/HeadsetControl_GUI_it.ts
@@ -135,6 +135,7 @@ Modello:</translation>
     </message>
     <message>
         <location filename="../../UI/mainwindow.ui" line="994"/>
+        <location filename="../../UI/mainwindow.cpp" line="569"/>
         <source>None</source>
         <translation>Nessun valore</translation>
     </message>
@@ -280,7 +281,7 @@ Modello:</translation>
     </message>
     <message>
         <location filename="../../UI/mainwindow.ui" line="1821"/>
-        <location filename="../../UI/mainwindow.cpp" line="749"/>
+        <location filename="../../UI/mainwindow.cpp" line="761"/>
         <source>Credits</source>
         <translation>Crediti</translation>
     </message>
@@ -295,115 +296,115 @@ Modello:</translation>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="160"/>
+        <location filename="../../UI/mainwindow.cpp" line="172"/>
         <source>Hide/Show</source>
         <translation>Nascondi/Mostra</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="161"/>
+        <location filename="../../UI/mainwindow.cpp" line="173"/>
         <source>Turn Lights On</source>
         <translation>Accendi le Luci</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="164"/>
+        <location filename="../../UI/mainwindow.cpp" line="176"/>
         <source>Turn Lights Off</source>
         <translation>Spegni le Luci</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="167"/>
+        <location filename="../../UI/mainwindow.cpp" line="179"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="525"/>
+        <location filename="../../UI/mainwindow.cpp" line="535"/>
         <source>Headset Off</source>
         <translation>Cuffie Spente</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="526"/>
+        <location filename="../../UI/mainwindow.cpp" line="536"/>
         <source>HeadsetControl <byte value="xd"/>
 Headset Off</source>
         <translation>HeadsetControl 
 Cuffie Spente</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="529"/>
+        <location filename="../../UI/mainwindow.cpp" line="539"/>
         <source>% - Charging</source>
         <translation>% - In Carica</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="530"/>
+        <location filename="../../UI/mainwindow.cpp" line="540"/>
         <source>HeadsetControl <byte value="xd"/>
 Battery Charging</source>
         <translation>HeadsetControl 
 Batteria in Carica</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="533"/>
+        <location filename="../../UI/mainwindow.cpp" line="543"/>
         <source>% - Descharging</source>
         <translation>% - Batteria in scarica</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="534"/>
+        <location filename="../../UI/mainwindow.cpp" line="544"/>
         <source>HeadsetControl <byte value="xd"/>
 Battery: </source>
         <translation>HeadsetControl 
 Batteria: </translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="544"/>
+        <location filename="../../UI/mainwindow.cpp" line="554"/>
         <source>Battery Alert!</source>
         <translation>Attenzione Batteria!</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="545"/>
+        <location filename="../../UI/mainwindow.cpp" line="555"/>
         <source>The battery of your headset is running low</source>
         <translation>La batteria delle tue cuffie è scarica</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="551"/>
+        <location filename="../../UI/mainwindow.cpp" line="561"/>
         <source>No battery info</source>
         <translation>No informazioni sulla batteria</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="568"/>
+        <location filename="../../UI/mainwindow.cpp" line="579"/>
         <source>Game</source>
         <translation>Gioco</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="570"/>
+        <location filename="../../UI/mainwindow.cpp" line="581"/>
         <source>Chat</source>
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="722"/>
+        <location filename="../../UI/mainwindow.cpp" line="734"/>
         <source>Check for updates</source>
         <translation>Controlla Aggirnamenti</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="702"/>
-        <location filename="../../UI/mainwindow.cpp" line="703"/>
+        <location filename="../../UI/mainwindow.cpp" line="714"/>
+        <location filename="../../UI/mainwindow.cpp" line="715"/>
         <source>up-to date v</source>
         <translation>aggiornato v</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="705"/>
-        <location filename="../../UI/mainwindow.cpp" line="712"/>
+        <location filename="../../UI/mainwindow.cpp" line="717"/>
+        <location filename="../../UI/mainwindow.cpp" line="724"/>
         <source>Newer version</source>
         <translation>Nuova versione</translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="733"/>
+        <location filename="../../UI/mainwindow.cpp" line="745"/>
         <source>About this program</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="734"/>
+        <location filename="../../UI/mainwindow.cpp" line="746"/>
         <source>You can find HeadsetControl-GUI source code on &lt;a href=&apos;https://github.com/LeoKlaus/HeadsetControl-GUI&apos;&gt;GitHub&lt;/a&gt;.&lt;br/&gt;Made by:&lt;br/&gt; - &lt;a href=&apos;https://github.com/LeoKlaus&apos;&gt;LeoKlaus&lt;/a&gt;&lt;br/&gt; - &lt;a href=&apos;https://github.com/nicola02nb&apos;&gt;nicola02nb&lt;/a&gt;&lt;br/&gt;Version: </source>
         <translation>Puoi trovare il codice sorgente di HeadsetControl-GUI su &lt;a href=&apos;https://github.com/LeoKlaus/HeadsetControl-GUI&apos;&gt;GitHub&lt;/a&gt;.&lt;br/&gt;Fatto da:&lt;br/&gt; - &lt;a href=&apos;https://github.com/LeoKlaus&apos;&gt;LeoKlaus&lt;/a&gt;&lt;br/&gt; - &lt;a href=&apos;https://github.com/nicola02nb&apos;&gt;nicola02nb&lt;/a&gt;&lt;br/&gt;Versione: </translation>
     </message>
     <message>
-        <location filename="../../UI/mainwindow.cpp" line="750"/>
+        <location filename="../../UI/mainwindow.cpp" line="762"/>
         <source>Big shout-out to:&lt;br/&gt; - &lt;a href=&apos;https://github.com/Sapd&apos;&gt;Sapd&lt;/a&gt; for &lt;a href=&apos;https://github.com/Sapd/HeadsetControl&apos;&gt;HeadsetCoontrol</source>
         <translation>Un grande riconoscimento va a:&lt;br/&gt; - &lt;a href=&apos;https://github.com/Sapd&apos;&gt;Sapd&lt;/a&gt; per &lt;a href=&apos;https://github.com/Sapd/HeadsetControl&apos;&gt;HeadsetCoontrol</translation>
     </message>