diff --git a/usr/bin/jgconky-pipe b/usr/bin/jgconky-pipe index 1beed40..0339b1a 100755 --- a/usr/bin/jgconky-pipe +++ b/usr/bin/jgconky-pipe @@ -132,7 +132,7 @@ out+=("^sep($SESSIONS_LBL)") if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf if [[ $panels_heightpos == "top" ]]; then diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid index 719d3f9..9b4258f 100755 --- a/usr/bin/jgdeskgrid +++ b/usr/bin/jgdeskgrid @@ -106,7 +106,7 @@ out2+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFI ### RUN if [[ "$1" == "-s" ]]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf out+=("^sep()") diff --git a/usr/bin/jgdeskmngr b/usr/bin/jgdeskmngr index 69d576e..55a1a79 100755 --- a/usr/bin/jgdeskmngr +++ b/usr/bin/jgdeskmngr @@ -82,7 +82,7 @@ out+=("  $NEW,deskmngr -s") ### RUN if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf out+=("^sep()") diff --git a/usr/bin/jgdesktops b/usr/bin/jgdesktops index b13e321..bdc9ad4 100755 --- a/usr/bin/jgdesktops +++ b/usr/bin/jgdesktops @@ -96,7 +96,7 @@ out+=("$DESKMNGR,jgdeskmngr -s") ### RUN if [[ $1 == "-s" ]]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" diff --git a/usr/bin/jgespanso-pipe b/usr/bin/jgespanso-pipe index 02c581e..c90f40d 100755 --- a/usr/bin/jgespanso-pipe +++ b/usr/bin/jgespanso-pipe @@ -59,7 +59,7 @@ fi ### RUN if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf MENU_PADDING_TOP=${jgtools_padding:-0} diff --git a/usr/bin/jghistory-pipe b/usr/bin/jghistory-pipe index 406b956..3ef85d0 100755 --- a/usr/bin/jghistory-pipe +++ b/usr/bin/jghistory-pipe @@ -35,7 +35,7 @@ echo "\"\"\"$NOTHING\"\"\",exo-open --launch TerminalEmulator" >>/tmp/history_li fi ### RUN if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg MENU_PADDING_TOP=24 MENU_HALIGN="center" diff --git a/usr/bin/jgkeys-pipe b/usr/bin/jgkeys-pipe index 71be9a1..a68585e 100755 --- a/usr/bin/jgkeys-pipe +++ b/usr/bin/jgkeys-pipe @@ -144,7 +144,7 @@ out+=("$(printf "%s,%s" "$SHORTCUTS" "mb-kb --gui &>/dev/null")") ### RUN if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf MENU_PADDING_TOP=0 diff --git a/usr/bin/jglockscreen b/usr/bin/jglockscreen index 9f88855..31928d8 100755 --- a/usr/bin/jglockscreen +++ b/usr/bin/jglockscreen @@ -101,7 +101,7 @@ for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s, ### RUN if [[ "$1" == "-s" ]]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf out+=("^sep()") diff --git a/usr/bin/jgssh b/usr/bin/jgssh index bfdc805..79844db 100755 --- a/usr/bin/jgssh +++ b/usr/bin/jgssh @@ -61,7 +61,7 @@ __removable() { __standalone() { __mklist -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf if [[ $panels_heightpos == "top" ]]; then diff --git a/usr/bin/jgsysinfo-pipe b/usr/bin/jgsysinfo-pipe index c35e8b7..044c771 100755 --- a/usr/bin/jgsysinfo-pipe +++ b/usr/bin/jgsysinfo-pipe @@ -129,7 +129,7 @@ out2+=("$(printf "%+29s %s" Uptime: "$UpTime")") ### RUN if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg MENU_PADDING_TOP=0 MENU_HALIGN="center" diff --git a/usr/bin/jgtint2-pipe b/usr/bin/jgtint2-pipe index 7cd8fcb..bfa6d8e 100755 --- a/usr/bin/jgtint2-pipe +++ b/usr/bin/jgtint2-pipe @@ -106,7 +106,7 @@ out+=("$RELOAD_TINT2,killall -SIGUSR1 tint2") # out+=("^sep()") fi if [ $1 == "-s" ]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf if [[ $panels_heightpos == "top" ]]; then MENU_VALIGN="top" diff --git a/usr/bin/jgtint2launcher b/usr/bin/jgtint2launcher index 0bfa62d..7755dae 100755 --- a/usr/bin/jgtint2launcher +++ b/usr/bin/jgtint2launcher @@ -63,7 +63,7 @@ out+=("$ADD ${filename%.*},cp \"$item\" $LAUNCHERDIR;killall -SIGUSR1 tin done ### RUN -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf MENU_PADDING_TOP=48 diff --git a/usr/bin/jgwallpaperchanger b/usr/bin/jgwallpaperchanger index 3c7a96c..37539df 100755 --- a/usr/bin/jgwallpaperchanger +++ b/usr/bin/jgwallpaperchanger @@ -86,7 +86,7 @@ for i in 3 5 10 30 60 120 300 600 1800 3600; do out2+=("$(printf " %4s, ### RUN if [[ "$1" == "-s" ]]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf out+=("^sep()") diff --git a/usr/bin/mbhelper b/usr/bin/mbhelper index f50089c..cadc27e 100755 --- a/usr/bin/mbhelper +++ b/usr/bin/mbhelper @@ -35,7 +35,7 @@ esac run() { ### RUN if [[ $1 = "-s" ]]; then -. /usr/bin/pipemenu-standalone.cfg +. /usr/share/mb-jgtools/pipemenu-standalone.cfg . $HOME/.config/mabox/mabox.conf MENU_PADDING_TOP=$((jgtools_padding+24)) MENU_HALIGN="center" diff --git a/usr/bin/pipemenu-standalone.cfg b/usr/bin/pipemenu-standalone.cfg deleted file mode 100644 index acd8694..0000000 --- a/usr/bin/pipemenu-standalone.cfg +++ /dev/null @@ -1,98 +0,0 @@ -. $HOME/.config/mabox/mabox.conf -jgmenu_theme=${jgmenu_theme:-obtheme} - -case $jgmenu_theme in - default) - export color_norm_fg="#FFFFFF " - ;; - obtheme) - export color_title_fg="#FFFFFF " - ob_file=$HOME/.config/openbox/rc.xml - [[ -f $ob_file ]] && wm_theme=$(awk '// {while (getline n) {if (match(n, //)){l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") - while read -r a b c - do - [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c" - done < $HOME/.config/mabox/jgobthemes/$wm_theme.colorrc - ;; - *) - export color_norm_fg="#FFFFFF " - while read -r a b c - do - [[ -n "$a" && "$a" != [[:blank:]#]* ]] && export "$a$b$c" - done < $HOME/.config/mabox/jgobthemes/$jgmenu_theme.colorrc - ;; -esac -menu_font_size=${menu_font_size:-9} -menu_font_family=${menu_font_family:-Noto Sans Medium} -jgmenu_font="${menu_font_family} ${menu_font_size}" - -mkconfigfile() { -cat < ${CONFIG_FILE} -position_mode = ${POSITION_MODE:-fixed} -csv_cmd = apps -stay_alive = 0 -hide_back_items = ${HIDE_BACK_ITEMS:-0} -terminal_exec = terminator -terminal_args = -e -tabs = ${TABS:-220} -menu_border = ${jgtools_border:-0} - -# MENU MARGIN -menu_margin_x = ${menu_margin_x:-0} -menu_margin_y = ${panels_topmargin:-0} -sub_spacing = ${submenu_spacing:-0} - - -menu_width = $JGWIDTH -menu_height_min = ${MENU_HEIGHT_MIN:-0} -menu_height_max = ${MENU_HEIGHT_MAX:-0} -menu_padding_top = ${MENU_PADDING_TOP:-70} -menu_padding_right = ${jgtools_padding:-0} -menu_padding_bottom = ${jgtools_padding:-0} -menu_padding_left = ${jgtools_padding:-0} -menu_radius = ${MENU_RADIUS:-0} -menu_valign = ${MENU_VALIGN:-top} -menu_halign = ${MENU_HALIGN:-left} - -item_height = ${jgmenu_item_height:-20} -item_halign = ${ITEM_HALIGN:-left} -item_padding_x = 4 - -item_margin_x = ${item_margin_x:-0} -item_margin_y = ${item_margin_y:-3} -item_radius = ${item_radius:-2} -item_border = ${item_border:-0} -arrow_string = ${ARROW_STRING:-⮞} - - - -columns = ${COLUMNS:-1} -menu_gradient_pos = ${menu_gradient_pos:- none} -color_menu_bg = ${color_menu_bg:-#222222 80} -color_menu_bg_to = ${color_menu_bg_to:- #000000 100} -color_menu_border = ${color_menu_border:-#2f9b85 100} -color_norm_bg = ${color_norm_bg:-#000000 0} -color_norm_fg = ${color_norm_fg:-#CCCCCC 100} -color_sel_bg = ${color_sel_bg:-#169f6f 60} -color_sel_fg = ${color_sel_fg:-#f8f8f8 100} -color_sel_border = ${color_sel_border:-#504e65 100} -color_sep_fg = ${color_sep_fg:-#4D4D4D 100} -color_sep_bg = ${color_sep_bg:-#262626 100} -color_title_fg = ${color_title_fg:-#4D4D4D 100} -color_title_border = ${color_title_border:-#169f6f 100} -color_title_bg = ${color_title_bg:-#262626 100} -color_scroll_ind = ${COLOR_SCROLL_IND:-#504e65 100} - - -sep_markup = weight="bold" foreground="${color_title_fg% *}" -sep_height = ${sep_height:-5} -font = ${jgmenu_font:-Noto Sans Medium 9} -icon_size = ${jgmenu_icon_size:-16} -icon_theme = ${jgmenu_icon_theme:-Numix-Square} -EOF - -unset font -} -CONFIG_FILE=$(mktemp) -MENU_ITEMS=$(mktemp) -trap "rm -f ${CONFIG_FILE} ${MENU_ITEMS}" EXIT