This commit is contained in:
Daniel Napora 2023-09-05 19:04:12 +02:00
parent 1df88f36cb
commit f782cb9435
2 changed files with 23 additions and 35 deletions

View File

@ -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 [ <b>${jgtools_border:-0}</b> ],^checkout(mborder)")
out+=("$PADDING [ <b>${jgtools_padding:-0}</b> ],^checkout(mpadding)")
out+=("$RADIUS [ <b>${jgtools_radius:-0}</b> ],^checkout(mradius)")
out+=("$SUBSPACING [ <b>${submenu_spacing:-0}</b> ],^checkout(subspacing)")
out+=("^sep()")
out+=("$SIDEPANELS_HPOS [ <b>${panels_heightpos:-center}</b> ],^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 "<tt>%3s</tt>,%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 "<tt>%3s</tt>,%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 "<tt>%3s</tt>,%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 "<tt>%4s</tt>,%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 "<tt>%4s</tt>,%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")

View File

@ -91,9 +91,11 @@ case $LANG in
DARKBG="<b>dark</b> - 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ł <b>Openbox</b>"
COLORIZER_MENU="Moduł <b>Menu</b>"
COLORIZER_CONKY="Moduł <b>Conky</b>"
COLORIZER_PYRADIO="Moduł <b>PyRadio</b>"
COLORIZER_CAVA="Moduł <b>Cava</b>"
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 <small>(from context menu)</small>"
SLIDESHOW="Slideshow"
STARTS="Start Slideshow <small>(<i>stopped</i>)</small>"
STOPS="Stop Slideshow <small>(<i>running - interval: $interval sec.</i>)</small>"
@ -120,7 +122,7 @@ case $LANG in
LEFTPANEL="Left panel"
OBTHEME="Openbox Theme"
MENUPANELS="Menus/Panels"
AUTOGEN_THEMES="<b>Auto theming</b> - 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="<b>Openbox</b> module"
COLORIZER_MENU="<b>Menus/Panels</b> module"
COLORIZER_CONKY="<b>Conky</b> module"
COLORIZER_PYRADIO="<b>PyRadio</b> module"
COLORIZER_CAVA="<b>Cava</b> module"
B_LC_ACTION="Button <i>left-click</i> action"
RAND="random"
CHOOSE="choose"
@ -161,7 +165,7 @@ if ! pgrep mbwallpaper > /dev/null; then
out+=("<big>󰧸</big> $SLIDESHOW,^checkout(sshow)")
out+=("^sep()")
out+=("<big></big> $EDIT_WPDIRS,xdg-open $CNF_FILE")
[[ "$wall2themes" = "yes" ]] && out+=("<big></big> $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=("<big></big> $AUTOGEN_THEMES,^checkout(colsettings2)")
[[ "$wall2themes" = "yes" ]] && out+=("<big></big> $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=("<big></big> $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 "<tt> %4s</tt>,
# COLORIZER_CONF SUBMENU
out1+=("^tag(colsettings2)")
out1+=("^sep($GENERATETHEMES)")
[[ "$wall2themes" = "yes" ]] && out1+=("<big></big> $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out1+=("<big></big> $NOC,mb-setvar wall2themes=yes $COLORIZER_CONF;$me")
[[ "$wall2themes" = "yes" ]] && out1+=("<big></big> $YESC,mb-setvar wall2themes=no $COLORIZER_CONF;$me") || out1+=("<big></big> $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: <b>[ $RAND ]</b>,^checkout(laction)") || out+=("$B_LC_ACTION: <b>[ $CHOOSE ]</b>,^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 <<EOF > ${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[@]}")