diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 0af697e..9b970b4 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -294,7 +294,6 @@ for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s, out+=("^sep(Desktop styling)") out+=(" OpenBox Windows Decoration,^root(obox)") out+=(" Mabox Menus,^root(jgmenus)") -out+=(" Conky widgets,^root(conky)") case "$2" in obox)option="--checkout=obox";; @@ -315,6 +314,9 @@ do ((n=n+1)) out1+=(" $(printf '%-20s' "${scheme_name}") in ,obtctl applytheme sys ${n};$me obox" "^sep()") done < <(tail -n +2 "$OB_SYSTHEMES") + +# OB User themes +if [ "$(grep -c ^ $OB_USERTHEMES)" -gt "1" ];then out1+=("^sep($YOUR_THEMES)" "^sep()") n=1 while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name @@ -322,6 +324,7 @@ do ((n=n+1)) out1+=(" $(printf '%-20s' "${scheme_name}") in ,obtctl applytheme usr ${n};$me obox" "^sep()") done < <(tail -n +2 "$OB_USERTHEMES") +fi out1+=("^sep($_GENERATE)") out1+=(" $RANDOMIZE,obtctl randomizer;$me obox") @@ -351,9 +354,9 @@ out1+=("^tag(jgmenus)") out1+=("^sep(Menu/Panels)") out1+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBACK,^back()") out1+=("^sep($_CHANGE_THEME)") -out1+=(" $SYSTEM_THEMES ($((JG_SYS_AMOUNT-1))),^checkout(jg_sys)") -out2+=("^tag(jg_sys)") -out2+=("^sep($_CLICK_TO_APPLY)") +#out1+=(" $SYSTEM_THEMES ($((JG_SYS_AMOUNT-1))),^checkout(jg_sys)") +#out2+=("^tag(jg_sys)") +#out2+=("^sep($_CLICK_TO_APPLY)") n=1 while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name @@ -370,9 +373,12 @@ n=1 bottom_left)icon="";; bottom_right)icon="";; esac - out2+=(" $(printf '%-18s' "${scheme_name}") title [ sel ] ${icon} ,jgctl applyscheme sys $n;$me jgmenus" "^sep()") + out1+=(" $(printf '%-18s' "${scheme_name}") title [ sel ] ${icon} ,jgctl applyscheme sys $n;$me jgmenus" "^sep()") done < <(tail -n +2 "$MENU_SYSSCHEMES") +# Menu User schemes +if [ "$(grep -c ^ $MENU_USERSCHEMES)" -gt "1" ];then +out1+=("^sep()") out1+=(" $YOUR_THEMES ($((JG_USR_AMOUNT-1))),^checkout(jg_usr)") out2+=("^tag(jg_usr)") out2+=("^sep($_CLICK_TO_APPLY)") @@ -393,6 +399,7 @@ out2+=("^sep($_CLICK_TO_APPLY)") esac out2+=(" $(printf '%-18s' "${scheme_name}") title [ sel ] ${icon} ,jgctl applyscheme usr ${n};$me jgmenus" "^sep()") done < <(tail -n +2 "$MENU_USERSCHEMES") +fi out1+=("^sep($_GENERATE)") out1+=(" $RANDOMIZE,jgctl randomscheme;$me jgmenus") @@ -414,13 +421,11 @@ out1+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBAC ## CONKIES -out1+=("^tag(conky)") -out1+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBACK,^back()") -out1+=("^sep(Conky)") -out1+=("^sep(not implemented yet)") -out1+=("$_COLORIZER_CONKY,colorizer-conky -s") -out1+=("^sep()") -out1+=("${arrow_string_left} ${arrow_string_left} ${arrow_string_left} $_GOBACK,^back()") +out+=("^sep()") +out+=(" $_COLORIZER_CONKY,colorizer-conky -s") + + + out+=("^sep()") out+=(" $_COLORIZER_FONTS,colorizer-fonts -s")