diff --git a/bin/colorizer b/bin/colorizer index 4f09462..c827d1f 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -53,6 +53,7 @@ case "$LANG" in SETTINGS="Ustawienia" COLORIZER_SETTINGS="Ustawienia Colorizera" AUTOGEN_THEMES="Autogenerowanie motywów?" + GENERATETHEMES="Generować motywy po zmianie tapety?" GENMENU="Pokolorować menu i panele?" GENCONKY="Pokolorować Conky?" GENPYRADIO="Pokolorować PyRadio?" @@ -106,6 +107,7 @@ case "$LANG" in SETTINGS="Settings" COLORIZER_SETTINGS="Colorizer Settings" AUTOGEN_THEMES="Autogenerate themes?" + GENERATETHEMES="Generate themes on wallpaper change?" GENMENU="Colorize Menus and Panels?" GENCONKY="Colorize Conky?" GENPYRADIO="Colorize PyRadio?" @@ -171,7 +173,7 @@ mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c out+=("^sep(Mabox Colorizer)") -out+=("$REGENERATE,^checkout(regen)") +out+=(" $REGENERATE,^checkout(regen)") out2+=("^tag(regen)") out2+=("^sep($REGENERATEALL)") out2+=(" $ASCONFIGURED,w2theme colorize;colorizer -s") @@ -206,15 +208,15 @@ out2+=("^sep(Plasma)") for i in ${plasma[@]};do out2+=("$i ,w2theme accent '${i}';colorizer -s");done out+=("^sep()") -out+=("$EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") +out+=(" $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") 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") +out+=(" $SYSWALLPAPER (${syswallp}),nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") if [[ -d "${user_wallpapers_dir}" ]]; then userwallp=$(shopt -s nullglob ; set -- $user_wallpapers_dir/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) -out+=("$USERWALLPAPER (${userwallp}),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") +out+=(" $USERWALLPAPER (${userwallp}),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") fi fi @@ -226,7 +228,7 @@ fi #out+=("Pin current colors to wallpaper") ### out+=("^sep($SETTINGS_AND_HELP)") -out+=("$SETTINGS,^checkout(settings)") +out+=(" $SETTINGS,^checkout(settings)") out2+=("^tag(settings)") out2+=("^sep($COLORIZER_SETTINGS)") @@ -242,9 +244,9 @@ out3+=("$FULL,mb-setvar colorizer_size=full $CNF_FILE;colorizer -s") out3+=("$COMPACT,mb-setvar colorizer_size=compact $CNF_FILE;colorizer -s") out2+=("^sep($AUTOGEN_THEMES)") -out2+=("$AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") +out2+=(" $AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") out3+=("^tag(autogen") -out3+=("^sep(GENERATE THEMES ON WALLPAPER CHANGE?)") +out3+=("^sep($GENERATETHEMES)") out3+=("$YES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s") out3+=("$NO,mb-setvar wall2themes=no $CNF_FILE;colorizer -s") out2+=("^sep()") @@ -277,23 +279,23 @@ out2+=("$WALLPAPERS,^checkout(wallpapersettings)") out3+=("^tag(wallpapersettings)") out3+=("^sep($SYSWALLPAPER ($syswallp))") out3+=("^sep(/usr/share/backgrounds)") -out3+=("$OPENDIR,xdg-open /usr/share/backgrounds") -out3+=("$OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds") -out3+=("$SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") +out3+=(" $OPENDIR,xdg-open /usr/share/backgrounds") +out3+=(" $OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds") +out3+=(" $SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") out3+=("^sep($USERWALLPAPER)") if [[ -d "${user_wallpapers_dir}" ]]; then # dir exist out3+=("^sep(${user_wallpapers_dir})") -out3+=("$OPENDIR ,xdg-open ${user_wallpapers_dir}") -out3+=("$OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}") -out3+=("$SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") +out3+=(" $OPENDIR ,xdg-open ${user_wallpapers_dir}") +out3+=(" $OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}") +out3+=(" $SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") out3+=("^sep()") -out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE") +out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") else # dir nit exist out3+=("^sep(${user_wallpapers_dir} - $USERDIR_NOT_EXIST") -out3+=("$CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s") -out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE") +out3+=(" $CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s") +out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") fi out2+=("$SHOW_RELATED [ ${related_tools} ],^checkout(related)") @@ -302,17 +304,17 @@ out3+=("^sep($SHOW_RELATED)") out3+=("$SHOW,mb-setvar related_tools=show $CNF_FILE;colorizer -s") out3+=("$HIDE,mb-setvar related_tools=hide $CNF_FILE;colorizer -s") out3+=("^sep()") -out3+=("$EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE") -out3+=("$RESET_RELATED,rm $CUSTOM_COMMANDS_FILE;colorizer -s") +out3+=(" $EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE") +out3+=(" $RESET_RELATED,rm $CUSTOM_COMMANDS_FILE;colorizer -s") out2+=("^sep()") -out2+=("$EDITCONF,xdg-open $CNF_FILE") -out2+=("$RESET,rm $CNF_FILE;colorizer -s") +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'") +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'") +out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Help - Colorizer'") fi diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 368d00a..e9955ea 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -212,7 +212,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then fi fi out+=("^sep($RESET)") - out+=("$RESETALL,^checkout(resetall)") + out+=(" $RESETALL,^checkout(resetall)") out2+=("^tag(resetall)") out2+=("^sep($AREYOUSURE)") out2+=("$YES,rm $BASECONKY;$me") diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 8b42d82..9149e43 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -18,14 +18,90 @@ if [ ! -f "${THEMERC}.bak" ]; then fi case "$LANG" in pl*) + MENU_THEME="Motyw menu" GENERATEFROMWP="Generuj z kolorów tapety..." LIGHTBG="Jasne tło" DARKBG="Ciemne tło" + COLOR_MENU_BG="Tło menu" + COLOR_MENU_BG_TO="Tło menu 2 (gradient)" + COLOR_MENU_BORDER="Obramowanie menu" + GRADIENT_POS="Kierunek gradientu" + NONE="brak gradientu (none)" + TOP="od góry (top)" + RIGHT="od prawej (right)" + BOTTOM="z dołu (bottom)" + LEFT="od lewej (left)" + TOP_LEFT="od góry z lewej (top_left)" + TOP_RIGHT="od góry z prawej (top_right)" + BOTTOM_LEFT="z dołu od lewej (bottom_left)" + BOTTOM_RIGHT="z dołu od prawej (bottom_right)" + ITEM="pozycja menu (element)" + COLOR_NORM_FG="Kolor tekstu" + COLOR_SEL_BG="Tło zaznaczonej poz." + COLOR_SEL_FG="Tekst zaznaczonej poz." + COLOR_SEL_BORDER="Obramowanie zazn. poz." + ITEM_BORDER="Obramowanie (px)" + ITEM_RADIUS="Zaokrąglenie (px)" + COLOR_NORM_BG="Tło" + SEPARATOR_TITLE="separator/nagłówek" + COLOR_TITLE_BG="Tło nagłówka" + COLOR_TITLE_FG="Kolor tekstu nagłówka" + COLOR_TITLE_BORDER="Kolor obramowania" + SEP_HALIGN="Wyrównanie nagłówka" + H_LEFT="do lewej" + H_CENTER="po środku" + H_RIGHT="do prawej" + COLOR_SEP_FG="Kolor separatora (linii)" + MORE_MENU_SETTINGS="więcej ustawień menu" + GLOBAL_MENU_SETTINGS="Globalne Ustawienia Menu" + RESET="Resetuj motyw" + TO_DEFAULT="" + EDIT="Edytuj plik " + FILE="" + SET_RANDOM="Ustaw losowy motyw menu" ;; *) + MENU_THEME="Menu theme" GENERATEFROMWP="Generate from wallpaper colors..." LIGHTBG="Light Background" DARKBG="Dark Background" + COLOR_MENU_BG="Background" + COLOR_MENU_BG_TO="Background to (gradient)" + COLOR_MENU_BORDER="Menu Border" + GRADIENT_POS="Gradient direction" + NONE="none" + TOP="top" + RIGHT="right" + BOTTOM="bottom" + LEFT="left" + TOP_LEFT="top_left" + TOP_RIGHT="top_right" + BOTTOM_LEFT="bottom_left" + BOTTOM_RIGHT="bottom_right" + ITEM="item" + COLOR_NORM_FG="Text Color" + COLOR_SEL_BG="Selected Item Background" + COLOR_SEL_FG="Selected Item Text" + COLOR_SEL_BORDER="Selected Item Border" + ITEM_BORDER="Item Border (px)" + ITEM_RADIUS="Item Radius (px)" + COLOR_NORM_BG="Item Background" + SEPARATOR_TITLE="separator/title" + COLOR_TITLE_BG="Title Background" + COLOR_TITLE_FG="Title Foreground" + COLOR_TITLE_BORDER="Title Border color " + SEP_HALIGN="Title alignment" + H_LEFT="left" + H_CENTER="center" + H_RIGHT="right" + COLOR_SEP_FG="Separator (line) color" + MORE_MENU_SETTINGS="more menu settings" + GLOBAL_MENU_SETTINGS="Global Menu Settings" + RESET="Reset" + TO_DEFAULT="to default" + EDIT="Edit" + FILE="file" + SET_RANDOM="Set random menu theme" ;; esac @@ -54,54 +130,54 @@ getvalues () { getvalues -out+=("^sep(Menu theme: ${jgmenu_theme})") +out+=("^sep($MENU_THEME: ${jgmenu_theme})") out+=("^sep($GENERATEFROMWP)") out+=("$LIGHTBG,w2theme menu light;$me") out+=("$DARKBG,w2theme menu dark;$me") out+=("^sep(menu)") -out+=("$(printf '%3s' "$MBGA") COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg COLOR_MENU_BG '$me')") -out+=("$(printf '%3s' "$MBGTA") COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to COLOR_MENU_BG_TO '$me')") -out+=("$(printf '%3s' "$MBORDERA") COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border COLOR_MENU_BORDER '$me')") +out+=("$(printf '%3s' "$MBGA") $COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg '${COLOR_MENU_BG}' '$me')") +out+=("$(printf '%3s' "$MBGTA") $COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to '${COLOR_MENU_BG_TO}' '$me')") +out+=("$(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+=("$GRADIENT_POS [ $GRADIENT ],^checkout(gradientpos)") -out+=("^sep(item)") -out+=("$(printf '%3s' "$NFGA") AbCd COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg COLOR_NORM_FG '$me')") -out+=("$(printf '%3s' "$SBGA") COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg COLOR_SEL_BG '$me')") -out+=("$(printf '%3s' "$SFGA") AbCd COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg COLOR_SEL_FG '$me')") -out+=("$(printf '%3s' "$SBORDERA") COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border COLOR_SEL_BORDER '$me')") -out+=("ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") -out+=("ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") +out+=("^sep($ITEM)") +out+=("$(printf '%3s' "$NFGA") AbCd $COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg '${COLOR_NORM_FG}' '$me')") +out+=("$(printf '%3s' "$SBGA") $COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg '${COLOR_SEL_BG}' '$me')") +out+=("$(printf '%3s' "$SFGA") AbCd $COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg '${COLOR_SEL_FG}' '$me')") +out+=("$(printf '%3s' "$SBORDERA") $COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border '${COLOR_SEL_BORDER}' '$me')") +out+=("$ITEM_BORDER [ $IBORDER ],^checkout(itemborder)") +out+=("$ITEM_RADIUS [ $IRADIUS ],^checkout(itemradius)") out+=("^sep()") -[[ ! -z "$NORMBG" ]] && out+=("$(printf '%3s' "$NORMBGA") COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg COLOR_NORM_BG '$me')") +[[ ! -z "$NORMBG" ]] && out+=("$(printf '%3s' "$NORMBGA") $COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg '${COLOR_NORM_BG}' '$me')") -out+=("^sep(separator/title)") -out+=("$(printf '%3s' "$TBGA") COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg COLOR_TITLE_BG '$me')") -out+=("$(printf '%3s' "$TFGA") AbCd COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg COLOR_TITLE_FG '$me')") -out+=("$(printf '%3s' "$TBORDERA") COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border COLOR_TITLE_BORDER '$me')") +out+=("^sep($SEPARATOR_TITLE)") +out+=("$(printf '%3s' "$TBGA") $COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg '${COLOR_TITLE_BG}' '$me')") +out+=("$(printf '%3s' "$TFGA") AbCd $COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg '${COLOR_TITLE_FG}' '$me')") +out+=("$(printf '%3s' "$TBORDERA") $COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border '${COLOR_TITLE_BORDER}' '$me')") out+=("^sep()") -out+=("SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") +out+=("$SEP_HALIGN [ $SEPHALIGN ],^checkout(sephalign)") out+=("^sep()") -out+=("$(printf '%3s' "$SEPFGA") ------ COLOR_SEP_FG,^pipe(mbclr '$SEPFG' jgctl color_sep_fg COLOR_SEP_FG '$me')") +out+=("$(printf '%3s' "$SEPFGA") ------ ${COLOR_SEP_FG},^pipe(mbclr '$SEPFG' jgctl color_sep_fg '${COLOR_SEP_FG}' '$me')") out2+=("^tag(gradientpos)") -out2+=("^sep(GRADIENT_POS $GRADIENT)") -out2+=("none,jgctl menu_gradient_pos none;$me") +out2+=("^sep($GRADIENT_POS $GRADIENT)") +out2+=("$NONE,jgctl menu_gradient_pos none;$me") out2+=("^sep()") -out2+=("top,jgctl menu_gradient_pos top;$me") -out2+=("right,jgctl menu_gradient_pos right;$me") -out2+=("bottom,jgctl menu_gradient_pos bottom;$me") -out2+=("left,jgctl menu_gradient_pos left;$me") -out2+=("top_left,jgctl menu_gradient_pos top_left;$me") -out2+=("top_right,jgctl menu_gradient_pos top_right;$me") -out2+=("bottom_left,jgctl menu_gradient_pos bottom_left;$me") -out2+=("bottom_right,jgctl menu_gradient_pos bottom_right;$me") +out2+=(" $TOP,jgctl menu_gradient_pos top;$me") +out2+=(" $RIGHT,jgctl menu_gradient_pos right;$me") +out2+=(" $BOTTOM,jgctl menu_gradient_pos bottom;$me") +out2+=(" $LEFT,jgctl menu_gradient_pos left;$me") +out2+=(" $TOP_LEFT,jgctl menu_gradient_pos top_left;$me") +out2+=(" $TOP_RIGHT,jgctl menu_gradient_pos top_right;$me") +out2+=(" $BOTTOM_LEFT,jgctl menu_gradient_pos bottom_left;$me") +out2+=(" $BOTTOM_RIGHT,jgctl menu_gradient_pos bottom_right;$me") out2+=("^tag(sephalign)") -out2+=("^sep(SEP_HALIGN)") -out2+=("left,jgctl sep_halign left;$me") -out2+=("center,jgctl sep_halign center;$me") -out2+=("right,jgctl sep_halign right;$me") +out2+=("^sep($SEP_HALIGN)") +out2+=(" $H_LEFT,jgctl sep_halign left;$me") +out2+=(" $H_CENTER,jgctl sep_halign center;$me") +out2+=(" $H_RIGHT,jgctl sep_halign right;$me") out2+=("^tag(itemborder)") out2+=("^sep(ITEM_BORDER)") out2+=("0,jgctl item_border 0;$me") @@ -121,31 +197,16 @@ out2+=("6,jgctl item_radius 6;$me") -out+=("^sep(MORE MENU SETTINGS)") -out+=("Global Menu Settings,jgmenusettings-pipe -c") -out+=("Global Menu Settings,^pipe(jgmenusettings-pipe -r)") -### COPIED FROM jgmenusettings-pipe for now -#out+=("FONT_ITEM [ ${menu_font_family:-0} ${menu_font_size:-0} ],mb-setfont menu_item;$me") -#out+=("FONT_TITLE [ ${menu_sep_font_family:-0} ${menu_sep_font_size:-0} ],mb-setfont menu_sep;$me") -#out+=("BORDER [ ${jgtools_border:-0} ],^checkout(mborder)") -#out+=("PADDING [ ${jgtools_padding:-0} ],^checkout(mpadding)") -#out+=("RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") -#out+=("SUBSPACING [ ${submenu_spacing:-0} ],^checkout(subspacing)") -#out2+=("^tag(mborder)") -#for i in 0 1 2 3 4 5 6 8 10 12; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar jgtools_border=${i};$me")");done -#out2+=("^tag(mpadding)") -#for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do out2+=("$(printf "%3s,%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 "%3s,%s" "$i" "mb-setvar jgtools_radius=${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 "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done +out+=("^sep($MORE_MENU_SETTINGS)") +out+=(" $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c") +#out+=("$GLOBAL_MENU_SETTINGS,^pipe(jgmenusettings-pipe -r)") out+=("^sep()") if [ -f "${THEMERC}.bak" ]; then - out+=("Reset ${jgmenu_theme} to default,jgctl reset;$me") + out+=(" $RESET ${jgmenu_theme} $TO_DEFAULT,jgctl reset;$me") fi -out+=("Edit ${jgmenu_theme} file,xdg-open $THEMERC") -out+=("Set random menu theme,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") +out+=(" $EDIT ${jgmenu_theme} $FILE,xdg-open $THEMERC") +out+=(" $SET_RANDOM,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me") ### RUN if [[ "$1" == "-s" ]]; then @@ -190,8 +251,6 @@ JGWIDTH=$((jgtools_padding + 278 + jgtools_padding)) convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB} fi - - mkconfigfile cat < ${MENU_ITEMS} diff --git a/bin/colorizer-ob b/bin/colorizer-ob index f125d61..dbd9961 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -22,6 +22,9 @@ case "$LANG" in TITLEBAR_TEXT="Tekst paska tytułowego" FONT="Czcionka" TEXTALIGN="Wyrównanie tekstu" + LEFT="do lewej" + CENTER="po środku" + RIGHT="do prawej" SHADOW="Cień" NOSHADOW="bez cienia" DARK="Ciemny" @@ -67,6 +70,10 @@ case "$LANG" in TITLEBAR_TEXT="Title Bar Text" FONT="Font" TEXTALIGN="Text align" + LEFT="left" + CENTER="center" + RIGHT="right" + SHADOW="Shadow" NOSHADOW="no shadow" DARK="Dark" @@ -187,7 +194,7 @@ out+=("$ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") if [ -f "${THEMERC}.bak" ]; then out+=("^sep($RESET)") -out+=("$RESET_THEME,^checkout(resettheme)") +out+=(" $RESET_THEME,^checkout(resettheme)") out2+=("^tag(resettheme)") out2+=("^sep($AREYOUSURE)") out2+=("$YES,obctl reset;$me") @@ -220,9 +227,9 @@ out2+=(" $INACTIVE_FG,^pipe(mbclr '$N #TEXTALIGN out2+=("^tag(talign)") out2+=("^sep($TEXTALIGN)") -out2+=("center,obtctl textjustify center;$me") -out2+=("left,obtctl textjustify left;$me") -out2+=("right,obtctl textjustify right;$me") +out2+=(" $LEFT,obtctl textjustify left;$me") +out2+=(" $CENTER,obtctl textjustify center;$me") +out2+=(" $RIGHT,obtctl textjustify right;$me") out2+=("^tag(shadow)") out2+=("^sep($SHADOW)") out2+=("$NOSHADOW,obtctl shadow 0;$me") diff --git a/bin/colorizer-pyradio b/bin/colorizer-pyradio index b4e5882..c5a28d5 100755 --- a/bin/colorizer-pyradio +++ b/bin/colorizer-pyradio @@ -107,7 +107,7 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})" out+=(" AbCd PyRadio URL,^pipe(mbclr '$PURLFG' prtctl pyradio_url 'PyRadio URL' '$me')") out+=(" AbCd Messages Border,^pipe(mbclr '$MBFG' prtctl messages_border 'Messages Border' '$me')") out+=("^sep()") - out+=("$RESETTHEME,prtctl resettheme;$me") + out+=(" $RESETTHEME,prtctl resettheme;$me") out+=("^sep()") out+=("$EXPORTTHEME,prtctl exp;$me") diff --git a/bin/conkyctl b/bin/conkyctl index 824092e..7c92a98 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -334,7 +334,7 @@ single () { out+=("^sep(Conky: [ ${title^} ])") out+=("^sep($POSITION)") - out+=("$MARKNEWPOS,conkyctl setpos ${1};$me") + out+=(" $MARKNEWPOS,conkyctl setpos ${1};$me") out+=("^sep()") out+=("$ALIGNMENT [ $POS ],^checkout(pos)") out2+=("^tag(pos)")