From d1b9bae155425c2d500b136111cc4f2f28fc0c16 Mon Sep 17 00:00:00 2001
From: Mavridis Philippe <mavridisf@gmail.com>
Date: Sun, 12 Dec 2021 16:24:28 +0200
Subject: KMix: system tray icon enhancements

* XDG-compliant icon names with volume level specification (low, medium, high)
  Low-Medium threshold:  33%
  Medium-High threshold: 67%
* Improved built-in icon theme with distinct volume levels (according to above)
* Choice between classic KMix icon theme, imrpoved KMix icon theme and system theme.
* New KMixDockWidget::getAvgVolume() method
  Gets average volume in %. Code actually comes from KMixDockWidget::setVolumeTip(),
  but was put into a separate method to be reused for determination of icon according
  to the volume level

(cherry picked from commit 3168c39ef1e445db1a6e22a7ba63e8cb4714e6e8)
---
 kmix/appearanceconfig.ui | 130 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 83 insertions(+), 47 deletions(-)

(limited to 'kmix/appearanceconfig.ui')

diff --git a/kmix/appearanceconfig.ui b/kmix/appearanceconfig.ui
index a55f5a11..294b00fb 100644
--- a/kmix/appearanceconfig.ui
+++ b/kmix/appearanceconfig.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>464</width>
-            <height>280</height>
+            <width>487</width>
+            <height>278</height>
         </rect>
     </property>
     <property name="caption">
@@ -19,30 +19,18 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="TQComboBox" row="0" column="1">
-            <item>
-                <property name="text">
-                    <string>Horizontal</string>
-                </property>
-            </item>
-            <item>
-                <property name="text">
-                    <string>Vertical</string>
-                </property>
-            </item>
+        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>kcfg_Orientation</cstring>
+                <cstring>kcfg_Menubar</cstring>
             </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>3</hsizetype>
-                    <vsizetype>0</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
+            <property name="text">
+                <string>Show &amp;menu bar</string>
+            </property>
+            <property name="checked">
+                <bool>true</bool>
             </property>
         </widget>
-        <widget class="TQLabel" row="1" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>lblValueStyle</cstring>
             </property>
@@ -50,20 +38,12 @@
                 <string>Volume values:</string>
             </property>
         </widget>
-        <widget class="TQLabel" row="0" column="0">
+        <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>lblOrientation</cstring>
-            </property>
-            <property name="text">
-                <string>Sliders orientation:</string>
-            </property>
-        </widget>
-        <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>kcfg_Tickmarks</cstring>
+                <cstring>kcfg_Labels</cstring>
             </property>
             <property name="text">
-                <string>Show &amp;tickmarks</string>
+                <string>Show &amp;labels</string>
             </property>
             <property name="checked">
                 <bool>true</bool>
@@ -71,27 +51,44 @@
         </widget>
         <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>kcfg_Labels</cstring>
+                <cstring>kcfg_Tickmarks</cstring>
             </property>
             <property name="text">
-                <string>Show &amp;labels</string>
+                <string>Show &amp;tickmarks</string>
             </property>
             <property name="checked">
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQComboBox" row="2" column="1">
+            <item>
+                <property name="text">
+                    <string>None</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Absolute</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Relative</string>
+                </property>
+            </item>
             <property name="name">
-                <cstring>kcfg_Menubar</cstring>
-            </property>
-            <property name="text">
-                <string>Show &amp;menu bar</string>
+                <cstring>kcfg_ValueStyle</cstring>
             </property>
-            <property name="checked">
-                <bool>true</bool>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
             </property>
         </widget>
-        <spacer row="5" column="1">
+        <spacer row="6" column="1">
             <property name="name">
                 <cstring>spacer5</cstring>
             </property>
@@ -108,24 +105,63 @@
                 </size>
             </property>
         </spacer>
+        <widget class="TQLabel" row="1" column="0">
+            <property name="name">
+                <cstring>lblOrientation</cstring>
+            </property>
+            <property name="text">
+                <string>Sliders orientation:</string>
+            </property>
+        </widget>
         <widget class="TQComboBox" row="1" column="1">
             <item>
                 <property name="text">
-                    <string>None</string>
+                    <string>Horizontal</string>
                 </property>
             </item>
             <item>
                 <property name="text">
-                    <string>Absolute</string>
+                    <string>Vertical</string>
                 </property>
             </item>
+            <property name="name">
+                <cstring>kcfg_Orientation</cstring>
+            </property>
+            <property name="sizePolicy">
+                <sizepolicy>
+                    <hsizetype>3</hsizetype>
+                    <vsizetype>0</vsizetype>
+                    <horstretch>0</horstretch>
+                    <verstretch>0</verstretch>
+                </sizepolicy>
+            </property>
+        </widget>
+        <widget class="TQLabel" row="0" column="0">
+            <property name="name">
+                <cstring>lblOrientation_2</cstring>
+            </property>
+            <property name="text">
+                <string>Icon theme:</string>
+            </property>
+        </widget>
+        <widget class="TQComboBox" row="0" column="1">
             <item>
                 <property name="text">
-                    <string>Relative</string>
+                    <string>Crystal</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>Classic (Old Crystal)</string>
+                </property>
+            </item>
+            <item>
+                <property name="text">
+                    <string>System</string>
                 </property>
             </item>
             <property name="name">
-                <cstring>kcfg_ValueStyle</cstring>
+                <cstring>kcfg_IconTheme</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
-- 
cgit v1.2.1