From 478b96e4e215a0f32815a83bcbaa1534f8bf2c7d Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Mon, 22 Aug 2022 16:48:45 +0200
Subject: [PATCH] mcc update

---
 bin/mcc                         | 69 ++++++++++++++++++++++++---------
 mcc/appearance/nitrogen.desktop | 17 --------
 mcc/appearance/qt5ct.desktop    | 69 ---------------------------------
 3 files changed, 50 insertions(+), 105 deletions(-)
 delete mode 100644 mcc/appearance/nitrogen.desktop
 delete mode 100644 mcc/appearance/qt5ct.desktop

diff --git a/bin/mcc b/bin/mcc
index d6c7521..91dc731 100755
--- a/bin/mcc
+++ b/bin/mcc
@@ -2,7 +2,6 @@
 #    mcc: Mabox Control Center
 #    Copyright (C) 2019-2022 napcok <napcok@gmail.com>
 #
-EDITOR=geany
 if hash btop 2>/dev/null; then
         BTOP="btop"
     else
@@ -70,7 +69,7 @@ case $LANG in
         OWN_COMMANDS_TOP="(Góra)"
         OWN_COMMANDS_BOTTOM="(Dół)"
         COMPOSITOR="Kompozytor"
-        COMP_DESC="Menadżerem kompozycji w Maboxie jest <b>Picom</b> - fork Compton.\nSkrót klawiszowy do włączania/wyłączania menadżera kompozycji to (<b>win</b>+<b>c</b>)."
+        COMP_DESC="Menadżerem kompozycji w Maboxie jest <b>Picom</b> - fork Compton.\nSkrót klawiszowy do włączania/wyłączania menadżera kompozycji to (<b>win</b>+<b>p</b>)."
         COMP_GUI="Ustawienia"
         COMP_EDIT="Edytuj plik konfiguracyjny"
         COMP_RESTART="Restart"
@@ -79,7 +78,11 @@ case $LANG in
         COMP_DEFAULT="Przywróć domyślny plik konfiguracyjny"
         MT_MNGR="Menedżer Motywów Maboxa"
         MT_MNGR_DESC="\n<a href='https://manual.maboxlinux.org/en/configuration/theme-manager/'>Pomoc (online)</a>\nMotyw Maboxa składa się z:\n - tapety\n - wystroju GTK2/GTK3 oraz obramowania okien Openboxa\n - ustawień panelu Tint2\n - uruchamianych automatycznie Conky                              \n\nZa pomocą menedżera motywów możesz w wygodny sposób zapisywać swoje konfiguracje, a następnie dowolnie przełączać się między nimi."
-       ;;
+        COLORIZER_DESC="<b>Colorizer</b>\nUmożliwia zmianę kolorystyki elementów pulpitu Mabox.\nMoże również automatycznie generować kolorystykę na bazie tapety.\n<i>Zobacz video (online):</i> <a href='https://odysee.com/@mabox-linux:8/mabox-22.08-let%E2%80%99s-meet-colorizer:f'>Colorizer - krótki przegląd</a>\n"
+        COL_MODULES="Pojedyńcze Moduły"
+        COL_HELP="Pomoc (interaktywna)"
+        LNG="pl"
+        ;;
     es*)
         TITLE="Centro de control Mabox"
         MCC="<big>Centro de control Mabox</big>\t\t\nConfigura y ajusta tu sistema Mabox\t\t"
@@ -149,6 +152,10 @@ case $LANG in
         COMP_DEFAULT="Reestablecer compositor grafico por defecto"
         MT_MNGR="Gestor de Temas Mabox"
         MT_MNGR_DESC="\n<a href='https://manual.maboxlinux.org/es/configuration/theme-manager/'>Help (online)</a>\nTemas Mabox consiste de:\n - fondos de pantalla\n - temas GTK2/GTK3\n - ajustes a tema Openbox\n - paneles Tint2 seleccionados\n - recuadros Conky seleccionados\n\nCon el gestor de Temas en Mabox puede fácilmente guardar nuevas configuraciones, y cambiar entre ellas."
+        COLORIZER_DESC="<b>Colorizer</b>\nColorizer allows you to change the color of the Mabox desktop elements.\nIt can also automatically generate colors based on the wallpaper.\n<i>See video (online - YT):</i> <a href='https://youtu.be/E-3CFgkfWXE'>Colorizer - overview</a>\n"
+        COL_MODULES="Individual Modules:"
+        COL_HELP="Help (interactive HTML)"
+        LNG="en"
         ;;
     *)
         TITLE="Mabox Control Center"
