diff --git a/bin/checkupdates.sh b/bin/checkupdates.sh index d0284c3..ab340bc 100755 --- a/bin/checkupdates.sh +++ b/bin/checkupdates.sh @@ -42,8 +42,8 @@ case "$1" in -g) CONKYPID=$(pgrep -f sysinfo_graph_mbcolor) ;; - *) - : + -m) + CONKYPID=$(pgrep -f mabox_info_mbcolor) ;; esac @@ -61,5 +61,5 @@ if [ -f /tmp/"$CONKYPID" ]; then printf "\${font}\${color}\${alignr} $UPTODATE" fi else - echo "$SUM" > /tmp/${CONKYPID} + echo "$1" > /tmp/${CONKYPID} fi diff --git a/bin/colorizer b/bin/colorizer index fd23236..933fc74 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -40,15 +40,13 @@ related_tools=hide # Colorizer size: full or compact colorizer_size=full # Action for rootmenucolors: accent or select -rootcolors=accent +rootcolors=select # Different colors for each/some Conkys: yes or no -conky_diff_colors=yes +conky_diff_colors=no # Gradients: change openbox theme? (active window titlebar) gradient_obtheme=yes # Gradients: change menu/panels background? -gradient_menu=yes -# Gradients: change Conky bg colors based on gradient -gradient_conkies=no +gradient_menu=no EOF # Copy new nitrogen wrapper cp -a /usr/share/mabox/common/wrappers/nitrogen ~/.local/bin/ @@ -97,7 +95,7 @@ case "$LANG" in SYSWALLPAPER="Tapety systemowe" USERWALLPAPER="Tapety użytkownika" GRADIENTS="Gradienty" - PRE_GRADIENTS="Gotowe Gradienty" + PRE_GRADIENTS="Gradienty" GRAD_OB="Stosować do motywu OpenBox?" GRAD_MENU="Stosować do Menu/Paneli?" GRAD_CONKY="Stosować do Conky?" @@ -259,6 +257,14 @@ mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c out+=("^sep(Mabox Colorizer)") +out+=(" $SETTINGS,^checkout(settings)") +LNG=${LANG:0:2} +if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then +out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Help - Colorizer'") +else +out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Help - Colorizer'") +fi +out+=("^sep()") out+=(" $REGENERATE,^checkout(regen)") out2+=("^tag(regen)") out2+=("^sep($REGENERATEALL)") @@ -475,7 +481,7 @@ done ##out+=(" $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") # Przerobić na submenu -if [[ "$wall2themes" == "yes" ]];then +#if [[ "$wall2themes" == "yes" ]];then out+=("^sep($RANDWALL)") syswallp=$(shopt -s nullglob ; set -- /usr/share/backgrounds/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) out+=(" $SYSWALLPAPER (${syswallp}),nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") @@ -485,10 +491,12 @@ out+=(" $USERWALLPAPER (${userwallp}),nitrogen --random ${use fi out+=("^sep()") out+=("$WALLPAPERS,^checkout(wallpapersettings)") -fi -if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" || "gradient_conkies" == "yes" ]];then -out+=("^sep($GRADIENTS)") -out+=("$PRE_GRADIENTS,^pipe(mbgrad)") +#fi +if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then + [[ "$gradient_obtheme" == "yes" ]] && OBGRAD="OB" || OBGRAD="" + [[ "$gradient_menu" == "yes" ]] && MENUGRAD="menus" || MENUGRAD="" + out+=("^sep($GRADIENTS $OBGRAD $MENUGRAD)") + out+=(" $PRE_GRADIENTS,^pipe(mbgrad)") fi if [[ "$related_tools" == "show" ]];then @@ -498,27 +506,8 @@ fi #out+=("^sep()") #out+=("Pin current colors to wallpaper") ### -out+=("^sep($SETTINGS_AND_HELP)") -out+=(" $SETTINGS,^checkout(settings)") out2+=("^tag(settings)") -out2+=("^sep($COLORIZER_SETTINGS)") -if [[ -f "$HOME/.config/tint2/launcherapps/colorizer.desktop" ]]; then -out2+=("$DELETELAUNCHER,rm ~/.config/tint2/launcherapps/colorizer.desktop;killall -SIGUSR1 tint2;colorizer -s") -else -out2+=("$ADDLAUNCHER,cp /usr/share/applications/colorizer.desktop ~/.config/tint2/launcherapps/;killall -SIGUSR1 tint2;colorizer -s") -fi -out2+=("$HEIGHT [ ${colorizer_size} ],^checkout(csize)") -out3+=("^tag(csize)") -out3+=("^sep($HEIGHT)") -out3+=("$FULL,mb-setvar colorizer_size=full $CNF_FILE;colorizer -s") -out3+=("$COMPACT,mb-setvar colorizer_size=compact $CNF_FILE;colorizer -s") -out2+=("$ROOTMENU_COLORS_ACTION [ $rootcolors ],^checkout(rootcolors)") -out3+=("^tag(rootcolors)") -out3+=("^sep($ROOTMENU_COLORS_ACTION)") -out3+=("$ACCENT,mb-setvar rootcolors=accent $CNF_FILE;colorizer -s") -out3+=("$SELECT,mb-setvar rootcolors=select $CNF_FILE;colorizer -s") - out2+=("^sep($AUTOGEN_THEMES)") out2+=(" $AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") out3+=("^tag(autogen") @@ -542,11 +531,11 @@ out3+=("$NO,mb-setvar wall2themes_conky=none $CNF_FILE;colorizer -s") out3+=("^sep()") out3+=("$LIGHTBG,mb-setvar wall2themes_conky=light $CNF_FILE;colorizer -s") out3+=("$DARKBG,mb-setvar wall2themes_conky=dark $CNF_FILE;colorizer -s") -out2+=("$DIFF_CONKY_COLORS [ $conky_diff_colors ],^checkout(conkycolors)") -out3+=("^tag(conkycolors)") -out3+=("^sep($DIFF_CONKY_COLORS)") -out3+=("$YES,mb-setvar conky_diff_colors=yes $CNF_FILE;colorizer -s") -out3+=("$NO,mb-setvar conky_diff_colors=no $CNF_FILE;colorizer -s") +#out2+=("$DIFF_CONKY_COLORS [ $conky_diff_colors ],^checkout(conkycolors)") +#out3+=("^tag(conkycolors)") +#out3+=("^sep($DIFF_CONKY_COLORS)") +#out3+=("$YES,mb-setvar conky_diff_colors=yes $CNF_FILE;colorizer -s") +#out3+=("$NO,mb-setvar conky_diff_colors=no $CNF_FILE;colorizer -s") out2+=("^sep()") out2+=("PyRadio [ ${wall2themes_pyradio} ],^checkout(pyradio)") @@ -592,12 +581,29 @@ out3+=("^sep($GRAD_MENU)") out3+=("$YES,mb-setvar gradient_menu=yes $CNF_FILE;colorizer -s") out3+=("$NO,mb-setvar gradient_menu=no $CNF_FILE;colorizer -s") out2+=("$GRAD_CONKY [ ${gradient_conkies} ],^checkout(grad_conky)") -out3+=("^tag(grad_conky") -out3+=("^sep($GRAD_CONKY)") -out3+=("$YES,mb-setvar gradient_conkies=yes $CNF_FILE;colorizer -s") -out3+=("$NO,mb-setvar gradient_conkies=no $CNF_FILE;colorizer -s") +#out3+=("^tag(grad_conky") +#out3+=("^sep($GRAD_CONKY)") +#out3+=("$YES,mb-setvar gradient_conkies=yes $CNF_FILE;colorizer -s") +#out3+=("$NO,mb-setvar gradient_conkies=no $CNF_FILE;colorizer -s") out2+=("^sep($OTHER_SETTINGS)") +#out2+=("^sep($COLORIZER_SETTINGS)") +#if [[ -f "$HOME/.config/tint2/launcherapps/colorizer.desktop" ]]; then +#out2+=("$DELETELAUNCHER,rm ~/.config/tint2/launcherapps/colorizer.desktop;killall -SIGUSR1 tint2;colorizer -s") +#else +#out2+=("$ADDLAUNCHER,cp /usr/share/applications/colorizer.desktop ~/.config/tint2/launcherapps/;killall -SIGUSR1 tint2;colorizer -s") +#fi + +out2+=("$ROOTMENU_COLORS_ACTION [ $rootcolors ],^checkout(rootcolors)") +out3+=("^tag(rootcolors)") +out3+=("^sep($ROOTMENU_COLORS_ACTION)") +out3+=("$ACCENT,mb-setvar rootcolors=accent $CNF_FILE;colorizer -s") +out3+=("$SELECT,mb-setvar rootcolors=select $CNF_FILE;colorizer -s") +out2+=("$HEIGHT [ ${colorizer_size} ],^checkout(csize)") +out3+=("^tag(csize)") +out3+=("^sep($HEIGHT)") +out3+=("$FULL,mb-setvar colorizer_size=full $CNF_FILE;colorizer -s") +out3+=("$COMPACT,mb-setvar colorizer_size=compact $CNF_FILE;colorizer -s") out2+=("$SHOW_RELATED [ ${related_tools} ],^checkout(related)") out3+=("^tag(related)") out3+=("^sep($SHOW_RELATED)") @@ -610,13 +616,6 @@ out2+=("^sep()") out2+=(" $EDITCONF,xdg-open $CNF_FILE") out2+=(" $RESET,rm $CNF_FILE;colorizer -s") -LNG=${LANG:0:2} -if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then -out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Help - Colorizer'") -else -out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Help - Colorizer'") -fi - ### RUN if [[ "$1" == "-s" ]]; then @@ -669,10 +668,29 @@ if [[ "$1" == "-s" ]]; then mkconfigfile #THUMB="$(DISPLAY=:0 scrot -t 220x100 -o $HOME/.config/mabox/colorizer.png -e 'echo $m')" + case "$LANG" in + pl*) THGEN="generuj motywy :";; + *) THGEN="theme generation:";; + esac +if [ "$wall2themes" = "yes" ]; then + FGCOL="limegreen" + case "$LANG" in + pl*) STATE="on";; + *) STATE="on";; + esac +else + FGCOL="red" + case "$LANG" in + pl*) STATE="off";; + *) STATE="off";; + esac +fi cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} -@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 100)),270,54,0,left,top,#222222 20,#222222 70, -@text,,$((jgtools_padding + 198)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR}, Colorizer +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 8)),270,20,0,left,top,#222222 20,#222222 70, +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 120)),270,34,0,left,top,#222222 20,#222222 70, +@text,,$((jgtools_padding + 12)),$((jgtools_padding + 2)),270,30,0,left,top,#FFFFFF ,${WINCLR}, ${THGEN} $STATE +@text,,$((jgtools_padding + 198)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer $(printf '%s\n' "${dots[@]}") #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 34)),270,120,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer.png $(printf '%s\n' "${out[@]}") diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 24bbb3b..658ed36 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -31,7 +31,7 @@ fi case "$LANG" in pl*) COLORIZECONKY="Conky Colorizer" - MOVEABLEALL="Ustaw wszystkie (poprzez przeciąganie)..." + MOVEABLEALL="Ustaw wszystkie (przeciągaj)..." GENERATEFROMWP="Generuj z kolorów tapety" LIGHTBG="Jasne tło" DARKBG="Ciemne tło" @@ -313,7 +313,9 @@ if [[ "$1" == "-s" ]]; then cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 120)),270,34,0,left,top,#222222 20,#222222 70, #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png +@text,,$((jgtools_padding + 158)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer Conky @rect,,$((jgtools_padding + 244)),$((jgtools_padding + 6)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, @rect,,$((jgtools_padding + 5)),$((jgtools_padding + 92)),29,60,0,left,top,#FFFFFF 30,${WINCLR} 60, @rect,,$((jgtools_padding + 36)),$((jgtools_padding + 112)),29,40,0,left,top,#FFFFFF 30,${WINCLR} 60, diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 4578370..dc79ec3 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -150,7 +150,7 @@ out+=("$(printf '%3s' "$MBGTA") $(printf '%3s' "$MBORDERA") $COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border '${COLOR_MENU_BORDER}' '$me')") out+=("^sep()") out+=("$GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") -out+=("$PRE_GRADIENTS,^pipe(mbgrad menu)") +out+=(" $PRE_GRADIENTS,^pipe(mbgrad menu)") out+=(" $GRADIENT_REVERSE,jgctl gradient '${MBGT}' '${MBG}';$me") out+=("^sep($ITEM)") @@ -268,6 +268,8 @@ JGWIDTH=$((jgtools_padding + 278 + jgtools_padding)) cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 120)),270,34,0,left,top,#222222 20,#222222 70, +@text,,$((jgtools_padding + 158)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer Menus $(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out2[@]}") EOF diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 35aea66..c59ec3c 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -41,9 +41,9 @@ case "$LANG" in PADDING="Odstęp" VERTICAL="W pionie" HORIZONTAL="W poziomie" - RAISED_OR_FLAT="Płaski, Podniesiony czy Wklęsły" + RAISED_OR_FLAT="Płaski, Uniesiony, Wklęsły" FLAT="płaski - flat" - RAISED="podniesiony - raised" + RAISED="uniesiony - raised" SUNKEN="wklęsły - sunken" BUTTONS="Przyciski" GRADIENT_TYPE="Typ Gradientu" @@ -59,8 +59,8 @@ case "$LANG" in INACTIVE_BG_TO="Tło nieaktywnego okna 2" BORDER="Obramowanie okna" BORDER_PX="Obramowanie (px)" - ACTIVE_BORDER="Obramowanie aktywnego okna" - INACTIVE_BORDER="Obramowanie nieaktywnego okna" + ACTIVE_BORDER="Obramowanie akt. okna" + INACTIVE_BORDER="Obramowanie nieakt. okna" HANDLEWIDTH="Uchwyt - rozmiar" ACTIVEHANDLE="Aktywny Uchwyt" YES="Tak" @@ -199,7 +199,7 @@ out+=("^sep()") out+=("$BUTTONS,^checkout(tbuttons)") out+=("^sep(Gradient)") out+=("$GRADIENT_TYPE [ ${REST##* } ],^checkout(gradient)") -out+=("$PRE_GRADIENTS,^pipe(mbgrad ob)") +out+=(" $PRE_GRADIENTS,^pipe(mbgrad ob)") out+=(" $GRADIENT_REVERSE,obtctl activegradient '${ABGTO}' '${ABG}';$me") out+=("^sep($BORDER)") @@ -394,7 +394,8 @@ mkconfigfile cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-ob.png - +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 128)),270,22,0,left,top,#222222 20,#222222 70, +@text,,$((jgtools_padding + 138)),$((jgtools_padding + 124)),130,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer Openbox $(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out2[@]}") EOF diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index 1fe39a7..96a6448 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -21,7 +21,7 @@ case "$LANG" in DARKBG="Ciemne tło" SETCOLORS="Ustaw kolory..." RESETTHEME="Resetuj motyw" - EXPORTTHEME="Eksportuj obecne kolory jako nowy motyw" + EXPORTTHEME="Eksportuj jako nowy motyw" CONFIG_AND_DOCS="Konfiguracja i Dokumentacja" README="PyRadio CZYTAJTO" MANUAL="Manual PyRadio" @@ -40,7 +40,7 @@ case "$LANG" in DARKBG="Dark Background" SETCOLORS="Set colors individually..." RESETTHEME="Reset theme" - EXPORTTHEME="Export current colors as new theme" + EXPORTTHEME="Export as new theme" CONFIG_AND_DOCS="Config and Docs" README="PyRadi README" MANUAL="PyRadio Manual" @@ -170,8 +170,9 @@ if [[ "$1" == "-s" ]]; then cat < ${MENU_ITEMS} @icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,${THUMB} #@icon,,$((jgtools_padding + 4)),$((jgtools_padding + 4)),270,150,4,left,top,,,/usr/share/mabox-colorizer/img/colorizer-conky.png -@rect,,$((jgtools_padding + 144)),$((jgtools_padding + 122)),120,30,4,left,top,#FFFFFF 60,#222222 80, -@text,,$((jgtools_padding + 150)),$((jgtools_padding + 122)),120,30,0,left,top,#FFFFFF,${WINCLR}, PyRadio +@rect,,$((jgtools_padding + 4)),$((jgtools_padding + 120)),270,34,0,left,top,#222222 20,#222222 70, +@text,,$((jgtools_padding + 148)),$((jgtools_padding + 124)),120,30,0,left,top,#FFFFFF ,${WINCLR},Colorizer PyRadio + $(printf '%s\n' "${out[@]}") $(printf '%s\n' "${out2[@]}") diff --git a/bin/conkyctl b/bin/conkyctl index 799ca20..86314de 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -357,7 +357,7 @@ languages () { COLOR_1="Kolor 1 (większy tekst)" COLOR_2="Kolor 2 (pasek/graf)" BACKGROUND="Kolor tła" - REGENERATE="Motywy kolorów" + COLORSCHEME="Motywy kolorów" OPENTHEMEDIR="Otwórz katalog motywów" APPLY_THEME="Zastosuj motyw" APPLY_TO_ONE="Zastosuj do " @@ -413,9 +413,9 @@ languages () { COLOR_1="Color 1 (bigger text)" COLOR_2="Color 2 (bars/graphs)" BACKGROUND="Background color" - REGENERATE="(Re)Generate colors" + COLORSCHEME="Color schemes" OPENTHEMEDIR="Open schemes dir" - APPLY_THEME="Color schemes" + APPLY_THEME="Apply scheme..." APPLY_TO_ONE="Apply to " APPLY_TO_ALL="Apply to All" NEWTHEME="New Color scheme..." @@ -469,9 +469,9 @@ languages () { COLOR_1="Color 1 (bigger text)" COLOR_2="Color 2 (bars/graphs)" BACKGROUND="Background color" - REGENERATE="(Re)Generate colors" + COLORSCHEME="Color schemes" OPENTHEMEDIR="Open schemes dir" - APPLY_THEME="Color schemes" + APPLY_THEME="Apply scheme..." APPLY_TO_ONE="Apply to " APPLY_TO_ALL="Apply to All" NEWTHEME="New Color scheme..." @@ -640,9 +640,9 @@ single () { out+=("^sep($COLORS)") if [ "$WINTRANS" == false ];then - out+=(" $REGENERATE,^checkout(regensingle)") + out+=(" $COLORSCHEME,^checkout(regensingle)") out2+=("^tag(regensingle)") - out2+=("^sep($REGENERATE)") + out2+=("^sep($COLORSCHEME)") out2+=("$RESETCOLORS,conkyctl resetcolorsone ${1}") out2+=("^sep($GENFROMWP)") out2+=("$LIGHTBG,w2theme conkyone light ${1}") @@ -657,7 +657,6 @@ single () { themefilename=${i##*/} themename=${themefilename%%.colors} out2+=(" $themename,conkyctl settheme $themefilename $1") - #out3+=("TEST [ ${title^} ],notify-send.sh $themefilename $1") out3+=(" $themename,conkyctl settheme_all $themefilename") done out2+=("^sep()") diff --git a/bin/obtctl b/bin/obtctl index ab5ccde..3a25485 100755 --- a/bin/obtctl +++ b/bin/obtctl @@ -58,7 +58,7 @@ handlewidth () { sd "\.handle.width:.*$" ".handle.width: $1" ${THEMERC} } raised () { - #flat or raised + #flat 0 or raised 1 or sunken 2 read WINRAISED REST <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)" case "$1" in 0) @@ -104,11 +104,11 @@ activegradient () { sd "\.active.border.color:.*$" ".active.border.color: $1" ${THEMERC} # calculate color for title.fg and buttons - TITLE_FG=$(pastel textcolor ${1}|pastel format hex) + TITLE_FG=$(pastel textcolor ${2}|pastel format hex) if [[ "${TITLE_FG}" == *"ffffff"* ]];then TITLE_FG="#EEEEEE" else - TITLE_FG="#222222" + TITLE_FG="#111111" fi sd "\.active.label.text.color:.*$" ".active.label.text.color: ${TITLE_FG}" ${THEMERC} @@ -176,6 +176,19 @@ clractivebg () { sd "menu.items.active.bg.color:.*$" "menu.items.active.bg.color: ${1}" ${THEMERC} sd "menu.items.active.bg.colorTo:.*$" "menu.items.active.bg.colorTo: ${colorTo}" ${THEMERC} + + # calculate color for title.fg and buttons + TITLE_FG=$(pastel textcolor ${colorTo}|pastel format hex) + if [[ "${TITLE_FG}" == *"ffffff"* ]];then + TITLE_FG="#EEEEEE" + else + TITLE_FG="#111111" + fi + sd "\.active.label.text.color:.*$" ".active.label.text.color: ${TITLE_FG}" ${THEMERC} + + # Button colors + activebuttonscolors "${TITLE_FG}" + } clrnormalbg () { @@ -234,6 +247,45 @@ activebuttonscolors () { #disabled=$() sd "^window.active.button.*.hover.image.color:.*$" "window.active.button.*.hover.image.color: ${hover}" ${THEMERC} } +fontsize () { + nspace="http://openbox.org/3.4/rc" + cfg="$HOME/.config/openbox/rc.xml" + case "$1" in + increase) + SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") + ((SIZE=SIZE+1)) + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "$SIZE" "$cfg" + ;; + decrease) + SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") + ((SIZE=SIZE-1)) + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "$SIZE" "$cfg" + ;; + *) + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "$1" "$cfg" + ;; + esac +} +fontweighttoggle (){ + nspace="http://openbox.org/3.4/rc" + cfg="$HOME/.config/openbox/rc.xml" + WEIGHT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:weight' "$cfg") + if [ "$WEIGHT" = "Normal" ];then + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:weight' -v "Bold" "$cfg" + else + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:weight' -v "Normal" "$cfg" + fi +} +fontslanttoggle (){ + nspace="http://openbox.org/3.4/rc" + cfg="$HOME/.config/openbox/rc.xml" + SLANT=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:slant' "$cfg") + if [ "$SLANT" = "Normal" ];then + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:slant' -v "Italic" "$cfg" + else + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:slant' -v "Normal" "$cfg" + fi +} case "$1" in theme) theme "$2";; @@ -258,6 +310,9 @@ case "$1" in inactivetextcolor) inactivetextcolor "$2";; buttons) buttons "$2";; activebuttonscolors) activebuttonscolors "$2";; + fontsize) fontsize "$2";; + fontweighttoggle) fontweighttoggle;; + fontslanttoggle) fontslanttoggle;; *) : ;; esac diff --git a/bin/w2theme b/bin/w2theme index 3992dd9..9d54d13 100755 --- a/bin/w2theme +++ b/bin/w2theme @@ -123,9 +123,9 @@ pyradio_theme() { esac } accent () { - obtctl clractivebg ${1} - colorTo=$(pastel darken 0.2 "${1}"|pastel format hex) - obtctl clractivebgto ${colorTo} + #obtctl clractivebg ${1} + #colorTo=$(pastel darken 0.2 "${1}"|pastel format hex) + #obtctl clractivebgto ${colorTo} # JGMENU based menus, sidepanels and tools #jgctl color_title_bg ${1} #TITLE_FG=$(pastel textcolor ${colorTo}|pastel format hex) @@ -235,7 +235,7 @@ colorize () { light) menu_theme light;; *) : ;; esac - # Openbox + # Openbox (TUTAJ WARUNEK) obtctl clractivebg ${w[3]} TITLE_FG=$(pastel textcolor ${w[3]}|pastel format hex) if [[ "$TITLE_FG" == *"ffffff"* ]];then @@ -284,7 +284,7 @@ reverse () { light) menu_theme dark;; *) : ;; esac - # Openbox + # Openbox (TUTAJ WARUNEK) obtctl clractivebg ${w[3]} obtctl clractivebgto ${w[4]} obtctl clrnormalbg ${w[0]} diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 05c99ba..c511e0f 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -19,12 +19,17 @@ div.fixeddown { bottom:0; right:0; } +.link {cursor:pointer;} +.w3-bar-block .w3-btn {width: 100px;text-align:center;} +.w3-bar-block .w3-btn:hover {background-color:white;color:gray;} +.w3-dropdown-content {min-width: 20px;}
-
+
+ @@ -33,7 +38,7 @@ div.fixeddown { - Launch Colorizer +  Colorizer
@@ -47,13 +52,13 @@ div.fixeddown {

a set of tools to easily customize your Mabox Linux Desktop

Easily change look and feel of:

    -
  • Openbox theme (windows decorations)
    • -
  • Menu, Sidepanels and other jgmenu-based Mabox tools
    • -
  • Conkies
    • +
  • Openbox theme (windows decorations)
    • +
  • Menu/Sidepanels and other jgmenu-based Mabox tools
    • +
  • Conkies
  • PyRadio - Internet Radio Player

-

NEW!!

Automatically generate themes for all above from Wallpaper colors

- Launch Colorizer +

Automatically generate themes for all above from Wallpaper colors New!

+  Colorizer
@@ -65,71 +70,164 @@ div.fixeddown {
- + diff --git a/share/mabox-colorizer/help/pl.html b/share/mabox-colorizer/help/pl.html index a348fa6..3979b1e 100644 --- a/share/mabox-colorizer/help/pl.html +++ b/share/mabox-colorizer/help/pl.html @@ -19,12 +19,14 @@ div.fixeddown { bottom:0; right:0; } +.link {cursor:pointer;}
-
+
+ @@ -47,12 +49,12 @@ div.fixeddown {

narzędzie do ustawiania Pulpitu Mabox Linux

Z łatwością zmienisz wygląd:

    -
  • motywu Openbox (dekoracje okien)
    • -
  • Menu, Paneli bocznych oraz innych bazujących na jgmenu narzędzi Mabox
    • -
  • Conky
    • +
  • motywu Openbox (dekoracje okien)
    • +
  • Menu oraz Paneli bocznych oraz innych bazujących na jgmenu narzędzi Mabox
    • +
  • Conky
  • PyRadio - Internetowy Radio Odtwarzacz

-

NOWE!!

Automatyczne generowanie kolorystyki na podstawie kolorów tapety

+

Nowe! Automatyczne generowanie kolorystyki na podstawie kolorów tapety

Uruchom Colorizer
@@ -65,7 +67,12 @@ div.fixeddown {
- +