diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index 8856a35..ec3d1ca 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -47,9 +47,9 @@ case $LANG in BORDER="Obramowanie" PADDING="Margines wewnętrzny" RADIUS="Zaokrąglone rogi" + SUBSPACING="Odstęp submenu" SIDEPANELS_HPOS="Panele boczne pozycja/wysokość" TOPMARGIN="Margines Paneli Góra/Dół" - SUBSPACING="Odstęp submenu" ICONS="Ikony" CIRCLE="Okrągłe ikony (Numix)" SQUARE="Kwadratowe ikony (Numix)" @@ -187,9 +187,9 @@ case $LANG in BORDER="Menu Border" PADDING="Padding" RADIUS="Rounded Corners" + SUBSPACING="Submenu Spacing" SIDEPANELS_HPOS="Panels Height/Position" TOPMARGIN="Panels Top/Bottom Margin" - SUBSPACING="Submenu Spacing" ICONS="Icons" CIRCLE="Circle icons (Numix)" SQUARE="Square icons (Numix)" @@ -295,33 +295,14 @@ out2+=("$RESET,mb-reset logout") ## out+=("^sep($LOOKANDFEEL)") -out+=("$BORDER [ ${jgtools_border:-0} ],^checkout(mborder)") -out+=("$PADDING [ ${jgtools_padding:-0} ],^checkout(mpadding)") -out+=("$RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") -out+=("$SUBSPACING [ ${submenu_spacing:-0} ],^checkout(subspacing)") -out+=("^sep()") out+=("$SIDEPANELS_HPOS [ ${panels_heightpos:-center} ],^checkout(sidepanelpos)") -out2+=("^tag(mborder)") -#for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done -for i in 0 1 2 3 4 5 6 8 10 12; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done - -out2+=("^tag(mpadding)") -#for i in 0 1 2 3 4; do out2+=("${i},mb-setvar jgtools_border=${i};$me");done -for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_padding=${i};$me")");done - -out2+=("^tag(mradius)") -for i in 0 1 2 3 4 6 8 12 14 16 18 20 40; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_radius=${i};$me")");done out2+=("^tag(topmargin)") for i in 0 20 30 40 50 60 80 100 120 160 200; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar panels_topmargin=${i};$me")");done #for i in 0 20 30 40 50 60 80 100; do out2+=("${i},mb-setvar panels_topmargin=${i};$me");done -out2+=("^tag(subspacing)") -for i in -20 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do out2+=("$(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done -#for i in -8 -6 -4 -2 0 1 2 3 4 5 6; do out2+=("${i},mb-setvar submenu_spacing=${i};$me");done - out2+=("^tag(sidepanelpos)") out2+=("^sep($SIDEPANELS_HPOS)") out2+=("$FULLHEIGHT,mb-setvar panels_heightpos=full;$me") diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index d148d0b..dc51fa8 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -91,9 +91,11 @@ case $LANG in DARKBG="dark - ciemne tło" COLORIZER_HELP="Okno główne i Pomoc" COLORIZER_ROOT="Colorizer rootmenu" - COLORIZER_OB="Moduł Openbox" - COLORIZER_MENU="Moduł Menu i Panele" - COLORIZER_CONKY="Moduł Conky" + COLORIZER_OB="Moduł Openbox" + COLORIZER_MENU="Moduł Menu" + COLORIZER_CONKY="Moduł Conky" + COLORIZER_PYRADIO="Moduł PyRadio" + COLORIZER_CAVA="Moduł Cava" B_LC_ACTION="Akcja przycisku (lewy klik)" RAND="losuj" CHOOSE="wybierz" @@ -107,7 +109,7 @@ case $LANG in RANDWALL="Random Wallpaper" EDIT_WPDIRS="Edit Wallpaper dirs" GENERATOR="Generate (ImageMagick)..." - CHOOSE_WP="Choose Wallpaper..." + CHOOSE_WP="Choose Wallpaper (from context menu)" SLIDESHOW="Slideshow" STARTS="Start Slideshow (stopped)" STOPS="Stop Slideshow (running - interval: $interval sec.)" @@ -120,7 +122,7 @@ case $LANG in LEFTPANEL="Left panel" OBTHEME="Openbox Theme" MENUPANELS="Menus/Panels" - AUTOGEN_THEMES="Auto theming - based on wallp colors" + AUTOGEN_THEMES="Auto theming" GENERATETHEMES="Generate themes on wallpaper change?" GENOB="Colorize Window Decorations?" GENMENU="Colorize Menus and Panels?" @@ -137,6 +139,8 @@ case $LANG in COLORIZER_OB="Openbox module" COLORIZER_MENU="Menus/Panels module" COLORIZER_CONKY="Conky module" + COLORIZER_PYRADIO="PyRadio module" + COLORIZER_CAVA="Cava module" B_LC_ACTION="Button left-click action" RAND="random" CHOOSE="choose" @@ -161,7 +165,7 @@ if ! pgrep mbwallpaper > /dev/null; then out+=("󰧸 $SLIDESHOW,^checkout(sshow)") out+=("^sep()") out+=(" $EDIT_WPDIRS,xdg-open $CNF_FILE") - [[ "$wall2themes" = "yes" ]] && out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") + [[ "$wall2themes" = "yes" ]] && out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") else out+=("$STOPS,killall mbwallpaper;pkill -f 'yad --not';$me") @@ -185,7 +189,7 @@ for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s, # COLORIZER_CONF SUBMENU out1+=("^tag(colsettings2)") out1+=("^sep($GENERATETHEMES)") -[[ "$wall2themes" = "yes" ]] && out1+=(" $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out1+=(" $NOC,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") +[[ "$wall2themes" = "yes" ]] && out1+=(" $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out1+=(" $NOC,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") out1+=("^sep()") @@ -227,11 +231,11 @@ out2+=("$DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me") ### RUN if [[ $1 == "-s" || $1 == "-c" || $1 == "-u" || $1 == "ipc" ]]; then . /usr/share/mb-jgtools/pipemenu-standalone.cfg -out+=("^sep()") + case "$1" in - -s) out+=(" ⮜ $LEFTPANEL,mb-jgtools places");; - -c) out+=(" ⮜ Colorizer,colorizer -s");; - -u) out+=(" ⮜ Settings menu,mb-jgtools settings");; + -s) out+=(" ${arrow_string_left} $LEFTPANEL,mb-jgtools places");; + -c) out+=(" ${arrow_string_left} Colorizer,colorizer -s");; + -u) out+=(" ${arrow_string_left} Settings menu,mb-jgtools settings");; ipc) POSITION_MODE=${1:-fixed} out+=("^sep(Colorizer)") out+=("$COLORIZER_HELP,ycolorizer") @@ -241,6 +245,9 @@ case "$1" in out+=("$COLORIZER_MENU,colorizer-menus -s") out+=("$COLORIZER_CONKY,colorizer-conky -s") out+=("^sep()") + out+=("$COLORIZER_PYRADIO,colorizer-pyradio -s") + out+=("$COLORIZER_CAVA,colorizer-cava -s") + out+=("^sep()") [[ "$t2_button_lclick_action" == "random" ]] && out+=("$B_LC_ACTION: [ $RAND ],^checkout(laction)") || out+=("$B_LC_ACTION: [ $CHOOSE ],^checkout(laction)") out2+=("^tag(laction)") out2+=("^sep(Panel button left-click action)") @@ -269,8 +276,8 @@ JGWIDTH=40 menu_margin_x=${submenu_spacing:-0} [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius [ -z $jgmenu_use_borders ] && menu_border=0 -JGWIDTH=$((jgtools_padding + 278 + jgtools_padding)) - MENU_PADDING_TOP=$((jgtools_padding + 158)) +JGWIDTH=$((jgtools_padding + 270 + jgtools_padding)) + MENU_PADDING_TOP=$((jgtools_padding + 150)) #WALLPAPER read WALLPATH<<< $(grep file "$HOME"/.config/nitrogen/bg-saved.cfg | cut -d'=' -f2) THUMBDIR="$HOME/.cache/colorizer/thumbs" @@ -293,7 +300,7 @@ JGWIDTH=$((jgtools_padding + 278 + jgtools_padding)) mkconfigfile cat < ${MENU_ITEMS} -@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} +@icon,,$((jgtools_padding )),$((jgtools_padding)),270,150,4,left,top,,,${THUMB} $(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out1[@]}") $(printf '%s\n' "${out2[@]}")