@@ -219,6 +226,10 @@ case $LANG in
         COMP_DEFAULT="Reset to default"
         MT_MNGR="Mabox Theme Manager"
         MT_MNGR_DESC="\n<a href='https://manual.maboxlinux.org/en/configuration/theme-manager/'>Help (online)</a>\nMabox theme consist of:\n - wallpaper\n - GTK2/GTK3 Theme and Openbox window decoration          \n - selected Tint2 panel(s)\n - selected Conkies                                \n\nWith Mabox Theme Manager you can easily save your configurations, and switch between them."
+        COLORIZER_DESC="<b>Colorizer</b>\nColorizer allows you to change the color of the Mabox desktop elements.\nIt can also automatically generate colors based on the wallpaper.\n<i>See video (online - YT):</i> <a href='https://youtu.be/E-3CFgkfWXE'>Colorizer - overview</a>\n"
+        COL_MODULES="Individual Modules:"
+        COL_HELP="Help (interactive HTML)"
+        LNG="en"
         ;;
 esac
 
@@ -245,10 +256,11 @@ maindialog () {
 	res8=$(mktemp --tmpdir mcc-tab8.XXXXXXXX)
 	res9=$(mktemp --tmpdir mcc-tab9.XXXXXXXX)
     res10=$(mktemp --tmpdir mcc-tab10.XXXXXXXX)
+    res11=$(mktemp --tmpdir mcc-tab11.XXXXXXXX)
 	out=$(mktemp --tmpdir mcc-out.XXXXXXXX)
 
 # cleanup
-trap "rm -f $res1 $res2 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $out" EXIT
+trap "rm -f $res1 $res2 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $out" EXIT
 
 
 # TAB1 SYSTEM_SPRZET
@@ -282,7 +294,7 @@ yad --plug=$KEY --tabnum=3 --borders=10 --uri-handler=xdg-open \
 --field="$AUTOSTART_DESC:LBL" "" \
 --field="$EDIT_XDG:FBTN" "yautostart" \
 --field="$AUTOSTART_DESC2 :LBL" "" \
---field="$EDIT_SCRIPT <i>~/.config/openbox/autostart</i>:FBTN" "geany $HOME/.config/openbox/autostart" \
+--field="$EDIT_SCRIPT <i>~/.config/openbox/autostart</i>:FBTN" "xdg-open $HOME/.config/openbox/autostart" \
 --field="$AUTOSTART_RESET:FBTN" "cp /etc/skel/.config/openbox/autostart $HOME/.config/openbox/" \
 > $res3 &
 #--field=":LBL" "" \
@@ -294,10 +306,10 @@ yad --plug=$KEY --tabnum=4 --text="$LOOK_DESC" --icons --read-dir=/usr/share/mcc
 yad --plug=$KEY --tabnum=5 --borders=10 \
 --text="$TINT_DESC" --image=tint2conf \
 --columns=1 --form \
---field="$T_CHOOSE:FBTN" "mb-tint2-manager" \
---field="$T_CONF:FBTN" "jgtint2-pipe -s" \
---field="$T_RESTART:FBTN" "mb-tint2restart" \
 --field="$T_LAUNCHERS:FBTN" "jgtint2launcher" \
+--field="$T_CONF:FBTN" "jgtint2-pipe -s" \
+--field="$T_CHOOSE:FBTN" "mb-tint2-manager" \
+--field="$T_RESTART:FBTN" "mb-tint2restart" \
 --field=":LBL" "" \
 --field="$TINT_DIR:FBTN" "exo-open $HOME/.config/tint2/" \
 > $res5 &
@@ -319,24 +331,24 @@ yad --plug=$KEY --tabnum=7 --borders=10 \
 --field="$M_LEFT:FBTN" "mb-jgtools places" \
 --field="$M_LEFT_KEY:LBL" "" \
 --field="$M_CUSTOMIZE:LBL" "" \
---field="$OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/places-prepend.csv" \
---field="$OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/places-append.csv" \
+--field="$OWN_COMMANDS_TOP:FBTN" "xdg-open $HOME/.config/mabox/places-prepend.csv" \
+--field="$OWN_COMMANDS_BOTTOM:FBTN" "xdg-open $HOME/.config/mabox/places-append.csv" \
 --field=":LBL" "" \
 --field=" :LBL" "" \
 --field=" :LBL" "" \
 --field="$M_MAIN:FBTN" "mb-jgtools main" \
 --field="$M_MAIN_KEY:LBL" "" \
 --field=" :LBL" "" \
---field="$M_EDIT_MAIN:FBTN" "geany $HOME/.config/mabox/favorites.csv" \
---field="$M_EDIT_MAIN_AFTER:FBTN" "geany $HOME/.config/mabox/mainmenu_below_apps.csv" \
+--field="$M_EDIT_MAIN:FBTN" "xdg-open $HOME/.config/mabox/favorites.csv" \
+--field="$M_EDIT_MAIN_AFTER:FBTN" "xdg-open $HOME/.config/mabox/mainmenu_below_apps.csv" \
 --field=":LBL" "" \
 --field=" :LBL" "" \
 --field="$M_MORE:FBTN" "jgmenusettings-pipe -s" \
 --field="$M_RIGHT:FBTN" "mb-jgtools right" \
 --field="$M_RIGHT_KEY:LBL" "" \
 --field=" :LBL" "" \
---field="$OWN_COMMANDS_TOP:FBTN" "geany $HOME/.config/mabox/right-prepend.csv" \
---field="$OWN_COMMANDS_BOTTOM:FBTN" "geany $HOME/.config/mabox/right-append.csv" \
+--field="$OWN_COMMANDS_TOP:FBTN" "xdg-open $HOME/.config/mabox/right-prepend.csv" \
+--field="$OWN_COMMANDS_BOTTOM:FBTN" "xdg-open $HOME/.config/mabox/right-append.csv" \
 --field=":LBL" "" \
 > $res7 &
 #--field="$M_LEFT_DESC:LBL" "" \
@@ -345,7 +357,7 @@ yad --plug=$KEY --tabnum=7 --borders=10 \
 yad --plug=$KEY --tabnum=8 --borders=10 \
 --text="$COMP_DESC" --image=compton \
 --columns=1 --form \
---field="$COMP_EDIT:FBTN" "$EDITOR $HOME/.config/picom.conf" \
+--field="$COMP_EDIT:FBTN" "xdg-open $HOME/.config/picom.conf" \
 --field="$COMP_RESTART:FBTN" "mabox-compositor --restart" \
 --field="$COMP_TOGGLE:FBTN" "mabox-compositor --toggle" \
 > $res8 &
@@ -359,17 +371,36 @@ yad --plug=$KEY --tabnum=9 --borders=10 --uri-handler=xdg-open \
 --form --field="$MT_MNGR!preferences-desktop-theme:FBTN" "mb-obthemes" \
 > $res9 &
 
-#TAB 10 -HELP
-yad --plug=$KEY --tabnum=10 \
+##############################################################EDIT
+yad --plug=$KEY --tabnum=10 --borders=10 \
+--text="$COLORIZER_DESC" --image=colorizer \
+--form \
+--columns=2 \
+--field="Colorizer:FBTN" "colorizer -s" \
+--field="$COL_MODULES :LBL" "" \
+--field="OpenBox:FBTN" "colorizer-ob -s" \
+--field="Conky:FBTN" "colorizer-conky -s" \
+--field="<p> </p> :LBL" "" \
+--field="$COL_HELP:FBTN" "yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Help - Colorizer'" \
+--field="<p> </p>:LBL" "" \
+--field="<p> </p>:LBL" "" \
+--field="Menu/SidePanels:FBTN" "colorizer-menus -s" \
+--field="PyRadio:FBTN" "colorizer-pyradio -s" \
+--field="<p> </p>:LBL" "" \
+> res10 &
+
+
+#TAB 11 -HELP
+yad --plug=$KEY --tabnum=11 \
 --image=/usr/share/icons/hicolor/128x128/apps/distributor-logo-mabox-trans.png --text-justify=center --uri-handler=xdg-open --text="$HELP_TXT" \
-> $res10 &
+> $res11 &
 
 #main window
 yad --window-icon=distributor-logo-mabox \
     --notebook --tab-pos="left" --key=$KEY \
     --tab="$SYSTEM" \
     --tab="$SOFTWARE" --tab="$AUTOSTART" --tab="$LOOK" --tab="$TINT2"\
-    --tab="$CONKY" --tab="$MENU" --tab="$COMPOSITOR" --tab="$THEMES" --tab="$HELP"\
+    --tab="$CONKY" --tab="$MENU" --tab="$COMPOSITOR" --tab="$THEMES" --tab="Colorizer" --tab="$HELP"\
     --title="$TITLE" --image=/usr/share/icons/hicolor/48x48/apps/distributor-logo-mabox.png \
     --width="720" --height="420" --image-on-top --text-justify=right --text="$MCC"  --no-buttons > $out &
 }
