diff --git a/bin/mbx b/bin/mbx index aa93217..3537c32 100755 --- a/bin/mbx +++ b/bin/mbx @@ -17,7 +17,7 @@ mbx setvar menu_padding=5 mbx setvar item_height_factor=200 mbx setvar "font=\'Noto Sans\'" mbx setvar font_size=13 -mbx setvar bgcolor=#252525 +mbx setvar color_menu_bg=#252525 mbx ${1} } @@ -30,7 +30,7 @@ menu_padding=5 item_height_factor=200 font='Noto Sans' font_size=13 -bgcolor=#252525 +color_menu_bg=#252525 EOF fi source <(grep = $CNF_FILE) @@ -41,7 +41,7 @@ fg(){ [ "$rgb" -gt 138000 ] && fgcolor="#222222" color_title_fg="#111111" color_sel_fg="#111111" color_sep_fg="#222222 20"|| fgcolor="#EEEEEE" color_title_fg="#FFFFFF" color_sel_fg="#FFFFFF" [ "$rgb" -gt 200000 ] && color_sel_bg="#222222 8" color_sel_border="#222222 16" color_title_bg="#222222 8" } -fg "$bgcolor" +fg "$color_menu_bg" [ "$menu_padding" == "0" ] && item_margin_x=0 item_margin_y=0 item_radius=0 item_padding_x=8 configure() { @@ -91,12 +91,13 @@ color_sel_fg = ${color_sel_fg:-} color_sel_border = ${color_sel_border:-#eeeeee 40} color_norm_fg = ${fgcolor:-} color_title_fg = ${color_title_fg:-} -color_menu_bg = ${bgcolor:-#0F2437} +color_menu_bg = ${color_menu_bg:-#0F2437} color_menu_border = #eeeeee 8 color_title_bg = ${color_title_bg:-"$fgcolor 12"} color_title_border = ${color_title_border:-} color_sep_fg = ${color_sep_fg:-} icon_theme = ${icon_theme:-Papirus} +icon_theme_fallback = ${icon_theme_fallback:-hicolor} icon_size = ${icon_size:-0} icon_norm_alpha = 70 icon_sel_alpha = 100 @@ -259,7 +260,7 @@ cat < ${MENU_ITEMS} @text,,$((menu_padding+40)),$((menu_padding+theight+26)),${twidth},25,4,left,top,${fgcolor} 60,${fgcolor} 12,a set of lightweight and handy utilities @text,,$((menu_padding+56)),$((menu_padding+theight+38)),${twidth},25,4,left,top,${fgcolor} 60,${fgcolor} 12,for your X11 window manager ^sep(Utilities) -Apps menu (main),mbx appsmenu,menu +Apps menu (main),mbx appsmenu,mbx-appsmenu Left SidePanel,mbx lpanel,mbx-lpanel Right SidePanel,mbx rpanel,mbx-rpanel Logout Dialog, mbx diff --git a/bin/mbx-preferences b/bin/mbx-preferences index 02de01f..0c8a92c 100755 --- a/bin/mbx-preferences +++ b/bin/mbx-preferences @@ -71,7 +71,7 @@ color_sel_fg = ${color_sel_fg:-} color_sel_border = ${color_sel_border:-#eeeeee 40} color_norm_fg = ${fgcolor:-} color_title_fg = ${color_title_fg:-} -color_menu_bg = ${bgcolor:-#0F2437} +color_menu_bg = ${color_menu_bg:-#0F2437} color_menu_border = #eeeeee 8 color_title_bg = ${color_title_bg:-"$fgcolor 12"} color_title_border = ${color_title_border:-} @@ -107,6 +107,12 @@ setvar() { echo $1 >> $CNF_FILE fi } +pickcolor() { + PAR="mbx ${2}" + color=$(colorpicker --short --one-shot --preview) + ${ME} setvar color_menu_bg=${color} + ${PAR} +} main() { # if $1 brak then standalone @@ -166,11 +172,14 @@ main() { out2+=("^tag(bgcolor)") out2+=("^sep(Select BGcolor)") - out2+=("Pick color from screen") + if hash colorpicker 2>/dev/null; then + out2+=("Pick color from screen,${ME} pickcolor ${1}") + out2+=("^sep()") + fi colors="$CNF_DIR/inc/colors.clr" while read -r color; do fgc $color - out2+=(" $color ,mbx setvar bgcolor='$color';$PAR fixed") + out2+=(" $color ,mbx setvar color_menu_bg='$color';$PAR fixed") done < "$colors" out2+=("^tag(menupadding)") @@ -206,7 +215,7 @@ main() { rpanel) menu_halign="right";; about) menu_halign="center";; esac - fg "$bgcolor" + fg "$color_menu_bg" [ "$menu_padding" == "0" ] && item_margin_x=0 item_margin_y=0 item_radius=0 configure cat < ${MENU_ITEMS} @@ -225,6 +234,7 @@ jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null case "$1" in fonts) fonts "$2";; setvar) setvar "$2";; + pickcolor) pickcolor "$1" "$2";; appsmenu|lpanel|rpanel|about) main "$1" "$2";; *) main;; esac diff --git a/share/icons/hicolor/128x128/mbx-lpanel.png b/share/icons/hicolor/128x128/mbx-lpanel.png index 3db17bd..82a6e19 100644 Binary files a/share/icons/hicolor/128x128/mbx-lpanel.png and b/share/icons/hicolor/128x128/mbx-lpanel.png differ diff --git a/share/icons/hicolor/128x128/mbx-rpanel.png b/share/icons/hicolor/128x128/mbx-rpanel.png index a0a8ebb..f313fbb 100644 Binary files a/share/icons/hicolor/128x128/mbx-rpanel.png and b/share/icons/hicolor/128x128/mbx-rpanel.png differ diff --git a/share/icons/hicolor/16x16/mbx-lpanel.png b/share/icons/hicolor/16x16/mbx-lpanel.png index c6fe264..87cf3a4 100644 Binary files a/share/icons/hicolor/16x16/mbx-lpanel.png and b/share/icons/hicolor/16x16/mbx-lpanel.png differ diff --git a/share/icons/hicolor/16x16/mbx-rpanel.png b/share/icons/hicolor/16x16/mbx-rpanel.png index c8991a7..feec2f9 100644 Binary files a/share/icons/hicolor/16x16/mbx-rpanel.png and b/share/icons/hicolor/16x16/mbx-rpanel.png differ diff --git a/share/icons/hicolor/22x22/mbx-lpanel.png b/share/icons/hicolor/22x22/mbx-lpanel.png index 1301c60..e9433ec 100644 Binary files a/share/icons/hicolor/22x22/mbx-lpanel.png and b/share/icons/hicolor/22x22/mbx-lpanel.png differ diff --git a/share/icons/hicolor/22x22/mbx-rpanel.png b/share/icons/hicolor/22x22/mbx-rpanel.png index 0321ccf..91be64e 100644 Binary files a/share/icons/hicolor/22x22/mbx-rpanel.png and b/share/icons/hicolor/22x22/mbx-rpanel.png differ diff --git a/share/icons/hicolor/24x24/mbx-lpanel.png b/share/icons/hicolor/24x24/mbx-lpanel.png index be50d9b..fe36620 100644 Binary files a/share/icons/hicolor/24x24/mbx-lpanel.png and b/share/icons/hicolor/24x24/mbx-lpanel.png differ diff --git a/share/icons/hicolor/24x24/mbx-rpanel.png b/share/icons/hicolor/24x24/mbx-rpanel.png index e666ee1..962211b 100644 Binary files a/share/icons/hicolor/24x24/mbx-rpanel.png and b/share/icons/hicolor/24x24/mbx-rpanel.png differ diff --git a/share/icons/hicolor/32x32/mbx-lpanel.png b/share/icons/hicolor/32x32/mbx-lpanel.png index 7a1ad54..4538891 100644 Binary files a/share/icons/hicolor/32x32/mbx-lpanel.png and b/share/icons/hicolor/32x32/mbx-lpanel.png differ diff --git a/share/icons/hicolor/32x32/mbx-rpanel.png b/share/icons/hicolor/32x32/mbx-rpanel.png index 99bd379..b1cafc9 100644 Binary files a/share/icons/hicolor/32x32/mbx-rpanel.png and b/share/icons/hicolor/32x32/mbx-rpanel.png differ diff --git a/share/icons/hicolor/48x48/mbx-lpanel.png b/share/icons/hicolor/48x48/mbx-lpanel.png index 7180e03..efda352 100644 Binary files a/share/icons/hicolor/48x48/mbx-lpanel.png and b/share/icons/hicolor/48x48/mbx-lpanel.png differ diff --git a/share/icons/hicolor/48x48/mbx-rpanel.png b/share/icons/hicolor/48x48/mbx-rpanel.png index 0dd314c..d9ef1c3 100644 Binary files a/share/icons/hicolor/48x48/mbx-rpanel.png and b/share/icons/hicolor/48x48/mbx-rpanel.png differ diff --git a/share/icons/hicolor/64x64/mbx-lpanel.png b/share/icons/hicolor/64x64/mbx-lpanel.png index 7f5d90c..19c7167 100644 Binary files a/share/icons/hicolor/64x64/mbx-lpanel.png and b/share/icons/hicolor/64x64/mbx-lpanel.png differ diff --git a/share/icons/hicolor/64x64/mbx-rpanel.png b/share/icons/hicolor/64x64/mbx-rpanel.png index 2b55f94..f218376 100644 Binary files a/share/icons/hicolor/64x64/mbx-rpanel.png and b/share/icons/hicolor/64x64/mbx-rpanel.png differ diff --git a/share/icons/hicolor/96x96/mbx-lpanel.png b/share/icons/hicolor/96x96/mbx-lpanel.png index 09e04b0..906a99d 100644 Binary files a/share/icons/hicolor/96x96/mbx-lpanel.png and b/share/icons/hicolor/96x96/mbx-lpanel.png differ diff --git a/share/icons/hicolor/96x96/mbx-rpanel.png b/share/icons/hicolor/96x96/mbx-rpanel.png index 5b113c9..f1ee301 100644 Binary files a/share/icons/hicolor/96x96/mbx-rpanel.png and b/share/icons/hicolor/96x96/mbx-rpanel.png differ diff --git a/share/icons/hicolor/scalable/apps/mbx-lpanel.svg b/share/icons/hicolor/scalable/apps/mbx-lpanel.svg index bf90987..a36b7e2 100644 --- a/share/icons/hicolor/scalable/apps/mbx-lpanel.svg +++ b/share/icons/hicolor/scalable/apps/mbx-lpanel.svg @@ -60,7 +60,7 @@ inkscape:groupmode="layer" id="layer1">