MCC update

This commit is contained in:
Daniel Napora 2025-01-09 21:33:32 +01:00
parent ade34784eb
commit c494a7d96c
3 changed files with 90 additions and 44 deletions

View File

@ -17,7 +17,7 @@ yad --title="About Mabox" --window-icon=mbcc \
--pversion="$(lsb_release -rs) <i>${OSCODE}</i>" \
--image=mbcc \
--comments="${COMMENT}" \
--copyright="Copyright 2016-2024, Daniel Napora <danieln@maboxlinux.org>" \
--copyright="Copyright 2016-2025, Daniel Napora <danieln@maboxlinux.org>" \
--license=GPL3 \
--website="https://maboxlinux.org" \
--website-label=maboxlinux.org \

126
bin/mcc
View File

@ -1,6 +1,6 @@
#!/bin/bash
# mcc: Mabox Control Center
# Copyright (C) 2019-2022 napcok <napcok@gmail.com>
# Copyright (C) 2019-2025 napcok <napcok@gmail.com>
#
if hash btop 2>/dev/null; then
BTOP="btop"
@ -108,6 +108,17 @@ case $LANG in
FONT_INC="Powiększ Wszystkie"
FONT_DEC="Pomniejsz Wszystkie"
FONT_RESET="Resetyj Wszystkie"
WALLPAPER="Tapety"
WALLPAPER_DESC="<b>Jak ustawić tapetę w Maboxie?</b>\n\nCzy widzisz ikonę z obrazkiem w panelu?\nKliknij w nią prawym przyciskiem myszy...\n"
WP_RANDOM="Losowa tapeta"
WP_CHOOSE="Wybierz w menadżerze plików"
WP_PREVIEW="Przeglądaj i wybierz"
WP_SLIDE="Pokaz slajdów"
WP_GENERATE="Generator tapet"
WP_DIRS="Edytuj katalogi z tapetami"
WP_TITLE="Jak ustawić tapetę w Maboxie?"
WP_MSG="\nKlikając prawym przyciskiem myszy w ikonę w panelu masz kilka sposobów ustawienia tapety:\n- <b>losowa</b>,\n- <b>wybierz</b> <i>(z menu kontekstowego w menadżerze plików)</i>,\n- <b>przeglądaj i wybierz</b>,\n- <b>pokaz slajdów</b>\n- lub <b>generator</b> tapet\n\nNa dole menu możesz ustawić akcję dla lewego kliknięcia w ikonę.\n\nWypróbuj różne opcje i ustaw tą, która najbardziej Ci pasuje."
;;
es*)
TITLE="Centro de control Mabox"
@ -203,6 +214,17 @@ case $LANG in
FONT_INC="Increase All"
FONT_DEC="Decrease All"
FONT_RESET="Reset All"
WALLPAPER="Wallpaper"
WALLPAPER_DESC="<b>How to set Wallpaper in Mabox?</b>\n\nDo you see an icon with a picture in the tint2 panel?\nRight-click on it...\n"
WP_RANDOM="Random wallpaper"
WP_CHOOSE="Choose from file manager"
WP_PREVIEW="Preview &amp; choose"
WP_SLIDE="Slideshow"
WP_GENERATE="Generate"
WP_DIRS="Edit Wallpapers Dirs"
WP_TITLE="How to set Wallpaper in Mabox?"
WP_MSG="\nFrom right-click on icon in panel you have access to several ways to set the wallpaper:\n- <b>random</b>,\n- <b>choose</b> <i>(using context menu in filemanager)</i>,\n- <b>preview and set</b>,\n- <b>slideshow</b>\n- or <b>generate</b>\n\nAt the bottom of the menu you have the option to assign the desired action to the left-click on the icon on the panel.\n\nTest different options and assign the one that suits you best."
;;
*)
TITLE="Mabox Control Center"
@ -297,6 +319,16 @@ case $LANG in
FONT_INC="Increase All"
FONT_DEC="Decrease All"
FONT_RESET="Reset All"
WALLPAPER="Wallpaper"
WALLPAPER_DESC="<b>How to set Wallpaper in Mabox?</b>\n\nDo you see an icon with a picture in the tint2 panel?\nRight-click on it...\n"
WP_RANDOM="Random wallpaper"
WP_CHOOSE="Choose from file manager"
WP_PREVIEW="Preview &amp; choose"
WP_SLIDE="Slideshow"
WP_GENERATE="Generate"
WP_DIRS="Edit Wallpapers Dirs"
WP_TITLE="How to set Wallpaper in Mabox?"
WP_MSG="\nFrom right-click on icon in panel you have access to several ways to set the wallpaper:\n- <b>random</b>,\n- <b>choose</b> <i>(using context menu in filemanager)</i>,\n- <b>preview and set</b>,\n- <b>slideshow</b>\n- or <b>generate</b>\n\nAt the bottom of the menu you have the option to assign the desired action to the left-click on the icon on the panel.\n\nTest different options and assign the one that suits you best."
;;
esac
@ -315,10 +347,11 @@ maindialog () {
res10=$(mktemp --tmpdir mcc-tab10.XXXXXXXX)
res11=$(mktemp --tmpdir mcc-tab11.XXXXXXXX)
res12=$(mktemp --tmpdir mcc-tab12.XXXXXXXX)
res13=$(mktemp --tmpdir mcc-tab13.XXXXXXXX)
out=$(mktemp --tmpdir mcc-out.XXXXXXXX)
# cleanup
trap "rm -f $res1 $res2 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $res12 $out" EXIT
trap "rm -f $res1 $res2 $res3 $res4 $res5 $res6 $res7 $res8 $res9 $res10 $res11 $res12 $res13 $out" EXIT
OSNAME=$(lsb_release -d | awk '{print $2}')
OSVERSION=$(lsb_release -r | awk '{print $2}')
@ -403,7 +436,7 @@ GDK_BACKEND=x11 yad --plug=$KEY --tabnum=2 --borders=20 \
--field="$ADVANCED:LBL" "" \
--field="$T_CHOOSE:FBTN" "mb-tint2-manager" \
--field="$TINT_DIR:FBTN" "exo-open $HOME/.config/tint2/" \
> $res4 &
> $res2 &
# MENU
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=3 --borders=1 \
@ -440,25 +473,35 @@ GDK_BACKEND=x11 yad --plug=$KEY --tabnum=3 --borders=1 \
--field="$OWN_COMMANDS_BOTTOM:FBTN" "xdg-open $HOME/.config/mabox/right-append.csv" \
--field=" :LBL" "" \
--field=" :LBL" "" \
> $res5 &
> $res3 &
#--field="$M_LEFT_DESC:LBL" "" \
#--field="$M_RIGHT_DESC:LBL" "" \
# AUTOSTART
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=4 --borders=20 --uri-handler=xdg-open \
--text="<b>$AUTOSTART_HEAD</b>" --image=gtk-execute \
--columns=1 --form \
--field="$AUTOSTART_DESC:LBL" "" \
--field="$EDIT_XDG:FBTN" "yautostart" \
--field="$AUTOSTART_DESC2 :LBL" "" \
--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" "" \
# WALLPAPERS
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=4 --borders=20 \
--text="$WALLPAPER_DESC \n" --image="$HOME/.config/mabox/wpicon.png" \
--columns=2 --form \
--field="INFO:FBTN" "notify-send.sh -t 12000 --icon=$HOME/.config/mabox/wpicon.png '$WP_TITLE' '$WP_MSG' " \
--field="$WP_RANDOM:FBTN" "mbwallpaper -o" \
--field="$WP_CHOOSE:FBTN" "pcmanwp" \
--field="$WP_PREVIEW:FBTN" "mbwallpaper -c" \
--field=" :LBL" "" \
--field="$WP_SLIDE:FBTN" "run_wallpaperslideshow" \
--field="$WP_GENERATE:FBTN" "jgwallpapergenerate -s" \
--field="$WP_DIRS:FBTN" "xdg-open $HOME/.config/mabox/wallp_dirs.conf" \
> $res4 &
# CONKY
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=5 --borders=20 \
--text="$CONKY_DESC \n" --image=conky \
--form \
--field=" Conky Manager!colorizer!:FBTN" "colorizer-conky -s" \
--field="$ADVANCED :LBL" "" \
--field="$OPEN_CONKYDIR:FBTN" "exo-open $HOME/.config/conky/" \
> $res5 &
# FONTS
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=5 --borders=20 \
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=6 --borders=20 \
--text="$FONT_DESC \n" --image=font \
--form \
--field="$FONT_MENU!colorizer!:FBTN" "colorizer-fonts -s" \
@ -466,17 +509,6 @@ GDK_BACKEND=x11 yad --plug=$KEY --tabnum=5 --borders=20 \
--field="$FONT_INC :FBTN" "fontctl inc_all" \
--field="$FONT_DEC :FBTN" "fontctl dec_all" \
--field="$FONT_RESET :FBTN" "fontctl resetall" \
> $res2 &
# CONKY
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=6 --borders=20 \
--text="$CONKY_DESC \n" --image=conky \
--form \
--field=" Conky Manager!colorizer!:FBTN" "colorizer-conky -s" \
--field="$ADVANCED :LBL" "" \
--field="$OPEN_CONKYDIR:FBTN" "exo-open $HOME/.config/conky/" \
> $res6 &
# Picom
@ -514,8 +546,19 @@ GDK_BACKEND=x11 yad --plug=$KEY --tabnum=8 --borders=20 \
--field=" :LBL" "" \
> $res8 &
# AUTOSTART
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=9 --borders=20 --uri-handler=xdg-open \
--text="<b>$AUTOSTART_HEAD</b>" --image=gtk-execute \
--columns=1 --form \
--field="$AUTOSTART_DESC:LBL" "" \
--field="$EDIT_XDG:FBTN" "yautostart" \
--field="$AUTOSTART_DESC2 :LBL" "" \
--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/" \
> $res9 &
# SYSTEM_SPRZET
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=9 --borders=0 --text="$SYSTEM_DESC" --columns=2 --align="center" --form --scroll \
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=10 --borders=0 --text="$SYSTEM_DESC" --columns=2 --align="center" --form --scroll \
--field="<b>$SETTINGS</b>:LBL" " " \
--field="$LOCALE_SETTINGS:FBTN" "manjaro-settings-manager -m msm_locale" \
--field="$LANGUAGE_PACKAGES:FBTN" "manjaro-settings-manager -m msm_language_packages" \
@ -532,26 +575,26 @@ GDK_BACKEND=x11 yad --plug=$KEY --tabnum=9 --borders=0 --text="$SYSTEM_DESC" --c
--field=" inxi -CGAD!utilities-terminal!:FBTN" "terminator -T 'inxi -CAGD system info' -e 'inxi -CGAD;bash'" \
--field=" $FETCH!utilities-terminal!:FBTN" "terminator -e '$FETCH;bash'" \
--field=" btop!utilities-terminal!:FBTN" "terminator -T 'btop' -x $BTOP" \
> $res11 &
# WYGLĄD
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=10 --borders=20 --text="$LOOK_DESC" --icons --read-dir=/usr/share/mcc/appearance --item-width=80 \
> $res9 &
# MOTYWY
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=11 --borders=20 --uri-handler=xdg-open \
--text="<b>$MT_MNGR</b>\n $MT_MNGR_DESC" \
--form --field="$MT_MNGR!preferences-desktop-theme:FBTN" "mb-obthemes" \
> $res10 &
# WYGLĄD
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=11 --borders=20 --text="$LOOK_DESC" --icons --read-dir=/usr/share/mcc/appearance --item-width=80 \
> $res11 &
# MOTYWY
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=12 --borders=20 --uri-handler=xdg-open \
--text="<b>$MT_MNGR</b>\n $MT_MNGR_DESC" \
--form --field="$MT_MNGR!preferences-desktop-theme:FBTN" "mb-obthemes" \
> $res12 &
# HELP
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=12 \
GDK_BACKEND=x11 yad --plug=$KEY --tabnum=13 \
--image=/usr/share/icons/hicolor/128x128/apps/distributor-logo-mabox-trans.png --text-justify=center --uri-handler=xdg-open --text="$HELP_TXT" \
--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/en/" \
--field="donate:FBTN" "xdg-open https://ko-fi.com/maboxlinux" \
> $res12 &
> $res13 &
#main window
@ -560,11 +603,12 @@ GDK_BACKEND=x11 yad --window-icon=mcc \
--tab="$START" \
--tab="$TINT2"\
--tab="$MENU" \
--tab="$AUTOSTART" \
--tab="$FONTS" \
--tab="$WALLPAPER" \
--tab="$CONKY" \
--tab="$FONTS" \
--tab="$COMPOSITOR" \
--tab="Colorizer" \
--tab="$AUTOSTART" \
--tab="$SYSTEM" \
--tab="<i>$LOOK</i>" \
--tab="<i>$THEMES</i>" \

View File

@ -49,6 +49,7 @@ Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu.
START="<b>START</b>"
UPDATE="Uaktualnij system"
UPDATE_LBL="Aktualizacja systemu"
MCC="Mabox Control Center:FBTN"
ADD_KERNEL="Dodatkowe jądro!!Dobrą praktyką jest <b>instakacja dodatkowego kernela</b>. Kliknij, aby wybrać i zainstalować:FBTN"
RELNOTES="Popularne programy!!Instalacja najpopularniejszych programów:FBTN"
RESOURCES="<b>ZASOBY</b>"
@ -69,6 +70,7 @@ Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu.
START="<b>INICIO</b>"
UPDATE="Actualizar el sistema"
UPDATE_LBL="System update"
MCC="Mabox Control Center:FBTN"
ADD_KERNEL="Agregar núcleo!!Es una buena idea tener más de un núcleo instalado. Sugerimos mantener un núcleo <b>LTS</b> y además <b>instalar otro más actualizado</b>.:FBTN"
RELNOTES="Instalar Aplicaciones!!Instale aplicaciones populares:FBTN"
RESOURCES="<b>RECURSOS</b>"
@ -89,7 +91,7 @@ Poniższe odnośniki pomogą Ci w rozpoczęciu używania nowego systemu.
START="<b>START</b>"
UPDATE="Update system"
UPDATE_LBL="System update"
ADD_KERNEL="Add Kernel!!It is good practice to have more than one kernel installed. We suggest to keep <b>LTS</b> one and <b>install newer one</b>.:FBTN"
MCC="Mabox Control Center:FBTN"
RELNOTES="Install Popular Apps!!Install popular applications:FBTN"
RESOURCES="<b>RESOURCES</b>"
QUICKSTART="Quick Start Guide"
@ -115,7 +117,7 @@ values=($(yad --window-icon=distributor-logo-mabox --center --buttons-layout="e
--columns=3 --align="center" --form \
--field="$START:LBL" ""\
--field="$UPDATE:FBTN" "pamac-manager --updates" \
--field="$ADD_KERNEL" "manjaro-settings-manager -m msm_kernel" \
--field="$MCC" "mcc" \
--field="$RELNOTES" "manjaro-application-utility"\
--field=" :LBL" ""\
--field="$RESOURCES:LBL" ""\