mcc update2

bin/mcc

@@ -27,10 +27,10 @@ case $LANG in
         TINT2="Panel Tint2"
         SETTINGS="Ustawienia"
         CONKY="Conky"
-        MENU="Menu i Panele"
+        MENU="Menu/Panele boczne"
         THEMES="Motywy"
         HELP="Pomoc"
-        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/en/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!"
+        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/en/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!\n"
         SYSTEM_DESC="Ustawienia oraz informacje systemowe i sprzętowe"
         MONITORS="<b>Monitor(y)</b>"
         SOFTWARE_DESC="Aktualizacja - Instalacja Programów - Preferowane programy\n"
@@ -80,8 +80,19 @@ case $LANG in
         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)"
+        COL_HELP="Pomoc (interaktywna HTML)"
         LNG="pl"
+        USER_LBL="użytkownik"
+        USERS_MSM="Użytkownicy"
+        RES="rozdzielczość"
+        PKGS_INSTALLED="zainstalowane pakiety"
+        PKGS_STAT="Statystyki"
+        UPDCHECK="sprawdź aktualizacje"
+        CLI_UPD="Aktualizacja CLI"
+        KERNEL_LBL="jądro"
+        KERNELS="Jądra"
+        INSTALLED="zainstalowany:"
+        MABOX_DESC="Twój lekki, szybki i funkcjonalny Linuksowy Desktop"
         ;;
     es*)
         TITLE="Centro de control Mabox"
@@ -104,7 +115,7 @@ case $LANG in
         MENU="Menú y Paneles"
         THEMES="Temas"
         HELP="Help"
-        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/es/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!"
+        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/es/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!\n"
         SYSTEM_DESC="Ajustes e información del sistema y de hardware"
         MONITORS="<b>Monitor(es)</b>"
         SOFTWARE_DESC="Instalación y actualización de programas - Aplicaciones preferidas.\n"
@@ -156,7 +167,17 @@ case $LANG in
         COL_MODULES="Individual Modules:"
         COL_HELP="Help (interactive HTML)"
         LNG="en"
-        ;;
+        USER_LBL="user"
+        USERS_MSM="Users"
+        RES="resolution"
+        PKGS_INSTALLED="installed pkgs"
+        PKGS_STAT="Statistics"
+        UPDCHECK="check updates"
+        CLI_UPD="CLI update"
+        KERNEL_LBL="kernel"
+        KERNELS="Kernels"
+        INSTALLED="install date: "
+        MABOX_DESC="Your fast, lightweight and functional Linux Desktop";;
     *)
         TITLE="Mabox Control Center"
         MCC="<big><b>Mabox Control Center</b></big>\t\t\n<i>Configure and customize your Mabox Linux</i>\t"
@@ -175,10 +196,10 @@ case $LANG in
         TINT2="Tint2 Panel"
         SETTINGS="Settings"
         CONKY="Conky"
-        MENU="Menu/Panels"
+        MENU="Menu/SidePanels"
         THEMES="Themes"
         HELP="Help"
-        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/en/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nHowever, maintaining the project's infrastructure costs money.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!"
+        HELP_TXT="Visit <a href='https://manual.maboxlinux.org/en/'>Mabox Linux Manual</a> to learn more about Mabox.    \nDo you have questions? Want to get involved?\nTake a look at our: <a href='https://maboxlinux.org/'>official website</a>, <a href='https://forum.maboxlinux.org/'>forum</a>, <a href='https://blog.maboxlinux.org/'>blog</a>\n                                                                              \n<i>Mabox Linux is developed with passion in spare time.\nMabox is free and it will always be.\nIf you like Mabox you can help by making a small <a href='https://ko-fi.com/maboxlinux'>donation</a></i>         \nThank you for choosing to use Mabox Linux!\n"
         SYSTEM_DESC="System and Hardware settings and information"
         MONITORS="<b>Monitor(s)</b>"
         SOFTWARE_DESC="Software installation and update - Preferred Applications.\n"
