update

2026-04-27 09:23:49 +02:00
parent 6c82dab7e1
commit c6dd951352
4 changed files with 91 additions and 34 deletions
--- a/bin/colorizer-menus
+++ b/bin/colorizer-menus
@@ -134,10 +134,10 @@ case "$LANG" in
    COLOR_NORM_BG="Tło"
    SEPARATOR_TITLE="Separator/Nagłówek"
    TITLE="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"
+    COLOR_TITLE_BG="Tło"
+    COLOR_TITLE_FG="Tekst"
+    COLOR_TITLE_BORDER="Obramowanie"
+    SEP_HALIGN="Wyrównanie"
    H_LEFT="do lewej"
    H_CENTER="po środku"
    H_RIGHT="do prawej"
@@ -220,10 +220,10 @@ case "$LANG" in
    COLOR_NORM_BG="Item Background"
    SEPARATOR_TITLE="Separator/Title"
    TITLE="Title"
-    COLOR_TITLE_BG="Title Background"
-    COLOR_TITLE_FG="Title Foreground"
-    COLOR_TITLE_BORDER="Title Border color "
-    SEP_HALIGN="Title alignment"
+    COLOR_TITLE_BG="Background"
+    COLOR_TITLE_FG="Text"
+    COLOR_TITLE_BORDER=" Border color "
+    SEP_HALIGN="Alignment"
    H_LEFT="left"
    H_CENTER="center"
    H_RIGHT="right"
--- a/bin/w2theme
+++ b/bin/w2theme
@@ -17,6 +17,7 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 #  w2theme - generate themes from wallpaper colors
+. ~/.config/mabox/mabox.conf

 WALLPALDIR="$HOME/.cache/colorizer/palettes"
 mkdir -p "$WALLPALDIR"
@@ -49,6 +50,9 @@ accents=("#e93d57" "#c7162b" "#e9633a" "#e95620" "#f4a300" "#e8cc2d" "#3cd425" "

 menu_theme () {
    jgctl theme MBcolors
+    jgctl color_menu_bg 100
+    jgctl color_menu_bg_to 100
+    
    case "$1" in
        dark2) #dark bg
        ITEM_FG=$(pastel textcolor ${w[1]}|pastel format hex)
@@ -68,7 +72,9 @@ menu_theme () {
        jgctl color_sel_fg "${ITEM_FG}"
        jgctl color_sel_border "${w[2]}"
        jgctl color_sep_fg "${w[2]}"
-        jgctl color_norm_bg "${w[1]}"
+        #jgctl color_norm_bg "${w[1]}"
+        jgctl color_norm_bg "#000000"
+        jgctl color_norm_bg "10"
        #sleep 1
        ;;
        dark) #dark bg
@@ -89,7 +95,9 @@ menu_theme () {
        jgctl color_sel_fg "${ITEM_FG}"
        jgctl color_sel_border "${w[2]}"
        jgctl color_sep_fg "${w[2]}"
-        jgctl color_norm_bg "${w[0]}"
+        #jgctl color_norm_bg "${w[0]}"
+        jgctl color_norm_bg "#FFFFFF"
+        jgctl color_norm_bg "3"
        #sleep 1
        ;;
        light) #light bg
@@ -110,7 +118,9 @@ menu_theme () {
        jgctl color_sel_fg "${ITEM_FG}"
        jgctl color_sel_border "${w[-3]}"
        jgctl color_sep_fg "${w[-3]}"
-        jgctl color_norm_bg "${w[-1]}"
+        #jgctl color_norm_bg "${w[-1]}"
+        jgctl color_norm_bg "#000000"
+        jgctl color_norm_bg "5"
        #sleep 1
        ;;
        light2) #light bg
@@ -131,7 +141,9 @@ menu_theme () {
        jgctl color_sel_fg "${ITEM_FG}"
        jgctl color_sel_border "${w[-3]}"
        jgctl color_sep_fg "${w[-3]}"
-        jgctl color_norm_bg "${w[-2]}"
+        #jgctl color_norm_bg "${w[-2]}"
+        jgctl color_norm_bg "#FFFFFF"
+        jgctl color_norm_bg "10"
        #sleep 1
        ;;
    esac
@@ -159,8 +171,8 @@ conky_colors() {
        conkyctl color3_all "${w[-2]}"
        ;;
        *) #light bg
-        conkyctl win_bgcolor_all "${w[-1]}"
-        conkyctl default_color_all "${w[1]}"
+        conkyctl win_bgcolor_all "${w[-2]}"
+        conkyctl default_color_all "${w[-3]}"
        conkyctl color0_all "${w[2]}"
        conkyctl color1_all "${w[5]}"
        conkyctl color2_all "${w[3]}"
@@ -363,6 +375,30 @@ case "$1" in
    esac
    obtctl shadow 0
 }
+
+logo_colors(){
+case "$1" in
+    dark)
+    mabox-logo colors ${w[1]} ${w[-1]}
+    ;;
+    light)
+    mabox-logo colors ${w[-2]} ${w[3]}
+    ;;
+esac
+}
+clock(){
+case "$1" in
+    dark)
+    conkyctl color8 ${w[2]} ~/.config/conky/Better_Clock_mbcolor.conkyrc
+    conkyctl color9 ${w[4]} ~/.config/conky/Better_Clock_mbcolor.conkyrc
+    ;;
+    light)
+    conkyctl color8 ${w[-1]} ~/.config/conky/Better_Clock_mbcolor.conkyrc
+    conkyctl color9 ${w[-2]} ~/.config/conky/Better_Clock_mbcolor.conkyrc
+    
+    ;;
+esac
+}
 notify_colorize(){

 case "$LANG" in
@@ -389,17 +425,35 @@ _RESET="Reset"
 esac
 	
 	notify-send.sh -t 5000 -i ~/.config/mabox/wpicon_wide.png --replace-file=/tmp/colorize_notid  "$_TITLE" "$_THEME_MODIFIED" \
-	-o "$_NEXT:mbwallpaper -o" -o "$_SETTINGS:jgwallpaperchanger -s autoth" -o "$_RESET:w2theme resetall"
+	-o "$_NEXT:mbwallpaper -o" -o "$_SETTINGS:jgwallpaperchanger -s autoth" -o "$_RESET:w2theme resetall" -o "DISABLE NOTIFY:mb-setvar autotheming_notify=false"
 }
 colorize () {
    source ~/.config/colorizer/colorizer.conf
+    [ -v autotheming_notify ] && : || mb-setvar autotheming_notify=true
+    if [[ "$autotheming_notify" == "true" ]];then
+    notify-send.sh  -t 5000 -i ~/.config/mabox/wpicon_wide.png --replace-file=/tmp/colorize_notid "Mabox Auto theming in progress..." "\n\nPlease wait... a few seconds...\n\n"
+	fi
    #
+    # Logo SVG
+    case "$wall2themes_logo" in
+        dark) logo_colors dark;;
+        light) logo_colors light;;
+        *) : ;;
+    esac
+    # Better Clock
+    case "$wall2themes_clock" in
+        dark) clock dark;;
+        light) clock light;;
+        *) : ;;
+    esac
+    
    # CONKY
    case "$wall2themes_conky" in
        dark) conky_colors dark;;
        light) conky_colors light;;
        *) : ;;
    esac
