diff --git a/usr/bin/jgmenusettings-pipe b/usr/bin/jgmenusettings-pipe index d19dd26..79d56c0 100755 --- a/usr/bin/jgmenusettings-pipe +++ b/usr/bin/jgmenusettings-pipe @@ -213,7 +213,11 @@ case $LANG in esac #me="mb-jgtools $jgtools_last" -me="jgmenusettings-pipe -s" +if [[ $1 == "-r" ]];then +me="${0##*/} -s" +else +me="${0##*/} ${1:--s}" +fi L="mb-jgtools places" R="mb-jgtools right" @@ -449,10 +453,14 @@ out+=("Colorizer - Menu,colorizer-menus -s") ### RUN -if [[ $1 == "-s" ]]; then +#if [[ $1 == "-s" ]]; then +if [[ $1 == "-s" || $1 == "-c" ]]; then . /usr/share/mb-jgtools/pipemenu-standalone.cfg out+=("^sep()") -out+=(" ⮜ $LEFTPANEL,mb-jgtools places") +case "$1" in + -s) out+=(" ⮜ $LEFTPANEL,mb-jgtools places");; + -c) out+=(" ⮜ Colorizer,colorizer -s");; +esac if [[ $panels_heightpos == "top" ]]; then @@ -471,6 +479,11 @@ jgmenu_icon_size=0 JGWIDTH=40 menu_margin_x=${submenu_spacing:-0} [ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius + + #TEMP POSITION: + MENU_VALIGN="top" + MENU_MARGIN_Y="60" + mkconfigfile cat < ${MENU_ITEMS} diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index f59ce68..cba0692 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -64,7 +64,12 @@ esac . $HOME/.config/mabox/mabox.conf -me="jgwallpaperchanger -s" +if [[ $1 == "-r" ]];then +me="${0##*/} -s" +else +me="${0##*/} ${1:--s}" +fi + #help='\nBased on Mabox forum member Shwaybo idea.\n\nchange wallpapers from a directory, never using the same picture twice until all the pictures have been shown, and rotating x number of seconds (configurable) before the next wallpaper change.\n' #out+=("^sep($TITLE)") @@ -93,12 +98,16 @@ out2+=("^tag(interval)") for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s,%s" "$i" "mb-setvar interval=${i} $CONFIG_FILE;$me")");done ### RUN -if [[ "$1" == "-s" ]]; then +if [[ $1 == "-s" || $1 == "-c" ]]; then . /usr/share/mb-jgtools/pipemenu-standalone.cfg +out+=("^sep()") +case "$1" in + -s) out+=(" ⮜ $LEFTPANEL,mb-jgtools places");; + -c) out+=(" ⮜ Colorizer,colorizer -s");; +esac + . $HOME/.config/mabox/mabox.conf -out+=("^sep()") -out+=(" ⮜ $LEFTPANEL,mb-jgtools places") if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" @@ -128,7 +137,9 @@ JGWIDTH=$((jgtools_padding + 278 + jgtools_padding)) then convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB} fi - + #TEMP POSITION: + MENU_VALIGN="top" + MENU_MARGIN_Y="60" mkconfigfile