diff --git a/mcc/appearance/nitrogen.desktop b/mcc/appearance/nitrogen.desktop
deleted file mode 100644
index e72106b..0000000
--- a/mcc/appearance/nitrogen.desktop
+++ /dev/null
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=nitrogen
-Name=Wallpaper
-Name[pl]=Wybór tapety
-GenericName=Wallpaper Setter
-GenericName[pl]=Wybór tapety
-GenericName[ru]=Установщик фонов
-Categories=Utility;GTK;DesktopSettings;
-Icon=nitrogen
-Comment=Browse and set desktop backgrounds
-Comment[pl]=Przeglądaj i wybierz tapetę
-Comment[bs]=Pregledaj i postavi pozadinske slike
-Comment[hr]=Pregledaj i postavi pozadinske slike
-Comment[sr]=Прегледај и постави позадинске слике
-Comment[ru]=Просмотр и выбор фонов рабочих столов
-Keywords=background;desktop;
diff --git a/mcc/appearance/qt5ct.desktop b/mcc/appearance/qt5ct.desktop
deleted file mode 100644
index c5dc801..0000000
--- a/mcc/appearance/qt5ct.desktop
+++ /dev/null
@@ -1,69 +0,0 @@
-[Desktop Entry]
-X-Desktop-File-Install-Version=0.11
-Name=Qt5 Settings
-
-Comment=Qt5 Configuration Tool
-
-Comment[ar]= أداة اعداد Qt5
-Name[ar]=إعدادات Qt5 
-
-Comment[bg]=Инструмент за настройка на Qt5
-Name[bg]=Настройки на Qt5
-
-Comment[ca]=Eina de configuració de Qt5
-Name[ca]=Configuració de Qt5
-
-Comment[cs]=Nástroj na nastavení Qt5
-Name[cs]=Nastavení Qt5
-
-Comment[da]=Qt5-konfigurationsværktøj
-Name[da]=Qt5-indstillinger
-
-Comment[de]=Qt5-Konfigurationswerkzeug
-Name[de]=Qt5-Einstellungen
-
-Comment[el]=Εργαλείο διαμόρφωσης της Qt5
-Name[el]=Ρυθμίσεις Qt5
-
-Comment[es]=Herramienta de configuración de QT5
-Name[es]=Ajustes QT5
-
-Comment[es_ES]=Herramienta de configuración de QT5
-Name[es_ES]=Ajustes QT5
-
-Comment[fr]=Un outil de configuration de Qt5
-Name[fr]=Paramètres de Qt5
-
-Comment[he]=כלי תצורה Qt5
-Name[he]=הגדרות Qt5
-
-Comment[ru]=Программа для настройки Qt5
-Name[ru]=Настройки Qt5
-
-Comment[it_IT]=Strumento di configurazione Qt5
-Name[it_IT]=Impostazioni Qt5
-
-Comment[nl_NL]=Qt5-instellingen
-Name[nl_NL]=Qt5-instellingen
-
-Comment[pl]=Narzędzie konfiguracji Qt5
-Name[pl]=Ustawienia Qt5
-
-Comment[sk]=Qt5 konfiguračný nástroj
-Name[sk]=Qt5 nastavenia
-
-Comment[sr]=Qt5 конфигурациони алат
-Name[sr]=Qt5 поставке
-
-Comment[zh_CN]=Qt5 配置工具
-Name[zh_CN]=Qt5 设置
-
-Comment[zh_TW]=Qt5 設定工具
-Name[zh_TW]=Qt5 設定
-
-
-Exec=qt5ct
-Icon=preferences-desktop-theme
-Terminal=false
-Type=Application
-Categories=Settings;DesktopSettings;Qt;