+    
   
    #show_desktop 
    #sleep 1
@@ -436,9 +490,9 @@ colorize () {
        light) menu_theme light;;
        *) : ;;
    esac
-    
+    if [[ "$autotheming_notify" == true ]];then
    notify_colorize
-    
+    fi
    

 }
@@ -484,8 +538,9 @@ reverse () {
        *) : ;;
    esac
    
-    
+if [[ "$autotheming_notify" == "true" ]];then
 notify_colorize
+fi
 }

 genthumb () {
@@ -518,6 +573,7 @@ rm -rf ~/.config/colorizer/pinned/$WALLNAME
 }
 resetall(){
 fehbg default
+mabox-logo default
 conkyctl resetcolorsall
 obtctl resetMBcolors
 jgctl resetMBcolors
@@ -532,6 +588,8 @@ case "$1" in
    conkyone) conky_colorsone "$2" "$3";;
    pyradio) pyradio_theme "$2";;
    cava) cava "$2";;
+    logo_colors) logo_colors "$2";;
+    clock) clock "$2";;
    accent) accent "$2";;
    gradient) gradient "$2" "$3";;
    colorize) colorize;;
--- a/share/mabox-colorizer/help/en.html
+++ b/share/mabox-colorizer/help/en.html
@@ -511,20 +511,20 @@ If you need a full set of options, precise color tuning and transparency - use t
 <div class="gi4 gi4r left-align"><h2>Conky widgets</h2>
 <p>Mabox provides several Conky configurations. <i>click names below to toggle</i></p>
 <p class="center">
-	System Info<br />
+	<strong>System Info</strong><br />
    <a class="tag small teal" href="run://conkyctl toggleone sysinfo_mbcolor">Default</a>
    <a class="tag small teal" href="run://conkyctl toggleone mabox_info">Mini</a>
    <a class="tag small teal" href="run://conkyctl toggleone Info_Bar">Info Bar</a><br />
    <a class="tag small teal" href="run://conkyctl toggleone CPU">CPU</a>
    <a class="tag small teal" href="run://conkyctl toggleone RAM">RAM</a>
    <a class="tag small teal" href="run://conkyctl toggleone mount_points">Discs</a>
