From ca19fb7e3496ca45080cc07b6836b9d2ae3d0d2c Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Fri, 27 Dec 2024 01:05:57 +0100 Subject: [PATCH] upd --- bin/colorizer | 32 +- bin/colorizer-menus | 330 ++++++++++--------- bin/colorizer-ob | 170 +++++----- bin/jgctl | 279 +++++++++------- bin/obtctl | 298 ++++++++--------- bin/randomizer | 10 +- share/mabox-colorizer/colorschemes/menus.csv | 13 +- share/mabox-colorizer/colorschemes/ob.csv | 4 +- 8 files changed, 600 insertions(+), 536 deletions(-) diff --git a/bin/colorizer b/bin/colorizer index 95ea9c0..4ac9c1c 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -1,7 +1,7 @@ #!/bin/bash # # colorizer - set of tools for Mabox (auto)theming -# Copyright (C) 2022-2023 Daniel Napora +# Copyright (C) 2022-2024 Daniel Napora # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,6 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +. $HOME/.config/mabox/mabox.conf + CNF_DIR="$HOME/.config/colorizer" mkdir -p "$CNF_DIR" CNF_FILE="$CNF_DIR/colorizer.conf" @@ -47,6 +49,7 @@ case "$LANG" in CURRENTCONF="Obecna konfiguracja" MODULES="Moduły" FONTS="Konfiguruj Czcionki" + _PICOM="Ustawienia Kompozytora (Picom)" OBTHEME="Motyw Openbox" MENUPANELS="Menu i Panele boczne" COLORIZER_CONKY="Conky Manager i Colorizer" @@ -101,6 +104,7 @@ case "$LANG" in RES_MENU="Menu i Paneli" RES_ALL="Wszystko (OB, menu, conky)" COLORIZE="Szybko Pokoloruj lub Resetuj..." + _LEFTSIDEPANEL="Lewy panel boczny" ;; *) REGENERATE="(Re)Generate from wallpaper colors..." @@ -110,6 +114,7 @@ case "$LANG" in CURRENTCONF="Current configuration" MODULES="Modules" FONTS="Configure Fonts" + _PICOM="Compositor settings (Picom)" OBTHEME="Openbox Theme" MENUPANELS="Menus/SidePanels" COLORIZER_CONKY="Conky Manager & Colorizer" @@ -164,6 +169,7 @@ case "$LANG" in RES_MENU="Menus / Panels" RES_ALL="All (OB, menus, conky)" COLORIZE="Quickly Colorize or Reset..." + _LEFTSIDEPANEL="Left Sidepanel" ;; esac @@ -211,6 +217,7 @@ out+=("^sep(Mabox Colorizer)") out+=(" $COLORIZE,^pipe(randomizer c)") out+=("^sep($MODULES)") out+=(" $FONTS,colorizer-fonts -s") +out+=("$_PICOM,jgpicom-pipe -s") out+=("^sep()") out+=("$OBTHEME,colorizer-ob -s") @@ -242,18 +249,18 @@ out+=("$CAVA,colorizer-cava -s") 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") - fi - out+=("^sep()") - out+=("$WALLPAPERS,^checkout(wallpapersettings)") + 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)") 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 out+=("^sep($SETTINGS)") @@ -264,6 +271,9 @@ out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/$LNG.html 'Mabox Coloriz else out+=(" $HELP,yhtml /usr/share/mabox-colorizer/help/en.html 'Mabox Colorizer'") fi +out+=("^sep()") +out+=(" ${arrow_string_left} ${arrow_string_left} $_LEFTSIDEPANEL,mb-jgtools places") + ### RESET ACTIONS (replaced by Randomizer) #out+=("^sep($RESET_COLORS)") diff --git a/bin/colorizer-menus b/bin/colorizer-menus index 9bc3639..a4e5143 100755 --- a/bin/colorizer-menus +++ b/bin/colorizer-menus @@ -19,7 +19,7 @@ SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/menus.csv" -USERSCHEMES="$HOME/.config/colorizer/menus/userschemes.csv" +USERSCHEMES="$HOME/.config/colorizer/menus/userschemes2.csv" ### Wallpaper colors @@ -251,6 +251,7 @@ getvalues () { read TFG TFGA<<< "$(grep 'color_title_fg' ${THEMERC} | cut -d'=' -f2)" read TBORDER TBORDERA<<< "$(grep 'color_title_border' ${THEMERC} | cut -d'=' -f2)" read NORMBG NORMBGA<<< "$(grep color_norm_bg ${THEMERC} | cut -d'=' -f2)" + [[ "$NORMBG" == "" ]] && NORMBG="${MBG}" NORMBGA=0 read NFG NFGA<<< "$(grep color_norm_fg ${THEMERC} | cut -d'=' -f2)" read SBG SBGA<<< "$(grep 'color_sel_bg' ${THEMERC} | cut -d'=' -f2)" read SFG SFGA<<< "$(grep 'color_sel_fg' ${THEMERC} | cut -d'=' -f2)" @@ -261,192 +262,193 @@ getvalues () { getvalues # Current colors -currcolors="${MBG}|${MBGT}|${MBORDER}|${TBG}|${TFG}|${TBORDER}|${NORMBG}|${NFG}|${SBG}|${SFG}|${SBORDER}|${SEPFG}|${GRADIENT}|" +currcolors="${MBG}|${MBGA}|${MBGT}|${MBGTA}|${MBORDER}|${MBORDERA}|${TBG}|${TBGA}|${TFG}|${TFGA}|${TBORDER}|${TBORDERA}|${NORMBG}|${NORMBGA}|${NFG}|${NFGA}|${SBG}|${SBGA}|${SFG}|${SFGA}|${SBORDER}|${SBORDERA}|${SEPFG}|${SEPFGA}|${jgtools_border}|${jgtools_radius}|${jgtools_padding}|${submenu_spacing}|${IBORDER}|${IRADIUS}|${arrow_string}|${arrow_string_left}|${SEPHALIGN}|${GRADIENT}|" #echo "${currcolors}" > ~/.config/mabox/.menu_colors +notify-send.sh "Currcolors" "${currcolors}" if [ ! -f "$USERSCHEMES" ]; then - mkdir -p "$HOME/.config/colorizer/menus/" - echo " MBG | MBGT |MBORDER| TBG | TFG |TBORDER|NORMBG | NFG | SBG | SFG |SBORDER| SEPFG |GRADIENT|scheme_name" > "$USERSCHEMES" + mkdir -p "$HOME/.config/colorizer/menus/" + echo " MBG |opa| MBGT |opa|MBORDER|opa| TBG |opa| TFG |opa|TBORDER|opa|NORMBG |opa| NFG |opa| SBG |opa| SFG |opa|SBORDER|opa| SEPFG |opa|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name" > "$USERSCHEMES" fi out+=("^sep($MENU_THEME: ${jgmenu_theme})") out+=(" $QUICK_TWEAKS,^checkout(tweaks)") - out2+=("^tag(tweaks)") - out2+=("^sep($OVERALL_STYLE)") - ###### - out2+=("$BORDER [ ${jgtools_border:-0}px ],^checkout(mborder)") - out2+=("$PADDING [ ${jgtools_padding:-0}px ],^checkout(mpadding)") - #out2+=("$RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") - out2+=("$SUBSPACING [ ${submenu_spacing:-0}px ],^checkout(subspacing)") - out2+=("^sep()") - out2+=("$LINE_HEIGHT [ $item_height_factor% ],^checkout(lineheight)") - out2+=("^sep()") - out2+=("$ARROW_STRING [ $arrow_string ],^checkout(arrow)") - out2+=("$ARROW_STRING_LEFT [ $arrow_string_left ],^checkout(arrowleft)") + out2+=("^tag(tweaks)") + out2+=("^sep($OVERALL_STYLE)") + ###### + out2+=("$BORDER [ ${jgtools_border:-0}px ],^checkout(mborder)") + out2+=("$PADDING [ ${jgtools_padding:-0}px ],^checkout(mpadding)") + #out2+=("$RADIUS [ ${jgtools_radius:-0} ],^checkout(mradius)") + out2+=("$SUBSPACING [ ${submenu_spacing:-0}px ],^checkout(subspacing)") + out2+=("^sep()") + out2+=("$LINE_HEIGHT [ $item_height_factor% ],^checkout(lineheight)") + out2+=("^sep()") + out2+=("$ARROW_STRING [ $arrow_string ],^checkout(arrow)") + out2+=("$ARROW_STRING_LEFT [ $arrow_string_left ],^checkout(arrowleft)") - out3+=("^tag(mborder)") - out3+=("^sep($BORDER)") - for i in 0 1 2 3 4 5 6 8 10 12; do [[ "$jgtools_border" == $i ]] && out3+=("綠 $(printf "%3s,%s" "$i" "jgctl border ${i}")") || out3+=("祿 $(printf "%3s,%s" "$i" "jgctl border ${i}")");done + out3+=("^tag(mborder)") + out3+=("^sep($BORDER)") + for i in 0 1 2 3 4 5 6 8 10 12; do [[ "$jgtools_border" == $i ]] && out3+=("綠 $(printf "%3s,%s" "$i" "jgctl border ${i}")") || out3+=("祿 $(printf "%3s,%s" "$i" "jgctl border ${i}")");done - out3+=("^tag(mpadding)") - out3+=("^sep($PADDING)") - for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do [[ "$jgtools_padding" == $i ]] && out3+=("綠 $(printf "%3s,%s" "$i" "jgctl padding ${i}")") || out3+=("祿 $(printf "%3s,%s" "$i" "jgctl padding ${i}")");done + out3+=("^tag(mpadding)") + out3+=("^sep($PADDING)") + for i in 0 2 4 6 8 10 12 14 16 18 20 22 24 28 32 40; do [[ "$jgtools_padding" == $i ]] && out3+=("綠 $(printf "%3s,%s" "$i" "jgctl padding ${i}")") || out3+=("祿 $(printf "%3s,%s" "$i" "jgctl padding ${i}")");done - out3+=("^tag(subspacing)") - out3+=("^sep($SUBSPACING)") - for i in -20 -12 -10 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do [[ "$submenu_spacing" == $i ]] && out3+=("綠 $(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")") || out3+=("祿 $(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done + out3+=("^tag(subspacing)") + out3+=("^sep($SUBSPACING)") + for i in -20 -12 -10 -8 -6 -4 -2 0 1 2 4 6 8 10 12 14 16 18 20; do [[ "$submenu_spacing" == $i ]] && out3+=("綠 $(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")") || out3+=("祿 $(printf "%4s,%s" "$i" "mb-setvar submenu_spacing=${i};$me")");done - out3+=("^tag(lineheight)") - out3+=("^sep($LINE_HEIGHT)") - for i in 160 180 200 220 240 280 300; do [[ "$item_height_factor" == $i ]] && out3+=("綠 $(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")") || out3+=("祿 $(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")");done - - out3+=("^tag(arrow)") - out3+=("^sep($ARROW_STRING)") - for i in "" "" "" "" "" "" "󰔰" "󰮺" "" "壟" "" "" "" "" "" "󰋇" "..." ":." "." "+" "^" "-" "_" "" "" "󰞔" "" ""; do [[ "$arrow_string" == $i ]] && out3+=(">> $i <<,$me") || out3+=(" $i,mb-setvar arrow_string=${i};$me");done + out3+=("^tag(lineheight)") + out3+=("^sep($LINE_HEIGHT)") + for i in 160 180 200 220 240 280 300; do [[ "$item_height_factor" == $i ]] && out3+=("綠 $(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")") || out3+=("祿 $(printf "%4s%%,%s" "$i" "mb-setvar item_height_factor=${i};$me")");done + + out3+=("^tag(arrow)") + out3+=("^sep($ARROW_STRING)") + for i in "" "" "" "" "" "" "󰔰" "󰮺" "" "壟" "" "" "" "" "" "󰋇" "..." ":." "." "+" "^" "-" "_" "" "" "󰞔" "" ""; do [[ "$arrow_string" == $i ]] && out3+=(">> $i <<,$me") || out3+=(" $i,mb-setvar arrow_string=${i};$me");done - out3+=("^tag(arrowleft)") - out3+=("^sep($ARROW_STRING_LEFT)") - for i in "" "" "" "" "" "" "󰶢" "󰮹" "" "鹿" "" "" "" "" "" "󰩔"; do [[ "$arrow_string_left" == $i ]] && out3+=(">> $i <<,$me") || out3+=(" $i,mb-setvar arrow_string_left=${i};$me");done + out3+=("^tag(arrowleft)") + out3+=("^sep($ARROW_STRING_LEFT)") + for i in "" "" "" "" "" "" "󰶢" "󰮹" "" "鹿" "" "" "" "" "" "󰩔"; do [[ "$arrow_string_left" == $i ]] && out3+=(">> $i <<,$me") || out3+=(" $i,mb-setvar arrow_string_left=${i};$me");done - out2+=("^sep()") - out2+=("$MBG_OPACITY,^checkout(mbgopacity") - out3+=("^tag(mbgopacity)") - out3+=("^sep(mbgopacity)") - out3+=("100% Opaque,jgctl tweak opacity 100;$me") - out3+=("90%,jgctl tweak opacity 90;$me") - out3+=("80%,jgctl tweak opacity 80;$me") - out3+=("60%,jgctl tweak opacity 60;$me") - out3+=("50%,jgctl tweak opacity 50;$me") - out3+=("40%,jgctl tweak opacity 40;$me") - out3+=("30%,jgctl tweak opacity 30;$me") - out3+=("20%,jgctl tweak opacity 20;$me") - out3+=("10%,jgctl tweak opacity 10;$me") - out3+=("0% Fully transparent,jgctl tweak opacity 0;$me") + out2+=("^sep()") + out2+=("$MBG_OPACITY,^checkout(mbgopacity") + out3+=("^tag(mbgopacity)") + out3+=("^sep(mbgopacity)") + out3+=("100% Opaque,jgctl tweak opacity 100;$me") + out3+=("90%,jgctl tweak opacity 90;$me") + out3+=("80%,jgctl tweak opacity 80;$me") + out3+=("60%,jgctl tweak opacity 60;$me") + out3+=("50%,jgctl tweak opacity 50;$me") + out3+=("40%,jgctl tweak opacity 40;$me") + out3+=("30%,jgctl tweak opacity 30;$me") + out3+=("20%,jgctl tweak opacity 20;$me") + out3+=("10%,jgctl tweak opacity 10;$me") + out3+=("0% Fully transparent,jgctl tweak opacity 0;$me") - out2+=("^sep()") - out2+=("Solid Color,jgctl tweak solid;$me") - out2+=("Gradient,jgctl tweak gradient;$me") + out2+=("^sep()") + out2+=("Solid Color,jgctl tweak solid;$me") + out2+=("Gradient,jgctl tweak gradient;$me") - out2+=("^sep($SIZING)") - out2+=("$WIDE,jgctl tweak sizing wide;$me") - out2+=("$NORMAL,jgctl tweak sizing normal;$me") - out2+=("$TIGHT,jgctl tweak sizing tight;$me") + out2+=("^sep($SIZING)") + out2+=("$WIDE,jgctl tweak sizing wide;$me") + out2+=("$NORMAL,jgctl tweak sizing normal;$me") + out2+=("$TIGHT,jgctl tweak sizing tight;$me") #### COLOR SCHEMES  out+=(" $SCHEMES,^checkout(schemes)") - out2+=("^tag(schemes)") - out2+=("^sep($SCHEMES)") - out2+=("^sep($MONOCHROMATIC)") - out2+=("^sep($CHOOSE_AND_PICK)") - out2+=(" $LIGHTBG...,jgctl mono pick light") - out2+=(" $DARKBG...,jgctl mono pick dark") - out2+=("^sep($GENERATEFROMWP)") - out2+=(" $LIGHTBG ,w2theme menu light;$me") - out2+=(" $DARKBG ,w2theme menu dark;$me") - out2+=("^sep($SYSTEM_SCHEMES)") + out2+=("^tag(schemes)") + out2+=("^sep($SCHEMES)") + out2+=("^sep($MONOCHROMATIC)") + out2+=("^sep($CHOOSE_AND_PICK)") + out2+=(" $LIGHTBG...,jgctl mono pick light") + out2+=(" $DARKBG...,jgctl mono pick dark") + out2+=("^sep($GENERATEFROMWP)") + out2+=(" $LIGHTBG ,w2theme menu light;$me") + out2+=(" $DARKBG ,w2theme menu dark;$me") + out2+=("^sep($SYSTEM_SCHEMES)") - n=1 - while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name - do - ((n=n+1)) - case "$grad" in - none)icon="󰄱";; - top)icon="";; - right)icon="";; - bottom)icon="";; - left)icon="";; - top_left)icon="";; - top_right)icon="";; - bottom_left)icon="";; - bottom_right)icon="";; - esac - out2+=("$(printf '%-20s' "${scheme_name}") item title [ sel ] ${icon} ,jgctl applyscheme sys $n;$me") - done < <(tail -n +2 "$SYSSCHEMES") + n=1 + while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name + do + ((n=n+1)) + case "$grad" in + none)icon="󰄱";; + top)icon="";; + right)icon="";; + bottom)icon="";; + left)icon="";; + top_left)icon="";; + top_right)icon="";; + bottom_left)icon="";; + bottom_right)icon="";; + esac + out2+=("$(printf '%-20s' "${scheme_name}") item title [ sel ] ${icon} ,jgctl applyscheme sys $n;$me") + done < <(tail -n +2 "$SYSSCHEMES") - out2+=("^sep($YOUR_SCHEMES)") - out2+=(" $SAVE_CURRSCHEME,jgctl savescheme '${currcolors}';$me") - out2+=(" $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES") - out2+=("^sep()") - n=1 - while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name - do - ((n=n+1)) - case "$grad" in - none)icon="󰄱";; - top)icon="";; - right)icon="";; - bottom)icon="";; - left)icon="";; - top_left)icon="";; - top_right)icon="";; - bottom_left)icon="";; - bottom_right)icon="";; - esac - out2+=("$(printf '%-20s' "${scheme_name}") item title [ sel ] ${icon} ,^checkout(sch${n})") - out3+=("^tag(sch${n}") - out3+=("^sep($COLORSCHEME: ${scheme_name})") - out3+=(" $APPLY_SCHEME,jgctl applyscheme usr ${n};$me") - out3+=("^sep($DELETE)") - out3+=("󰗨 $DELETE_SCHEME ${scheme_name},jgctl delscheme ${n};$me") - done < <(tail -n +2 "$USERSCHEMES") + out2+=("^sep($YOUR_SCHEMES)") + out2+=(" $SAVE_CURRSCHEME,jgctl savescheme '${currcolors}';$me") + out2+=(" $OPEN_SCHEMEFILE,xdg-open $USERSCHEMES") + out2+=("^sep()") + n=1 + while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name + do + ((n=n+1)) + case "$grad" in + none)icon="󰄱";; + top)icon="";; + right)icon="";; + bottom)icon="";; + left)icon="";; + top_left)icon="";; + top_right)icon="";; + bottom_left)icon="";; + bottom_right)icon="";; + esac + out2+=("$(printf '%-20s' "${scheme_name}") item title [ sel ] ${icon} ,^checkout(sch${n})") + out3+=("^tag(sch${n}") + out3+=("^sep($COLORSCHEME: ${scheme_name})") + out3+=(" $APPLY_SCHEME,jgctl applyscheme usr ${n};$me") + out3+=("^sep($DELETE)") + out3+=("󰗨 $DELETE_SCHEME ${scheme_name},jgctl delscheme ${n};$me") + done < <(tail -n +2 "$USERSCHEMES") out+=("^sep($FONTS)") out+=("󰛖 $TITLE [ $menu_sep_font_family $menu_sep_font_size ],^checkout(mtitlefont)") out+=("󰛖 $ITEM [ $menu_font_family $menu_font_size ],^checkout(mitemfont)") - - # Item font submenu - out2+=("^tag(mitemfont)") - out2+=("^sep($ITEM_FONT)") - out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_item;$me") - out2+=("^sep($FONT_SIZE)") - out2+=("󰧴 $INCREASE $((menu_font_size+1)) px,mb-setvar menu_font_size=$((menu_font_size+1));$me") - out2+=("󰧳 $DECREASE $((menu_font_size-1)) px,mb-setvar menu_font_size=$((menu_font_size-1));$me") - out2+=("^sep()") - sizes=(14 13 12 11 10 9 8) - for i in "${sizes[@]}" - do - [[ "$menu_font_size" == "$i" ]] && out2+=("綠 $i px,$me") || out2+=("祿 $i px,mb-setvar menu_font_size=$i;$me") - done + + # Item font submenu + out2+=("^tag(mitemfont)") + out2+=("^sep($ITEM_FONT)") + out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_item;$me") + out2+=("^sep($FONT_SIZE)") + out2+=("󰧴 $INCREASE $((menu_font_size+1)) px,mb-setvar menu_font_size=$((menu_font_size+1));$me") + out2+=("󰧳 $DECREASE $((menu_font_size-1)) px,mb-setvar menu_font_size=$((menu_font_size-1));$me") + out2+=("^sep()") + sizes=(14 13 12 11 10 9 8) + for i in "${sizes[@]}" + do + [[ "$menu_font_size" == "$i" ]] && out2+=("綠 $i px,$me") || out2+=("祿 $i px,mb-setvar menu_font_size=$i;$me") + done - if [ -f "$HOME/.config/mabox/fonts.list" ];then - mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) - else - mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) - cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ - fi - - if [ "${#favfonts[@]}" -gt 0 ];then - out2+=("^sep($FONT_FAMILY)") - for fon in "${favfonts[@]}";do - [[ "$menu_font_family" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},mb-setvar \"menu_font_family='${fon}'\";$me") - done - fi + if [ -f "$HOME/.config/mabox/fonts.list" ];then + mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) + else + mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) + cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ + fi + + if [ "${#favfonts[@]}" -gt 0 ];then + out2+=("^sep($FONT_FAMILY)") + for fon in "${favfonts[@]}";do + [[ "$menu_font_family" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},mb-setvar \"menu_font_family='${fon}'\";$me") + done + fi - out2+=("^tag(mtitlefont)") - out2+=("^sep($TITLE_FONT)") - out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_sep;$me") + out2+=("^tag(mtitlefont)") + out2+=("^sep($TITLE_FONT)") + out2+=("󰛖 $FONT_CUSTOM,mb-setfont menu_sep;$me") - out2+=("^sep($FONT_SIZE)") - out2+=("󰧴 $INCREASE $((menu_sep_font_size+1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me") - out2+=("󰧳 $DECREASE $((menu_sep_font_size-1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me") - out2+=("^sep()") - sizes=(14 13 12 11 10 9 8) - for i in "${sizes[@]}" - do - [[ "$menu_sep_font_size" == "$i" ]] && out2+=("綠 $i px,$me") || out2+=("祿 $i px,mb-setvar menu_sep_font_size=$i;$me") - done + out2+=("^sep($FONT_SIZE)") + out2+=("󰧴 $INCREASE $((menu_sep_font_size+1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size+1));$me") + out2+=("󰧳 $DECREASE $((menu_sep_font_size-1)) px,mb-setvar menu_sep_font_size=$((menu_sep_font_size-1));$me") + out2+=("^sep()") + sizes=(14 13 12 11 10 9 8) + for i in "${sizes[@]}" + do + [[ "$menu_sep_font_size" == "$i" ]] && out2+=("綠 $i px,$me") || out2+=("祿 $i px,mb-setvar menu_sep_font_size=$i;$me") + done - if [ "${#favfonts[@]}" -gt 0 ];then - out2+=("^sep($FONT_FAMILY)") - for fon in "${favfonts[@]}";do - [[ "$menu_sep_font_family" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},mb-setvar \"menu_sep_font_family='${fon}'\";$me") - done - fi + if [ "${#favfonts[@]}" -gt 0 ];then + out2+=("^sep($FONT_FAMILY)") + for fon in "${favfonts[@]}";do + [[ "$menu_sep_font_family" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},mb-setvar \"menu_sep_font_family='${fon}'\";$me") + done + fi ### MENU out+=("^sep(Menu)") @@ -501,16 +503,16 @@ fi out+=("^sep()") out+=("Apply accent preset,^checkout(sel_accents)") - out2+=("^tag(sel_accents)") - out2+=("^sep(Accent presets)") - while IFS="," read -r BG FG BGNAME FGNAME - do - [[ "$BGNAME" == "" ]] && BGNAME=${BG} - [[ "$FGNAME" == "" ]] && FGNAME=${FG} - out2+=(" $(printf '%*s' 25 "${FGNAME} on ${BGNAME}") ,jgctl accent '${BG}' '${FG}';$me") - out21+=(" $(printf '%*s' 25 "${BGNAME} on ${FGNAME}") ,jgctl accent '${FG}' '${BG}';$me") - done < <(tail -n +2 /usr/share/mabox-colorizer/readable_colors.csv) - out2+=("${out21[@]}") + out2+=("^tag(sel_accents)") + out2+=("^sep(Accent presets)") + while IFS="," read -r BG FG BGNAME FGNAME + do + [[ "$BGNAME" == "" ]] && BGNAME=${BG} + [[ "$FGNAME" == "" ]] && FGNAME=${FG} + out2+=(" $(printf '%*s' 25 "${FGNAME} on ${BGNAME}") ,jgctl accent '${BG}' '${FG}';$me") + out21+=(" $(printf '%*s' 25 "${BGNAME} on ${FGNAME}") ,jgctl accent '${FG}' '${BG}';$me") + done < <(tail -n +2 /usr/share/mabox-colorizer/readable_colors.csv) + out2+=("${out21[@]}") ### ITEM out+=("^sep($ITEM)") diff --git a/bin/colorizer-ob b/bin/colorizer-ob index c186c50..0ce88d5 100755 --- a/bin/colorizer-ob +++ b/bin/colorizer-ob @@ -247,19 +247,19 @@ getvalues () { #read BEVEL REST <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)" read TITLEBG <<< "$(grep .title.bg: ${THEMERC} | cut -d':' -f2)" case "${TITLEBG,,}" in - *flat*) BEVEL="flat";; - *raised*) BEVEL="raised";; - *sunken*) BEVEL="sunken";; - esac + *flat*) BEVEL="flat";; + *raised*) BEVEL="raised";; + *sunken*) BEVEL="sunken";; + esac case "${TITLEBG,,}" in - *solid*) GRAD=Solid;; - *splitvertical*) GRAD=SplitVertical;; - *vertical*) GRAD=Vertical;; - *mirrorhorizontal*) GRAD=MirrorHorizontal;; - *horizontal*) GRAD=Horizontal;; - *crossdiagonal*) GRAD=CrossDiagonal;; - *diagonal*) GRAD=Diagonal;; - *pyramid*) GRAD=Pyramid;; + *solid*) GRAD=Solid;; + *splitvertical*) GRAD=SplitVertical;; + *vertical*) GRAD=Vertical;; + *mirrorhorizontal*) GRAD=MirrorHorizontal;; + *horizontal*) GRAD=Horizontal;; + *crossdiagonal*) GRAD=CrossDiagonal;; + *diagonal*) GRAD=Diagonal;; + *pyramid*) GRAD=Pyramid;; esac but=$(<"$MBCOLORSDIR/.buttons") @@ -328,84 +328,84 @@ currvalues=("${ABG}|${ABGTO}|${AFG}|${ALINE}|${NBG}|${NBGTO}|${NFG}|${NLINE}|${G #notify-send.sh "$BEVEL" "${currvalues}" if [ ! -f "$USERTHEMES" ]; then - mkdir -p "$HOME/.config/colorizer/openbox/" - echo " ABG | ABGTO | AFG | ALINE | NBG | NBGTO | NFG | NLINE | GRAD |TXTJUST|PHEIGHT|PWIDTH|HANDLE|BORD|BEVEL|BUTTONS|FSIZE|FNAME|NDSLIMC|WEIGHT|SLANT|scheme_name" > "$USERTHEMES" + mkdir -p "$HOME/.config/colorizer/openbox/" + echo " ABG | ABGTO | AFG | ALINE | NBG | NBGTO | NFG | NLINE | GRAD |TXTJUST|PHEIGHT|PWIDTH|HANDLE|BORD|BEVEL|BUTTONS|FSIZE|FNAME|NDSLIMC|WEIGHT|SLANT|scheme_name" > "$USERTHEMES" fi #out+=("^sep($OBTHEME_LBL: $OBTHEME)") out+=(" $QUICK_TWEAKS,^checkout(tweaks)") - out2+=("^tag(tweaks)") - out2+=("^sep(Overall style)") - out2+=("Large,obtctl tweak large;$me") - out2+=("Big,obtctl tweak big;$me") - out2+=("Normal,obtctl tweak normal;$me") - out2+=("Small,obtctl tweak small;$me") - out2+=("Tiny,obtctl tweak tiny;$me") - out2+=("^sep()") - out2+=(" $RANDOMIZE,obtctl randomizer;$me") - out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"") - [[ "$BEVEL" == "flat" ]] && out2+=("綠 $FLAT,obtctl raised 0;$me") || out2+=("祿 $FLAT,obtctl raised 0;$me") - [[ "$BEVEL" == "raised" ]] && out2+=("綠 $RAISED,obtctl raised 1;$me") || out2+=("祿 $RAISED,obtctl raised 1;$me") - [[ "$BEVEL" == "sunken" ]] && out2+=("綠 $SUNKEN,obtctl raised 2;$me") || out2+=("祿 $SUNKEN,obtctl raised 2;$me") - out2+=("^sep($GRADIENT_TYPE)") - [[ "$GRAD" == Solid ]] && out2+=("綠 $SOLID_COLOR,obtctl gradient_type solid;$me") || out2+=("祿 $SOLID_COLOR,obtctl gradient_type solid;$me") - out2+=("^sep()") - [[ "$GRAD" == Vertical ]] && out2+=("綠 $VERTICAL,obtctl gradient_type vertical;$me") || out2+=("祿 $VERTICAL,obtctl gradient_type vertical;$me") - [[ "$GRAD" == Horizontal ]] && out2+=("綠 $HORIZONTAL,obtctl gradient_type horizontal;$me") || out2+=("祿 $HORIZONTAL,obtctl gradient_type horizontal;$me") - [[ "$GRAD" == MirrorHorizontal ]] && out2+=("綠 $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") || out2+=("祿 $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") - [[ "$GRAD" == SplitVertical ]] && out2+=("綠 $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") || out2+=("祿 $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") - [[ "$GRAD" == Diagonal ]] && out2+=("綠 $DIAGONAL,obtctl gradient_type diagonal;$me") || out2+=("祿 $DIAGONAL,obtctl gradient_type diagonal;$me") - [[ "$GRAD" == CrossDiagonal ]] && out2+=("綠 $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") || out2+=("祿 $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") - [[ "$GRAD" == Pyramid ]] && out2+=("綠 $PYRAMID,obtctl gradient_type pyramid;$me") || out2+=("祿 $PYRAMID,obtctl gradient_type pyramid;$me") + out2+=("^tag(tweaks)") + out2+=("^sep(Overall style)") + out2+=("Large,obtctl tweak large;$me") + out2+=("Big,obtctl tweak big;$me") + out2+=("Normal,obtctl tweak normal;$me") + out2+=("Small,obtctl tweak small;$me") + out2+=("Tiny,obtctl tweak tiny;$me") + out2+=("^sep()") + out2+=(" $RANDOMIZE,obtctl randomizer;$me") + out2+=("\"\"\"^sep($RAISED_OR_FLAT?)\"\"\"") + [[ "$BEVEL" == "flat" ]] && out2+=("綠 $FLAT,obtctl raised 0;$me") || out2+=("祿 $FLAT,obtctl raised 0;$me") + [[ "$BEVEL" == "raised" ]] && out2+=("綠 $RAISED,obtctl raised 1;$me") || out2+=("祿 $RAISED,obtctl raised 1;$me") + [[ "$BEVEL" == "sunken" ]] && out2+=("綠 $SUNKEN,obtctl raised 2;$me") || out2+=("祿 $SUNKEN,obtctl raised 2;$me") + out2+=("^sep($GRADIENT_TYPE)") + [[ "$GRAD" == Solid ]] && out2+=("綠 $SOLID_COLOR,obtctl gradient_type solid;$me") || out2+=("祿 $SOLID_COLOR,obtctl gradient_type solid;$me") + out2+=("^sep()") + [[ "$GRAD" == Vertical ]] && out2+=("綠 $VERTICAL,obtctl gradient_type vertical;$me") || out2+=("祿 $VERTICAL,obtctl gradient_type vertical;$me") + [[ "$GRAD" == Horizontal ]] && out2+=("綠 $HORIZONTAL,obtctl gradient_type horizontal;$me") || out2+=("祿 $HORIZONTAL,obtctl gradient_type horizontal;$me") + [[ "$GRAD" == MirrorHorizontal ]] && out2+=("綠 $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") || out2+=("祿 $MIRRORHORIZONTAL,obtctl gradient_type mirrorhorizontal;$me") + [[ "$GRAD" == SplitVertical ]] && out2+=("綠 $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") || out2+=("祿 $SPLITVERTICAL,obtctl gradient_type splitvertical;$me") + [[ "$GRAD" == Diagonal ]] && out2+=("綠 $DIAGONAL,obtctl gradient_type diagonal;$me") || out2+=("祿 $DIAGONAL,obtctl gradient_type diagonal;$me") + [[ "$GRAD" == CrossDiagonal ]] && out2+=("綠 $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") || out2+=("祿 $CROSSDIAGONAL,obtctl gradient_type crossdiagonal;$me") + [[ "$GRAD" == Pyramid ]] && out2+=("綠 $PYRAMID,obtctl gradient_type pyramid;$me") || out2+=("祿 $PYRAMID,obtctl gradient_type pyramid;$me") #### COLOR SCHEMES  out+=(" $THEMES,^checkout(schemes)") - out2+=("^tag(schemes)") - out2+=("^sep($THEMES)") - out2+=("^sep($MONOCHROMATIC)") - out2+=("^sep($CHOOSE_AND_PICK)") - out2+=(" $LIGHTBG...,obtctl mono pick light") - out2+=(" $DARKBG...,obtctl mono pick dark") - out2+=("^sep($GENERATEFROMWP)") + out2+=("^tag(schemes)") + out2+=("^sep($THEMES)") + out2+=("^sep($MONOCHROMATIC)") + out2+=("^sep($CHOOSE_AND_PICK)") + out2+=(" $LIGHTBG...,obtctl mono pick light col") + out2+=(" $DARKBG...,obtctl mono pick dark col") + out2+=("^sep($GENERATEFROMWP)") out2+=(" $LIGHTBG ,w2theme ob light;$me") out2+=(" $DARKBG ,w2theme ob dark;$me") - out2+=("^sep()") - out2+=(" $RANDOMIZE,obtctl randomizer;$me") - - out2+=("^sep($SYSTEM_THEMES)") - n=1 - while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name - do - ((n=n+1)) - out2+=(" $(printf '%-20s' "${scheme_name}") inactive ,^checkout(schsys${n})") - out3+=("^tag(schsys${n}") - out3+=("^sep($THEME: ${scheme_name})") - out3+=("^sep($APPLY)") - out3+=("\"\"\" $APPLY_THEME\"\"\",obtctl applytheme sys ${n};$me") - out3+=("^sep()") - out3+=(" $APPLY_SCHEME ,obtctl applyscheme sys ${n};$me") - done < <(tail -n +2 "$SYSTHEMES") - out2+=("^sep($YOUR_THEMES)") - out2+=(" $SAVE_CURRTHEME,obtctl savetheme '${currvalues}';$me") - out2+=(" $OPEN_THEMEFILE,xdg-open $USERTHEMES") - out2+=("^sep()") - n=1 - while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name - do - ((n=n+1)) - out2+=(" $(printf '%-20s' "${scheme_name}") inactive ,^checkout(sch${n})") - out3+=("^tag(sch${n}") - out3+=("^sep($THEME: ${scheme_name})") - out3+=("^sep($APPLY)") - out3+=("\"\"\" $APPLY_THEME\"\"\",obtctl applytheme usr ${n};$me") - out3+=("^sep()") - out3+=(" $APPLY_SCHEME ,obtctl applyscheme usr ${n};$me") - out3+=("^sep($DELETE)") - out3+=("󰗨 $DELETE_THEME: ${scheme_name},obtctl delscheme ${n};$me") - done < <(tail -n +2 "$USERTHEMES") - + out2+=("^sep()") + out2+=(" $RANDOMIZE,obtctl randomizer;$me") + + out2+=("^sep($SYSTEM_THEMES)") + n=1 + while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name + do + ((n=n+1)) + out2+=(" $(printf '%-20s' "${scheme_name}") inactive ,^checkout(schsys${n})") + out3+=("^tag(schsys${n}") + out3+=("^sep($THEME: ${scheme_name})") + out3+=("^sep($APPLY)") + out3+=("\"\"\" $APPLY_THEME\"\"\",obtctl applytheme sys ${n};$me") + out3+=("^sep()") + out3+=(" $APPLY_SCHEME ,obtctl applyscheme sys ${n};$me") + done < <(tail -n +2 "$SYSTHEMES") + out2+=("^sep($YOUR_THEMES)") + out2+=(" $SAVE_CURRTHEME,obtctl savetheme '${currvalues}';$me") + out2+=(" $OPEN_THEMEFILE,xdg-open $USERTHEMES") + out2+=("^sep()") + n=1 + while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel buttons fsize fname ndslimc weight slant scheme_name + do + ((n=n+1)) + out2+=(" $(printf '%-20s' "${scheme_name}") inactive ,^checkout(sch${n})") + out3+=("^tag(sch${n}") + out3+=("^sep($THEME: ${scheme_name})") + out3+=("^sep($APPLY)") + out3+=("\"\"\" $APPLY_THEME\"\"\",obtctl applytheme usr ${n};$me") + out3+=("^sep()") + out3+=(" $APPLY_SCHEME ,obtctl applyscheme usr ${n};$me") + out3+=("^sep($DELETE)") + out3+=("󰗨 $DELETE_THEME: ${scheme_name},obtctl delscheme ${n};$me") + done < <(tail -n +2 "$USERTHEMES") + out+=("^sep($TITLEBAR)") @@ -503,10 +503,10 @@ done out2+=("^sep($FONTFAMILY)") if [ -f "$HOME/.config/mabox/fonts.list" ];then - mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) + mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) else - mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) - cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ + mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) + cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ fi if [ "${#favfonts[@]}" -gt 0 ];then for fon in "${favfonts[@]}";do @@ -622,10 +622,10 @@ out+=("^sep(font family)") if [ -f "$HOME/.config/mabox/fonts.list" ];then - mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) + mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) else - mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) - cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ + mapfile -t favfonts < <( grep -vE "^($|#)" /usr/share/mabox-colorizer/fonts.list) + cp /usr/share/mabox-colorizer/fonts.list ~/.config/mabox/ fi if [ "${#favfonts[@]}" -gt 0 ];then for fon in "${favfonts[@]}";do diff --git a/bin/jgctl b/bin/jgctl index 1726864..96658b7 100755 --- a/bin/jgctl +++ b/bin/jgctl @@ -238,79 +238,79 @@ color_sel_border () { #[[ ${IBOR} == "0" ]] && item_border 1 } accent () { - color_sel_bg "${1}" - color_sel_fg "${2}" - color_sel_border "${2}" + color_sel_bg "${1}" + color_sel_fg "${2}" + color_sel_border "${2}" } tweak () { - case "$1" in - solid) - menu_gradient_pos none - tweak opacity 100 - opacity color_norm_bg 0 - opacity color_sep_fg 30 - item_radius 0 - item_border 0 - ;; - gradient) - menu_gradient_pos right - opacity color_norm_bg 10 - opacity color_sep_fg 0 - item_radius 3 - item_border 0 - ;; - opacity) - opacity color_menu_bg "$2" - opacity color_menu_bg_to "$2" - ;; - sizing) - case "$2" in - tight) - mb-setvar jgtools_padding=4 - mb-setvar jgtools_border=0 - mb-setvar submenu_spacing=2 - mb-setvar arrow_string= - ;; - normal) - mb-setvar jgtools_padding=8 - mb-setvar jgtools_border=3 - mb-setvar submenu_spacing=3 - mb-setvar arrow_string= - ;; - wide) - mb-setvar jgtools_padding=20 - mb-setvar jgtools_border=6 - mb-setvar submenu_spacing=6 - mb-setvar arrow_string= - ;; - esac - ;; - *):;; - esac - [[ "$3" == "menu" ]] && colorizer-menus -s 2>/dev/null + case "$1" in + solid) + menu_gradient_pos none + tweak opacity 100 + opacity color_norm_bg 0 + opacity color_sep_fg 30 + item_radius 0 + item_border 0 + ;; + gradient) + menu_gradient_pos right + opacity color_norm_bg 10 + opacity color_sep_fg 0 + item_radius 3 + item_border 0 + ;; + opacity) + opacity color_menu_bg "$2" + opacity color_menu_bg_to "$2" + ;; + sizing) + case "$2" in + tight) + mb-setvar jgtools_padding=4 + mb-setvar jgtools_border=0 + mb-setvar submenu_spacing=2 + mb-setvar arrow_string= + ;; + normal) + mb-setvar jgtools_padding=8 + mb-setvar jgtools_border=3 + mb-setvar submenu_spacing=3 + mb-setvar arrow_string= + ;; + wide) + mb-setvar jgtools_padding=20 + mb-setvar jgtools_border=6 + mb-setvar submenu_spacing=6 + mb-setvar arrow_string= + ;; + esac + ;; + *):;; + esac + [[ "$3" == "menu" ]] && colorizer-menus -s 2>/dev/null } t_search_field () { - [[ $search_field == "false" ]] && mb-setvar search_field=true || mb-setvar search_field=false - mb-jgtools main ipc + [[ $search_field == "false" ]] && mb-setvar search_field=true || mb-setvar search_field=false + mb-jgtools main ipc } t_apps_in_submenu () { - [[ $apps_in_submenu == "true" ]] && mb-setvar apps_in_submenu=false || mb-setvar apps_in_submenu=true - mb-jgtools main ipc + [[ $apps_in_submenu == "true" ]] && mb-setvar apps_in_submenu=false || mb-setvar apps_in_submenu=true + mb-jgtools main ipc } t_icons () { - [[ $jgmenu_use_icons == "true" ]] && mb-setvar jgmenu_use_icons=false || mb-setvar jgmenu_use_icons=true - mb-jgtools main ipc + [[ $jgmenu_use_icons == "true" ]] && mb-setvar jgmenu_use_icons=false || mb-setvar jgmenu_use_icons=true + mb-jgtools main ipc } border () { - [[ "$jgtools_padding" -lt "${1}" ]] && mb-setvar jgtools_padding=${1} - mb-setvar jgtools_border=${1} - colorizer-menus -s + [[ "$jgtools_padding" -lt "${1}" ]] && mb-setvar jgtools_padding=${1} + mb-setvar jgtools_border=${1} + colorizer-menus -s } padding () { - [[ "$jgtools_border" -gt "${1}" ]] && mb-setvar jgtools_border=${1} - mb-setvar jgtools_padding=${1} - colorizer-menus -s + [[ "$jgtools_border" -gt "${1}" ]] && mb-setvar jgtools_border=${1} + mb-setvar jgtools_padding=${1} + colorizer-menus -s } opacity () { @@ -322,31 +322,31 @@ opacity () { } savescheme () { - case "$LANG" in + case "$LANG" in pl*)SAVE_AS="Nowy motyw Menu" - DESC="Zapisz obecnie ustawione kolory Menu jako nowy motyw..." - LABEL="Nazwa:" - NAME="nazwa";; - *) SAVE_AS="New Menu colorscheme" - DESC="Save current Menu colors as colorscheme..." - LABEL="Name:" - NAME="colorscheme-name";; + DESC="Zapisz obecnie ustawione kolory Menu jako nowy motyw..." + LABEL="Nazwa:" + NAME="nazwa";; + *) SAVE_AS="New Menu colorscheme" + DESC="Save current Menu colors as colorscheme..." + LABEL="Name:" + NAME="colorscheme-name";; esac - # ask for scheme name - schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 - - echo "${1}${schemename}" >> "$HOME/.config/colorizer/menus/userschemes.csv" + # ask for scheme name + schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 + + echo "${1}${schemename}" >> "$HOME/.config/colorizer/menus/userschemes2.csv" } applyscheme () { theme MBcolors -line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes.csv") +line=$(awk 'NR == n' n=$1 "$HOME/.config/colorizer/menus/userschemes2.csv") #notify-send.sh "$1" "${line}" case "$1" in - sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/menus.csv";; - usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes.csv";; + sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/menus.csv";; + usr) SCHEMEFILE="$HOME/.config/colorizer/menus/userschemes2.csv";; esac -while IFS="|" read -r mbg mbgt mborder tbg tfg tborder normbg nfg sbg sfg sborder sepfg grad scheme_name +while IFS="|" read -r mbg mbga mbgt mbgta mborder mbordera tbg tbga tfg tfga tborder tbordera normbg normbga nfg nfga sbg sbga sfg sfga sborder sbordera sepfg sepfga b r p ss ibor irad a al sephal grad scheme_name do mb-setvar jgmenu_theme=MBcolors color_menu_bg "${mbg}" @@ -363,70 +363,113 @@ color_sel_border "${sborder}" color_sep_fg "${sepfg}" menu_gradient_pos "${grad}" -item_border 0 -color_title_bg 100 -color_menu_bg 100 -color_menu_bg_to 100 -color_norm_bg 0 +#opacity +color_menu_bg "${mbga}" +color_menu_bg_to "${mbgta}" +color_menu_border "${mbordera}" +color_title_bg "${tbga}" +color_title_fg "${tfga}" +color_title_border "${tbordera}" +color_norm_bg "${normbga}" +color_norm_fg "${nfga}" +color_sel_bg "${sbga}" +color_sel_fg "${sfga}" +color_sel_border "${sbordera}" +color_sep_fg "${sepfga}" + + +item_border "${ibor}" +item_radius "${irad}" +sep_halign "${sephal}" + +mb-setvar arrow_string=${a} +mb-setvar arrow_string_left=${al} + +# missing: ( from mabox.conf ) +mb-setvar jgtools_border=${b} +mb-setvar jgtools_padding=${p} +mb-setvar jgtools_radius=${r} +mb-setvar submenu_spacing=${ss} + #notify-send.sh "${scheme_name}" "${mbg}" done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") } delscheme() { - sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes.csv" + sed -i ${1}d "$HOME/.config/colorizer/menus/userschemes2.csv" } mono () { lighten=(0.92 0.8 0.65 0.45 0.28) darken=(0.9 0.74 0.54 0.38 0.18) if [ "${1}" == pick ];then - color=$(gpick -pso 2>/dev/null) + color=$(gpick -pso 2>/dev/null) else - color="${1}" + color="${1}" fi if [ "${#color}" == 7 ];then - for i in "${lighten[@]}" - do - pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)") - done - pal+=("$color") + for i in "${lighten[@]}" + do + pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)") + done + pal+=("$color") - for i in "${darken[@]}" - do - pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)") - done + for i in "${darken[@]}" + do + pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)") + done else - exit 0 + exit 0 fi # colorize menu if [ "$2" == "dark" ];then - #notify-send.sh "$1" "gen_menu" - color_menu_bg "${pal[8]}" - color_menu_bg_to "${pal[7]}" - color_menu_border "${pal[10]}" - color_title_bg "${pal[9]}" - color_title_border "${pal[9]}" - color_title_fg "${pal[2]}" - color_norm_fg "${pal[3]}" - color_sel_bg "${pal[6]}" - color_sel_fg "${pal[1]}" - color_sep_fg "${pal[6]}" + #notify-send.sh "$1" "gen_menu" + color_menu_bg "${pal[8]}" + color_menu_bg_to "${pal[7]}" + color_menu_border "${pal[10]}" + color_title_bg "${pal[9]}" + color_title_border "${pal[9]}" + color_title_fg "${pal[2]}" + color_norm_bg "${pal[8]}" + color_norm_fg "${pal[3]}" + color_sel_bg "${pal[6]}" + color_sel_fg "${pal[1]}" + color_sep_fg "${pal[6]}" else #light - color_menu_bg "${pal[2]}" - color_menu_bg_to "${pal[3]}" - color_menu_border "${pal[1]}" - color_title_bg "${pal[3]}" - color_title_border "${pal[4]}" - color_title_fg "${pal[10]}" - color_norm_fg "${pal[8]}" - color_sel_bg "${pal[4]}" - color_sel_fg "${pal[10]}" - color_sep_fg "${pal[3]}" + color_menu_bg "${pal[2]}" + color_menu_bg_to "${pal[3]}" + color_menu_border "${pal[1]}" + color_title_bg "${pal[3]}" + color_title_border "${pal[4]}" + color_title_fg "${pal[10]}" + color_norm_bg "${pal[2]}" + color_norm_fg "${pal[8]}" + color_sel_bg "${pal[4]}" + color_sel_fg "${pal[10]}" + color_sep_fg "${pal[3]}" fi -colorizer-menus -s 2>/dev/null + # opacity + color_norm_bg 0 + +case "$3" in + col)colorizer-menus -s 2>/dev/null;; + stylemenu) jgwallpaperchanger -s jgmenus;; + *):;; +esac +} +randomscheme(){ +mb-setvar jgmenu_theme=MBcolors +themefile=$(find /usr/share/mb-jgtools/jgobthemes/ -type f -name *.colorrc |shuf -n 1) +#notify-send.sh "Theme:" "${themefile}" +cat ${themefile} > ~/.config/mabox/jgobthemes/MBcolors.colorrc +} +applyoldscheme(){ + notify-send.sh "th" "${1}" +mb-setvar jgmenu_theme=MBcolors +cat ${1} > ~/.config/mabox/jgobthemes/MBcolors.colorrc } case "$1" in @@ -458,9 +501,11 @@ case "$1" in t_icons)t_icons;; border)border "$2";; padding)padding "$2";; - mono) mono "$2" "$3";; + mono) mono "$2" "$3" "$4";; savescheme) savescheme "$2";; applyscheme) applyscheme "$2" "$3";; delscheme) delscheme "$2";; + randomscheme) randomscheme;; + applyoldscheme) applyoldscheme "$2";; *) : ;; esac diff --git a/bin/obtctl b/bin/obtctl index 8fe64b7..3f0543f 100755 --- a/bin/obtctl +++ b/bin/obtctl @@ -8,12 +8,12 @@ THEMERC="$HOME/.themes/$OBTHEME/openbox-3/themerc" #if [[ $OBTHEME = MBcolor* ]];then #switch to MBcolors theme -# THEMEDIR="$HOME/.themes/$OBTHEME/openbox-3" -# THEMERC="$HOME/.themes/$OBTHEME/openbox-3/themerc" -# else -# xmlstarlet ed -L -N o="http://openbox.org/3.4/rc" -u '/o:openbox_config/o:theme/o:name' -v "MBcolors" "$HOME/.config/openbox/rc.xml" -# THEMEDIR="$HOME/.themes/MBcolors/openbox-3" -# THEMERC="$HOME/.themes/MBcolors/openbox-3/themerc" +# THEMEDIR="$HOME/.themes/$OBTHEME/openbox-3" +# THEMERC="$HOME/.themes/$OBTHEME/openbox-3/themerc" +# else +# xmlstarlet ed -L -N o="http://openbox.org/3.4/rc" -u '/o:openbox_config/o:theme/o:name' -v "MBcolors" "$HOME/.config/openbox/rc.xml" +# THEMEDIR="$HOME/.themes/MBcolors/openbox-3" +# THEMERC="$HOME/.themes/MBcolors/openbox-3/themerc" #fi @@ -271,7 +271,7 @@ activegradient () { fi } gradient () { - sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC} + sd "^window.active.title.bg.color:.*$" "window.active.title.bg.color: ${1}" ${THEMERC} sd "^window.active.title.bg.colorTo:.*$" "window.active.title.bg.colorTo: ${2}" ${THEMERC} ## split.To - only used if gradient = splitvertical @@ -318,7 +318,7 @@ gradient () { shadow light fi fi - + } gradient_reverse () { : @@ -493,29 +493,29 @@ buttons () { echo "${1}" > $THEMEDIR/.buttons #if buttons big check font size also case "$1" in - big-12) - nspace="http://openbox.org/3.4/rc" - cfg="$HOME/.config/openbox/rc.xml" - SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") - if [ "$SIZE" -lt "12" ]; then - xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "12" "$cfg" + big-12) + nspace="http://openbox.org/3.4/rc" + cfg="$HOME/.config/openbox/rc.xml" + SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") + if [ "$SIZE" -lt "12" ]; then + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "12" "$cfg" xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:size' -v "12" "$cfg" fi - ;; - big-14) - nspace="http://openbox.org/3.4/rc" - cfg="$HOME/.config/openbox/rc.xml" - SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") - if [ "$SIZE" -lt "14" ]; then - xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "14" "$cfg" + ;; + big-14) + nspace="http://openbox.org/3.4/rc" + cfg="$HOME/.config/openbox/rc.xml" + SIZE=$(xmlstarlet sel -N a="$nspace" -t -v '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' "$cfg") + if [ "$SIZE" -lt "14" ]; then + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v "14" "$cfg" xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:size' -v "14" "$cfg" fi - ;; - *) : ;; + ;; + *) : ;; esac } ndslimc() { - xmlstarlet ed -L -N o="http://openbox.org/3.4/rc" -u '/o:openbox_config/o:theme/o:titleLayout' -v "$1" "$HOME/.config/openbox/rc.xml" + xmlstarlet ed -L -N o="http://openbox.org/3.4/rc" -u '/o:openbox_config/o:theme/o:titleLayout' -v "$1" "$HOME/.config/openbox/rc.xml" } activebuttonscolors () { sd "^window.active.button.*.unpressed.image.color:.*$" "window.active.button.*.unpressed.image.color: ${1}" ${THEMERC} @@ -525,11 +525,11 @@ activebuttonscolors () { #pressed=$() #disabled=$() if [[ "${1}" == *"E5E5E5"* ]];then - hover="#FFFFFF" - else - hover="#000000" - fi - #notify-send.sh "${1}" "${hover}" + hover="#FFFFFF" + else + hover="#000000" + fi + #notify-send.sh "${1}" "${hover}" sd "^window.active.button.*.hover.image.color:.*$" "window.active.button.*.hover.image.color: ${hover}" ${THEMERC} } fontfamily () { @@ -740,152 +740,156 @@ randomizer () { } tweak() { - case "$1" in - large) - fontsize 14 - paddingHeight 8 - buttons big-14 - borderWidth 6 - handlewidth 6 - ;; - big) - fontsize 12 - paddingHeight 6 - buttons big-12 - borderWidth 4 - handlewidth 4 - ;; - normal) - fontsize 11 - paddingHeight 4 - buttons tiny - borderWidth 1 - handlewidth 3 - ;; - small) - fontsize 10 - paddingHeight 2 - buttons dots - borderWidth 0 - handlewidth 2 - ;; - tiny) - fontsize 9 - paddingHeight 1 - buttons normal - borderWidth 0 - handlewidth 0 - ;; - *):;; - esac + case "$1" in + large) + fontsize 14 + paddingHeight 8 + buttons big-14 + borderWidth 6 + handlewidth 6 + ;; + big) + fontsize 12 + paddingHeight 6 + buttons big-12 + borderWidth 4 + handlewidth 4 + ;; + normal) + fontsize 11 + paddingHeight 4 + buttons tiny + borderWidth 1 + handlewidth 3 + ;; + small) + fontsize 10 + paddingHeight 2 + buttons dots + borderWidth 0 + handlewidth 2 + ;; + tiny) + fontsize 9 + paddingHeight 1 + buttons normal + borderWidth 0 + handlewidth 0 + ;; + *):;; + esac } savetheme () { - case "$LANG" in + case "$LANG" in pl*)SAVE_AS="Nowy motyw Openbox" - DESC="Zapisz obecne ustawionia Openbox jako nowy motyw..." - LABEL="Nazwa:" - NAME="nazwa";; - *) SAVE_AS="New Openbox theme" - DESC="Save current Openbox window decoration setup as theme..." - LABEL="Name:" - NAME="theme-name";; + DESC="Zapisz obecne ustawionia Openbox jako nowy motyw..." + LABEL="Nazwa:" + NAME="nazwa";; + *) SAVE_AS="New Openbox theme" + DESC="Save current Openbox window decoration setup as theme..." + LABEL="Name:" + NAME="theme-name";; esac - # ask for scheme name - schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 - - echo "${1}${schemename}" >> "$HOME/.config/colorizer/openbox/userthemes.csv" + # ask for scheme name + schemename=$(yad --center --width=300 --borders=20 --window-icon=mbcc --title "$SAVE_AS" --text="$DESC" --entry --entry-label="$LABEL" --entry-text="$NAME") || exit 1 + + echo "${1}${schemename}" >> "$HOME/.config/colorizer/openbox/userthemes.csv" } applyscheme () { - theme MBcolors - case "$1" in - sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";; - usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";; - esac - while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name - do - clractivebg "${abg}" - clractivebgto "${abgto}" - activetextcolor "${afg}" - activeborderColor "${aline}" - clrnormalbg "${nbg}" - clrnormalbgto "${nbgto}" - inactivetextcolor "${nfg}" - inactiveborderColor "${nline}" - gradient_type "${grad}" - done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") + theme MBcolors + case "$1" in + sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";; + usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";; + esac + while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name + do + clractivebg "${abg}" + clractivebgto "${abgto}" + activetextcolor "${afg}" + activeborderColor "${aline}" + clrnormalbg "${nbg}" + clrnormalbgto "${nbgto}" + inactivetextcolor "${nfg}" + inactiveborderColor "${nline}" + gradient_type "${grad}" + done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") } applytheme() { - case "$1" in - sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";; - usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";; - esac - applyscheme "$1" "$2" - while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name - do - textjustify "${txtjust}" - paddingHeight "${pheight}" - paddingWidth "${pwidth}" - handlewidth "${handle}" - borderWidth "${bord}" - raised "${bevel}" - buttons "${button}" - fontsize "${fsize}" - fontfamily "${fname}" - ndslimc "${ndslim}" - fontweight "${weight}" - fontslant "${slant}" - done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") + case "$1" in + sys) SCHEMEFILE="/usr/share/mabox-colorizer/colorschemes/ob.csv";; + usr) SCHEMEFILE="$HOME/.config/colorizer/openbox/userthemes.csv";; + esac + applyscheme "$1" "$2" + while IFS="|" read -r abg abgto afg aline nbg nbgto nfg nline grad txtjust pheight pwidth handle bord bevel button fsize fname ndslim weight slant scheme_name + do + textjustify "${txtjust}" + paddingHeight "${pheight}" + paddingWidth "${pwidth}" + handlewidth "${handle}" + borderWidth "${bord}" + raised "${bevel}" + buttons "${button}" + fontsize "${fsize}" + fontfamily "${fname}" + ndslimc "${ndslim}" + fontweight "${weight}" + fontslant "${slant}" + done < <(awk 'NR == n' n=$2 "$SCHEMEFILE") } delscheme() { - sed -i ${1}d "$HOME/.config/colorizer/openbox/userthemes.csv" + sed -i ${1}d "$HOME/.config/colorizer/openbox/userthemes.csv" } mono() { lighten=(0.92 0.8 0.65 0.45 0.28) darken=(0.9 0.74 0.54 0.38 0.18) if [ "${1}" == pick ];then - color=$(gpick -pso 2>/dev/null) + color=$(gpick -pso 2>/dev/null) else - color="${1}" + color="${1}" fi if [ "${#color}" == 7 ];then - for i in "${lighten[@]}" - do - pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)") - done - pal+=("$color") + for i in "${lighten[@]}" + do + pal+=("$(pastel mix -f $i "#ffffff" "$color"|pastel format hex)") + done + pal+=("$color") - for i in "${darken[@]}" - do - pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)") - done + for i in "${darken[@]}" + do + pal+=("$(pastel mix -f $i "$color" "#000000"|pastel format hex)") + done else - exit 0 + exit 0 fi #colorize OB if [ "$2" == "dark" ];then - clractivebg "${pal[5]}" - #clractivebgto "${pal[6]}" - activeborderColor "${pal[2]}" - activetextcolor "${pal[1]}" - clrnormalbg "${pal[9]}" - clrnormalbgto "${pal[10]}" - inactiveborderColor "${pal[8]}" - inactivetextcolor "${pal[4]}" + clractivebg "${pal[5]}" + #clractivebgto "${pal[6]}" + activeborderColor "${pal[2]}" + activetextcolor "${pal[1]}" + clrnormalbg "${pal[9]}" + clrnormalbgto "${pal[10]}" + inactiveborderColor "${pal[8]}" + inactivetextcolor "${pal[4]}" else #light - clractivebg "${pal[4]}" - #clractivebgto "${pal[4]}" - activeborderColor "${pal[0]}" - activetextcolor "${pal[9]}" - clrnormalbg "${pal[9]}" - clrnormalbgto "${pal[10]}" - inactiveborderColor "${pal[7]}" - inactivetextcolor "${pal[5]}" + clractivebg "${pal[4]}" + #clractivebgto "${pal[4]}" + activeborderColor "${pal[0]}" + activetextcolor "${pal[9]}" + clrnormalbg "${pal[9]}" + clrnormalbgto "${pal[10]}" + inactiveborderColor "${pal[7]}" + inactivetextcolor "${pal[5]}" fi openbox --reconfigure -colorizer-ob -s 2>/dev/null +case "$3" in + col)colorizer-ob -s 2>/dev/null;; + stylemenu)jgwallpaperchanger -s obox;; + *):;; +esac } case "$1" in @@ -928,7 +932,7 @@ case "$1" in fontslanttoggle) fontslanttoggle;; randomizer) randomizer;; tweak) tweak "$2";; - mono) mono "$2" "$3";; + mono) mono "$2" "$3" "$4";; savetheme) savetheme "$2";; applyscheme) applyscheme "$2" "$3";; applytheme) applytheme "$2" "$3";; diff --git a/bin/randomizer b/bin/randomizer index f988456..602d15e 100755 --- a/bin/randomizer +++ b/bin/randomizer @@ -6,17 +6,17 @@ ob () { obtctl randomizer } menu () { - mb-setvar jgmenu_theme=$(basename -s .colorrc $(ls ~/.config/mabox/jgobthemes/*.colorrc | shuf -n 1)) + jgctl randomscheme case "$1" in show) colorizer-menus -s;; *):;; esac } conky () { - LINES=$(tail -n +2 /usr/share/mabox-colorizer/colorschemes/conky.csv|wc -l) - N=$(( ( RANDOM % $LINES ) + 2 )) - #notify-send.sh "$LINES" "$N" - conkyctl applyscheme_all sys $N + LINES=$(tail -n +2 /usr/share/mabox-colorizer/colorschemes/conky.csv|wc -l) + N=$(( ( RANDOM % $LINES ) + 2 )) + #notify-send.sh "$LINES" "$N" + conkyctl applyscheme_all sys $N } wp () { : # Może niepotrzebne tu diff --git a/share/mabox-colorizer/colorschemes/menus.csv b/share/mabox-colorizer/colorschemes/menus.csv index a8e9bee..3c91069 100644 --- a/share/mabox-colorizer/colorschemes/menus.csv +++ b/share/mabox-colorizer/colorschemes/menus.csv @@ -1,6 +1,7 @@ - MBG | MBGT |MBORDER| TBG | TFG |TBORDER|NORMBG | NFG | SBG | SFG |SBORDER| SEPFG |GRADIENT|scheme_name -#383838|#222222|#eeeeee|#325a52|#d3d4bf|#579c8e|#2b303b|#dadada|#579c8e|#ffffff|#579c8e|#4f4f4f|none|Istredd -#1E1E1E|#262626|#333333|#383838|#BBBBBB|#222222|#1e1e1e|#9b9b9b|#000000|#FFCC66|#FFCC66|#363636|right|Jaskier -#d3d4bf|#d2cda1|#cdc76d|#cdc76d|#0c1d23|#c6b76b|#d3d4bf|#0c1d23|#a29d62|#060b0a|#c6b76b|#a29d62|top_right|Jaskier Light -#38373c|#424247|#2a2a2c|#2a2a2d|#d0d0ce|#151517|#2b303b|#c8c8c4|#59595a|#f8f8f8|#373739|#2a2a2c|bottom_left|GreyBird Dark -#ececea|#e0e0de|#d0d0ce|#d0d0ce|#1e1e20|#c0c0be|#2b303b|#1e1e20|#b0b0af|#151517|#c0c0be|#b0b0af|bottom_left|GreyBird Light + MBG |op| MBGT |op|MBORDER|op| TBG |op| TFG |op|TBORDER|op|NORMBG |op| NFG |op| SBG |op| SFG |op|SBORDER|op| SEPFG |op|B|R|P|SS|IB|IR|A|AL|SEPHAL|GRADIENT|scheme_name +#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|0|#dadada|90|#579c8e|90|#ffffff|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|none|Istredd +#383838|90|#222222|90|#eeeeee|90|#325a52|100|#d3d4bf|90|#579c8e|40|#383838|100|#dadada|90|#e8cc2d|70|#0d0d0d|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|right|Istredd v2 +#1E1E1E|90|#262626|90|#333333|90|#383838|90|#BBBBBB|90|#222222|90|#1e1e1e|90|#9b9b9b|90|#000000|90|#FFCC66|90|#FFCC66|90|#363636|20|0|2|8|8|0|2|||center|right|Jaskier +#d3d4bf|90|#d2cda1|90|#cdc76d|90|#cdc76d|90|#0c1d23|90|#c6b76b|90|#d3d4bf|90|#0c1d23|90|#e8e8dd|100|#060b0a|90|#c6b76b|90|#a29d62|20|0|2|8|8|0|2|||center|top_right|Jaskier Light +#38373c|90|#424247|90|#2a2a2c|90|#2a2a2d|90|#d0d0ce|90|#151517|90|#38373c|90|#c8c8c4|90|#59595a|90|#f8f8f8|90|#373739|90|#2a2a2c|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Dark +#ececea|90|#e0e0de|90|#d0d0ce|90|#d0d0ce|90|#1e1e20|90|#c0c0be|90|#e0e0de|90|#1e1e20|90|#b0b0af|90|#151517|90|#c0c0be|90|#b0b0af|20|0|2|8|8|0|2|||center|bottom_left|GreyBird Light diff --git a/share/mabox-colorizer/colorschemes/ob.csv b/share/mabox-colorizer/colorschemes/ob.csv index 81a7b0a..2a852cd 100644 --- a/share/mabox-colorizer/colorschemes/ob.csv +++ b/share/mabox-colorizer/colorschemes/ob.csv @@ -5,5 +5,7 @@ #D9D9D9|#B6B6B6|#0F0F0F|#BDBBB9|#D9D9D9|#B4B4B4|#656565|#BFBCBB|vertical|left|2|2|1|0|raised|bold|11|Ubuntu Bold|NLIMC|Bold|Normal|Light Grey #CE5C00|#9b4600|#E5E5E5|#CE5C00|#D3D7CF|#B4B4B4|#656565|#BFBCBB|mirrorhorizontal|center|2|2|1|0|raised|dots|11|Noto Sans|NLIMC|Normal|Normal|Orange #F7941E|#004E8F|#E5E5E5|#F7941E|#4a2c09|#00172b|#656565|#4a2c09|mirrorhorizontal|center|4|4|1|0|raised|big-14|13|Ubuntu|NLIMC|Normal|Normal|Sky and Sea -#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|flat|bold|11|Ubuntu|LIMC|Bold|Normal|BL Boron Light +#bda9a9|#D3C6C6|#222222|#EBDCDD|#D2C6C5|#D2C6C5|#837B7C|#D2C6C5|mirrorhorizontal|center|4|4|0|6|sunken|bold|11|Ubuntu|LIMC|Bold|Normal|BL Boron Light #765BAB|#5e478c|#FFFFFF|#242424|#373737|#1e1e1e|#9A9A9A|#373737|solid|center|2|2|4|1|flat|tiny|10|Cantarell|NDSLIMC|Normal|Normal|Lean +#0395E2|#02669c|#E5E5E5|#0395E2|#201d29|#09080b|#898989|#201d29|splitvertical|center|4|4|3|1|flat|bold|11|Ubuntu|NLIMC|Bold|Normal|Split Blue +#393c47|#75443b|#E5E5E5|#393c47|#201d29|#09080b|#898989|#201d29|mirrorhorizontal|center|2|2|4|4|flat|tiny|8|Ubuntu|NLIMC|Bold|Normal|MirrHor Brown