push again

This commit is contained in:
Daniel Napora 2022-08-27 18:52:55 +02:00
parent 785adde172
commit 950da06b28
6 changed files with 153 additions and 85 deletions

View File

@ -53,6 +53,7 @@ case "$LANG" in
SETTINGS="Ustawienia" SETTINGS="Ustawienia"
COLORIZER_SETTINGS="Ustawienia Colorizera" COLORIZER_SETTINGS="Ustawienia Colorizera"
AUTOGEN_THEMES="Autogenerowanie motywów?" AUTOGEN_THEMES="Autogenerowanie motywów?"
GENERATETHEMES="Generować motywy po zmianie tapety?"
GENMENU="Pokolorować menu i panele?" GENMENU="Pokolorować menu i panele?"
GENCONKY="Pokolorować Conky?" GENCONKY="Pokolorować Conky?"
GENPYRADIO="Pokolorować PyRadio?" GENPYRADIO="Pokolorować PyRadio?"
@ -106,6 +107,7 @@ case "$LANG" in
SETTINGS="Settings" SETTINGS="Settings"
COLORIZER_SETTINGS="Colorizer Settings" COLORIZER_SETTINGS="Colorizer Settings"
AUTOGEN_THEMES="Autogenerate themes?" AUTOGEN_THEMES="Autogenerate themes?"
GENERATETHEMES="Generate themes on wallpaper change?"
GENMENU="Colorize Menus and Panels?" GENMENU="Colorize Menus and Panels?"
GENCONKY="Colorize Conky?" GENCONKY="Colorize Conky?"
GENPYRADIO="Colorize PyRadio?" GENPYRADIO="Colorize PyRadio?"
@ -171,7 +173,7 @@ mint+=("#6cabcd" "#5b73c4" "#aa876a" "#9d9d9d" "#db9d61" "#c76199" "#8c6ec9" "#c
out+=("^sep(Mabox Colorizer)") out+=("^sep(Mabox Colorizer)")
out+=("$REGENERATE,^checkout(regen)") out+=("$REGENERATE,^checkout(regen)")
out2+=("^tag(regen)") out2+=("^tag(regen)")
out2+=("^sep($REGENERATEALL)") out2+=("^sep($REGENERATEALL)")
out2+=(" $ASCONFIGURED,w2theme colorize;colorizer -s") out2+=(" $ASCONFIGURED,w2theme colorize;colorizer -s")
@ -206,15 +208,15 @@ out2+=("^sep(Plasma)")
for i in ${plasma[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,w2theme accent '${i}';colorizer -s");done for i in ${plasma[@]};do out2+=("<tt><small>$i</small> <span bgcolor='$i'> </span></tt>,w2theme accent '${i}';colorizer -s");done
out+=("^sep()") out+=("^sep()")
out+=("$EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") out+=("$EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr")
if [[ "$wall2themes" == "yes" ]];then if [[ "$wall2themes" == "yes" ]];then
out+=("^sep($RANDWALL)") out+=("^sep($RANDWALL)")
syswallp=$(shopt -s nullglob ; set -- /usr/share/backgrounds/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) syswallp=$(shopt -s nullglob ; set -- /usr/share/backgrounds/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#)
out+=("$SYSWALLPAPER (<small>${syswallp}</small>),nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") out+=("$SYSWALLPAPER (<small>${syswallp}</small>),nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s")
if [[ -d "${user_wallpapers_dir}" ]]; then if [[ -d "${user_wallpapers_dir}" ]]; then
userwallp=$(shopt -s nullglob ; set -- $user_wallpapers_dir/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#) userwallp=$(shopt -s nullglob ; set -- $user_wallpapers_dir/*.{jpg,JPG,jpeg,JPEG,png,PNG} ; echo $#)
out+=("$USERWALLPAPER (<small>${userwallp}</small>),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") out+=("$USERWALLPAPER (<small>${userwallp}</small>),nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s")
fi fi
fi fi
@ -226,7 +228,7 @@ fi
#out+=("Pin current colors to wallpaper") #out+=("Pin current colors to wallpaper")
### ###
out+=("^sep($SETTINGS_AND_HELP)") out+=("^sep($SETTINGS_AND_HELP)")
out+=("$SETTINGS,^checkout(settings)") out+=("$SETTINGS,^checkout(settings)")
out2+=("^tag(settings)") out2+=("^tag(settings)")
out2+=("^sep($COLORIZER_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") out3+=("$COMPACT,mb-setvar colorizer_size=compact $CNF_FILE;colorizer -s")
out2+=("^sep($AUTOGEN_THEMES)") out2+=("^sep($AUTOGEN_THEMES)")
out2+=("$AUTOGEN_THEMES [ <b>${wall2themes}</b> ],^checkout(autogen)") out2+=("$AUTOGEN_THEMES [ <b>${wall2themes}</b> ],^checkout(autogen)")
out3+=("^tag(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+=("$YES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s")
out3+=("$NO,mb-setvar wall2themes=no $CNF_FILE;colorizer -s") out3+=("$NO,mb-setvar wall2themes=no $CNF_FILE;colorizer -s")
out2+=("^sep()") out2+=("^sep()")
@ -277,23 +279,23 @@ out2+=("$WALLPAPERS,^checkout(wallpapersettings)")
out3+=("^tag(wallpapersettings)") out3+=("^tag(wallpapersettings)")
out3+=("^sep($SYSWALLPAPER ($syswallp))") out3+=("^sep($SYSWALLPAPER ($syswallp))")
out3+=("^sep(<i>/usr/share/backgrounds</i>)") out3+=("^sep(<i>/usr/share/backgrounds</i>)")
out3+=("$OPENDIR,xdg-open /usr/share/backgrounds") out3+=("$OPENDIR,xdg-open /usr/share/backgrounds")
out3+=("$OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds") out3+=("$OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds")
out3+=("$SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") out3+=("$SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s")
out3+=("^sep($USERWALLPAPER)") out3+=("^sep($USERWALLPAPER)")
if [[ -d "${user_wallpapers_dir}" ]]; then if [[ -d "${user_wallpapers_dir}" ]]; then
# dir exist # dir exist
out3+=("^sep(<i>${user_wallpapers_dir}</i>)") out3+=("^sep(<i>${user_wallpapers_dir}</i>)")
out3+=("$OPENDIR ,xdg-open ${user_wallpapers_dir}") out3+=("$OPENDIR ,xdg-open ${user_wallpapers_dir}")
out3+=("$OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}") out3+=("$OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}")
out3+=("$SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") out3+=("$SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s")
out3+=("^sep()") out3+=("^sep()")
out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE") out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE")
else else
# dir nit exist # dir nit exist
out3+=("^sep(<i>${user_wallpapers_dir} - $USERDIR_NOT_EXIST</i>") out3+=("^sep(<i>${user_wallpapers_dir} - $USERDIR_NOT_EXIST</i>")
out3+=("$CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s") out3+=("$CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s")
out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE") out3+=("$CHANGE ($EDITCONF),xdg-open $CNF_FILE")
fi fi
out2+=("$SHOW_RELATED [ <b>${related_tools}</b> ],^checkout(related)") out2+=("$SHOW_RELATED [ <b>${related_tools}</b> ],^checkout(related)")
@ -302,17 +304,17 @@ out3+=("^sep($SHOW_RELATED)")
out3+=("$SHOW,mb-setvar related_tools=show $CNF_FILE;colorizer -s") out3+=("$SHOW,mb-setvar related_tools=show $CNF_FILE;colorizer -s")
out3+=("$HIDE,mb-setvar related_tools=hide $CNF_FILE;colorizer -s") out3+=("$HIDE,mb-setvar related_tools=hide $CNF_FILE;colorizer -s")
out3+=("^sep()") out3+=("^sep()")
out3+=("$EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE") out3+=("$EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE")
out3+=("$RESET_RELATED,rm $CUSTOM_COMMANDS_FILE;colorizer -s") out3+=("$RESET_RELATED,rm $CUSTOM_COMMANDS_FILE;colorizer -s")
out2+=("^sep()") out2+=("^sep()")
out2+=("$EDITCONF,xdg-open $CNF_FILE") out2+=("$EDITCONF,xdg-open $CNF_FILE")
out2+=("$RESET,rm $CNF_FILE;colorizer -s") out2+=("$RESET,rm $CNF_FILE;colorizer -s")
LNG=${LANG:0:2} LNG=${LANG:0:2}
if [[ -f "/usr/share/mabox-colorizer/help/$LNG.html" ]];then 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 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 fi

View File

@ -212,7 +212,7 @@ if pgrep -af "conky.*mbcolor" >/dev/null; then
fi fi
fi fi
out+=("^sep($RESET)") out+=("^sep($RESET)")
out+=("$RESETALL,^checkout(resetall)") out+=("$RESETALL,^checkout(resetall)")
out2+=("^tag(resetall)") out2+=("^tag(resetall)")
out2+=("^sep($AREYOUSURE)") out2+=("^sep($AREYOUSURE)")
out2+=("$YES,rm $BASECONKY;$me") out2+=("$YES,rm $BASECONKY;$me")

View File

@ -18,14 +18,90 @@ if [ ! -f "${THEMERC}.bak" ]; then
fi fi
case "$LANG" in case "$LANG" in
pl*) pl*)
MENU_THEME="Motyw menu"
GENERATEFROMWP="<i>Generuj z kolorów tapety...</i>" GENERATEFROMWP="<i>Generuj z kolorów tapety...</i>"
LIGHTBG="Jasne tło" LIGHTBG="Jasne tło"
DARKBG="Ciemne 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="<i>Generate from wallpaper colors...</i>" GENERATEFROMWP="<i>Generate from wallpaper colors...</i>"
LIGHTBG="Light Background" LIGHTBG="Light Background"
DARKBG="Dark 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 esac
@ -54,54 +130,54 @@ getvalues () {
getvalues getvalues
out+=("^sep(Menu theme: <i>${jgmenu_theme}</i>)") out+=("^sep($MENU_THEME: <i>${jgmenu_theme}</i>)")
out+=("^sep($GENERATEFROMWP)") out+=("^sep($GENERATEFROMWP)")
out+=("$LIGHTBG,w2theme menu light;$me") out+=("$LIGHTBG,w2theme menu light;$me")
out+=("$DARKBG,w2theme menu dark;$me") out+=("$DARKBG,w2theme menu dark;$me")
out+=("^sep(menu)") out+=("^sep(menu)")
out+=("<tt><small>$(printf '%3s' "$MBGA")</small> <span bgcolor='$MBG' bgalpha='${MBGA/#[0]/1}%'> </span><span bgcolor='$MBG'> </span></tt> COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg COLOR_MENU_BG '$me')") out+=("<tt><small>$(printf '%3s' "$MBGA")</small> <span bgcolor='$MBG' bgalpha='${MBGA/#[0]/1}%'> </span><span bgcolor='$MBG'> </span></tt> $COLOR_MENU_BG,^pipe(mbclr '$MBG' jgctl color_menu_bg '${COLOR_MENU_BG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$MBGTA")</small> <span bgcolor='$MBGT' bgalpha='${MBGTA/#[0]/1}%'> </span><span bgcolor='$MBGT'> </span></tt> COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to COLOR_MENU_BG_TO '$me')") out+=("<tt><small>$(printf '%3s' "$MBGTA")</small> <span bgcolor='$MBGT' bgalpha='${MBGTA/#[0]/1}%'> </span><span bgcolor='$MBGT'> </span></tt> $COLOR_MENU_BG_TO,^pipe(mbclr '$MBGT' jgctl color_menu_bg_to '${COLOR_MENU_BG_TO}' '$me')")
out+=("<tt><small>$(printf '%3s' "$MBORDERA")</small> <span bgcolor='$MBORDER' bgalpha='${MBORDERA/#[0]/1}%'> </span><span bgcolor='$MBORDER'> </span></tt> COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border COLOR_MENU_BORDER '$me')") out+=("<tt><small>$(printf '%3s' "$MBORDERA")</small> <span bgcolor='$MBORDER' bgalpha='${MBORDERA/#[0]/1}%'> </span><span bgcolor='$MBORDER'> </span></tt> $COLOR_MENU_BORDER,^pipe(mbclr '$MBORDER' jgctl color_menu_border '${COLOR_MENU_BORDER}' '$me')")
out+=("^sep()") out+=("^sep()")
out+=("GRADIENT_POS [ <b>$GRADIENT</b> ],^checkout(gradientpos)") out+=("$GRADIENT_POS [ <b>$GRADIENT</b> ],^checkout(gradientpos)")
out+=("^sep(item)") out+=("^sep($ITEM)")
out+=("<tt><small>$(printf '%3s' "$NFGA")</small> <span weight='bold' fgcolor='$NFG' fgalpha='${NFGA/#[0]/1}%'> AbCd </span></tt> COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg COLOR_NORM_FG '$me')") out+=("<tt><small>$(printf '%3s' "$NFGA")</small> <span weight='bold' fgcolor='$NFG' fgalpha='${NFGA/#[0]/1}%'> AbCd </span></tt> $COLOR_NORM_FG,^pipe(mbclr '$NFG' jgctl color_norm_fg '${COLOR_NORM_FG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$SBGA")</small> <span bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%'> </span><span bgcolor='$SBG'> </span></tt> COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg COLOR_SEL_BG '$me')") out+=("<tt><small>$(printf '%3s' "$SBGA")</small> <span bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%'> </span><span bgcolor='$SBG'> </span></tt> $COLOR_SEL_BG,^pipe(mbclr '$SBG' jgctl color_sel_bg '${COLOR_SEL_BG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$SFGA")</small> <span weight='bold' bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%' fgcolor='$SFG' fgalpha='${SFGA/#[0]/1}%'> AbCd </span></tt> COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg COLOR_SEL_FG '$me')") out+=("<tt><small>$(printf '%3s' "$SFGA")</small> <span weight='bold' bgcolor='$SBG' bgalpha='${SBGA/#[0]/1}%' fgcolor='$SFG' fgalpha='${SFGA/#[0]/1}%'> AbCd </span></tt> $COLOR_SEL_FG,^pipe(mbclr '$SFG' jgctl color_sel_fg '${COLOR_SEL_FG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$SBORDERA")</small> <span bgcolor='$SBORDER' bgalpha='${SBORDERA/#[0]/1}%'> </span><span bgcolor='$SBORDER'> </span></tt> COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border COLOR_SEL_BORDER '$me')") out+=("<tt><small>$(printf '%3s' "$SBORDERA")</small> <span bgcolor='$SBORDER' bgalpha='${SBORDERA/#[0]/1}%'> </span><span bgcolor='$SBORDER'> </span></tt> $COLOR_SEL_BORDER,^pipe(mbclr '$SBORDER' jgctl color_sel_border '${COLOR_SEL_BORDER}' '$me')")
out+=("ITEM_BORDER [ <b>$IBORDER</b> ],^checkout(itemborder)") out+=("$ITEM_BORDER [ <b>$IBORDER</b> ],^checkout(itemborder)")
out+=("ITEM_RADIUS [ <b>$IRADIUS</b> ],^checkout(itemradius)") out+=("$ITEM_RADIUS [ <b>$IRADIUS</b> ],^checkout(itemradius)")
out+=("^sep()") out+=("^sep()")
[[ ! -z "$NORMBG" ]] && out+=("<tt><small>$(printf '%3s' "$NORMBGA")</small> <span bgcolor='${NORMBG}' bgalpha='${NORMBGA/#[0]/1}%'> </span><span bgcolor='${NORMBG}'> </span></tt> COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg COLOR_NORM_BG '$me')") [[ ! -z "$NORMBG" ]] && out+=("<tt><small>$(printf '%3s' "$NORMBGA")</small> <span bgcolor='${NORMBG}' bgalpha='${NORMBGA/#[0]/1}%'> </span><span bgcolor='${NORMBG}'> </span></tt> $COLOR_NORM_BG,^pipe(mbclr '$NORMBG' jgctl color_norm_bg '${COLOR_NORM_BG}' '$me')")
out+=("^sep(separator/title)") out+=("^sep($SEPARATOR_TITLE)")
out+=("<tt><small>$(printf '%3s' "$TBGA")</small> <span bgcolor='$TBG' bgalpha='${TBGA}%'> </span><span bgcolor='$TBG'> </span></tt> COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg COLOR_TITLE_BG '$me')") out+=("<tt><small>$(printf '%3s' "$TBGA")</small> <span bgcolor='$TBG' bgalpha='${TBGA}%'> </span><span bgcolor='$TBG'> </span></tt> $COLOR_TITLE_BG,^pipe(mbclr '$TBG' jgctl color_title_bg '${COLOR_TITLE_BG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$TFGA")</small> <span weight='bold' bgcolor='$TBG' bgalpha='${TBGA/#[0]/1}%' fgcolor='$TFG' fgalpha='${TFGA}%'> AbCd </span></tt> COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg COLOR_TITLE_FG '$me')") out+=("<tt><small>$(printf '%3s' "$TFGA")</small> <span weight='bold' bgcolor='$TBG' bgalpha='${TBGA/#[0]/1}%' fgcolor='$TFG' fgalpha='${TFGA}%'> AbCd </span></tt> $COLOR_TITLE_FG,^pipe(mbclr '$TFG' jgctl color_title_fg '${COLOR_TITLE_FG}' '$me')")
out+=("<tt><small>$(printf '%3s' "$TBORDERA")</small> <span bgcolor='$TBORDER' bgalpha='${TBORDERA/#[0]/1}%'> </span><span bgcolor='$TBORDER'> </span></tt> COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border COLOR_TITLE_BORDER '$me')") out+=("<tt><small>$(printf '%3s' "$TBORDERA")</small> <span bgcolor='$TBORDER' bgalpha='${TBORDERA/#[0]/1}%'> </span><span bgcolor='$TBORDER'> </span></tt> $COLOR_TITLE_BORDER,^pipe(mbclr '$TBORDER' jgctl color_title_border '${COLOR_TITLE_BORDER}' '$me')")
out+=("^sep()") out+=("^sep()")
out+=("SEP_HALIGN [ <b>$SEPHALIGN</b> ],^checkout(sephalign)") out+=("$SEP_HALIGN [ <b>$SEPHALIGN</b> ],^checkout(sephalign)")
out+=("^sep()") out+=("^sep()")
out+=("<tt><small>$(printf '%3s' "$SEPFGA")</small> <span fgcolor='$SEPFG' fgalpha='${SEPFGA/#[0]/1}%'>------</span></tt> COLOR_SEP_FG,^pipe(mbclr '$SEPFG' jgctl color_sep_fg COLOR_SEP_FG '$me')") out+=("<tt><small>$(printf '%3s' "$SEPFGA")</small> <span fgcolor='$SEPFG' fgalpha='${SEPFGA/#[0]/1}%'>------</span></tt> ${COLOR_SEP_FG},^pipe(mbclr '$SEPFG' jgctl color_sep_fg '${COLOR_SEP_FG}' '$me')")
out2+=("^tag(gradientpos)") out2+=("^tag(gradientpos)")
out2+=("^sep(GRADIENT_POS <small>$GRADIENT</small>)") out2+=("^sep($GRADIENT_POS <small>$GRADIENT</small>)")
out2+=("none,jgctl menu_gradient_pos none;$me") out2+=("$NONE,jgctl menu_gradient_pos none;$me")
out2+=("^sep()") out2+=("^sep()")
out2+=("top,jgctl menu_gradient_pos top;$me") out2+=(" $TOP,jgctl menu_gradient_pos top;$me")
out2+=("right,jgctl menu_gradient_pos right;$me") out2+=(" $RIGHT,jgctl menu_gradient_pos right;$me")
out2+=("bottom,jgctl menu_gradient_pos bottom;$me") out2+=(" $BOTTOM,jgctl menu_gradient_pos bottom;$me")
out2+=("left,jgctl menu_gradient_pos left;$me") out2+=(" $LEFT,jgctl menu_gradient_pos left;$me")
out2+=("top_left,jgctl menu_gradient_pos top_left;$me") out2+=(" $TOP_LEFT,jgctl menu_gradient_pos top_left;$me")
out2+=("top_right,jgctl menu_gradient_pos top_right;$me") out2+=(" $TOP_RIGHT,jgctl menu_gradient_pos top_right;$me")
out2+=("bottom_left,jgctl menu_gradient_pos bottom_left;$me") out2+=(" $BOTTOM_LEFT,jgctl menu_gradient_pos bottom_left;$me")
out2+=("bottom_right,jgctl menu_gradient_pos bottom_right;$me") out2+=(" $BOTTOM_RIGHT,jgctl menu_gradient_pos bottom_right;$me")
out2+=("^tag(sephalign)") out2+=("^tag(sephalign)")
out2+=("^sep(SEP_HALIGN)") out2+=("^sep($SEP_HALIGN)")
out2+=("left,jgctl sep_halign left;$me") out2+=(" $H_LEFT,jgctl sep_halign left;$me")
out2+=("center,jgctl sep_halign center;$me") out2+=(" $H_CENTER,jgctl sep_halign center;$me")
out2+=("right,jgctl sep_halign right;$me") out2+=(" $H_RIGHT,jgctl sep_halign right;$me")
out2+=("^tag(itemborder)") out2+=("^tag(itemborder)")
out2+=("^sep(ITEM_BORDER)") out2+=("^sep(ITEM_BORDER)")
out2+=("0,jgctl item_border 0;$me") out2+=("0,jgctl item_border 0;$me")
@ -121,31 +197,16 @@ out2+=("6,jgctl item_radius 6;$me")
out+=("^sep(MORE MENU SETTINGS)") out+=("^sep($MORE_MENU_SETTINGS)")
out+=("Global Menu Settings,jgmenusettings-pipe -c") out+=(" $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c")
out+=("Global Menu Settings,^pipe(jgmenusettings-pipe -r)") #out+=("$GLOBAL_MENU_SETTINGS,^pipe(jgmenusettings-pipe -r)")
### COPIED FROM jgmenusettings-pipe for now
#out+=("FONT_ITEM [ <b>${menu_font_family:-0} ${menu_font_size:-0}</b> ],mb-setfont menu_item;$me")
#out+=("FONT_TITLE [ <b>${menu_sep_font_family:-0} ${menu_sep_font_size:-0}</b> ],mb-setfont menu_sep;$me")
#out+=("BORDER [ <b>${jgtools_border:-0}</b> ],^checkout(mborder)")
#out+=("PADDING [ <b>${jgtools_padding:-0}</b> ],^checkout(mpadding)")
#out+=("RADIUS [ <b>${jgtools_radius:-0}</b> ],^checkout(mradius)")
#out+=("SUBSPACING [ <b>${submenu_spacing:-0}</b> ],^checkout(subspacing)")
#out2+=("^tag(mborder)")
#for i in 0 1 2 3 4 5 6 8 10 12; do out2+=("$(printf "<tt>%3s</tt>,%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 "<tt>%3s</tt>,%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 "<tt>%3s</tt>,%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 "<tt>%4s</tt>,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done
out+=("^sep()") out+=("^sep()")
if [ -f "${THEMERC}.bak" ]; then if [ -f "${THEMERC}.bak" ]; then
out+=("Reset <i>${jgmenu_theme}</i> to default,jgctl reset;$me") out+=(" $RESET <i>${jgmenu_theme}</i> $TO_DEFAULT,jgctl reset;$me")
fi fi
out+=("Edit <i>${jgmenu_theme}</i> file,xdg-open $THEMERC") out+=(" $EDIT <i>${jgmenu_theme}</i> $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+=(" $SET_RANDOM,mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1));$me")
### RUN ### RUN
if [[ "$1" == "-s" ]]; then if [[ "$1" == "-s" ]]; then
@ -190,8 +251,6 @@ JGWIDTH=$((jgtools_padding + 278 + jgtools_padding))
convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB} convert ${WALLPATH} -resize 270x150^ -gravity center -extent 270x150 ${THUMB}
fi fi
mkconfigfile mkconfigfile
cat <<EOF > ${MENU_ITEMS} cat <<EOF > ${MENU_ITEMS}

View File

@ -22,6 +22,9 @@ case "$LANG" in
TITLEBAR_TEXT="Tekst paska tytułowego" TITLEBAR_TEXT="Tekst paska tytułowego"
FONT="Czcionka" FONT="Czcionka"
TEXTALIGN="Wyrównanie tekstu" TEXTALIGN="Wyrównanie tekstu"
LEFT="do lewej"
CENTER="po środku"
RIGHT="do prawej"
SHADOW="Cień" SHADOW="Cień"
NOSHADOW="bez cienia" NOSHADOW="bez cienia"
DARK="Ciemny" DARK="Ciemny"
@ -67,6 +70,10 @@ case "$LANG" in
TITLEBAR_TEXT="Title Bar Text" TITLEBAR_TEXT="Title Bar Text"
FONT="Font" FONT="Font"
TEXTALIGN="Text align" TEXTALIGN="Text align"
LEFT="left"
CENTER="center"
RIGHT="right"
SHADOW="Shadow" SHADOW="Shadow"
NOSHADOW="no shadow" NOSHADOW="no shadow"
DARK="Dark" DARK="Dark"
@ -187,7 +194,7 @@ out+=("$ACTIVEHANDLE? [ <b>$AHANDLE</b> ],^checkout(handle)")
if [ -f "${THEMERC}.bak" ]; then if [ -f "${THEMERC}.bak" ]; then
out+=("^sep($RESET)") out+=("^sep($RESET)")
out+=("$RESET_THEME,^checkout(resettheme)") out+=("$RESET_THEME,^checkout(resettheme)")
out2+=("^tag(resettheme)") out2+=("^tag(resettheme)")
out2+=("^sep($AREYOUSURE)") out2+=("^sep($AREYOUSURE)")
out2+=("$YES,obctl reset;$me") out2+=("$YES,obctl reset;$me")
@ -220,9 +227,9 @@ out2+=("<tt><span bgcolor='$NFG'> </span></tt> $INACTIVE_FG,^pipe(mbclr '$N
#TEXTALIGN #TEXTALIGN
out2+=("^tag(talign)") out2+=("^tag(talign)")
out2+=("^sep($TEXTALIGN)") out2+=("^sep($TEXTALIGN)")
out2+=("center,obtctl textjustify center;$me") out2+=(" $LEFT,obtctl textjustify left;$me")
out2+=("left,obtctl textjustify left;$me") out2+=(" $CENTER,obtctl textjustify center;$me")
out2+=("right,obtctl textjustify right;$me") out2+=(" $RIGHT,obtctl textjustify right;$me")
out2+=("^tag(shadow)") out2+=("^tag(shadow)")
out2+=("^sep($SHADOW)") out2+=("^sep($SHADOW)")
out2+=("$NOSHADOW,obtctl shadow 0;$me") out2+=("$NOSHADOW,obtctl shadow 0;$me")

View File

@ -107,7 +107,7 @@ read MB1 MB2 MBFG<<< "$(grep '^Messages Border ' ${THEMERC})"
out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$PURLFG'> AbCd </span></tt> PyRadio URL,^pipe(mbclr '$PURLFG' prtctl pyradio_url 'PyRadio URL' '$me')") out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$PURLFG'> AbCd </span></tt> PyRadio URL,^pipe(mbclr '$PURLFG' prtctl pyradio_url 'PyRadio URL' '$me')")
out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$MBFG'> AbCd </span></tt> Messages Border,^pipe(mbclr '$MBFG' prtctl messages_border 'Messages Border' '$me')") out+=("<tt><span weight='bold' bgcolor='$SBG' fgcolor='$MBFG'> AbCd </span></tt> Messages Border,^pipe(mbclr '$MBFG' prtctl messages_border 'Messages Border' '$me')")
out+=("^sep()") out+=("^sep()")
out+=("$RESETTHEME,prtctl resettheme;$me") out+=("$RESETTHEME,prtctl resettheme;$me")
out+=("^sep()") out+=("^sep()")
out+=("$EXPORTTHEME,prtctl exp;$me") out+=("$EXPORTTHEME,prtctl exp;$me")

View File

@ -334,7 +334,7 @@ single () {
out+=("^sep(Conky: [ ${title^} ])") out+=("^sep(Conky: [ ${title^} ])")
out+=("^sep($POSITION)") out+=("^sep($POSITION)")
out+=("$MARKNEWPOS,conkyctl setpos ${1};$me") out+=("$MARKNEWPOS,conkyctl setpos ${1};$me")
out+=("^sep()") out+=("^sep()")
out+=("$ALIGNMENT [ <b>$POS</b> ],^checkout(pos)") out+=("$ALIGNMENT [ <b>$POS</b> ],^checkout(pos)")
out2+=("^tag(pos)") out2+=("^tag(pos)")