diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid
index e6d680d..377ee84 100755
--- a/usr/bin/jgdeskgrid
+++ b/usr/bin/jgdeskgrid
@@ -18,6 +18,17 @@ case $LANG in
;;
es*)
REMOVE="Eliminar este menĂº del panel"
+ title="DesktopGrid - arrange your windows on the grid"
+ help='\n\nUse Ctrl+Shift+Keypad_Keys to move windows on the grid\nCtrl+Shift+LeftMouseClick on appropriate area of the window to snap it in a given direction.\nSee: video on YT\n\n If you need even more control of windows size and position on the grid - use super + LeftMouseClick on window and then draw rectangle on the screen to select new window size and position.\nSee: deskgrid preview on YT\n\nConfigurable settings:\n- columns\n- rows\n- gap\n- show_outer_gap'
+ ABOUT="About DesktopGrid"
+ SHOW_IMGHELPER="Show image helper"
+ CONFIGURATION="Configuration"
+ LCOLUMNS="Columns"
+ LROWS="Rows"
+ LGAP="Gap between windows"
+ OUTER_GAP="Show outer gap"
+ NOTIFY="Notifications"
+ EDITCONF="Edit config file"
;;
*)
REMOVE="Remove this menu from panel"
@@ -35,11 +46,10 @@ case $LANG in
;;
esac
-. ~/.config/mabox/mabox.conf
CONFIG_DIR="$HOME/.config/deskgrid"
CONFIG_FILE="$CONFIG_DIR/deskgrid.cfg"
-mkdir -p $CONFIG_DIR
+#mkdir -p $CONFIG_DIR
if [ ! -f $CONFIG_FILE ]; then
cat < ${CONFIG_FILE}
# Gap between windows in pixels (reasonable values: 0 8 16 24)
@@ -59,26 +69,24 @@ activate_window=false
EOF
fi
source <(grep = $CONFIG_FILE)
-
GAP=${gap:-16}
-COLUMNS=${columns:-12}
+COL=${columns:-12}
ROWS=${rows:-6}
TITLEBAR_HEIGHT=${titlebar_height:-18}
-me="mb-jgtools $jgtools_last"
-
+me="jgdeskgrid -s"
out+=("^sep(DesktopGrid)")
out+=("$ABOUT,notify-send.sh -u critical -i mbcc '$title' '$help' -o '$EDITCONF:geany ~/.config/deskgrid/deskgrid.cfg'")
out+=("$SHOW_IMGHELPER,drawgrid")
out+=("^sep($CONFIGURATION)")
-out+=("$LCOLUMNS [ $COLUMNS ],^checkout(columns)")
+out+=("$LCOLUMNS [ $COL ],^checkout(columns)")
out+=("$LROWS [ $ROWS ],^checkout(rows)")
out+=("$LGAP [ $GAP ],^checkout(gap)")
out+=("$OUTER_GAP [ $show_outer_gap ],^checkout(outer)")
out+=("$NOTIFY [ $notifications ],^checkout(notify)")
out+=("^sep()")
-out+=("$EDITCONF ,geany $CONFIG_FILE")
+out+=("$EDITCONF,geany $CONFIG_FILE")
out2+=("^tag(columns)")
for i in 8 12 16 24 32; do out2+=("$(printf "%3s,%s" "$i" "mb-setvar columns=${i} $CONFIG_FILE;$me")");done
@@ -93,18 +101,17 @@ out2+=("^tag(notify)")
out2+=("$(printf "%3s,%s" "true" "mb-setvar notifications=true $CONFIG_FILE;$me")")
out2+=("$(printf "%3s,%s" "false" "mb-setvar notifications=false $CONFIG_FILE;$me")")
-
-
### RUN
if [[ "$1" == "-s" ]]; then
. /usr/bin/pipemenu-standalone.cfg
+. $HOME/.config/mabox/mabox.conf
-
-MENU_PADDING_TOP=0
-MENU_HALIGN="center"
+MENU_PADDING_TOP=${jgtools_padding:-0}
+MENU_HALIGN="left"
MENU_VALIGN="center"
jgmenu_icon_size=0
-
+JGWIDTH=40
+menu_margin_x=${submenu_spacing:-0}
[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius
[ -z $jgmenu_use_borders ] && menu_border=0
@@ -118,7 +125,6 @@ EOF
jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} 2>/dev/null
exit 0
-
fi
printf '%s\n' "${out[@]}"
diff --git a/usr/bin/jgespanso-pipe b/usr/bin/jgespanso-pipe
index 5303344..3783692 100755
--- a/usr/bin/jgespanso-pipe
+++ b/usr/bin/jgespanso-pipe
@@ -55,7 +55,9 @@ fi
### RUN
if [ $1 == "-s" ]; then
. /usr/bin/pipemenu-standalone.cfg
+. $HOME/.config/mabox/mabox.conf
+MENU_PADDING_TOP=${jgtools_padding:-0}
MENU_PADDING_TOP=24
MENU_HALIGN="center"
MENU_VALIGN="top"
@@ -63,6 +65,9 @@ MENU_MARGIN_Y=40
jgmenu_icon_size=0
JGWIDTH=500
#MENU_HEIGHT_MAX=600
+[ $(pidof picom) ] && MENU_RADIUS=$jgtools_radius
+[ -z $jgmenu_use_borders ] && menu_border=0
+
mkconfigfile