diff --git a/bin/colorizer b/bin/colorizer index c61d8ce..71c9776 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -109,6 +109,7 @@ case "$LANG" in GENMENU="Pokolorować menu i panele?" GENCONKY="Pokolorować Conky?" GENPYRADIO="Pokolorować PyRadio?" + GRADIENTS_ACT="Działanie gradientów w menu gł." EDITCONF="Edytuj plik konfiguracyjny" RESET="Resetuj ustawienia Colorizera" YES="Tak" @@ -148,7 +149,7 @@ case "$LANG" in RES_CONKY="Conky" RES_MENU="Menu i Paneli" RES_ALL="Wszystko (OB, menu, conky)" - COLORIZE="Pokoloruj..." + COLORIZE="Szybko Pokoloruj lub Resetuj..." ;; *) REGENERATE="(Re)Generate from wallpaper colors..." @@ -203,6 +204,7 @@ case "$LANG" in GENMENU="Colorize Menus and Panels?" GENCONKY="Colorize Conky?" GENPYRADIO="Colorize PyRadio?" + GRADIENTS_ACT="Gradients in Rootmenu actions" EDITCONF="Edit config file" RESET="Reset to defaults" YES="Yes" @@ -231,8 +233,8 @@ case "$LANG" in USERDIR_NOT_EXIST="directory does not exist" CREATE_USERDIR="Create directory" ROOTMENU_COLORS_ACTION="Rootmenu Colors Action" - ACCENT="accent - chenge accent color" - SELECT="select - select action" + ACCENT="accent - change accent color" + SELECT="select - select action from submenu" DIFF_CONKY_COLORS="Different colors for each Conky" HELP="Main Window and Help" RESET_COLORS="Reset Colors" @@ -242,7 +244,7 @@ case "$LANG" in RES_CONKY="Conkies" RES_MENU="Menus / Panels" RES_ALL="All (OB, menus, conky)" - COLORIZE="Colorize..." + COLORIZE="Quickly Colorize or Reset..." ;; esac @@ -298,8 +300,8 @@ out+=("^sep()") out+=(" $COLORIZE,^pipe(randomizer c)") out+=("^sep($MODULES)") out+=("$OBTHEME,^pipe(colorizer-ob)") -out+=("Conky Manager,^pipe(colorizer-conky)") out+=("$MENUPANELS,^pipe(colorizer-menus)") +out+=("Conky Manager,^pipe(colorizer-conky)") #out+=("TINT2,^pipe(colorizer-tint2)") #out+=("Systray HW monitor,^pipe(colorizer-phwmon)") @@ -519,23 +521,25 @@ 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") -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") + 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") + fi + out+=("^sep()") + out+=("$WALLPAPERS,^checkout(wallpapersettings)") fi -out+=("^sep()") -out+=("$WALLPAPERS,^checkout(wallpapersettings)") -#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)") + [[ "$gradient_obtheme" == "yes" ]] && OBGRAD="OB" || OBGRAD="" + [[ "$gradient_menu" == "yes" ]] && MENUGRAD="menus" || MENUGRAD="" + out+=("^sep($GRADIENTS $OBGRAD $MENUGRAD)") + out+=(" $PRE_GRADIENTS,^pipe(mbgrad)") fi + ### RESET ACTIONS (replaced by Randomizer) #out+=("^sep($RESET_COLORS)") #out+=("$RESET_CHOOSE,^checkout(resetroot)") @@ -557,11 +561,13 @@ fi out2+=("^tag(settings)") out2+=("^sep($AUTOGEN_THEMES)") -out2+=(" $AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") -out3+=("^tag(autogen") -out3+=("^sep($GENERATETHEMES)") -out3+=("$YES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s") -out3+=("$NO,mb-setvar wall2themes=no $CNF_FILE;colorizer -s") +[[ "$wall2themes" = "yes" ]] && out2+=(" $AUTOGEN_THEMES,mb-setvar wall2themes=no $CNF_FILE;colorizer -s") || out2+=(" $AUTOGEN_THEMES,mb-setvar wall2themes=yes $CNF_FILE;colorizer -s") + +#out2+=(" $AUTOGEN_THEMES [ ${wall2themes} ],^checkout(autogen)") +#out3+=("^tag(autogen") +#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()") out2+=("$OBTHEME [ ${wall2themes_ob} ],^checkout(ob)") @@ -627,18 +633,21 @@ 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") fi -out2+=("^sep($GRADIENTS)") -out2+=("$GRAD_OB [ ${gradient_obtheme} ],^checkout(grad_ob)") -out3+=("^tag(grad_ob") -out3+=("^sep($GRAD_OB)") -out3+=("$YES,mb-setvar gradient_obtheme=yes $CNF_FILE;colorizer -s") -out3+=("$NO,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") -out2+=("$GRAD_MENU [ ${gradient_menu} ],^checkout(grad_menu)") -out3+=("^tag(grad_menu") -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)") +out2+=("^sep($GRADIENTS_ACT)") +[[ "$gradient_obtheme" == "yes" ]] && out2+=(" $GRAD_OB,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") || out2+=(" $GRAD_OB,mb-setvar gradient_obtheme=yes $CNF_FILE;colorizer -s") +#out2+=("$GRAD_OB [ ${gradient_obtheme} ],^checkout(grad_ob)") +#out3+=("^tag(grad_ob") +#out3+=("^sep($GRAD_OB)") +#out3+=("$YES,mb-setvar gradient_obtheme=yes $CNF_FILE;colorizer -s") +#out3+=("$NO,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") + +[[ "$gradient_menu" == "yes" ]] && out2+=(" $GRAD_MENU,mb-setvar gradient_menu=no $CNF_FILE;colorizer -s") || out2+=(" $GRAD_MENU,mb-setvar gradient_menu=yes $CNF_FILE;colorizer -s") +#out2+=("$GRAD_MENU [ ${gradient_menu} ],^checkout(grad_menu)") +#out3+=("^tag(grad_menu") +#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") @@ -662,17 +671,16 @@ 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)") +[[ "$related_tools" == "show" ]] && out2+=(" $SHOW_RELATED,^checkout(related)") || out2+=(" $SHOW_RELATED,^checkout(related)") out3+=("^tag(related)") 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") +[[ "$related_tools" == "show" ]] && out3+=("綠 $SHOW,colorizer -s" "祿 $HIDE,mb-setvar related_tools=hide $CNF_FILE;colorizer -s") || out3+=("祿 $SHOW,mb-setvar related_tools=show $CNF_FILE;colorizer -s" "綠 $HIDE,colorizer -s") out3+=("^sep()") 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+=(" $EDITCONF,xdg-open $CNF_FILE") -out2+=(" $RESET,rm $CNF_FILE;colorizer -s") +out2+=("󰁯 $RESET,rm $CNF_FILE;colorizer -s") ### RUN diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 84a6330..50dfe1c 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -180,9 +180,6 @@ out2+=("wide,jgctl tweak padding wide;$me") out2+=("normal,jgctl tweak padding normal;$me") out2+=("tight,jgctl tweak padding tight;$me") -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')") @@ -279,7 +276,9 @@ out2+=("4,jgctl item_radius 4;$me") out2+=("5,jgctl item_radius 5;$me") out2+=("6,jgctl item_radius 6;$me") - +out+=("^sep($GENERATEFROMWP)") +out+=("$LIGHTBG,w2theme menu light;$me") +out+=("$DARKBG,w2theme menu dark;$me") out+=("^sep($MORE_MENU_SETTINGS)") out+=(" $GLOBAL_MENU_SETTINGS,jgmenusettings-pipe -c") diff --git a/bin/colorizer-ob b/bin/colorizer-ob index 08a9c9a..2b21e18 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -205,9 +205,7 @@ getvalues () { getvalues out+=("^sep($OBTHEME_LBL: $OBTHEME)") -out+=("^sep($GENERATEFROMWP)") - out+=("$LIGHTBG,w2theme ob light;$me") - out+=("$DARKBG,w2theme ob dark;$me") + out+=("^sep($TITLEBAR)") out+=(" $ACTIVE_BG,^pipe(mbclr '$ABG' obtctl clractivebg_only '${ACTIVE_BG}' '$me')") [[ ! -z "$ABGTO" ]] && out+=(" $ACTIVE_BG_TO,^pipe(mbclr '$ABGTO' obtctl clractivebgto '${ACTIVE_BG_TO}' '$me')") @@ -234,6 +232,11 @@ out+=("$BORDER [ $BORD ],^checkout(border)") out+=("$HANDLEWIDTH [ $HANDLE ],^checkout(handlewidth)") out+=("$ACTIVEHANDLE? [ $AHANDLE ],^checkout(handle)") + +out+=("^sep($GENERATEFROMWP)") + out+=("$LIGHTBG,w2theme ob light;$me") + out+=("$DARKBG,w2theme ob dark;$me") + if [ -f "${THEMERC}.bak" ]; then out+=("^sep($RESET)") diff --git a/bin/jgctl b/bin/jgctl index d06307d..4015efd 100755 --- a/bin/jgctl +++ b/bin/jgctl @@ -278,7 +278,7 @@ opacity () { read FUNC B COLOR OPACITY REST<<< "$(grep ${1} ${THEMERC})" #echo "$FUNC $B $COLOR $OPACITY $REST" - sd "$1.*= $COLOR.*$" "$FUNC = $COLOR $2 $REST" ${THEMERC} + sd "$1 .*= $COLOR.*$" "$FUNC = $COLOR $2 $REST" ${THEMERC} } case "$1" in diff --git a/bin/mbclr b/bin/mbclr index 1ff082d..f7dbe4c 100755 --- a/bin/mbclr +++ b/bin/mbclr @@ -27,12 +27,15 @@ case "$LANG" in OPACITY="Nieprzezroczystość" SHADES_OF_CURRENT="Oblicz z bieżącego" SHADES_OF="Odcienie" + LIGHTEN_DARKEN="Jaśniejsze / Ciemniejsze" SATURATION="Nasycenie..." ROTATE_HSL_HUE="Obróć kanał barwy HSL..." + CURRENT="obecny kolor" WALLPAPER_COLORS="Kolory z tapety" ACCENT_COLORS="Popularne kolory akcentu" LIGHTCOLORS="Jasne kolory..." DARKCOLORS="Ciemne kolory..." + ;; *) SELECT_COLOR="Select color" @@ -41,8 +44,10 @@ case "$LANG" in OPACITY="Opacity" SHADES_OF_CURRENT="Calculate from current" SHADES_OF="Shades of" + LIGHTEN_DARKEN="Lighten / Darken" SATURATION="Saturation..." ROTATE_HSL_HUE="Rotate HSL hue channel..." + CURRENT="current color" WALLPAPER_COLORS="Wallpaper colors" ACCENT_COLORS="Popular accent colors" LIGHTCOLORS="Light colors..." @@ -124,8 +129,16 @@ fi out+=("^sep($SELECT_COLOR)") out+=(" $PICK_FROM_SCREEN,mbclr pixelcolor $2 $3 ${5} ${6}") out+=(" $SELECT_OR_PICK,mbclr pick $2 $3 ${5} ${6}") -out+=("^sep()") -out+=("$SHADES_OF_CURRENT ($1),^checkout(curshades)") + +# HERE +CUR_FG=$(pastel textcolor $1|pastel format hex) +out+=("^sep($SHADES_OF_CURRENT $1 )") +out+=("$LIGHTEN_DARKEN,^checkout(curshades)") +out+=("$SATURATION,^checkout(saturate)") +out+=("$ROTATE_HSL_HUE,^checkout(rotate_hsl)") +#out+=("$SHADES_OF_CURRENT ($1),^checkout(curshades)") + +# HERE out+=("^sep($WALLPAPER_COLORS)") for i in "${wallcolors[@]}" @@ -162,27 +175,31 @@ out2+=("$i ,$2 done -#Shades +# Shades out2+=("^tag(curshades)") out2+=("^sep($SHADES_OF $1)") for i in 3 25 2 15 1 05; do clr=$(pastel lighten 0.$i "${1}" | pastel format hex) if [ "${clr}" != "#ffffff" ];then -out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") +out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") fi done out2+=("^sep()") -out2+=("$1 ,$2 $3 '${1}' ${6};${5}") +out2+=(" $CURRENT $1 ,$2 $3 '${1}' ${6};${5}") out2+=("^sep()") for i in 05 1 15 2 25 3; do clr=$(pastel darken 0.$i "${1}" | pastel format hex) if [ "${clr}" != "#000000" ];then -out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") +out2+=("$clr ,$2 $3 '${clr}' ${6};${5}") fi done +# Shades ENG -# NOWE + + +# SATURATION +out2+=("^tag(saturate)") out2+=("^sep($SATURATION)") for i in 9 8 7 6 5 4 3 2 1; do clr=$(pastel desaturate 0.$i "${1}" | pastel format hex) @@ -191,6 +208,9 @@ out2+=("$clr $CURRENT $1 ,$2 $3 '${1}' ${6};${5}") +out2+=("^sep()") for i in 1 2 3 4 5 6 7 8 9; do clr=$(pastel saturate 0.$i "${1}" | pastel format hex) if [ "${clr}" != "${oldclr}" ];then @@ -198,16 +218,23 @@ out2+=("$clr $clr -$i°,$2 $3 '${clr}' ${6};${5}") done +out2+=("^sep()") +out2+=(" $CURRENT $1 ,$2 $3 '${1}' ${6};${5}") +out2+=("^sep()") for i in {15..135..15};do clr=$(pastel rotate $i "${1}" |pastel format hex) out2+=("$clr $i°,$2 $3 '${clr}' ${6};${5}") done -# NOWE +# ROTATE HSL END printf '%s\n' "${out[@]}" printf '%s\n' "${out2[@]}" diff --git a/bin/obtctl b/bin/obtctl index e282348..eccc406 100755 --- a/bin/obtctl +++ b/bin/obtctl @@ -424,11 +424,12 @@ randomizer () { ### ensure we use MBColors at the moment theme MBcolors ### SHADOW (here, because we must know if is set later when title font color is calculated) - SHADOWS=(no dark light) - rand=$((RANDOM%3)) - SHADOW="${SHADOWS[$rand]}" + ### Maybe better is not to change shadow? for now + #SHADOWS=(no dark light) + #rand=$((RANDOM%3)) + #SHADOW="${SHADOWS[$rand]}" - obtctl shadow "${SHADOW}" + #shadow "${SHADOW}" ### RANDOM GRADIENT COLORS GRADIENT_FILE="$HOME"/.config/colorizer/gradients_all.inc diff --git a/bin/randomizer b/bin/randomizer index dcc9dee..ba4f3c7 100755 --- a/bin/randomizer +++ b/bin/randomizer @@ -52,6 +52,7 @@ pipemenu () { MENUS="Menu i Panele boczne" OBWD="Dekoracja okien Openbox" ALL="Wszystko" + ALLRESET="Resetuj wszystko" RESET_TO_DEFAULT="Resetuj do ustawień domyślnych..." HELP="Okno Główne i Pomoc" ;; @@ -59,7 +60,8 @@ pipemenu () { SETRANDOM="Set random colorscheme for..." MENUS="Menus and Panels" OBWD="OpenBox Window Decoration" - ALL="All" + ALL="All above" + ALLRESET="Reset All above" RESET_TO_DEFAULT="Reset to default settings..." HELP="Main Window and Help" ;; @@ -68,6 +70,7 @@ pipemenu () { MENUS="Menus and Panels" OBWD="OpenBox Window Decoration" ALL="All above" + ALLRESET="Reset All above" RESET_TO_DEFAULT="Reset to default settings..." HELP="Main Window and Help" ;; @@ -77,16 +80,26 @@ pipemenu () { out+=("$OBWD,randomizer ob;$me") out+=("Conky,randomizer conky;$me") out+=("^sep()") - out+=("$ALL,randomizer all;$me") + out+=(" $ALL,randomizer all;$me") out+=("^sep($RESET_TO_DEFAULT)") out+=("$MENUS,jgctl resetMBcolors;$me") out+=("$OBWD,obtctl resetMBcolors;$me") out+=("Conky,conkyctl resetcolorsall;$me") out+=("^sep()") - out+=("$ALL,randomizer resetall;$me") + out+=("󰁯 $ALLRESET,randomizer resetall;$me") + if [[ "$1" != "c" ]];then out+=("^sep(Colorizer)") - out+=("Colorizer - $HELP,ycolorizer") + out+=(" Colorizer - $HELP,ycolorizer") + out+=("Colorizer - Rootmenu,colorizer -s") + out+=("^sep(Colorizer modules)") + out+=("OpenBox,colorizer-ob -s") + out+=("Menus,colorizer-menus -s") + out+=("Conky,colorizer-conky -s") + out+=("^sep()") + out+=("Cava,colorizer-cava -s") + out+=("PyRadio,colorizer-pyradio -s") + fi printf '%s\n' "${out[@]}" } diff --git a/share/mabox-colorizer/help/en.html b/share/mabox-colorizer/help/en.html index 9279337..291785f 100644 --- a/share/mabox-colorizer/help/en.html +++ b/share/mabox-colorizer/help/en.html @@ -61,11 +61,12 @@ nav button.w3-bar-item {padding:4px 12px !important;} + -
+
Choose wallpaperChoose wallpaper from image context menu Colorizer RootmenuColorizer Menu (advanced) Openbox moduleOpenbox Window Decoration module @@ -87,22 +88,20 @@ nav button.w3-bar-item {padding:4px 12px !important;}
- -
+

