From 3e4adfa0d34826ee7049b8d32559c86a95bdc1d2 Mon Sep 17 00:00:00 2001
From: q3aql <q3aql@protonmail.ch>
Date: Wed, 7 Jul 2021 10:20:07 +0200
Subject: [PATCH] Add window-icon on GUI Windows

---
 zenidrv-g203           |  7 +++++--
 zenidrv-g203-admin     |  7 +++++--
 zenidrv-g203-lightsync | 12 +++++++-----
 zenidrv-g203-prodigy   | 12 +++++++-----
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/zenidrv-g203 b/zenidrv-g203
index 865eb60..ddec16b 100755
--- a/zenidrv-g203
+++ b/zenidrv-g203
@@ -10,6 +10,9 @@
 VERSION="1.0"
 M_DATE="060721"
 
+# Variables
+iconPath="/usr/share/icons/logitech/logitech-black.png"
+
 # Function to check admin rights
 function rootMessage() {
   mkdir -p /etc/root &> /dev/null
@@ -17,7 +20,7 @@ function rootMessage() {
   if [ ${administrador} -eq 0 ] ; then
     rm -rf /etc/root
   else
-    zenity --title "zenidrv-g203 v${VERSION} (${M_DATE})" --warning --width=340 --text "Administrator permissions are required"
+    zenity --title "zenidrv-g203 v${VERSION} (${M_DATE})" --window-icon=${iconPath} --warning --width=340 --text "Administrator permissions are required"
     echo ""
     echo "* zenidrv-g203 v${VERSION} (${M_DATE}) (GPL v2.0)"
     echo ""
@@ -28,7 +31,7 @@ function rootMessage() {
 }
 
 rootMessage
-zenity --question --title "zenidrv-g203 ${VERSION} (${M_DATE})" --cancel-label="Prodigy 1r Gen (Default)" --ok-label="Lightsync 2nd Gen" --width=530 \
+zenity --question --title "zenidrv-g203 ${VERSION} (${M_DATE})" --window-icon=${iconPath} --cancel-label="Prodigy 1r Gen (Default)" --ok-label="Lightsync 2nd Gen" --width=530 \
 --text "Choose the version of your Logitech G203 (Prodigy 1r Gen or Lightsync 2nd Gen)"
 createLink=$?
 if [ ${createLink} -eq 1 ] ; then
diff --git a/zenidrv-g203-admin b/zenidrv-g203-admin
index 0b47473..3faf025 100755
--- a/zenidrv-g203-admin
+++ b/zenidrv-g203-admin
@@ -10,6 +10,9 @@
 VERSION="1.0"
 M_DATE="060721"
 
+# Variables
+iconPath="/usr/share/icons/logitech/logitech-black.png"
+
 # Link with  gksudo,gksu o bessu
 function showRootMessage() {
   if [ -f /usr/bin/gksudo ] ; then
@@ -46,7 +49,7 @@ function showRootMessage() {
     zenity -h &> /dev/null
     output=$?
     if [ ${output} -eq 0 ] ; then
-      zenity --title "zenidrv-g203 ${VERSION} (${M_DATE})" --info \
+      zenity --title "zenidrv-g203 ${VERSION} (${M_DATE})" --window-icon=${iconPath} --info \
       --text "The 'zenidrv-g203' program could not be run as administrator\n\nPlease run the command 'zenidrv-g203' as root user in terminal"
     else
       xterm -T "zenidrv-g203 ${VERSION} (${M_DATE})" -fa Monospace -fs 10 -bg white -fg black -e "zenidrv-g203-admin --error"
@@ -67,7 +70,7 @@ function errorMessage() {
   exit
 }
 
-# Inicio del script
+# Startup script
 if [ "${1}" == "--error" ] ; then
   errorMessage
 else
diff --git a/zenidrv-g203-lightsync b/zenidrv-g203-lightsync
index 603b64b..41ee4f0 100755
--- a/zenidrv-g203-lightsync
+++ b/zenidrv-g203-lightsync
@@ -10,6 +10,8 @@
 VERSION="1.0"
 M_DATE="060721"
 
+# Variables
+iconPath="/usr/share/icons/logitech/logitech-black.png"
 
 # Function to check admin rights.
 function rootMessage() {
@@ -18,7 +20,7 @@ function rootMessage() {
   if [ ${administrador} -eq 0 ] ; then
     rm -rf /etc/root
   else
-    zenity --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --warning --width=340 --text "Administrator permissions are required"
+    zenity --title "zenidrv-g203-lightsync ${VERSION} (${M_DATE})" --window-icon=${iconPath} --warning --width=340 --text "Administrator permissions are required"
     echo ""
     echo "* zenidrv-g203-lightsync ${VERSION} (${M_DATE}) (GPL v2.0)"
     echo ""
@@ -34,12 +36,12 @@ rootMessage
 while [ ${showMenu} -eq 0 ] ; do
   clear
   opcion=$(zenity --width=280 --height=380 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \
-  --column "Select effect or option :" "Solid" "Cycle" "Breathe" "Wave" "Blend" \
+  --window-icon=${iconPath} --column "Select effect or option :" "Solid" "Cycle" "Breathe" "Wave" "Blend" \
   "Intro (On)" "Intro (Off)" "Set DPI" \
   "Light off" "Exit")
   if [ "${opcion}" == "Solid" ] ; then
     color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \
-  --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
+  --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
   "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" )
     if [ "${color_selected}" == "Black" ] ; then
       color_apply="000000"
@@ -80,7 +82,7 @@ while [ ${showMenu} -eq 0 ] ; do
     g203-led.py lightsync cycle
   elif [ "${opcion}" == "Breathe" ] ; then
     color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \
-  --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
+  --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
   "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" )
     if [ "${color_selected}" == "Black" ] ; then
       color_apply="000000"
@@ -126,7 +128,7 @@ while [ ${showMenu} -eq 0 ] ; do
   elif [ "${opcion}" == "Intro (Off)" ] ; then
     g203-led.py lightsync intro off
   elif [ "${opcion}" == "Set DPI" ] ; then
-    dpi_number=$(zenity --entry --title "Set DPI (from 50 to 8000)" --text "Enter DPI number (from 50 to 8000):" --entry-text "800")
+    dpi_number=$(zenity --entry --title "Set DPI (from 50 to 8000)" --window-icon=${iconPath} --text "Enter DPI number (from 50 to 8000):" --entry-text "800")
     g203-led.py lightsync dpi ${dpi_number}
   elif [ "${opcion}" == "Light off" ] ; then
     g203-led.py lightsync breathe 00FFFF 1000 0
diff --git a/zenidrv-g203-prodigy b/zenidrv-g203-prodigy
index 219c3e7..89f4ea3 100755
--- a/zenidrv-g203-prodigy
+++ b/zenidrv-g203-prodigy
@@ -10,6 +10,8 @@
 VERSION="1.0"
 M_DATE="060721"
 
+# Variables
+iconPath="/usr/share/icons/logitech/logitech-black.png"
 
 # Function to check admin rights.
 function rootMessage() {
@@ -18,7 +20,7 @@ function rootMessage() {
   if [ ${administrador} -eq 0 ] ; then
     rm -rf /etc/root
   else
-    zenity --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --warning --width=340 --text "Administrator permissions are required"
+    zenity --title "zenidrv-g203-prodigy ${VERSION} (${M_DATE})" --window-icon=${iconPath} --warning --width=340 --text "Administrator permissions are required"
     echo ""
     echo "* zenidrv-g203-prodigy ${VERSION} (${M_DATE}) (GPL v2.0)"
     echo ""
@@ -34,11 +36,11 @@ rootMessage
 while [ ${showMenu} -eq 0 ] ; do
   clear
   opcion=$(zenity --width=280 --height=330 --list --title "zenidrv-g203-prodigy ${VERSION} ($M_DATE)" \
-  --column "Select effect or option :" "Solid" "Cycle" "Breathe" "Intro (On)" "Intro (Off)" "Set DPI" \
+  --window-icon=${iconPath} --column "Select effect or option :" "Solid" "Cycle" "Breathe" "Intro (On)" "Intro (Off)" "Set DPI" \
   "Light off" "Exit")
   if [ "${opcion}" == "Solid" ] ; then
     color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \
-  --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
+  --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
   "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" )
     if [ "${color_selected}" == "Black" ] ; then
       color_apply="000000"
@@ -79,7 +81,7 @@ while [ ${showMenu} -eq 0 ] ; do
     g203-led.py cycle
   elif [ "${opcion}" == "Breathe" ] ; then
     color_selected=$(zenity --width=260 --height=520 --list --title "zenidrv-g203-lightsync ${VERSION} ($M_DATE)" \
-  --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
+  --window-icon=${iconPath} --column "Select color from list :" "Black" "White" "Red" "Lime" "Blue" "Yellow" "Cyan" "Magenta" \
   "Silver" "Gray" "Maroon" "Olive" "Green" "Purple" "Teal" "Navy" )
     if [ "${color_selected}" == "Black" ] ; then
       color_apply="000000"
@@ -121,7 +123,7 @@ while [ ${showMenu} -eq 0 ] ; do
   elif [ "${opcion}" == "Intro (Off)" ] ; then
     g203-led.py intro off
   elif [ "${opcion}" == "Set DPI" ] ; then
-    dpi_number=$(zenity --entry --title "Set DPI (from 200 to 8000)" --text "Enter DPI number (from 200 to 8000):" --entry-text "800")
+    dpi_number=$(zenity --entry --title "Set DPI (from 200 to 8000)" --window-icon=${iconPath} --text "Enter DPI number (from 200 to 8000):" --entry-text "800")
     g203-led.py dpi ${dpi_number}
   elif [ "${opcion}" == "Light off" ] ; then
     g203-led.py breathe 00FFFF 1000 0