@@ -230,24 +251,24 @@ case $LANG in
         COL_MODULES="Individual Modules:"
         COL_HELP="Help (interactive HTML)"
         LNG="en"
-        ;;
+        USER_LBL="user"
+        USERS_MSM="Users"
+        RES="resolution"
+        PKGS_INSTALLED="installed pkgs"
+        PKGS_STAT="Statistics"
+        UPDCHECK="check updates"
+        CLI_UPD="CLI update"
+        KERNEL_LBL="kernel"
+        KERNELS="Kernels"
+        INSTALLED="install date: "
+        MABOX_DESC="Your fast, lightweight and functional Linux Desktop";;
 esac
 
-#if [ "$(pidof tint2)" ];then
-#       while read -r pid cmd; do
-#            if [[ ${cmd%% *} = tint2 ]]; then
-#                TINT=${cmd##* }
-#                TINT2FILE=${TINT#$HOME/.config/tint2/}
-#            fi
-#        done < <(pgrep -a tint2|head -n 1)
-#fi
-
-
 maindialog () {
 	KEY=$RANDOM
 
 	res1=$(mktemp --tmpdir mcc-tab1.XXXXXXXX)
-	res2=$(mktemp --tmpdir mcc-tab2.XXXXXXXX)
+	#res2=$(mktemp --tmpdir mcc-tab2.XXXXXXXX)
 	res3=$(mktemp --tmpdir mcc-tab3.XXXXXXXX)
 	res4=$(mktemp --tmpdir mcc-tab4.XXXXXXXX)
 	res5=$(mktemp --tmpdir mcc-tab5.XXXXXXXX)
@@ -257,38 +278,82 @@ maindialog () {
 	res9=$(mktemp --tmpdir mcc-tab9.XXXXXXXX)
     res10=$(mktemp --tmpdir mcc-tab10.XXXXXXXX)
     res11=$(mktemp --tmpdir mcc-tab11.XXXXXXXX)
-	out=$(mktemp --tmpdir mcc-out.XXXXXXXX)
+    res12=$(mktemp --tmpdir mcc-tab12.XXXXXXXX)
+    out=$(mktemp --tmpdir mcc-out.XXXXXXXX)
 
 # cleanup
-trap "rm -f $res1 $res2 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $out" EXIT
+trap "rm -f $res1 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $res12 $out" EXIT
 
+OSNAME=$(lsb_release -d | awk '{print $2}')
+OSVERSION=$(lsb_release -r | awk '{print $2}')
+OSCODE=$(lsb_release -c | awk '{print $2}')
 
-# TAB1 SYSTEM_SPRZET
+ # system uptime
-yad --plug=$KEY --tabnum=1 --text="$SYSTEM_DESC" --columns=2 --align="center" --form --scroll \
+UPT="$(uptime -p)"
---field="<b>$SETTINGS</b>:LBL" " " \
+UPT="${UPT/up /}"
---field="$LOCALE_SETTINGS:FBTN" "manjaro-settings-manager -m msm_locale" \
+UPT="${UPT/ day?/d}"
---field="$LANGUAGE_PACKAGES:FBTN" "manjaro-settings-manager -m msm_language_packages" \
+UPT="${UPT/ hour?/h}"
---field="$KERNEL:FBTN" "manjaro-settings-manager -m msm_kernel" \
+UPT="${UPT/ minute?/m}"
---field="$USER_ACCOUNTS:FBTN" "manjaro-settings-manager -m msm_users" \
+# install date
---field="$TIME_DATE:FBTN" "manjaro-settings-manager -m msm_timedate" \
+if [[ -e /var/log/pacman.log ]]; then
---field="$KEYBOARD:FBTN" "lxinput" \
+        INST="$(sed 1q /var/log/pacman.log)"
---field="$HARDWARE:FBTN" "manjaro-settings-manager -m msm_mhwd" \
+        INST="${INST/ */}"
---field="$MONITORS:LBL" "" \
+        INST="${INST/T*/}" # newer pacman adds a different timestamp (TXX:XX:XX+0000), we just want the date
---field="ARandr:FBTN" "arandr" \
+        INST="${INST/\[/}"
---field="LXRandR:FBTN" "lxrandr" \
+        #INST="${INST//\-/ }"
---field="<b>Info</b>:LBL" "" \
+fi
---field="Neofetch:FBTN" "terminator -x bash -c 'neofetch;bash'" \
+PKGS=$(pacman -Qq 2>/dev/null | wc -l)
---field="$BTOP:FBTN" "terminator -x $BTOP" \
+# kernel version
---field=" :LBL" \
+KERN="${KERN:-$(uname -sr | awk '{print $2}')}"
+KERN="${KERN/-*/}"
+KERN="${KERN/linux/}"
+KERN="${KERN,,}"
+
+RESOLUTION=$(xdpyinfo | awk '/^ +dimensions/ {print $2}')
+
+INTRO_TXT=$(cat <<EOF
+\t<big>Mabox Linux $OSVERSION</big> <i>$OSCODE</i>
+\t<small><i>$MABOX_DESC</i></small>\n
+\t<small><tt>$INSTALLED </tt></small><b>$INST</b>
+\t<small><tt>wm:            </tt></small><b>openbox</b>
+\t<small><tt>uptime:        </tt></small><b>$UPT</b>
+\n
+EOF
+)
+#INTRO
+yad --plug=$KEY --tabnum=1 --borders=10 \
+--text="$INTRO_TXT" --image=/usr/share/icons/hicolor/128x128/apps/mbcc.png \
+--columns=4 --form \
+--field="$USER_LBL:LBL" "" \
+--field="$RES:LBL" "" \
+--field="$PKGS_INSTALLED:LBL" "" \
+--field="$UPDCHECK:LBL" "" \
+--field="$KERNEL_LBL:LBL" "" \
+--field="<b>$USER</b>:LBL" "" \
+--field="<b>$RESOLUTION</b>:LBL" "" \
+--field="<b>$PKGS</b>:LBL" "" \
+--field="<b>>>></b>:LBL" "" \
+--field="<b>$KERN</b>:LBL" "" \
+--field=" $USERS_MSM!system-config-users!:FBTN" "manjaro-settings-manager -m msm_users" \
+--field=" ARandr!system-terminal!:FBTN" "arandr" \
+--field=" Pamac!package-manager-icon!:FBTN" "pamac-manager" \
+--field=" Pamac updater!software-update!:FBTN" "pamac-manager --updates" \
+--field=" $KERNELS!distributor-logo-linux!:FBTN" "manjaro-settings-manager -m msm_kernel" \
+--field=" :LBL" "" \
+--field=" LXRandr!system-terminal!:FBTN" "lxrandr" \
+--field=" $PKGS_STAT (<small><tt>yay -Ps</tt></small>)!utilities-terminal!:FBTN" "terminator -T 'Package stats' -x bash -c 'yay -Ps;read'" \
+--field=" $CLI_UPD (<small><tt>yay</tt></small>)!utilities-terminal!:FBTN" "terminator -x bash -c 'theme.sh red-alert;yay;read'" \
+--field=" :LBL" "" \
 > $res1 &
 
-# TAB2 Programy
+# Programy
-yad --plug=$KEY --tabnum=2 --borders=10 --text="$SOFTWARE_DESC" \
+#yad --plug=$KEY --tabnum=2 --borders=20 --text="$SOFTWARE_DESC" \
---icons --read-dir=/usr/share/mcc/software --item-width=100 \
+#--icons --compact --term "terminator -e %s" --read-dir=/home/napcok/Git/mabox-tools/mcc/software --item-width=100 \
-> $res2 &
+#> $res2 &
+#--icons --compact --read-dir=/usr/share/mcc/software --item-width=100 \
 
-#TAB 3 AUTOSTART
+# AUTOSTART
-yad --plug=$KEY --tabnum=3 --borders=10 --uri-handler=xdg-open \
+yad --plug=$KEY --tabnum=2 --borders=10 --uri-handler=xdg-open \
 --text="<b>$AUTOSTART_HEAD</b>" --image=gtk-execute \
 --columns=1 --form \
 --field="$AUTOSTART_DESC:LBL" "" \
@@ -298,12 +363,10 @@ yad --plug=$KEY --tabnum=3 --borders=10 --uri-handler=xdg-open \
 --field="$AUTOSTART_RESET:FBTN" "cp /etc/skel/.config/openbox/autostart $HOME/.config/openbox/" \
 > $res3 &
 #--field=":LBL" "" \
-#TAB 4 WYGLĄD
-yad --plug=$KEY --tabnum=4 --text="$LOOK_DESC" --icons --read-dir=/usr/share/mcc/appearance --item-width=100 \
-> $res4 &
 
-#TAB 5 TINT2
+
-yad --plug=$KEY --tabnum=5 --borders=10 \
+# TINT2
+yad --plug=$KEY --tabnum=3 --borders=10 \
 --text="$TINT_DESC" --image=tint2conf \
 --columns=1 --form \
 --field="$T_LAUNCHERS:FBTN" "jgtint2launcher" \
@@ -314,18 +377,8 @@ yad --plug=$KEY --tabnum=5 --borders=10 \
 --field="$TINT_DIR:FBTN" "exo-open $HOME/.config/tint2/" \
 > $res5 &
 
-#TAB 6 CONKY
+# MENU
-yad --plug=$KEY --tabnum=6 --borders=10 \
+yad --plug=$KEY --tabnum=4 --borders=1 \
---text="$CONKY_DESC" --image=conky \
---form \
---field="$CONKY_CHOOSE:FBTN" "mb-conky-manager" \
---field="$CONKY_RESTART:FBTN" "mb-conky-session" \
---field="$CONKY_EDIT:FBTN" "mb-conkyedit" \
---field="$OPEN_CONKYDIR:FBTN" "exo-open $HOME/.config/conky/" \
-> $res6 &
-
-# TAB 7 MENU
-yad --plug=$KEY --tabnum=7 --borders=10 \
 --text="$MENU_DESC" --image=menu-editor \
 --columns=3 --form \
 --field="$M_LEFT:FBTN" "mb-jgtools places" \
@@ -350,57 +403,109 @@ yad --plug=$KEY --tabnum=7 --borders=10 \
 --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 &
+> $res6 &
 #--field="$M_LEFT_DESC:LBL" "" \
 #--field="$M_RIGHT_DESC:LBL" "" \
-#TAB 8 Picom 
+
+# WYGLĄD
+yad --plug=$KEY --tabnum=5 --text="$LOOK_DESC" --icons --read-dir=/usr/share/mcc/appearance --item-width=100 \
+> $res4 &
+
+# MOTYWY
+yad --plug=$KEY --tabnum=6 --borders=10 --uri-handler=xdg-open \
+--text="<b>$MT_MNGR</b>\n $MT_MNGR_DESC" \
+--form --field="$MT_MNGR!preferences-desktop-theme:FBTN" "mb-obthemes" \
+> $res9 &
+
+# COLORIZER
+yad --plug=$KEY --tabnum=7 --borders=10 \
+--text="$COLORIZER_DESC" --image=colorizer \
+--form \
+--columns=4 \
+--field=" Colorizer!colorizer!:FBTN" "colorizer -s" \
+--field="$COL_MODULES :LBL" "" \
+--field="OpenBox:FBTN" "colorizer-ob -s" \
+--field=" :LBL" "" \
+--field=" :LBL" "" \
+--field=" :LBL" "" \
+--field="Conky:FBTN" "colorizer-conky -s" \
+--field=" :LBL" "" \
+--field=" :LBL" "" \
+--field=" :LBL" "" \
+--field="Menu/SidePanels:FBTN" "colorizer-menus -s" \
+--field=" :LBL" "" \
+--field="$COL_HELP:FBTN" "yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Help - Colorizer'" \
+--field=" :LBL" "" \
+--field="PyRadio:FBTN" "colorizer-pyradio -s" \
+--field=" :LBL" "" \
+> res8 &
+
+
+# CONKY
 yad --plug=$KEY --tabnum=8 --borders=10 \
+--text="$CONKY_DESC" --image=conky \
+--form \
+--field="$CONKY_CHOOSE:FBTN" "mb-conky-manager" \
+--field="$CONKY_RESTART:FBTN" "mb-conky-session" \
+--field="$CONKY_EDIT:FBTN" "mb-conkyedit" \
+--field="$OPEN_CONKYDIR:FBTN" "exo-open $HOME/.config/conky/" \
+> $res10 &
+
+# Picom 
+yad --plug=$KEY --tabnum=9 --borders=10 \
 --text="$COMP_DESC" --image=compton \
 --columns=1 --form \
 --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 &
+> $res11 &
-
 #--field="$COMP_REMOVE:FBTN" "rm -f $HOME/.config/picom.conf" \
 #--field="$COMP_DEFAULT:FBTN" "cp /etc/skel/.config/picom.conf $HOME/.config/" \
 
-#TAB 9 MOTYWY
+# SYSTEM_SPRZET
-yad --plug=$KEY --tabnum=9 --borders=10 --uri-handler=xdg-open \
+yad --plug=$KEY --tabnum=10 --text="$SYSTEM_DESC" --columns=2 --align="center" --form --scroll \
---text="<b>$MT_MNGR</b>\n $MT_MNGR_DESC" \
+--field="<b>$SETTINGS</b>:LBL" " " \
---form --field="$MT_MNGR!preferences-desktop-theme:FBTN" "mb-obthemes" \
+--field="$LOCALE_SETTINGS:FBTN" "manjaro-settings-manager -m msm_locale" \
-> $res9 &
+--field="$LANGUAGE_PACKAGES:FBTN" "manjaro-settings-manager -m msm_language_packages" \
-
+--field="$KERNEL:FBTN" "manjaro-settings-manager -m msm_kernel" \
-##############################################################EDIT
+--field="$USER_ACCOUNTS:FBTN" "manjaro-settings-manager -m msm_users" \
-yad --plug=$KEY --tabnum=10 --borders=10 \
+--field="$TIME_DATE:FBTN" "manjaro-settings-manager -m msm_timedate" \
---text="$COLORIZER_DESC" --image=colorizer \
+--field="$KEYBOARD:FBTN" "lxinput" \
---form \
+--field="$HARDWARE:FBTN" "manjaro-settings-manager -m msm_mhwd" \
---columns=2 \
+--field="$MONITORS:LBL" "" \
---field="Colorizer:FBTN" "colorizer -s" \
+--field="ARandr:FBTN" "arandr" \
---field="$COL_MODULES :LBL" "" \
+--field="LXRandR:FBTN" "lxrandr" \
---field="OpenBox:FBTN" "colorizer-ob -s" \
+--field=" :LBL" "" \
---field="Conky:FBTN" "colorizer-conky -s" \
+--field="<b>Info</b>:LBL" "" \
---field="<p> </p> :LBL" "" \
+--field=" inxi -CGAD!utilities-terminal!:FBTN" "terminator -x bash -c 'inxi -CGAD;bash'" \
---field="$COL_HELP:FBTN" "yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Help - Colorizer'" \
+--field=" neofetch!utilities-terminal!:FBTN" "terminator -x bash -c 'neofetch;bash'" \
---field="<p> </p>:LBL" "" \
+--field="btop!utilities-terminal!:FBTN" "terminator -x $BTOP" \
---field="<p> </p>:LBL" "" \
+> $res7 &
---field="Menu/SidePanels:FBTN" "colorizer-menus -s" \
+# HELP
---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" \
-> $res11 &
+--form --columns="4" \
+--field="www:FBTN" "xdg-open https://maboxlinux.org" \
+--field="forum:FBTN" "xdg-open https://forum.maboxlinux.org" \
+--field="manual:FBTN" "xdg-open https://manual.maboxlinux.org" \
+--field="donate:FBTN" "xdg-open https://ko-fi.com/maboxlinux" \
+> $res12 &
+
 
 #main window
 yad --window-icon=distributor-logo-mabox \
     --notebook --tab-pos="left" --key=$KEY \
+    --tab="Home" \
+    --tab="$AUTOSTART" \
+    --tab="$TINT2"\
+    --tab="$MENU" \
+    --tab="$LOOK" \
+    --tab="$THEMES" \
+    --tab="Colorizer" \
+    --tab="$CONKY" \
+    --tab="$COMPOSITOR" \
     --tab="$SYSTEM" \
-    --tab="$SOFTWARE" --tab="$AUTOSTART" --tab="$LOOK" --tab="$TINT2"\
+    --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 &
 }

icons/hicolor/scalable/apps/mcc.svg

@@ -26,9 +26,9 @@
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:zoom="1.4479166"
+     inkscape:zoom="2.8958332"
-     inkscape:cx="253.46763"
+     inkscape:cx="214.27339"
-     inkscape:cy="165.41008"
+     inkscape:cy="134.15828"
      inkscape:window-width="1647"
      inkscape:window-height="1097"
      inkscape:window-x="260"
@@ -201,7 +201,7 @@
     </g>
     <path
        id="path5911"
-       d="M 76.812833,88.828677 65.28389,108.80258 m 28.822357,-49.920332 -2.882235,4.986268 m -36.489105,34.38508 4.986268,-2.882243 M 104.65524,69.431231 99.668967,72.313467 M 50.872711,83.84241 h 5.764472 m 28.822357,0 h 23.05789 M 54.734907,69.431231 59.721175,72.313467 M 104.65524,98.253596 99.668967,95.371353 M 76.812833,78.856142 65.28389,58.882248 m 28.822357,49.920332 -2.882235,-4.98627 m -11.528943,8.84847 v -5.76447 m 0,-51.880258 v 5.764472 m 0,28.822357 a 5.7644715,5.7644715 0 1 0 0,-11.528943 5.7644718,5.7644718 0 0 0 0,11.528943 z m 0,17.293429 a 23.057891,23.057891 0 1 0 0,-46.115786 23.057891,23.057891 0 0 0 0,46.115786 z"
+       d="M 74.423354,86.158276 59.205146,112.52383 M 97.250665,46.628982 93.446114,53.210857 M 45.280486,98.599171 51.862361,94.79461 m 59.312979,-34.240968 -6.58188,3.804552 M 40.182386,79.576402 h 7.609104 m 38.045519,0 h 30.436421 m -70.992944,-19.02276 6.581875,3.804552 M 111.17534,98.599171 104.59346,94.79461 M 74.423354,72.994527 59.205146,46.628982 m 38.045519,65.894848 -3.804551,-6.58187 m -15.218208,11.67998 v -7.6091 m 0,-68.481958 v 7.609105 m 0,38.045518 a 7.6091039,7.6091039 0 1 0 0,-15.218207 7.6091043,7.6091043 0 0 0 0,15.218207 z m 0,22.827335 a 30.436426,30.436426 0 1 0 0,-60.872853 30.436426,30.436426 0 0 0 0,60.872853 z"
-       style="fill:#008000;stroke:#ffffff;stroke-width:2.88224;stroke-opacity:1" />
+       style="fill:#008000;stroke:#ffffff;stroke-width:3.80456;stroke-opacity:1" />
   </g>
 </svg>