diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 1e31177..1d32dd0 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -135,7 +135,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(colsettings)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings)") + [[ "$wall2themes" = "yes" ]] && out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") || out+=(" $AUTOGEN_THEMES,^checkout(colsettings2)") else out+=("$STOPS,killall mbwallpaper;pkill -f 'yad --not';$me") @@ -157,14 +157,14 @@ for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s, # COLORIZER_CONF SUBMENU -out1+=("^tag(colsettings)") +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") out1+=("^sep()") -out1+=("$OBTHEME [ ${wall2themes_ob} ],^checkout(ob)") -out2+=("^tag(ob)") +out1+=("$OBTHEME [ ${wall2themes_ob} ],^checkout(ob2)") +out2+=("^tag(ob2)") out2+=("^sep($GENOB)") out2+=("$NO,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me") out2+=("^sep()") @@ -172,8 +172,8 @@ out2+=("$LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me") out2+=("$DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me") -out1+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp)") -out2+=("^tag(mp)") +out1+=("$MENUPANELS [ ${wall2themes_menu} ],^checkout(mp2)") +out2+=("^tag(mp2)") out2+=("^sep($GENMENU)") out2+=("$NO,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me") out2+=("^sep()") @@ -181,8 +181,8 @@ out2+=("$LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me") out2+=("$DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me") -out1+=("Conky [ ${wall2themes_conky} ],^checkout(conky)") -out2+=("^tag(conky)") +out1+=("Conky [ ${wall2themes_conky} ],^checkout(conky2)") +out2+=("^tag(conky2)") out2+=("^sep($GENCONKY)") out2+=("$NO,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me") out2+=("^sep()") @@ -190,8 +190,8 @@ out2+=("$LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me") out2+=("$DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me") -out1+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio)") -out2+=("^tag(pyradio)") +out1+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio2)") +out2+=("^tag(pyradio2)") out2+=("^sep($GENPYRADIO)") out2+=("$NO,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me") out2+=("^sep()")