diff --git a/usr/bin/jgcursor b/usr/bin/jgcursor index 2c92fdd..ba2067e 100755 --- a/usr/bin/jgcursor +++ b/usr/bin/jgcursor @@ -3,6 +3,8 @@ # jgcursor pipemenu to configure cursor theme and size # To hook it into some menu use: # Cursor,^pipe(jgcursor) + +. /usr/share/mb-jgtools/glyphicons.inc GTK3RC="$HOME/.config/gtk-3.0/settings.ini" case $LANG in @@ -28,13 +30,13 @@ while read -r line; do lin=${line::-8} li=${lin##*/} -[[ "${CURTHEME}" = "${li}" ]] && o+=("綠 ${li}") || o+=("祿 ${li},mb-cursor theme ${li}") +[[ "${CURTHEME}" = "${li}" ]] && o+=("${ron} ${li}") || o+=("${roff} ${li},mb-cursor theme ${li}") done < <(find /usr/share/icons ~/.local/share/icons ~/.icons -type d -name "cursors") o+=("^sep($_SIZE)") for c in 16 24 32 48 64;do -[[ "${CURSIZE}" == "${c}" ]] && o+=("綠 ${c}") || o+=("祿 ${c},mb-cursor size ${c}") +[[ "${CURSIZE}" == "${c}" ]] && o+=("${ron} ${c}") || o+=("${roff} ${c},mb-cursor size ${c}") done printf "%s\n" "${o[@]}" diff --git a/usr/bin/jgdesktops b/usr/bin/jgdesktops index e00cdc2..8745658 100755 --- a/usr/bin/jgdesktops +++ b/usr/bin/jgdesktops @@ -5,6 +5,7 @@ COLORIZER_CONF="$HOME/.config/colorizer/colorizer.conf" AREA_CFG="$HOME/.config/areaclick.conf" GTK3RC="$HOME/.config/gtk-3.0/settings.ini" source ${COLORIZER_CONF} +. /usr/share/mb-jgtools/jgtools.inc me="jgdesktops -s" case $LANG in @@ -287,7 +288,7 @@ while read -r line; do lin=${line::-8} li=${lin##*/} -[[ "${CURTHEME}" = "${li}" ]] && out2+=("綠 ${li}") || out2+=("祿 ${li},mb-cursor theme ${li}") +[[ "${CURTHEME}" = "${li}" ]] && out2+=("${ron} ${li}") || out2+=("${roff} ${li},mb-cursor theme ${li}") #out2+=("${li}") done < <(find /usr/share/icons ~/.local/share/icons ~/.icons -type d -name "cursors") @@ -295,8 +296,8 @@ done < <(find /usr/share/icons ~/.local/share/icons ~/.icons -type d -name "curs out2+=("^sep($_SIZE)") -for c in 16 24 32 48 64;do -[[ "${CURSIZE}" == "${c}" ]] && out2+=("綠 ${c}") || out2+=("祿 ${c},mb-cursor size ${c}") +for c in 16 18 24 32 48 64;do +[[ "${CURSIZE}" == "${c}" ]] && out2+=("${ron} ${c}") || out2+=("${roff} ${c},mb-cursor size ${c}") done out+=("^sep()") @@ -342,12 +343,12 @@ if source ~/.config/areaclick.conf ;then out2+=("^sep(AreaClick)") #out2+=("$ABOUT_AREACLICK,mb-docs areaclick") out2+=("^sep($AREA_WIDTH (px))") - [[ "${sidearea}" == "0" ]] && out2+=("綠 0 (disabled),areaclick area 0") || out2+=("祿 0 (disable),areaclick area 0") - [[ "${sidearea}" == "2" ]] && out2+=("綠 2px,areaclick area 2") || out2+=("祿 2px,areaclick area 2") - [[ "${sidearea}" == "10" ]] && out2+=("綠 10px,areaclick area 10") || out2+=("祿 10px,areaclick area 10") - [[ "${sidearea}" == "60" ]] && out2+=("綠 60px,areaclick area 60") || out2+=("祿 60px,areaclick area 60") - [[ "${sidearea}" == "100" ]] && out2+=("綠 100px,areaclick area 80") || out2+=("祿 100px,areaclick area 100") - [[ "${sidearea}" == "200" ]] && out2+=("綠 200px (disable),areaclick area 200") || out2+=("祿 200px,areaclick area 200") + [[ "${sidearea}" == "0" ]] && out2+=("${ron} 0 (disabled),areaclick area 0") || out2+=("${roff} 0 (disable),areaclick area 0") + [[ "${sidearea}" == "2" ]] && out2+=("${ron} 2px,areaclick area 2") || out2+=("${roff} 2px,areaclick area 2") + [[ "${sidearea}" == "10" ]] && out2+=("${ron} 10px,areaclick area 10") || out2+=("${roff} 10px,areaclick area 10") + [[ "${sidearea}" == "60" ]] && out2+=("${ron} 60px,areaclick area 60") || out2+=("${roff} 60px,areaclick area 60") + [[ "${sidearea}" == "100" ]] && out2+=("${ron} 100px,areaclick area 80") || out2+=("${roff} 100px,areaclick area 100") + [[ "${sidearea}" == "200" ]] && out2+=("${ron} 200px (disable),areaclick area 200") || out2+=("${roff} 200px,areaclick area 200") out2+=("^sep()") out2+=("$EDIT_AREACONF,areaclick editconf") out2+=("^sep()") @@ -385,8 +386,7 @@ out+=(" $DESKMNGR,^pipe(jgdeskmngr)") ### RUN if [[ "$1" == "-s" || "$1" == "ipc" ]]; then -. /usr/share/mb-jgtools/pipemenu-standalone.cfg -. $HOME/.config/mabox/mabox.conf + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" MENU_MARGIN_Y=${panels_topmargin:-0} diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 0fe6edf..c45769a 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -1,7 +1,7 @@ #!/bin/bash # jgwallpaperchanger - panel executor/dynamic menu (or submenu) to configure/set wallpapers # - +. /usr/share/mb-jgtools/jgtools.inc if [[ $1 == "-r" || "$1" == "-d" ]];then me="${0##*/} -s" else @@ -171,7 +171,7 @@ case $LANG in _AUTOTH_SETTINGS="Ustawienia Auto theming" _APPLY_COLORSCHEME_TO="Zastosuj kolory tapety do..." _APPLY_TO_ALL="Wszystko" - _APPLY_REVERSE="Wszystko odwrotnie (jasny 易 ciemny)" + _APPLY_REVERSE="Wszystko odwrotnie (jasny 󰑖 ciemny)" _APPLY_ONLY_TO="Zastosuj tylko do..." _RESET_WP_THEMES="Reset tapety i motywów" _ENABLED="włączony" @@ -277,7 +277,7 @@ case $LANG in _AUTOTH_SETTINGS="Auto theming settings" _APPLY_COLORSCHEME_TO="Apply wallpaper colors to..." _APPLY_TO_ALL="All elements" - _APPLY_REVERSE="All elements inversely (dark 易 light)" + _APPLY_REVERSE="All elements inversely (dark 󰑖 light)" _APPLY_ONLY_TO="Apply only to..." _RESET_WP_THEMES="Reset (wallpaper and themes)" _ENABLED="enabled" @@ -331,14 +331,14 @@ while IFS=, read -r label wpfile do if [[ "${wallpap}" == "${wpfile}" ]];then #notify-send.sh "FAV" "${wpfile}" - favs+=("\"\"\"綠 ${label}\"\"\",^checkout(delfav)") + favs+=("\"\"\"${ron} ${label}\"\"\",^checkout(delfav)") out3+=("^tag(delfav)") out3+=("^sep($_REMOVE_FROM_FAV)") out3+=("^sep($_AND_SET_RANDOM ?)") out3+=("\"\"\"$_YES_REMOVE ${label}\"\"\",jgwallpaperchanger remfav ${wpfile:1};$me") isfav=1 else - favs+=("\"\"\"祿 ${label}\"\"\",nitrogen --set-scaled --save $wpfile;$me") + favs+=("\"\"\"${roff} ${label}\"\"\",nitrogen --set-scaled --save $wpfile;$me") fi ((fav++)) done < <(sort $FAVWP |grep -v '^\s*$\|^#\|^\s*#') @@ -399,7 +399,7 @@ if ! pgrep -f "mbwallpaper -s" > /dev/null; then done out+=("^sep()") - out+=("易 $_PREVIEW_DESC,mbwallpaper -c") + out+=(" $_PREVIEW_DESC,mbwallpaper -c") out+=("󰧸 $_SLIDESHOW_DESC,^checkout(sshow)") out+=("󱡄 $_GENERATOR,^pipe(jgwallpapergenerate)") out+=("^sep()") @@ -417,7 +417,7 @@ if ! pgrep -f "mbwallpaper -s" > /dev/null; then do wpdir=${dir/\~/$HOME} wallp=$(shopt -s nullglob ; set -- $wpdir/*.{jpg,JPG,jpeg,JPEG,png,PNG,avif,AVIF,webp,WEBP} ; echo $#) - [[ "$wallpaper_dir2" == "${dir}" ]] && out2+=("綠 (${wallp}) ${dir}") || out2+=("祿 (${wallp}) ${dir},mbwallpaper changedir ${dir};$me") + [[ "$wallpaper_dir2" == "${dir}" ]] && out2+=("${ron} (${wallp}) ${dir}") || out2+=("${roff} (${wallp}) ${dir},mbwallpaper changedir ${dir};$me") wpimgs=$((wpimgs+wallp)) done out2+=("^sep($_TOTAL: $wpimgs $_WPS ${#wpdirs[@]} $_DIRS)") @@ -433,15 +433,15 @@ out1+=("^tag(sshow)") out1+=("^sep($_SLIDESHOW_DESC)") out1+=(" $_STARTS,run_wallpaperslideshow") out1+=("^sep($_INTERVAL_DESC)") -[[ "${interval}" == "10" ]] && out1+=("綠 10s,mb-setvar interval=10 $CONF_FILE;$me") || out1+=("祿 10s,mb-setvar interval=10 $CONF_FILE;$me") -[[ "${interval}" == "30" ]] && out1+=("綠 30s,mb-setvar interval=30 $CONF_FILE;$me") || out1+=("祿 30s,mb-setvar interval=30 $CONF_FILE;$me") -[[ "${interval}" == "60" ]] && out1+=("綠 1m ,mb-setvar interval=60 $CONF_FILE;$me") || out1+=("祿 1m,mb-setvar interval=60 $CONF_FILE;$me") -[[ "${interval}" == "120" ]] && out1+=("綠 2m ,mb-setvar interval=120 $CONF_FILE;$me") || out1+=("祿 2m,mb-setvar interval=120 $CONF_FILE;$me") -[[ "${interval}" == "300" ]] && out1+=("綠 5m ,mb-setvar interval=300 $CONF_FILE;$me") || out1+=("祿 5m,mb-setvar interval=300 $CONF_FILE;$me") -[[ "${interval}" == "600" ]] && out1+=("綠 10m ,mb-setvar interval=600 $CONF_FILE;$me") || out1+=("祿 10m,mb-setvar interval=600 $CONF_FILE;$me") -[[ "${interval}" == "900" ]] && out1+=("綠 15m ,mb-setvar interval=900 $CONF_FILE;$me") || out1+=("祿 15m,mb-setvar interval=900 $CONF_FILE;$me") -[[ "${interval}" == "1800" ]] && out1+=("綠 30m ,mb-setvar interval=1800 $CONF_FILE;$me") || out1+=("祿 30m,mb-setvar interval=1800 $CONF_FILE;$me") -[[ "${interval}" == "3600" ]] && out1+=("綠 1h ,mb-setvar interval=3600 $CONF_FILE;$me") || out1+=("祿 1h,mb-setvar interval=3600 $CONF_FILE;$me") +[[ "${interval}" == "10" ]] && out1+=("${ron} 10s,mb-setvar interval=10 $CONF_FILE;$me") || out1+=("${roff} 10s,mb-setvar interval=10 $CONF_FILE;$me") +[[ "${interval}" == "30" ]] && out1+=("${ron} 30s,mb-setvar interval=30 $CONF_FILE;$me") || out1+=("${roff} 30s,mb-setvar interval=30 $CONF_FILE;$me") +[[ "${interval}" == "60" ]] && out1+=("${ron} 1m ,mb-setvar interval=60 $CONF_FILE;$me") || out1+=("${roff} 1m,mb-setvar interval=60 $CONF_FILE;$me") +[[ "${interval}" == "120" ]] && out1+=("${ron} 2m ,mb-setvar interval=120 $CONF_FILE;$me") || out1+=("${roff} 2m,mb-setvar interval=120 $CONF_FILE;$me") +[[ "${interval}" == "300" ]] && out1+=("${ron} 5m ,mb-setvar interval=300 $CONF_FILE;$me") || out1+=("${roff} 5m,mb-setvar interval=300 $CONF_FILE;$me") +[[ "${interval}" == "600" ]] && out1+=("${ron} 10m ,mb-setvar interval=600 $CONF_FILE;$me") || out1+=("${roff} 10m,mb-setvar interval=600 $CONF_FILE;$me") +[[ "${interval}" == "900" ]] && out1+=("${ron} 15m ,mb-setvar interval=900 $CONF_FILE;$me") || out1+=("${roff} 15m,mb-setvar interval=900 $CONF_FILE;$me") +[[ "${interval}" == "1800" ]] && out1+=("${ron} 30m ,mb-setvar interval=1800 $CONF_FILE;$me") || out1+=("${roff} 30m,mb-setvar interval=1800 $CONF_FILE;$me") +[[ "${interval}" == "3600" ]] && out1+=("${ron} 1h ,mb-setvar interval=3600 $CONF_FILE;$me") || out1+=("${roff} 1h,mb-setvar interval=3600 $CONF_FILE;$me") #out1+=(" $EDITCONF ,xdg-open $CONF_FILE") #out1+=(" $OPENDIR,pcmanfm -n $wallpaper_dir") out1+=("^sep()") @@ -491,7 +491,7 @@ out2+=("^tag(applyto)") [[ "${2}" == "applyto" ]] && out2+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBACK,^back()") out2+=("^sep($_APPLY_COLORSCHEME_TO)") out2+=(" $_APPLY_TO_ALL,w2theme colorize;$me applyto") -out2+=("敏 $_APPLY_REVERSE,w2theme reverse;$me applyto") +out2+=(" $_APPLY_REVERSE,w2theme reverse;$me applyto") out2+=("^sep($_APPLY_ONLY_TO)") out2+=("^sep(Menu)") out2+=(" $_LIGHTBG,w2theme menu light;$me applyto") @@ -509,38 +509,38 @@ out2+=(" $_DARKBG,w2theme ob dark;$me applyto") out+=("^sep()") -[[ "$wall2themes" == "yes" ]] && out+=(" $_AUTOTH_SETTINGS,^checkout(autotheming)") || out+=(" $_AUTOTH_SETTINGS,^checkout(autotheming)") +[[ "$wall2themes" == "yes" ]] && out+=("${cbon} $_AUTOTH_SETTINGS,^checkout(autotheming)") || out+=("${cboff} $_AUTOTH_SETTINGS,^checkout(autotheming)") out2+=("^tag(autotheming)") [[ "${2}" == "autoth" ]] && out2+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBACK,^back()") out2+=("^sep($_AUTOTH_SETTINGS (beta))") -[[ "$wall2themes" == "yes" ]] && out2+=("綠 $_ENABLED") || out2+=("祿 $_ENABLED,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") -[[ "$wall2themes" != "yes" ]] && out2+=("綠 $_DISABLED") || out2+=("祿 $_DISABLED,mb-setvar wall2themes=no $COLORIZER_CONF;$me") +[[ "$wall2themes" == "yes" ]] && out2+=("${ron} $_ENABLED") || out2+=("${roff} $_ENABLED,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") +[[ "$wall2themes" != "yes" ]] && out2+=("${ron} $_DISABLED") || out2+=("${roff} $_DISABLED,mb-setvar wall2themes=no $COLORIZER_CONF;$me") out2+=("^sep(OpenBox)") -[[ "$wall2themes_ob" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_ob" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_ob" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me autoth") out2+=("^sep(Menu)") -[[ "$wall2themes_menu" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_menu" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_menu" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me autoth") out2+=("^sep(Conky)") -[[ "$wall2themes_conky" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_conky" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_conky" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me autoth") out2+=("^sep(PyRadio / Cava)") out2+=("PyRadio and Cava,^checkout(pycava)") out3+=("^tag(pycava)") out3+=("^sep(Pyradio)") -[[ "$wall2themes_pyradio" == "light" ]] && out3+=("綠 $_LIGHTBG") || out3+=("祿 $_LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_pyradio" == "dark" ]] && out3+=("綠 $_DARKBG") || out3+=("祿 $_DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "light" ]] && out3+=("${ron} $_LIGHTBG") || out3+=("${roff} $_LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "dark" ]] && out3+=("${ron} $_DARKBG") || out3+=("${roff} $_DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me autoth") out3+=("^sep()") -[[ "$wall2themes_pyradio" == "none" ]] && out3+=("綠 $_NONE") || out3+=("祿 $_NONE,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "none" ]] && out3+=("${ron} $_NONE") || out3+=("${roff} $_NONE,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me autoth") out3+=("^sep(Cava)") out3+=("^sep(not implemented yet)") out3+=("Use Colorizer Cava,colorizer-cava -s") @@ -636,15 +636,15 @@ n=1 do ((n=n+1)) case "$grad" in - none)icon="󰄱";; - top)icon="";; - right)icon="";; - bottom)icon="";; - left)icon="";; - top_left)icon="";; - top_right)icon="";; - bottom_left)icon="";; - bottom_right)icon="";; + none)icon="${cboff}";; + top)icon="";; + right)icon="";; + bottom)icon="";; + left)icon="";; + top_left)icon="";; + top_right)icon="";; + bottom_left)icon="";; + bottom_right)icon="";; esac out1+=(" $(printf '%-18s' "${scheme_name}") title [ sel ] ${icon} ,jgctl applyscheme sys $n;$me jgmenus" "^sep()") done < <(tail -n +2 "$MENU_SYSSCHEMES") @@ -660,15 +660,15 @@ out2+=("^sep($_CLICK_TO_APPLY)") do ((n=n+1)) case "$grad" in - none)icon="󰄱";; - top)icon="";; - right)icon="";; - bottom)icon="";; - left)icon="";; - top_left)icon="";; - top_right)icon="";; - bottom_left)icon="";; - bottom_right)icon="";; + none)icon="${cboff}";; + top)icon="";; + right)icon="";; + bottom)icon="";; + left)icon="";; + top_left)icon="";; + top_right)icon="";; + bottom_left)icon="";; + bottom_right)icon="";; esac out2+=(" $(printf '%-18s' "${scheme_name}") title [ sel ] ${icon} ,jgctl applyscheme usr ${n};$me jgmenus" "^sep()") done < <(tail -n +2 "$MENU_USERSCHEMES") @@ -696,7 +696,7 @@ out1+=("$_USE Colorizer Menu module,colorizer-menus -s") ## CONKIES out+=("^sep()") -out+=(" $_COLORIZER_CONKY,colorizer-conky -s") +out+=(" $_COLORIZER_CONKY,colorizer-conky -s") @@ -711,7 +711,7 @@ out+=(" $_COLORIZER_ROOT,colorizer -s") ### RUN if [[ $1 == "-s" || $1 == "-c" || $1 == "-u" || $1 == "ipc" || $1 == "-d" ]]; then -. /usr/share/mb-jgtools/pipemenu-standalone.cfg + case "$1" in @@ -733,7 +733,7 @@ case "$1" in out+=("^sep($_PANEL_ICON_ACTIONS)") if [[ "${t2execp}" == "true" ]];then - [[ "${wp_icon}" == "wide" ]] && out+=(" $_WIDE_ICON,mb-setvar wp_icon=square $CONF_FILE;tint2-send refresh-execp mb-t2wall;${me}") || out+=("󰄱 $_WIDE_ICON,mb-setvar wp_icon=wide $CONF_FILE;tint2-send refresh-execp mb-t2wall;${me}") + [[ "${wp_icon}" == "wide" ]] && out+=("${cbon} $_WIDE_ICON,mb-setvar wp_icon=square $CONF_FILE;tint2-send refresh-execp mb-t2wall;${me}") || out+=("${cboff} $_WIDE_ICON,mb-setvar wp_icon=wide $CONF_FILE;tint2-send refresh-execp mb-t2wall;${me}") out+=("^sep()") fi @@ -752,15 +752,15 @@ case "$1" in out2+=("^tag(laction)") out2+=("^sep($_P_B_LC_ACTION)") - [[ "$t2_button_lclick_action" == "random" ]] && out2+=("綠 $_RANDOM_DESC") || out2+=("祿 $_RANDOM_DESC,mb-setvar t2_button_lclick_action=random $CONF_FILE") - [[ "$t2_button_lclick_action" == "randfav" ]] && out2+=("綠 $_RANDOMFAV_DESC") || out2+=("祿 $_RANDOMFAV_DESC,mb-setvar t2_button_lclick_action=randfav $CONF_FILE") - [[ "$t2_button_lclick_action" == "choose" ]] && out2+=("綠 $_CHOOSE_DESC") || out2+=("祿 $_CHOOSE_DESC,mb-setvar t2_button_lclick_action=choose $CONF_FILE") - [[ "$t2_button_lclick_action" == "preview" ]] && out2+=("綠 $_PREVIEW_DESC") || out2+=("祿 $_PREVIEW_DESC,mb-setvar t2_button_lclick_action=preview $CONF_FILE") - [[ "$t2_button_lclick_action" == "menu" ]] && out2+=("綠 $_WALL_MENU_DESC") || out2+=("祿 $_WALL_MENU_DESC,mb-setvar t2_button_lclick_action=menu $CONF_FILE") - [[ "$t2_button_lclick_action" == "slideshow" ]] && out2+=("綠 $_SLIDESHOW_DESC") || out2+=("祿 $_SLIDESHOW_DESC,mb-setvar t2_button_lclick_action=slideshow $CONF_FILE") + [[ "$t2_button_lclick_action" == "random" ]] && out2+=("${ron} $_RANDOM_DESC") || out2+=("${roff} $_RANDOM_DESC,mb-setvar t2_button_lclick_action=random $CONF_FILE") + [[ "$t2_button_lclick_action" == "randfav" ]] && out2+=("${ron} $_RANDOMFAV_DESC") || out2+=("${roff} $_RANDOMFAV_DESC,mb-setvar t2_button_lclick_action=randfav $CONF_FILE") + [[ "$t2_button_lclick_action" == "choose" ]] && out2+=("${ron} $_CHOOSE_DESC") || out2+=("${roff} $_CHOOSE_DESC,mb-setvar t2_button_lclick_action=choose $CONF_FILE") + [[ "$t2_button_lclick_action" == "preview" ]] && out2+=("${ron} $_PREVIEW_DESC") || out2+=("${roff} $_PREVIEW_DESC,mb-setvar t2_button_lclick_action=preview $CONF_FILE") + [[ "$t2_button_lclick_action" == "menu" ]] && out2+=("${ron} $_WALL_MENU_DESC") || out2+=("${roff} $_WALL_MENU_DESC,mb-setvar t2_button_lclick_action=menu $CONF_FILE") + [[ "$t2_button_lclick_action" == "slideshow" ]] && out2+=("${ron} $_SLIDESHOW_DESC") || out2+=("${roff} $_SLIDESHOW_DESC,mb-setvar t2_button_lclick_action=slideshow $CONF_FILE") out2+=("^sep()") - [[ "$t2_button_lclick_action" == "window" ]] && out2+=("綠 $_COL_WINDOW_DESC") || out2+=("祿 $_COL_WINDOW_DESC,mb-setvar t2_button_lclick_action=window $CONF_FILE") - [[ "$t2_button_lclick_action" == "colmenu" ]] && out2+=("綠 $_COL_MENU_DESC") || out2+=("祿 $_COL_MENU_DESC,mb-setvar t2_button_lclick_action=colmenu $CONF_FILE") + [[ "$t2_button_lclick_action" == "window" ]] && out2+=("${ron} $_COL_WINDOW_DESC") || out2+=("${roff} $_COL_WINDOW_DESC,mb-setvar t2_button_lclick_action=window $CONF_FILE") + [[ "$t2_button_lclick_action" == "colmenu" ]] && out2+=("${ron} $_COL_MENU_DESC") || out2+=("${roff} $_COL_MENU_DESC,mb-setvar t2_button_lclick_action=colmenu $CONF_FILE") if [[ "${t2execp}" == "true" ]];then @@ -776,13 +776,13 @@ case "$1" in esac out2+=("^tag(wuaction)") out2+=("^sep($_P_B_WU_ACTION)") - [[ "$t2_button_wheelup_action" == "show-desk" ]] && out2+=("綠 $_SHOW_DESK_DESC") || out2+=("祿 $_SHOW_DESK_DESC,mb-setvar t2_button_wheelup_action=show-desk $CONF_FILE") - [[ "$t2_button_wheelup_action" == "random" ]] && out2+=("綠 $_RANDOM_DESC") || out2+=("祿 $_RANDOM_DESC,mb-setvar t2_button_wheelup_action=random $CONF_FILE") - [[ "$t2_button_wheelup_action" == "win-switch" ]] && out2+=("綠 $_WIN_SWITCH_DESC") || out2+=("祿 $_WIN_SWITCH_DESC,mb-setvar t2_button_wheelup_action=win-switch $CONF_FILE") - [[ "$t2_button_wheelup_action" == "desk-switch" ]] && out2+=("綠 $_DESK_SWITCH_DESC") || out2+=("祿 $_DESK_SWITCH_DESC,mb-setvar t2_button_wheelup_action=desk-switch $CONF_FILE") + [[ "$t2_button_wheelup_action" == "show-desk" ]] && out2+=("${ron} $_SHOW_DESK_DESC") || out2+=("${roff} $_SHOW_DESK_DESC,mb-setvar t2_button_wheelup_action=show-desk $CONF_FILE") + [[ "$t2_button_wheelup_action" == "random" ]] && out2+=("${ron} $_RANDOM_DESC") || out2+=("${roff} $_RANDOM_DESC,mb-setvar t2_button_wheelup_action=random $CONF_FILE") + [[ "$t2_button_wheelup_action" == "win-switch" ]] && out2+=("${ron} $_WIN_SWITCH_DESC") || out2+=("${roff} $_WIN_SWITCH_DESC,mb-setvar t2_button_wheelup_action=win-switch $CONF_FILE") + [[ "$t2_button_wheelup_action" == "desk-switch" ]] && out2+=("${ron} $_DESK_SWITCH_DESC") || out2+=("${roff} $_DESK_SWITCH_DESC,mb-setvar t2_button_wheelup_action=desk-switch $CONF_FILE") # buggy skippy-xd or openbox bug - #[[ "$t2_button_wheelup_action" == "win-next" ]] && out2+=("綠 $_WIN_NEXT_DESC") || out2+=("祿 $_WIN_NEXT_DESC,mb-setvar t2_button_wheelup_action=win-next $CONF_FILE") - #[[ "$t2_button_wheelup_action" == "win-prev" ]] && out2+=("綠 $_WIN_PREV_DESC") || out2+=("祿 $_WIN_PREV_DESC,mb-setvar t2_button_wheelup_action=win-prev $CONF_FILE") + #[[ "$t2_button_wheelup_action" == "win-next" ]] && out2+=("${ron} $_WIN_NEXT_DESC") || out2+=("${roff} $_WIN_NEXT_DESC,mb-setvar t2_button_wheelup_action=win-next $CONF_FILE") + #[[ "$t2_button_wheelup_action" == "win-prev" ]] && out2+=("${ron} $_WIN_PREV_DESC") || out2+=("${roff} $_WIN_PREV_DESC,mb-setvar t2_button_wheelup_action=win-prev $CONF_FILE") #wheel-down t2_button_wheeldown_action=${t2_button_wheeldown_action:-show-desk} @@ -796,12 +796,12 @@ case "$1" in esac out2+=("^tag(wdaction)") out2+=("^sep($_P_B_WD_ACTION)") - [[ "$t2_button_wheeldown_action" == "show-desk" ]] && out2+=("綠 $_SHOW_DESK_DESC") || out2+=("祿 $_SHOW_DESK_DESC,mb-setvar t2_button_wheeldown_action=show-desk $CONF_FILE") - [[ "$t2_button_wheeldown_action" == "random" ]] && out2+=("綠 $_RANDOM_DESC") || out2+=("祿 $_RANDOM_DESC,mb-setvar t2_button_wheeldown_action=random $CONF_FILE") - [[ "$t2_button_wheeldown_action" == "win-switch" ]] && out2+=("綠 $_WIN_SWITCH_DESC") || out2+=("祿 $_WIN_SWITCH_DESC,mb-setvar t2_button_wheeldown_action=win-switch $CONF_FILE") - [[ "$t2_button_wheeldown_action" == "desk-switch" ]] && out2+=("綠 $_DESK_SWITCH_DESC") || out2+=("祿 $_DESK_SWITCH_DESC,mb-setvar t2_button_wheeldown_action=desk-switch $CONF_FILE") - #[[ "$t2_button_wheeldown_action" == "win-next" ]] && out2+=("綠 $_WIN_NEXT_DESC") || out2+=("祿 $_WIN_NEXT_DESC,mb-setvar t2_button_wheeldown_action=win-next $CONF_FILE") - #[[ "$t2_button_wheeldown_action" == "win-prev" ]] && out2+=("綠 $_WIN_PREV_DESC") || out2+=("祿 $_WIN_PREV_DESC,mb-setvar t2_button_wheeldown_action=win-prev $CONF_FILE") + [[ "$t2_button_wheeldown_action" == "show-desk" ]] && out2+=("${ron} $_SHOW_DESK_DESC") || out2+=("${roff} $_SHOW_DESK_DESC,mb-setvar t2_button_wheeldown_action=show-desk $CONF_FILE") + [[ "$t2_button_wheeldown_action" == "random" ]] && out2+=("${ron} $_RANDOM_DESC") || out2+=("${roff} $_RANDOM_DESC,mb-setvar t2_button_wheeldown_action=random $CONF_FILE") + [[ "$t2_button_wheeldown_action" == "win-switch" ]] && out2+=("${ron} $_WIN_SWITCH_DESC") || out2+=("${roff} $_WIN_SWITCH_DESC,mb-setvar t2_button_wheeldown_action=win-switch $CONF_FILE") + [[ "$t2_button_wheeldown_action" == "desk-switch" ]] && out2+=("${ron} $_DESK_SWITCH_DESC") || out2+=("${roff} $_DESK_SWITCH_DESC,mb-setvar t2_button_wheeldown_action=desk-switch $CONF_FILE") + #[[ "$t2_button_wheeldown_action" == "win-next" ]] && out2+=("${ron} $_WIN_NEXT_DESC") || out2+=("${roff} $_WIN_NEXT_DESC,mb-setvar t2_button_wheeldown_action=win-next $CONF_FILE") + #[[ "$t2_button_wheeldown_action" == "win-prev" ]] && out2+=("${ron} $_WIN_PREV_DESC") || out2+=("${roff} $_WIN_PREV_DESC,mb-setvar t2_button_wheeldown_action=win-prev $CONF_FILE") fi ;; @@ -861,7 +861,7 @@ echo menu_height_mode=dynamic >> ${CONFIG_FILE} if [[ "$wall2themes" == "yes" ]]; then AUTOTHEME_IND=" @rect,,$((jgtools_padding+4)),$((jgtools_padding + 6)),262,20,0,left,top,#222222 20,#222222 70, -@text,,$((jgtools_padding+8)),$((jgtools_padding + 6)),262,22,0,left,top,#FFFFFF,#222222 70, Auto theming $_ENABLED ! +@text,,$((jgtools_padding+8)),$((jgtools_padding + 6)),262,22,0,left,top,#FFFFFF,#222222 70, ${cbon} Auto theming $_ENABLED ! " fi diff --git a/usr/bin/jgwallpapergenerate b/usr/bin/jgwallpapergenerate old mode 100755 new mode 100644 index 1268df4..05d646a --- a/usr/bin/jgwallpapergenerate +++ b/usr/bin/jgwallpapergenerate @@ -1,11 +1,13 @@ #!/bin/bash # jgwallpapergenerate - submenu to generate wallpapers # +. /usr/share/mb-jgtools/jgtools.inc + CONFIG_DIR="$HOME/.config/mabox/tools" -CONFIG_FILE="$CONFIG_DIR/mb-canvas.cfg" +CNF_FILE="$CONFIG_DIR/mb-canvas.cfg" mkdir -p $CONFIG_DIR -if [ ! -f $CONFIG_FILE ]; then -cat < ${CONFIG_FILE} +if [ ! -f $CNF_FILE ]; then +cat < ${CNF_FILE} # Imagetype extension avif or png # avif (recommended) faster and much smaller size extension=avif @@ -15,7 +17,7 @@ extension=avif show_preview=yes EOF fi -source <(grep = $CONFIG_FILE) +source <(grep = $CNF_FILE) case $LANG in pl*) @@ -68,7 +70,7 @@ case $LANG in ;; esac -. $HOME/.config/mabox/mabox.conf +#. $HOME/.config/mabox/mabox.conf DIR="$(xdg-user-dir PICTURES)/imagick" files="$(ls ${DIR}|wc -l)" du="$(du -sh ${DIR}|awk '{print $1}')" @@ -98,17 +100,15 @@ out+=(" $_OPENDIR,xdg-open $DIR") out+=(" $_EMPTYDIR,rm ${DIR}/*.*;$me") fi out+=("^sep($_SETTINGS)") -[[ "$show_preview" == "yes" ]] && out+=("󰱒 $_PREVIEW,mb-setvar show_preview=no $CONFIG_FILE;${me}") || out+=("󰄱 $_PREVIEW,mb-setvar show_preview=yes $CONFIG_FILE;${me}") +[[ "$show_preview" == "yes" ]] && out+=("${cbon} $_PREVIEW,mb-setvar show_preview=no $CNF_FILE;${me}") || out+=("${cboff} $_PREVIEW,mb-setvar show_preview=yes $CNF_FILE;${me}") out+=("^sep($_IMG_FORMAT)") -[[ "$extension" == "avif" ]] && out+=("綠 avif $_RECOMMENDED,mb-setvar extension=png $CONFIG_FILE;${me}") || out+=("祿 avif $_RECOMMENDED,mb-setvar extension=avif $CONFIG_FILE;${me}") -[[ "$extension" == "png" ]] && out+=("綠 png,mb-setvar extension=avif $CONFIG_FILE;${me}") || out+=("祿 png,mb-setvar extension=png $CONFIG_FILE;${me}") +[[ "$extension" == "avif" ]] && out+=("${ron} avif $_RECOMMENDED,mb-setvar extension=png $CNF_FILE;${me}") || out+=("${roff} avif $_RECOMMENDED,mb-setvar extension=avif $CNF_FILE;${me}") +[[ "$extension" == "png" ]] && out+=("${ron} png,mb-setvar extension=avif $CNF_FILE;${me}") || out+=("${roff} png,mb-setvar extension=png $CNF_FILE;${me}") ### RUN if [[ "$1" == "-s" ]]; then -. /usr/share/mb-jgtools/pipemenu-standalone.cfg -. $HOME/.config/mabox/mabox.conf out+=("^sep()") out+=(" ${arrow_string_left} ${arrow_string_left} $_WALLPAPERMENU,jgwallpaperchanger -s") diff --git a/usr/bin/mb-places b/usr/bin/mb-places index bbdb4cd..d632b59 100755 --- a/usr/bin/mb-places +++ b/usr/bin/mb-places @@ -1,7 +1,8 @@ #!/bin/bash # mb-places # -. ~/.config/mabox/mabox.conf +. /usr/share/mb-jgtools/jgtools.inc + PLACES="$HOME/.config/mabox/places.csv" gtkbookmarks() { @@ -90,10 +91,10 @@ esac #cat < ${PLACES} out+=("^sep($LABEL [  + . ])") #out+=("^sep($LABEL [W-.])") -out+=(" $HOME_DIR (~),^pipe(jgbrowser),folder-home") +out+=("󰋜 $HOME_DIR (~),^pipe(jgbrowser),folder-home") out+=(" $(basename $(xdg-user-dir DOWNLOAD)),^pipe(jgbrowser $(xdg-user-dir DOWNLOAD)),folder-download") out+=(" $(basename $(xdg-user-dir DOCUMENTS)),^pipe(jgbrowser $(xdg-user-dir DOCUMENTS)),folder-documents") -out+=(" $(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)),folder-music") +out+=("󰌳 $(basename $(xdg-user-dir MUSIC)),^pipe(jgbrowser $(xdg-user-dir MUSIC)),folder-music") out+=(" $(basename $(xdg-user-dir PICTURES)),^pipe(jgbrowser $(xdg-user-dir PICTURES)),folder-pictures") out+=(" $(basename $(xdg-user-dir VIDEOS)),^pipe(jgbrowser $(xdg-user-dir VIDEOS)),folder-video") #^sep() @@ -116,10 +117,10 @@ out2+=("^tag(inst)") out+=("^sep($FILETOOLS)") if hash pcmanfm &>/dev/null; then -out+=(" PCManFM,pcmanfm,file-manager") +out+=(" PCManFM,pcmanfm,file-manager") fi if hash thunar &>/dev/null; then -out+=(" Thunar,thunar,file-manager") +out+=(" Thunar,thunar,file-manager") fi if hash fsearch &>/dev/null; then out+=("󰥨 FSearch,fsearch,search") @@ -144,7 +145,7 @@ out+=("$INST ...,^checkout(inst),package-manager-icon ") fi out+=("^sep($SETTINGS)") -[[ $jgbrowser_show_hidden = false ]] && out+=(" $SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=true;mb-places -s") || out+=(" $SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=false;mb-places -s") +[[ $jgbrowser_show_hidden = false ]] && out+=("${cboff} $SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=true;mb-places -s") || out+=("${cbon} $SHOW_HIDDEN,mb-setvar jgbrowser_show_hidden=false;mb-places -s") #out+=(" $EDIT $LABEL,xdg-open $PLACES,geany") } @@ -153,8 +154,7 @@ out+=("^sep($SETTINGS)") main if [[ "$1" == "-s" || "$1" == "ipc" || "$1" == "-d" ]]; then -. /usr/share/mb-jgtools/pipemenu-standalone.cfg -. $HOME/.config/mabox/mabox.conf + if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" MENU_MARGIN_Y=${panels_topmargin:-0}