From e7186ded1be85f38b037518fc0bf5431ac57a4c9 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sun, 19 Jan 2025 21:06:28 +0100 Subject: [PATCH] small updates --- bin/colorizer | 30 ++++---------------- bin/colorizer-fonts | 2 +- bin/fontctl | 6 ++-- bin/jgctl | 1 + share/mabox-colorizer/colorschemes/menus.csv | 3 ++ 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/bin/colorizer b/bin/colorizer index 4ac9c1c..55e3580 100755 --- a/bin/colorizer +++ b/bin/colorizer @@ -105,6 +105,7 @@ case "$LANG" in RES_ALL="Wszystko (OB, menu, conky)" COLORIZE="Szybko Pokoloruj lub Resetuj..." _LEFTSIDEPANEL="Lewy panel boczny" + _WALL_DESK_MENU="Tapety oraz stylizacja pulpitu" ;; *) REGENERATE="(Re)Generate from wallpaper colors..." @@ -170,6 +171,7 @@ case "$LANG" in RES_ALL="All (OB, menus, conky)" COLORIZE="Quickly Colorize or Reset..." _LEFTSIDEPANEL="Left Sidepanel" + _WALL_DESK_MENU="Wallpaper & Desktop styling menu" ;; esac @@ -246,6 +248,8 @@ out+=("$CAVA,colorizer-cava -s") ##out+=(" $EDIT_PALETTE,xdg-open $WALLPALDIR/$WALLPAPER.clr") + +out+=("^sep($WALLPAPER)") 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") @@ -253,8 +257,8 @@ out+=(" $SYSWALLPAPER (${syswallp}),nitrogen --random /usr/sh 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)") +out+=("^sep()") +out+=(" $_WALL_DESK_MENU,jgwallpaperchanger -s") if [[ "$gradient_obtheme" == "yes" || "$gradient_menu" == "yes" ]];then [[ "$gradient_obtheme" == "yes" ]] && OBGRAD="OB" || OBGRAD="" @@ -297,28 +301,6 @@ fi out2+=("^tag(settings)") -#out2+=("$WALLPAPERS,^checkout(wallpapersettings)") -out3+=("^tag(wallpapersettings)") -out3+=("^sep($SYSWALLPAPER ($syswallp))") -out3+=("^sep(/usr/share/backgrounds)") -out3+=(" $OPENDIR,xdg-open /usr/share/backgrounds") -out3+=(" $OPENDIR_VIEWNIOR,viewnior /usr/share/backgrounds") -out3+=(" $SETRANDOM,nitrogen --random /usr/share/backgrounds --set-scaled --save;colorizer -s") -out3+=("^sep($USERWALLPAPER ($userwallp))") -if [[ -d "${user_wallpapers_dir}" ]]; then -# dir exist -out3+=("^sep(${user_wallpapers_dir})") -out3+=(" $OPENDIR ,xdg-open ${user_wallpapers_dir}") -out3+=(" $OPENDIR_VIEWNIOR ,viewnior ${user_wallpapers_dir}") -out3+=(" $SETRANDOM,nitrogen --random ${user_wallpapers_dir} --set-scaled --save;colorizer -s") -out3+=("^sep()") -out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") -else -# dir not exist -out3+=("^sep(${user_wallpapers_dir} - $USERDIR_NOT_EXIST") -out3+=(" $CREATE_USERDIR,mkdir -p ${user_wallpapers_dir};colorizer -s") -out3+=(" $CHANGE ($EDITCONF),xdg-open $CNF_FILE") -fi 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)") diff --git a/bin/colorizer-fonts b/bin/colorizer-fonts index b4628b2..d319fa6 100755 --- a/bin/colorizer-fonts +++ b/bin/colorizer-fonts @@ -158,7 +158,7 @@ out+=("󰑓 $_RESET,^checkout(reset)") out2+=("^sep($_RESET)") out2+=("$_ALL,fontctl resetall;$me") out2+=("^sep()") - out2+=("$_TITLEBAR_FONT,fontctl resetob;$me") + out2+=("$_TITLEBAR_FONT ($_OPENBOX_WM),fontctl resetob;$me") out2+=("$_MENUS,fontctl resetmenus;$me") out2+=("$_CONKY,fontctl resetconky;$me") out2+=("$_GTK,fontctl resetgtk;$me") diff --git a/bin/fontctl b/bin/fontctl index aaa4228..045d3f2 100755 --- a/bin/fontctl +++ b/bin/fontctl @@ -43,8 +43,8 @@ resetob () { xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:name' -v "Ubuntu" "$cfg" xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:name' -v "Ubuntu" "$cfg" - xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v 9 "$cfg" - xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:size' -v 9 "$cfg" + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="ActiveWindow"]/a:size' -v 10 "$cfg" + xmlstarlet ed -L -N a="$nspace" -u '/a:openbox_config/a:theme/a:font[@place="InactiveWindow"]/a:size' -v 10 "$cfg" #add Weight and slant @@ -71,11 +71,13 @@ inc_all() { gtk_fontsize inc inc_conky inc_menus + ob_fontsize inc } dec_all() { gtk_fontsize dec dec_conky dec_menus + ob_fontsize dec } inc_conky () { read FONTDEF <<< "$(grep "font .*=.*,$" ${BASECONKY} | cut -d'=' -f2,3 |cut -d"'" -f2)" diff --git a/bin/jgctl b/bin/jgctl index c0a941d..b59cbd5 100755 --- a/bin/jgctl +++ b/bin/jgctl @@ -68,6 +68,7 @@ color_menu_border () { } menu_gradient_pos () { sd "menu_gradient_pos.*$" "menu_gradient_pos = $1" ${THEMERC} + #mb-setvar menu_gradient_pos=${1} } gradient () { read MBG MBGA<<< "$(grep 'color_menu_bg ' ${THEMERC} | cut -d'=' -f2)" diff --git a/share/mabox-colorizer/colorschemes/menus.csv b/share/mabox-colorizer/colorschemes/menus.csv index 3c91069..471bea5 100644 --- a/share/mabox-colorizer/colorschemes/menus.csv +++ b/share/mabox-colorizer/colorschemes/menus.csv @@ -5,3 +5,6 @@ #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 +#2f343f|100|#2f343f|100|#4C566A|100|#3B4252|100|#ffffff|100|#2f343f|100|#2f343f|0|#a8adb5|100|#3B4252|100|#A3BE8C|100|#A3BE8C|20|#4C566A|20|12|8|24|8|0|2|||center|top_right|Nordic +#103C48|100|#184956|90|#eeeeee|90|#2D5B69|100|#CAD8D9|90|#103C48|100|#383838|0|#ADBCBC|90|#DBB32D|100|#103C48|100|#061307|60|#4f4f4f|30|0|2|8|4|0|3|||center|none|Selenized-Dark +#252525|100|#181818|90|#184956|90|#181818|100|#b2b2b2|90|#252525|100|#181818|0|#c0c0c0|90|#70B433|70|#ffffff|100|#70B433|90|#1d3036|30|0|2|8|4|1|3|||center|none|Selenized-Black