-    <a class="tag small teal" href="run://conkyctl toggleone Network">Network</a><br />
-    Educational</br />
+    <a class="tag small teal" href="run://conkyctl toggleone Network">Network</a><br /><br />
+    <strong>Educational</strong></br />
    <a class="tag small teal" href="run://conkyctl toggleone shortcuts_mbcolor">Shortcuts</a>
    <a class="tag small teal" href="run://conkyctl toggleone PCmanFM">PCmanFM</a>
    <a class="tag small teal" href="run://conkyctl toggleone tiling_terminal">Terminal</a>
-    <a class="tag small teal" href="run://conkyctl toggleone mabox_tools_">Mabox Tools</a><br />
-    Advanced<br />
+    <a class="tag small teal" href="run://conkyctl toggleone mabox_tools_">Mabox Tools</a><br /><br />
+    <strong>Advanced</strong><br />
    <a class="tag small teal" href="run://conkyctl toggleone Better_Clock">Clock</a>
    <a class="tag small teal" href="run://conkyctl toggleone Polaroid">Polaroid</a>
    <a class="tag small teal" href="run://conkyctl toggleone quoter_">Quotes</a>
--- a/share/mabox-colorizer/help/pl.html
+++ b/share/mabox-colorizer/help/pl.html
@@ -500,30 +500,29 @@ Jeśli potrzebujesz pełen zestaw opcji, precyzyjnego dostrajania kolorów i prz
 	<main class="grid">
 <div class="gi4 gi4r left-align"><h2>Widżety Conky</h2>
    <p>Mabox dostarcza kilkunastu konfiguracji Conky.<br /><em>Kliknij ich nazwy poniżej aby je wypróbować (właczyć/wyłączyć).</em></p>
-<p class="center">Informacje systemowe<br />
+<p class="center"><strong>informacje systemowe</strong><br />
    <a class="tag small teal" href="run://conkyctl toggleone sysinfo_mbcolor">Domyślne</a>
    <a class="tag small teal" href="run://conkyctl toggleone mabox_info">Mini</a> 
-    <a class="tag small teal" href="run://conkyctl toggleone Info_Bar">Info Bar</a>
+    <a class="tag small teal" href="run://conkyctl toggleone Info_Bar">Info Bar</a><br />
    <a class="tag small teal" href="run://conkyctl toggleone CPU">CPU</a>
    <a class="tag small teal" href="run://conkyctl toggleone RAM">RAM</a>
    <a class="tag small teal" href="run://conkyctl toggleone mount_points">Dyski</a>
-    <a class="tag small teal" href="run://conkyctl toggleone Network">Sieć</a><br />
-    Edukacyjne</br />
+    <a class="tag small teal" href="run://conkyctl toggleone Network">Sieć</a><br /><br />
+    <strong>edukacyjne</strong><br />
    <a class="tag small teal" href="run://conkyctl toggleone shortcuts_mbcolor">Skróty</a>
    <a class="tag small teal" href="run://conkyctl toggleone PCmanFM">PCmanFM</a>
-    <a class="tag small teal" href="run://conkyctl toggleone tiling_terminal">Terminal</a>
-    <a class="tag small teal" href="run://conkyctl toggleone mabox_tools_">Narzędzia Maboxa</a><br />
-    Zaawansowane<br />
+    <a class="tag small teal" href="run://conkyctl toggleone tiling_terminal">Tiling Terminal</a>
+    <a class="tag small teal" href="run://conkyctl toggleone mabox_tools_">Narzędzia Maboxa</a><br /><br />
+    <strong>zaawansowane</strong><br />
    <a class="tag small teal" href="run://conkyctl toggleone Better_Clock">Zegar</a>
    <a class="tag small teal" href="run://conkyctl toggleone Polaroid">Polaroid</a>
    <a class="tag small teal" href="run://conkyctl toggleone quoter_">Cytaty</a>
    <a class="tag small teal" href="run://conkyctl toggleone Mabox_logo_SVG">Kolorowalne Logo</a>
    <a class="tag small teal" href="run://conkyctl toggleone TODOlist">TODO list</a>
-    </p>
-    <p><hr /></p>
+    </p><p><hr /></p>
 <div class="pale-green leftbar border-green">
-	Użyj dynamicznego menu aby mieć dostęp do większej ilości opcji<br /> <a class="button amber" href="run://colorizer-conky -s"> Conky Manager & Colorizer</a>
-	</div>
+	Potrzebujesz więcej opcji dostrajania Conky?...<br /> <a class="button amber" href="run://colorizer-conky -s"> Conky Menedżer & Colorizer</a>
+</div>
 </div>
 <div class="gi2 dark"><span>Generuj motywy...</span></div>
 <div class="gi2 dark"><strong>Monochromatyczny</strong><br /><em>Pobierz kolor z ekranu</em><br />