From eb758ac16203f8b4a1edc6b9e92ba73405e1fc30 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sun, 12 Apr 2026 16:20:51 +0200 Subject: [PATCH] glyphicons --- bin/colorizer | 56 +++++++++++++++--------------- bin/colorizer-conky | 41 +++++++++++----------- bin/colorizer-fonts | 41 +++++++++++----------- bin/conkyctl | 84 ++++++++++++++++++++++----------------------- bin/fontctl | 2 +- 5 files changed, 111 insertions(+), 113 deletions(-) mode change 100755 => 100644 bin/colorizer diff --git a/bin/colorizer b/bin/colorizer old mode 100755 new mode 100644 index 18d6715..1c83b9e --- a/bin/colorizer +++ b/bin/colorizer @@ -16,7 +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 +. /usr/share/mb-jgtools/jgtools.inc + CNF_DIR="$HOME/.config/colorizer" mkdir -p "$CNF_DIR" @@ -114,7 +115,7 @@ case "$LANG" in _AUTOTH_SETTINGS="Ustawienia Auto theming" _APPLY_COLORSCHEME_TO="Zastosuj kolory tapety do..." _APPLY_TO_ALL="Wszystko" - _APPLY_REVERSE="Wszystko odwrotnie (jasny 易 ciemny)" + _APPLY_REVERSE="Wszystko odwrotnie (jasny 󰑖 ciemny)" _APPLY_ONLY_TO="Zastosuj tylko do..." _RESET_WP_THEMES="Reset tapety i motywów" _ENABLED="włączony" @@ -194,7 +195,7 @@ case "$LANG" in _AUTOTH_SETTINGS="Auto theming settings" _APPLY_COLORSCHEME_TO="Apply wallpaper colors to..." _APPLY_TO_ALL="All elements" - _APPLY_REVERSE="All elements inversely (dark 易 light)" + _APPLY_REVERSE="All elements inversely (dark 󰑖 light)" _APPLY_ONLY_TO="Apply only to..." _RESET_WP_THEMES="Reset (wallpaper and themes)" _ENABLED="enabled" @@ -292,7 +293,7 @@ out+=(" $_APPLY_COLORSCHEME_TO,^checkout(applyto)") out2+=("^tag(applyto)") out2+=("^sep($_APPLY_COLORSCHEME_TO)") out2+=(" $_APPLY_TO_ALL,w2theme colorize;$me applyto") -out2+=("敏 $_APPLY_REVERSE,w2theme reverse;$me applyto") +out2+=("󰑤 $_APPLY_REVERSE,w2theme reverse;$me applyto") out2+=("^sep($_APPLY_ONLY_TO)") out2+=("^sep(Menu)") out2+=(" $_LIGHTBG,w2theme menu light;$me applyto") @@ -310,37 +311,37 @@ out2+=(" $_DARKBG,w2theme ob dark;$me applyto") out+=("^sep()") -[[ "$wall2themes" == "yes" ]] && out+=(" $_AUTOTH_SETTINGS,^checkout(autotheming)") || out+=(" $_AUTOTH_SETTINGS,^checkout(autotheming)") +[[ "$wall2themes" == "yes" ]] && out+=("${cbon} $_AUTOTH_SETTINGS,^checkout(autotheming)") || out+=("${cboff} $_AUTOTH_SETTINGS,^checkout(autotheming)") out2+=("^tag(autotheming)") out2+=("^sep($_AUTOTH_SETTINGS (beta))") -[[ "$wall2themes" == "yes" ]] && out2+=("綠 $_ENABLED") || out2+=("祿 $_ENABLED,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") -[[ "$wall2themes" != "yes" ]] && out2+=("綠 $_DISABLED") || out2+=("祿 $_DISABLED,mb-setvar wall2themes=no $COLORIZER_CONF;$me") +[[ "$wall2themes" == "yes" ]] && out2+=("${ron} $_ENABLED") || out2+=("${roff} $_ENABLED,mb-setvar wall2themes=yes $COLORIZER_CONF;$me") +[[ "$wall2themes" != "yes" ]] && out2+=("${ron} $_DISABLED") || out2+=("${roff} $_DISABLED,mb-setvar wall2themes=no $COLORIZER_CONF;$me") out2+=("^sep(OpenBox)") -[[ "$wall2themes_ob" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_ob" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_ob=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_ob=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_ob" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_ob" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_ob=none $COLORIZER_CONF;$me autoth") out2+=("^sep(Menu)") -[[ "$wall2themes_menu" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_menu" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_menu=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_menu=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_menu" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_menu" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_menu=none $COLORIZER_CONF;$me autoth") out2+=("^sep(Conky)") -[[ "$wall2themes_conky" == "light" ]] && out2+=("綠 $_LIGHTBG") || out2+=("祿 $_LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_conky" == "dark" ]] && out2+=("綠 $_DARKBG") || out2+=("祿 $_DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "light" ]] && out2+=("${ron} $_LIGHTBG") || out2+=("${roff} $_LIGHTBG,mb-setvar wall2themes_conky=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "dark" ]] && out2+=("${ron} $_DARKBG") || out2+=("${roff} $_DARKBG,mb-setvar wall2themes_conky=dark $COLORIZER_CONF;$me autoth") out2+=("^sep()") -[[ "$wall2themes_conky" == "none" ]] && out2+=("綠 $_NONE") || out2+=("祿 $_NONE,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_conky" == "none" ]] && out2+=("${ron} $_NONE") || out2+=("${roff} $_NONE,mb-setvar wall2themes_conky=none $COLORIZER_CONF;$me autoth") out2+=("^sep(PyRadio / Cava)") out2+=("PyRadio and Cava,^checkout(pycava)") out3+=("^tag(pycava)") out3+=("^sep(Pyradio)") -[[ "$wall2themes_pyradio" == "light" ]] && out3+=("綠 $_LIGHTBG") || out3+=("祿 $_LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me autoth") -[[ "$wall2themes_pyradio" == "dark" ]] && out3+=("綠 $_DARKBG") || out3+=("祿 $_DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "light" ]] && out3+=("${ron} $_LIGHTBG") || out3+=("${roff} $_LIGHTBG,mb-setvar wall2themes_pyradio=light $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "dark" ]] && out3+=("${ron} $_DARKBG") || out3+=("${roff} $_DARKBG,mb-setvar wall2themes_pyradio=dark $COLORIZER_CONF;$me autoth") out3+=("^sep()") -[[ "$wall2themes_pyradio" == "none" ]] && out3+=("綠 $_NONE") || out3+=("祿 $_NONE,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me autoth") +[[ "$wall2themes_pyradio" == "none" ]] && out3+=("${ron} $_NONE") || out3+=("${roff} $_NONE,mb-setvar wall2themes_pyradio=none $COLORIZER_CONF;$me autoth") out3+=("^sep(Cava)") out3+=("^sep(not implemented yet)") out3+=("Use Colorizer Cava,colorizer-cava -s") @@ -405,14 +406,14 @@ out2+=("^tag(settings)") 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") +[[ "$gradient_obtheme" == "yes" ]] && out2+=("${cbon} $GRAD_OB,mb-setvar gradient_obtheme=no $CNF_FILE;colorizer -s") || out2+=("${cboff} $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") +[[ "$gradient_menu" == "yes" ]] && out2+=("${cbon} $GRAD_MENU,mb-setvar gradient_menu=no $CNF_FILE;colorizer -s") || out2+=("${cboff} $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)") @@ -437,22 +438,21 @@ 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") -[[ "$related_tools" == "show" ]] && out2+=(" $SHOW_RELATED,^checkout(related)") || out2+=(" $SHOW_RELATED,^checkout(related)") +[[ "$related_tools" == "show" ]] && out2+=("${cbon} $SHOW_RELATED,^checkout(related)") || out2+=("${cboff} $SHOW_RELATED,^checkout(related)") out3+=("^tag(related)") out3+=("^sep($SHOW_RELATED)") -[[ "$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") +[[ "$related_tools" == "show" ]] && out3+=("${ron} $SHOW,colorizer -s" "${roff} $HIDE,mb-setvar related_tools=hide $CNF_FILE;colorizer -s") || out3+=("${roff} $SHOW,mb-setvar related_tools=show $CNF_FILE;colorizer -s" "${ron} $HIDE,colorizer -s") out3+=("^sep()") -out3+=(" $EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE") +out3+=(" $EDIT_RELATED,xdg-open $CUSTOM_COMMANDS_FILE") out3+=("󰁯 $RESET_RELATED,rm $CUSTOM_COMMANDS_FILE;colorizer -s") out2+=("^sep()") -out2+=(" $EDITCONF,xdg-open $CNF_FILE") +out2+=(" $EDITCONF,xdg-open $CNF_FILE") out2+=("󰁯 $RESET,rm $CNF_FILE;colorizer -s") ### RUN if [[ "$1" == "-s" ]]; then - . /usr/share/mb-jgtools/pipemenu-standalone.cfg - . $HOME/.config/mabox/mabox.conf + if [[ "$colorizer_size" == "full" ]];then eval $(xdotool getdisplaygeometry --shell) @@ -504,7 +504,7 @@ if [[ "$1" == "-s" ]]; then if [[ "$wall2themes" == "yes" ]]; then AUTOTHEME_IND=" @rect,,$((jgtools_padding+4)),$((jgtools_padding + 6)),262,20,0,left,top,#222222 20,#222222 70, -@text,,$((jgtools_padding+8)),$((jgtools_padding + 6)),262,22,0,left,top,#FFFFFF,#222222 70, Auto theming $_ENABLED ! +@text,,$((jgtools_padding+8)),$((jgtools_padding + 6)),262,22,0,left,top,#FFFFFF,#222222 70, ${cbon} Auto theming $_ENABLED ! " fi diff --git a/bin/colorizer-conky b/bin/colorizer-conky index 4bda73e..7c40afa 100755 --- a/bin/colorizer-conky +++ b/bin/colorizer-conky @@ -16,7 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -source ~/.config/mabox/mabox.conf +. /usr/share/mb-jgtools/jgtools.inc + SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv" #USERSCHEMES="$HOME/.config/colorizer/conky/c_userschemes.csv" @@ -385,7 +386,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then sizes=(12 11 10 9 8) for i in "${sizes[@]}" do - [[ "$FONTSIZE" == "$i" ]] && out2+=("綠 $i px,conkyctl basefont_size_all $i;$me") || out2+=("祿 $i px,conkyctl basefont_size_all $i;$me") + [[ "$FONTSIZE" == "$i" ]] && out2+=("${ron} $i px,conkyctl basefont_size_all $i;$me") || out2+=("${roff} $i px,conkyctl basefont_size_all $i;$me") done if [ -f "$HOME/.config/mabox/fonts.list" ];then mapfile -t favfonts < <( grep -vE "^($|#)" ~/.config/mabox/fonts.list) @@ -397,37 +398,37 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then if [ "${#favfonts[@]}" -gt 0 ];then out2+=("^sep($FONTFAMILY_LBL)") for fon in "${favfonts[@]}";do - [[ "$FONT" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},conkyctl basefont_family_all \"${fon}\";$me") + [[ "$FONT" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},conkyctl basefont_family_all \"${fon}\";$me") done fi out2+=("^sep()") out2+=(" $_EDIT_FAVFONTS,geany ~/.config/mabox/fonts.list") - [[ "$SHADOWS" == "shadow" ]] && out+=("󰄲 $SHADOW,conkyctl shades_all no;$me") || out+=("󰄱 $SHADOW,conkyctl shades_all shadow;$me") - [[ "$SHADOWS" == "outline" ]] && out+=("󰄲 $OLINE,conkyctl shades_all no;$me") || out+=("󰄱 $OLINE,conkyctl shades_all outline;$me") + [[ "$SHADOWS" == "shadow" ]] && out+=("${cbon} $SHADOW,conkyctl shades_all no;$me") || out+=("${cboff} $SHADOW,conkyctl shades_all shadow;$me") + [[ "$SHADOWS" == "outline" ]] && out+=("${cbon} $OLINE,conkyctl shades_all no;$me") || out+=("${cboff} $OLINE,conkyctl shades_all outline;$me") out+=("^sep()") - [[ "$BORD" == false ]] && out+=("󰄱 $BORDERS [ $BWIDTH px ],^checkout(border)") || out+=("󰄲 $BORDERS [ $BWIDTH px ],^checkout(border)") + [[ "$BORD" == false ]] && out+=("${cboff} $BORDERS [ $BWIDTH px ],^checkout(border)") || out+=("${cbon} $BORDERS [ $BWIDTH px ],^checkout(border)") out2+=("^tag(border)") out2+=("^sep($DRAW $BORDERS?)") - [[ "$BORD" == false ]] && out2+=("祿 $YES,conkyctl draw_borders_all true;$me") || out2+=("綠 $YES,conkyctl draw_borders_all false;$me") - [[ "$BORD" == false ]] && out2+=("綠 $NO,conkyctl draw_borders_all true;$me") || out2+=("祿 $NO,conkyctl draw_borders_all false;$me") + [[ "$BORD" == false ]] && out2+=("${roff} $YES,conkyctl draw_borders_all true;$me") || out2+=("${ron} $YES,conkyctl draw_borders_all false;$me") + [[ "$BORD" == false ]] && out2+=("${ron} $NO,conkyctl draw_borders_all true;$me") || out2+=("${roff} $NO,conkyctl draw_borders_all false;$me") out2+=("^sep($_BORDER_WIDTH)") - [[ "${BWIDTH}" == "1" ]] && out2+=("綠 1 px ${_OLD_STYLE}") || out2+=("祿 1 px ${_OLD_STYLE},conkyctl border_width_all 1") + [[ "${BWIDTH}" == "1" ]] && out2+=("${ron} 1 px ${_OLD_STYLE}") || out2+=("${roff} 1 px ${_OLD_STYLE},conkyctl border_width_all 1") for i in 2 4 6 8 10;do - [[ "${BWIDTH}" == "${i}" ]] && out2+=("綠 ${i} px") || out2+=("祿 ${i} px,conkyctl border_width_all ${i}") + [[ "${BWIDTH}" == "${i}" ]] && out2+=("${ron} ${i} px") || out2+=("${roff} ${i} px,conkyctl border_width_all ${i}") done out2+=("^sep($STIPPLED_BORDERS?)") - [[ "$STIP" == 0 ]] && out2+=("綠 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") || out2+=("祿 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") + [[ "$STIP" == 0 ]] && out2+=("${ron} 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") || out2+=("${roff} 0 ($SOLID_LINE),conkyctl stippled_borders_all 0;$me") out2+=("^sep()") - [[ "$STIP" == 1 ]] && out2+=("綠 1 px,conkyctl stippled_borders_all 1;$me") || out2+=("祿 1 px,conkyctl stippled_borders_all 1;$me") - [[ "$STIP" == 2 ]] && out2+=("綠 2 px,conkyctl stippled_borders_all 2;$me") || out2+=("祿 2 px,conkyctl stippled_borders_all 2;$me") - [[ "$STIP" == 3 ]] && out2+=("綠 3 px,conkyctl stippled_borders_all 3;$me") || out2+=("祿 3 px,conkyctl stippled_borders_all 3;$me") - [[ "$STIP" == 4 ]] && out2+=("綠 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("祿 4 px,conkyctl stippled_borders_all 4;$me") + [[ "$STIP" == 1 ]] && out2+=("${ron} 1 px,conkyctl stippled_borders_all 1;$me") || out2+=("${roff} 1 px,conkyctl stippled_borders_all 1;$me") + [[ "$STIP" == 2 ]] && out2+=("${ron} 2 px,conkyctl stippled_borders_all 2;$me") || out2+=("${roff} 2 px,conkyctl stippled_borders_all 2;$me") + [[ "$STIP" == 3 ]] && out2+=("${ron} 3 px,conkyctl stippled_borders_all 3;$me") || out2+=("${roff} 3 px,conkyctl stippled_borders_all 3;$me") + [[ "$STIP" == 4 ]] && out2+=("${ron} 4 px,conkyctl stippled_borders_all 4;$me") || out2+=("${roff} 4 px,conkyctl stippled_borders_all 4;$me") out+=("^sep()") out+=(" 󰎡 󰎤 󰎧 $REGENERATE,^checkout(regenconky)") @@ -480,7 +481,7 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then else out+=("$BACKGROUND transparent ,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor_all '${BACKGROUND}' '$me')") fi - [[ "$WINTRANS" == false ]] && out+=("󰄱 $TRANSPARENT,conkyctl transparent_all true;$me") || out+=("󰄲 $TRANSPARENT,conkyctl transparent_all false;$me") + [[ "$WINTRANS" == false ]] && out+=("${cboff} $TRANSPARENT,conkyctl transparent_all true;$me") || out+=("${cbon} $TRANSPARENT,conkyctl transparent_all false;$me") out+=("^sep()") if [[ "${recolor3}" == "1" ]];then @@ -498,10 +499,10 @@ if pgrep -u $USER -af "conky.*mbcolor" >/dev/null; then out+=(" $_ADVANCED,^checkout(adv)") out2+=("^tag(adv)") out2+=("^sep($_ADVANCED)") - [[ "${conky_leftclick}" == "off" ]] && out2+=("󰄱 $_C_LCLICK,mb-setvar conky_leftclick=on;$me") || out2+=("󰄲 $_C_LCLICK,mb-setvar conky_leftclick=off;$me") - [[ "${conky_rightclick}" == "off" ]] && out2+=("󰄱 $_C_RCLICK,mb-setvar conky_rightclick=on;$me") || out2+=("󰄲 $_C_RCLICK,mb-setvar conky_rightclick=off;$me") + [[ "${conky_leftclick}" == "off" ]] && out2+=("${cboff} $_C_LCLICK,mb-setvar conky_leftclick=on;$me") || out2+=("${cbon} $_C_LCLICK,mb-setvar conky_leftclick=off;$me") + [[ "${conky_rightclick}" == "off" ]] && out2+=("${cboff} $_C_RCLICK,mb-setvar conky_rightclick=on;$me") || out2+=("${cbon} $_C_RCLICK,mb-setvar conky_rightclick=off;$me") out+=("^sep()") - [[ "${conky_basicmode}" == "on" ]] && out2+=("󰄲 $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=off;$me") || out2+=("󰄱 $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=on;$me") + [[ "${conky_basicmode}" == "on" ]] && out2+=("${cbon} $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=off;$me") || out2+=("${cboff} $_C_SIMPLIFIEDMENU,mb-setvar conky_basicmode=on;$me") @@ -540,8 +541,6 @@ fi ### RUN if [[ "$1" == "-s" ]]; then - . /usr/share/mb-jgtools/pipemenu-standalone.cfg - . $HOME/.config/mabox/mabox.conf source $HOME/.config/colorizer/colorizer.conf diff --git a/bin/colorizer-fonts b/bin/colorizer-fonts index f2158b8..49fa83c 100755 --- a/bin/colorizer-fonts +++ b/bin/colorizer-fonts @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. $HOME/.config/mabox/mabox.conf +. /usr/share/mb-jgtools/jgtools.inc me="colorizer-fonts -s" @@ -113,8 +113,8 @@ case "$LANG" in esac getvalues () { -GTK2RC="$HOME"/.gtkrc-2.0 -GTK_FONT=( $(grep "gtk-font-name" ${GTK2RC} | cut -d'"' -f2) ) +GTK3RC="$HOME"/.config/gtk-3.0/settings.ini +GTK_FONT=( $(grep "gtk-font-name" ${GTK3RC} | cut -d'=' -f2) ) GTK_FAMILY=${GTK_FONT[@]::${#GTK_FONT[@]}-1} GTK_SIZE=${GTK_FONT[-1]} @@ -210,26 +210,26 @@ out2+=("^sep()") sizes=(16 15 14 13 12 11 10 9 8) for i in "${sizes[@]}" do -[[ "$OBFSIZE" == "$i" ]] && out2+=("綠 $i px,obtctl fontsize $i;$me") || out2+=("祿 $i px,fontctl ob_fontsize $i;$me") +[[ "$OBFSIZE" == "$i" ]] && out2+=("${ron} $i px,obtctl fontsize $i;$me") || out2+=("${roff} $i px,fontctl ob_fontsize $i;$me") done out2+=("^sep($_FONT_FAMILY)") if [ "${#favfonts[@]}" -gt 0 ];then for fon in "${favfonts[@]}";do - [[ "${OBFNAME}" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},obtctl fontfamily \"${fon}\";$me") + [[ "${OBFNAME}" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},obtctl fontfamily \"${fon}\";$me") done fi out2+=("^sep()") -[[ "$WEIGHT" =~ .*"old" ]] && out2+=(" $_BOLD,obtctl fontweight Normal;$me") || out2+=(" $_BOLD,obtctl fontweight Bold;$me") -[[ "$SLANT" =~ .*"talic" ]] && out2+=(" $_ITALIC,obtctl fontslant Normal;$me") || out2+=(" $_ITALIC,obtctl fontslant Italic;$me") +[[ "$WEIGHT" =~ .*"old" ]] && out2+=("${cbon} $_BOLD,obtctl fontweight Normal;$me") || out2+=("${cboff} $_BOLD,obtctl fontweight Bold;$me") +[[ "$SLANT" =~ .*"talic" ]] && out2+=("${cbon} $_ITALIC,obtctl fontslant Normal;$me") || out2+=("${cboff} $_ITALIC,obtctl fontslant Italic;$me") #SHADOW out2+=("^sep($_TEXTALIGN)") -[[ "$TXTJUST" = left ]] && out2+=("綠  $_LEFT,obtctl textjustify left;$me")||out2+=("祿  $_LEFT,obtctl textjustify left;$me") -[[ "$TXTJUST" = center ]] && out2+=("綠  $_CENTER,obtctl textjustify center;$me")||out2+=("祿  $_CENTER,obtctl textjustify center;$me") -[[ "$TXTJUST" = right ]] && out2+=("綠  $_RIGHT,obtctl textjustify right;$me")||out2+=("祿  $_RIGHT,obtctl textjustify right;$me") +[[ "$TXTJUST" = left ]] && out2+=("${ron}  $_LEFT,obtctl textjustify left;$me")||out2+=("${roff}  $_LEFT,obtctl textjustify left;$me") +[[ "$TXTJUST" = center ]] && out2+=("${ron}  $_CENTER,obtctl textjustify center;$me")||out2+=("${roff}  $_CENTER,obtctl textjustify center;$me") +[[ "$TXTJUST" = right ]] && out2+=("${ron}  $_RIGHT,obtctl textjustify right;$me")||out2+=("${roff}  $_RIGHT,obtctl textjustify right;$me") @@ -246,13 +246,13 @@ 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") + [[ "$menu_sep_font_size" == "$i" ]] && out2+=("${ron} $i px,$me") || out2+=("${roff} $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") + [[ "$menu_sep_font_family" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},mb-setvar \"menu_sep_font_family='${fon}'\";$me") done fi out2+=("^sep()") @@ -273,13 +273,13 @@ 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") + [[ "$menu_font_size" == "$i" ]] && out2+=("${ron} $i px,$me") || out2+=("${roff} $i px,mb-setvar menu_font_size=$i;$me") done 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") + [[ "$menu_font_family" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},mb-setvar \"menu_font_family='${fon}'\";$me") done fi out2+=("^sep()") @@ -299,21 +299,21 @@ out2+=("^sep()") sizes=(14 13 12 11 10 9 8 7 6) for i in "${sizes[@]}" do - [[ "$C_FONTSIZE" == "$i" ]] && out2+=("綠 $i px,conkyctl basefont_size_all $i;$me") || out2+=("祿 $i px,conkyctl basefont_size_all $i;$me") + [[ "$C_FONTSIZE" == "$i" ]] && out2+=("${ron} $i px,conkyctl basefont_size_all $i;$me") || out2+=("${roff} $i px,conkyctl basefont_size_all $i;$me") done if [ "${#favfonts[@]}" -gt 0 ];then out2+=("^sep($_FONT_FAMILY)") for fon in "${favfonts[@]}";do - [[ "$C_FONT" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},conkyctl basefont_family_all \"${fon}\";$me") + [[ "$C_FONT" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},conkyctl basefont_family_all \"${fon}\";$me") done fi out2+=("^sep()") out2+=(" $_EDIT_FAVFONTS,geany ~/.config/mabox/fonts.list") out2+=("^sep($_C_EFFCTS)") -[[ "$SHADOWS" == "shadow" ]] && out2+=("󰄲 $_SHADOW,conkyctl shades_all no;$me") || out2+=("󰄱 $_SHADOW,conkyctl shades_all shadow;$me") -[[ "$SHADOWS" == "outline" ]] && out2+=("󰄲 $_OUTLINE,conkyctl shades_all no;$me") || out2+=("󰄱 $_OUTLINE,conkyctl shades_all outline;$me") +[[ "$SHADOWS" == "shadow" ]] && out2+=("${cbon} $_SHADOW,conkyctl shades_all no;$me") || out2+=("${cboff} $_SHADOW,conkyctl shades_all shadow;$me") +[[ "$SHADOWS" == "outline" ]] && out2+=("${cbon} $_OUTLINE,conkyctl shades_all no;$me") || out2+=("${cboff} $_OUTLINE,conkyctl shades_all outline;$me") @@ -329,13 +329,13 @@ out2+=("^sep()") sizes=(14 13 12 11 10 9 8) for i in "${sizes[@]}" do - [[ "$GTK_SIZE" == "$i" ]] && out2+=("綠 $i px,$me") || out2+=("祿 $i px,fontctl gtk_fontsize $i;$me") + [[ "$GTK_SIZE" == "$i" ]] && out2+=("${ron} $i px,$me") || out2+=("${roff} $i px,fontctl gtk_fontsize $i;$me") done if [ "${#favfonts[@]}" -gt 0 ];then out2+=("^sep($_FONT_FAMILY)") for fon in "${favfonts[@]}";do - [[ "$GTK_FAMILY" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},fontctl gtk_fontfamily \"${fon}\";$me") + [[ "$GTK_FAMILY" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},fontctl gtk_fontfamily \"${fon}\";$me") done fi out2+=("^sep()") @@ -343,7 +343,6 @@ fi ### RUN if [[ "$1" == "-s" ]]; then - . /usr/share/mb-jgtools/pipemenu-standalone.cfg CNF_DIR="$HOME/.config/colorizer" diff --git a/bin/conkyctl b/bin/conkyctl index c003dc1..b8d5a3b 100755 --- a/bin/conkyctl +++ b/bin/conkyctl @@ -582,6 +582,7 @@ languages () { } single () { + . /usr/share/mb-jgtools/glyphicons.inc unset NOT_SUPPORTED OLD_SYNTAX SYSSCHEMES="/usr/share/mabox-colorizer/colorschemes/conky.csv" @@ -687,7 +688,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];then #out+=("^sep($POSITION)") out2+=("^tag(position)") out2+=("^sep($POSITION)") - out2+=(" $MARKNEWPOS,conkyctl setpos ${1};$me") + out2+=("󰆞 $MARKNEWPOS,conkyctl setpos ${1};$me") #out2+=("^sep()") out2+=("^sep($ALIGNMENT)") out2+=(" $TOPLEFT,conkyctl pos top_left ${1};$me") @@ -770,7 +771,7 @@ if [[ "$OLD_SYNTAX" = "true" ]];then if [ "${#favfonts[@]}" -gt 0 ];then out2+=("^sep($FONTFAMILY_LBL)") for fon in "${favfonts[@]}";do - [[ "$fon" == "$font_name" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},mb-setvar 'font_name=\"${fon}\"' $Q_CFG;conkyctl restartone ${1}") + [[ "$fon" == "$font_name" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},mb-setvar 'font_name=\"${fon}\"' $Q_CFG;conkyctl restartone ${1}") done fi fi @@ -845,7 +846,7 @@ if [[ "${WINCLASS}" != *"nobg"* ]];then out+=(" transparent $BACKGROUND,^pipe(mbclr '$WINCLR' conkyctl win_bgcolor '${BACKGROUND}' '$me' ${1})") fi fi - [[ "$WINTRANS" == false ]] && out+=("󰄱 $TRANSPARENT,conkyctl transparent true ${1}") || out+=("󰄲 $TRANSPARENT,conkyctl transparent false ${1}") + [[ "$WINTRANS" == false ]] && out+=("${cboff} $TRANSPARENT,conkyctl transparent true ${1}") || out+=("${cbon} $TRANSPARENT,conkyctl transparent false ${1}") out+=("^sep()") if [[ "$1" != *"logo_mbcolor"* ]]; then @@ -899,15 +900,15 @@ read SIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)" . ~/.config/mabox/mabox.conf #notify-send.sh "Colors" "${logo_in_color} ${logo_in_opacity}\n${logo_out_color} ${logo_out_opacity}" out+=("^sep($_VARIANT_AND_SIZE)") - [[ "${TYP}" == *"3d"* ]] && out+=("綠 $_3D,mabox-logo type 3d") || out+=("祿 $_3D,mabox-logo type 3d") - [[ "${TYP}" == *"square"* ]] && out+=("綠 $_SQUARE,mabox-logo type square") || out+=("祿 $_SQUARE,mabox-logo type square") - [[ "${TYP}" == *"circle"* ]] && out+=("綠 $_CIRCLE,mabox-logo type circle") || out+=("祿 $_CIRCLE,mabox-logo type circle") + [[ "${TYP}" == *"3d"* ]] && out+=("${ron} $_3D,mabox-logo type 3d") || out+=("${roff} $_3D,mabox-logo type 3d") + [[ "${TYP}" == *"square"* ]] && out+=("${ron} $_SQUARE,mabox-logo type square") || out+=("${roff} $_SQUARE,mabox-logo type square") + [[ "${TYP}" == *"circle"* ]] && out+=("${ron} $_CIRCLE,mabox-logo type circle") || out+=("${roff} $_CIRCLE,mabox-logo type circle") out+=("^sep()") out+=("$_LOGOSIZE [ ${SIZE}x${SIZE} ],^checkout(logosize)") out2+=("^tag(logosize)") out2+=("^sep($_LOGOSIZE (px))") for s in 32 48 64 96 128 256 512;do - [[ "${SIZE}" == "${s}" ]] && out2+=("綠 ${s},mabox-logo size ${s}") || out2+=("祿 ${s},mabox-logo size ${s}") + [[ "${SIZE}" == "${s}" ]] && out2+=("${ron} ${s},mabox-logo size ${s}") || out2+=("${roff} ${s},mabox-logo size ${s}") done out+=("^sep($_COLORS)") out+=(" $_INNER_COLOR,^pipe(mbclr '${logo_in_color}' mabox-logo ic '$_INNER_COLOR')") @@ -926,13 +927,13 @@ read SIZE <<< "$(grep minimum_height ${1} | cut -d'=' -f2 | cut -d"," -f1)" out2+=("^tag(iopa)") out2+=("^sep($_INNER_OPACITY)") for o in 1 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1 0;do - [[ "${logo_in_opacity}" == "$o" ]] && out2+=("綠 ${o},mabox-logo io ${o}") || out2+=("祿 ${o},mabox-logo io ${o}") + [[ "${logo_in_opacity}" == "$o" ]] && out2+=("${ron} ${o},mabox-logo io ${o}") || out2+=("${roff} ${o},mabox-logo io ${o}") done out+=(" $_OUTER_OPACITY [ ${logo_out_opacity} ],^checkout(oopa)") out2+=("^tag(oopa)") out2+=("^sep($_OUTER_OPACITY)") for o in 1 0.9 0.8 0.7 0.6 0.5 0.4 0.3 0.2 0.1 0;do - [[ "${logo_out_opacity}" == "$o" ]] && out2+=("綠 ${o},mabox-logo oo ${o}") || out2+=("祿 ${o},mabox-logo oo ${o}") + [[ "${logo_out_opacity}" == "$o" ]] && out2+=("${ron} ${o},mabox-logo oo ${o}") || out2+=("${roff} ${o},mabox-logo oo ${o}") done fi # END LOGO SVG @@ -972,19 +973,19 @@ read DCOLOR <<< "$(grep color9 ${1} | cut -d'=' -f2 | cut -d"'" -f2)" read TCOLOR <<< "$(grep color8 ${1} | cut -d'=' -f2 | cut -d"'" -f2)" #out+=("\"\"\"󱑀 _TIMEFORMAT [ ${TIMEFORMAT} ]\"\"\"") -[[ "${TIMEFORMAT}" == "%H:%M" ]] && out+=("綠 $(date +%H:%M) ( %H:%M )") || out+=("祿 $(date +%H:%M) ( %H:%M ),conkyctl bc_tformat \"%H:%M\"") -[[ "${TIMEFORMAT}" == "%H:%M:%S" ]] && out+=("綠 $(date +%H:%M:%S) ( %H:%M:%S )") || out+=("祿 $(date +%H:%M:%S) ( %H:%M:%S ),conkyctl bc_tformat \"%H:%M:%S\"") -[[ "${TIMEFORMAT}" == "%I:%M %p" ]] && out+=("綠 $(date +"%I:%M %p") ( %I:%M %p )") || out+=("祿 $(date +"%I:%M %p") ( %I:%M %p ),conkyctl bc_tformat \"%I:%M %p\"") -[[ "${TIMEFORMAT}" == "%-I:%M %p" ]] && out+=("綠 $(date +"%-I:%M %p") ( %-I:%M %p )") || out+=("祿 $(date +"%-I:%M %p") ( %-I:%M %p ),conkyctl bc_tformat \"%-I:%M %p\"") -[[ "${TIMEFORMAT}" == "%H:%M (%a)" ]] && out+=("綠 $(date +"%H:%M (%a)") ( %H:%M (%a) )") || out+=("祿 $(date +"%H:%M (%a)") ( %H:%M (%a) ),conkyctl bc_tformat \"%H:%M (%a)\"") +[[ "${TIMEFORMAT}" == "%H:%M" ]] && out+=("${ron} $(date +%H:%M) ( %H:%M )") || out+=("${roff} $(date +%H:%M) ( %H:%M ),conkyctl bc_tformat \"%H:%M\"") +[[ "${TIMEFORMAT}" == "%H:%M:%S" ]] && out+=("${ron} $(date +%H:%M:%S) ( %H:%M:%S )") || out+=("${roff} $(date +%H:%M:%S) ( %H:%M:%S ),conkyctl bc_tformat \"%H:%M:%S\"") +[[ "${TIMEFORMAT}" == "%I:%M %p" ]] && out+=("${ron} $(date +"%I:%M %p") ( %I:%M %p )") || out+=("${roff} $(date +"%I:%M %p") ( %I:%M %p ),conkyctl bc_tformat \"%I:%M %p\"") +[[ "${TIMEFORMAT}" == "%-I:%M %p" ]] && out+=("${ron} $(date +"%-I:%M %p") ( %-I:%M %p )") || out+=("${roff} $(date +"%-I:%M %p") ( %-I:%M %p ),conkyctl bc_tformat \"%-I:%M %p\"") +[[ "${TIMEFORMAT}" == "%H:%M (%a)" ]] && out+=("${ron} $(date +"%H:%M (%a)") ( %H:%M (%a) )") || out+=("${roff} $(date +"%H:%M (%a)") ( %H:%M (%a) ),conkyctl bc_tformat \"%H:%M (%a)\"") out+=("^sep()") -[[ -f "${CONKYDIR}/menuscripts/.seconds" ]] && out+=("󰄲 $_SHOW_SECONDS,rm ${CONKYDIR}/menuscripts/.seconds") || out+=("󰄱 $_SHOW_SECONDS,touch ${CONKYDIR}/menuscripts/.seconds") +[[ -f "${CONKYDIR}/menuscripts/.seconds" ]] && out+=("${cbon} $_SHOW_SECONDS,rm ${CONKYDIR}/menuscripts/.seconds") || out+=("${cboff} $_SHOW_SECONDS,touch ${CONKYDIR}/menuscripts/.seconds") out+=("^sep()") out+=(" ${FONTTIME} ${FSTIME},^checkout(ftime)") out2+=("^tag(ftime)") out2+=("^sep($_FONT_TIME)") for si in 128 96 64 48 32;do -[[ "${FSTIME}" == "$si" ]] && out2+=("綠 ${si} px") || out2+=("祿 ${si} px,conkyctl bc_fstime ${si}") +[[ "${FSTIME}" == "$si" ]] && out2+=("${ron} ${si} px") || out2+=("${roff} ${si} px,conkyctl bc_fstime ${si}") done out2+=("^sep()") @@ -996,35 +997,35 @@ else fi if [ "${#favfonts[@]}" -gt 0 ];then for fon in "${favfonts[@]}";do - [[ "$fon" == "${FONTTIME}" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},conkyctl bc_ftime \"${fon}\"") + [[ "$fon" == "${FONTTIME}" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},conkyctl bc_ftime \"${fon}\"") done fi out+=("^sep()") out+=(" $_TIMECOLOR,^pipe(mbclr '$TCOLOR' conkyctl color8 '$_TIMECOLOR' '$me' ${1})") out+=("^sep($_DATE)") -[[ -f "${CONKYDIR}/menuscripts/.date" ]] && out+=("󰄲 $_SHOW_DATE,rm ${CONKYDIR}/menuscripts/.date") || out+=("󰄱 $_SHOW_DATE,touch ${CONKYDIR}/menuscripts/.date") +[[ -f "${CONKYDIR}/menuscripts/.date" ]] && out+=("${cbon} $_SHOW_DATE,rm ${CONKYDIR}/menuscripts/.date") || out+=("${cboff} $_SHOW_DATE,touch ${CONKYDIR}/menuscripts/.date") if [[ -f "${CONKYDIR}/menuscripts/.date" ]];then out+=("^sep()") #out+=("\"\"\"_DATEFORMAT [ ${DATEFORMAT} ]\"\"\"") -[[ "${DATEFORMAT}" == "%A, %B %e" ]] && out+=("\"\"\"綠 $(date "+%A, %B %e") ( %A, %B %e )\"\"\"") || out+=("\"\"\"祿 $(date "+%A, %B %e") ( %A, %B %e )\"\"\",\"\"\"conkyctl bc_dformat '%A, %B %e'\"\"\"") -[[ "${DATEFORMAT}" == "%A %e %B" ]] && out+=("綠 $(date "+%A %e %B") ( %A %e %B )") || out+=("祿 $(date "+%A %e %B") ( %A %e %B ),conkyctl bc_dformat '%A %e %B'") -[[ "${DATEFORMAT}" == "%a %e %b" ]] && out+=("綠 $(date "+%a %e %b") ( %a %e %b )") || out+=("祿 $(date "+%a %e %b") ( %a %e %b ),conkyctl bc_dformat '%a %e %b'") -[[ "${DATEFORMAT}" == "%F" ]] && out+=("\"\"\"綠 $(date "+%F") ( %F )\"\"\"") || out+=("祿 $(date "+%F") ( %F ),conkyctl bc_dformat \"%F\"") -[[ "${DATEFORMAT}" == "%x" ]] && out+=("\"\"\"綠 $(date "+%x") ( %x )\"\"\"") || out+=("祿 $(date "+%x") ( %x ),conkyctl bc_dformat \"%x\"") -[[ "${DATEFORMAT}" == "%m-%d-%Y" ]] && out+=("\"\"\"綠 $(date "+%m-%d-%Y") ( %m-%d-%Y )\"\"\"") || out+=("祿 $(date "+%m-%d-%Y") ( %m-%d-%Y ),conkyctl bc_dformat \"%m-%d-%Y\"") +[[ "${DATEFORMAT}" == "%A, %B %e" ]] && out+=("\"\"\"${ron} $(date "+%A, %B %e") ( %A, %B %e )\"\"\"") || out+=("\"\"\"${roff} $(date "+%A, %B %e") ( %A, %B %e )\"\"\",\"\"\"conkyctl bc_dformat '%A, %B %e'\"\"\"") +[[ "${DATEFORMAT}" == "%A %e %B" ]] && out+=("${ron} $(date "+%A %e %B") ( %A %e %B )") || out+=("${roff} $(date "+%A %e %B") ( %A %e %B ),conkyctl bc_dformat '%A %e %B'") +[[ "${DATEFORMAT}" == "%a %e %b" ]] && out+=("${ron} $(date "+%a %e %b") ( %a %e %b )") || out+=("${roff} $(date "+%a %e %b") ( %a %e %b ),conkyctl bc_dformat '%a %e %b'") +[[ "${DATEFORMAT}" == "%F" ]] && out+=("\"\"\"${ron} $(date "+%F") ( %F )\"\"\"") || out+=("${roff} $(date "+%F") ( %F ),conkyctl bc_dformat \"%F\"") +[[ "${DATEFORMAT}" == "%x" ]] && out+=("\"\"\"${ron} $(date "+%x") ( %x )\"\"\"") || out+=("${roff} $(date "+%x") ( %x ),conkyctl bc_dformat \"%x\"") +[[ "${DATEFORMAT}" == "%m-%d-%Y" ]] && out+=("\"\"\"${ron} $(date "+%m-%d-%Y") ( %m-%d-%Y )\"\"\"") || out+=("${roff} $(date "+%m-%d-%Y") ( %m-%d-%Y ),conkyctl bc_dformat \"%m-%d-%Y\"") out+=("^sep()") out+=(" ${FONTDATE} ${FSDATE},^checkout(fdate)") out2+=("^tag(fdate)") out2+=("^sep($_FONT_DATE)") for si in 32 24 20 16 12 10;do -[[ "${FSDATE}" == "$si" ]] && out2+=("綠 ${si} px") || out2+=("祿 ${si} px,conkyctl bc_fsdate ${si}") +[[ "${FSDATE}" == "$si" ]] && out2+=("${ron} ${si} px") || out2+=("${roff} ${si} px,conkyctl bc_fsdate ${si}") done out2+=("^sep()") if [ "${#favfonts[@]}" -gt 0 ];then for fon in "${favfonts[@]}";do - [[ "$fon" == "${FONTDATE}" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},conkyctl bc_fdate \"${fon}\"") + [[ "$fon" == "${FONTDATE}" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},conkyctl bc_fdate \"${fon}\"") done fi out+=("^sep()") @@ -1048,7 +1049,7 @@ if [[ "$FONT" != "" ]];then sizes=(12 11 10 9 8 ) for i in "${sizes[@]}" do - [[ "$FONTSIZE" == "$i" ]] && out2+=("綠 $i px,conkyctl basefont_size ${1} $i;$me") || out2+=("祿 $i px,conkyctl basefont_size ${1} $i;$me") + [[ "$FONTSIZE" == "$i" ]] && out2+=("${ron} $i px,conkyctl basefont_size ${1} $i;$me") || out2+=("${roff} $i px,conkyctl basefont_size ${1} $i;$me") done if [ -f "$HOME/.config/mabox/fonts.list" ];then @@ -1061,33 +1062,33 @@ if [[ "$FONT" != "" ]];then if [ "${#favfonts[@]}" -gt 0 ];then out2+=("^sep($FONTFAMILY_LBL)") for fon in "${favfonts[@]}";do - [[ "$FONT" == "$fon" ]] && out2+=("綠 ${fon},$me") || out2+=("祿 ${fon},conkyctl basefont_family ${1} \"${fon}\";$me") + [[ "$FONT" == "$fon" ]] && out2+=("${ron} ${fon},$me") || out2+=("${roff} ${fon},conkyctl basefont_family ${1} \"${fon}\";$me") done fi out2+=("^sep()") out2+=(" $_EDIT_FAVFONTS,geany ~/.config/mabox/fonts.list") fi - [[ "$SHADOWS" == "shadow" ]] && out+=("󰄲 $SHADOW,conkyctl shades no ${1};$me") || out+=("󰄱 $SHADOW,conkyctl shades shadow ${1};$me") - [[ "$SHADOWS" == "outline" ]] && out+=("󰄲 $OLINE,conkyctl shades no ${1};$me") || out+=("󰄱 $OLINE,conkyctl shades outline ${1};$me") + [[ "$SHADOWS" == "shadow" ]] && out+=("${cbon} $SHADOW,conkyctl shades no ${1};$me") || out+=("${cboff} $SHADOW,conkyctl shades shadow ${1};$me") + [[ "$SHADOWS" == "outline" ]] && out+=("${cbon} $OLINE,conkyctl shades no ${1};$me") || out+=("${cboff} $OLINE,conkyctl shades outline ${1};$me") #out+=("^sep()") fi - [[ "$BORD" == false ]] && out+=("󰄱 $BORDERS [ $BWIDTH px ],^checkout(bordersingle)") || out+=("󰄲 $BORDERS [ $BWIDTH px ],^checkout(bordersingle)") + [[ "$BORD" == false ]] && out+=("${cboff} $BORDERS [ $BWIDTH px ],^checkout(bordersingle)") || out+=("${cbon} $BORDERS [ $BWIDTH px ],^checkout(bordersingle)") out2+=("^tag(bordersingle)") out2+=("^sep($DRAW $BORDERS?)") - [[ "$BORD" == false ]] && out2+=("祿 $YES,conkyctl draw_borders true ${1};$me") || out2+=("綠 $YES,conkyctl draw_borders false ${1};$me") - [[ "$BORD" == false ]] && out2+=("綠 $NO,conkyctl draw_borders true ${1};$me") || out2+=("祿 $NO,conkyctl draw_borders false ${1};$me") + [[ "$BORD" == false ]] && out2+=("${roff} $YES,conkyctl draw_borders true ${1};$me") || out2+=("${ron} $YES,conkyctl draw_borders false ${1};$me") + [[ "$BORD" == false ]] && out2+=("${ron} $NO,conkyctl draw_borders true ${1};$me") || out2+=("${roff} $NO,conkyctl draw_borders false ${1};$me") out2+=("^sep($_BORDER_WIDTH)") - [[ "${BWIDTH}" == "1" ]] && out2+=("綠 1 px ${_OLD_STYLE}") || out2+=("祿 1 px ${_OLD_STYLE},conkyctl border_width 1 ${1}") + [[ "${BWIDTH}" == "1" ]] && out2+=("${ron} 1 px ${_OLD_STYLE}") || out2+=("${roff} 1 px ${_OLD_STYLE},conkyctl border_width 1 ${1}") for i in 2 4 6 8 10;do - [[ "${BWIDTH}" == "${i}" ]] && out2+=("綠 ${i} px") || out2+=("祿 ${i} px,conkyctl border_width ${i} ${1}") + [[ "${BWIDTH}" == "${i}" ]] && out2+=("${ron} ${i} px") || out2+=("${roff} ${i} px,conkyctl border_width ${i} ${1}") done out2+=("^sep($STIPPLED_BORDERS ?)") - [[ "${STIP}" == "0" ]] && out2+=("綠 0 ($SOLID_LINE)") || out2+=("祿 0 ($SOLID_LINE),conkyctl stippled_borders 0 ${1};$me") + [[ "${STIP}" == "0" ]] && out2+=("${ron} 0 ($SOLID_LINE)") || out2+=("${roff} 0 ($SOLID_LINE),conkyctl stippled_borders 0 ${1};$me") out2+=("^sep()") for st in 1 2 3 4;do - [[ "${STIP}" == "${st}" ]] && out2+=("綠 ${st} px") || out2+=("祿 ${st} px,conkyctl stippled_borders ${st} ${1};$me") + [[ "${STIP}" == "${st}" ]] && out2+=("${ron} ${st} px") || out2+=("${roff} ${st} px,conkyctl stippled_borders ${st} ${1};$me") done fi fi #OLD SYNTAX CHECK @@ -1095,7 +1096,7 @@ fi #OLD SYNTAX CHECK if [[ "${conky_basicmode}" != "on" ]];then out+=("^sep($_ACTIONS)") out+=(" $EDIT ${title^},xdg-open ${1}") - out+=("北 $RELOAD ${title^},conkyctl restartone ${1}") + out+=("󰑤 $RELOAD ${title^},conkyctl restartone ${1}") fi } @@ -1108,8 +1109,8 @@ pipemenu () { } contextmenu () { - - source "$HOME/.config/mabox/mabox.conf" + . /usr/share/mb-jgtools/jgtools.inc + if [[ "$conky_rightclick" == "off" ]];then exit 0 fi @@ -1167,8 +1168,7 @@ contextmenu () { #notify-send.sh -t 0 "Window" "z xdotool: ${WINDOW} \n X $X \n Y $Y \n hexid: $hexid \n $CONKYCFG \n ${WINCLR}\n ${name}\n $HOME/.config/mabox/${name}.csv" - . /usr/share/mb-jgtools/pipemenu-standalone.cfg - . $HOME/.config/mabox/mabox.conf + CONFIG_FILE=$(mktemp) MENU_ITEMS=$(mktemp) trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT diff --git a/bin/fontctl b/bin/fontctl index 045d3f2..5aa8606 100755 --- a/bin/fontctl +++ b/bin/fontctl @@ -9,7 +9,7 @@ get_gtkfont() { GTK2RC="$HOME"/.gtkrc-2.0 GTK3RC="$HOME"/.config/gtk-3.0/settings.ini -GTK_FONT=( $(grep "gtk-font-name" ${GTK2RC} | cut -d'"' -f2) ) +GTK_FONT=( $(grep "gtk-font-name" ${GTK3RC} | cut -d'=' -f2) ) GTK_FAMILY=${GTK_FONT[@]::${#GTK_FONT[@]}-1} GTK_SIZE=${GTK_FONT[-1]} }