diff --git a/bin/checkupdates.sh b/bin/checkupdates.sh index aba5bfb..3ae973e 100755 --- a/bin/checkupdates.sh +++ b/bin/checkupdates.sh @@ -18,12 +18,12 @@ case "$LANG" in DISABLE="Wyłącz powiadomienia" ;; es*) - AVAIL_UPDATES="Available updates" - UPTODATE="System is up to date" - PKGS_TO_UPDATE="Packages to update:" - YAY_UPD="Update with yay (cli)" - PAMAC_UPD="Update with Pamac (GUI)" - DISABLE="Disable notifications" + AVAIL_UPDATES="Actualizaciones disponibles" + UPTODATE="El sistema esta actualizado" + PKGS_TO_UPDATE="Paquetes para actualizar:" + YAY_UPD="Actualizar con yay (cli)" + PAMAC_UPD="Actualizar con Pamac (GUI)" + DISABLE="Deshabilitar notificaciones" ;; *) AVAIL_UPDATES="Available updates" diff --git a/bin/colorizer b/bin/colorizer index 19487f8..b411fce 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -9,11 +9,11 @@ out+=("CONKY,^pipe(colorizer-conky)") out+=("Terminal color scheme,^term(theme.sh -i2;/bin/bash)") #out+=("GTKTHEME,^pipe(colorizer-gtktheme)") out+=("^sep(OTHER_TOOLS)") -out+=("WALLPAPER,^pipe(jgwallpaperchanger)") -out+=("MBX Colors,mbxcolors") +out+=("Wallpaper,^pipe(jgwallpaperchanger)") +out+=("Color Menu,mbxcolors") out+=("^sep()") #out+=("PREFERENCES") -out+=("ABOUT and Help,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'") +out+=("About and Help,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'") ### RUN if [[ "$1" == "-s" ]]; then diff --git a/bin/colorizer-conky b/bin/colorizer-conky index bebc011..f2a9294 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -128,8 +128,11 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then fi fi fi - - #out+=("RESET") + out+=("^sep(RESET)") + out+=("Reset all to defaults,^checkout(resetall)") + out2+=("^tag(resetall)") + out2+=("^sep(Are you sure?)") + out2+=("Yes,rm $BASECONKY;$me") else out+=("^sep(No supported Conky running)") @@ -190,7 +193,8 @@ cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png @rect,,$((jgtools_padding + 244)),$((jgtools_padding + 6)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, -@rect,,$((jgtools_padding + 5)),$((jgtools_padding + 82)),29,40,0,left,top,#FFFFFF 30,${WINCLR} 60, +@rect,,$((jgtools_padding + 5)),$((jgtools_padding + 92)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, +@rect,,$((jgtools_padding + 36)),$((jgtools_padding + 112)),29,40,0,left,top,#FFFFFF 30,${WINCLR} 60, $(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out2[@]}") EOF diff --git a/bin/mbclr b/bin/mbclr index 218019c..a324ce4 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -10,7 +10,7 @@ mkdir -p "$WALLPALDIR" read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2) WALLPAPER=${WALLPATH##*/} if [ ! -f "$WALLPALDIR/$WALLPAPER.clr" ]; then -convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print $3}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$WALLPAPER.clr" +convert ${WALLPATH} -resize 25% -colors 16 -unique-colors txt:- |grep -v '^#'| awk '{print substr($3,1,7)}' |pastel sort-by brightness |pastel format hex > "$WALLPALDIR/$WALLPAPER.clr" fi mapfile -t wallcolors < "$WALLPALDIR/$WALLPAPER.clr"