Mabox Colorizer pre-release

-

a set of tools to easily customize
your Mabox Linux Desktop

-
+

a set of tools to easily customize
your Mabox Linux Desktop

+

Easily change look and feel of:

    -
  • Openbox theme (window decorations)
    • -
  • Menu/Sidepanels and other jgmenu-based Mabox tools
    • -
  • Conkies
    • +
  • Openbox theme (window decorations)
    • +
  • Menu/Sidepanels and other jgmenu-based Mabox tools
    • +
  • Conkies
    • +
  • Automatically generate themes for all above from Wallpaper colors

- -
-

Randomizer - set color themes quickly and securely New!

-
+

 Try Randomizer to change themes quickly. You can securely reset to defaults at any time New!

+

Quickly randomize
colorschemes for...

Openbox theme @@ -126,11 +125,10 @@ nav button.w3-bar-item {padding:4px 12px !important;}

Colorizer offers two modes of operation: basic and advanced.

  • basic - you use this window - easy and fast
    • -
  • advanced - using dynamically generated menus - more customization possibilities, unlimited choice of colors
    • +
  • advanced - using dynamically generated menus - more customization possibilities, unlimited choice of colors. Tuning.

-
-
+
@@ -461,11 +459,9 @@ You can add your own commands to each Conky, which will be show  Colorizer Menu
-

Generating themes from wallpaper

- -
+

Colorizer generates a color palette based on the currently set wallpaper

Based on such a color palette, it is possible to use two versions of themes (dark and light) for: @@ -473,7 +469,6 @@ You can add your own commands to each Conky, which will be show

  • OpenBox window decoration
  • Menus, Panels
  • Conky
    • -
  • PyRadio

    • Try how it works...

    @@ -540,11 +535,33 @@ You can add your own commands to each Conky, which will be show
    -
    +

    Automatic generation of themes after changing wallpaper

    +

    You can setup Colorizer to auto-generate themes when you change wallpaper.
    Use  Colorizer -> Settings or  edit configuration file to enable this feature.

    + +
    + +