From f7db96aac6025042ddadf947e41da0b1166dbdf1 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Sun, 23 May 2021 13:19:01 +0200
Subject: [PATCH] deskgrid cfg file update

---
 usr/bin/jgdeskgrid | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/bin/jgdeskgrid b/usr/bin/jgdeskgrid
index d32da21..adab145 100755
--- a/usr/bin/jgdeskgrid
+++ b/usr/bin/jgdeskgrid
@@ -17,16 +17,16 @@ esac
 . ~/.config/mabox/mabox.conf
 
 CONFIG_DIR="$HOME/.config/deskgrid"
-CONFIG_FILE="$CONFIG_DIR/deskgrid.conf"
+CONFIG_FILE="$CONFIG_DIR/deskgrid.cfg"
 mkdir -p $CONFIG_DIR
 if [ ! -f $CONFIG_FILE ]; then
 cat <<EOF > ${CONFIG_FILE}
 # Gap between windows in pixels (reasonable values: 0 8 16 24)
 gap=16
 # Grid columns (12 16 24)
-grid_x=16
+columns=12
 # Grid rows (6 12 16)
-grid_y=12
+rows=6
 # 
 titlebar_height=18
 #Notifications true or false
@@ -40,8 +40,8 @@ fi
 source <(grep = $CONFIG_FILE)
 
 GAP=${gap:-16}
-GRID_X=${grid_x:-16}
-GRID_Y=${grid_y:-12}
+COLUMNS=${columns:-12}
+ROWS=${rows:-6}
 TITLEBAR_HEIGHT=${titlebar_height:-18}
 
 me="mb-jgtools $jgtools_last"
@@ -50,8 +50,8 @@ out+=("^sep(DeskGrid)")
 out+=("Show image helper,drawgrid")
 #out+=("About,")
 out+=("^sep(Configuration)")
-out+=("Columns [ <b>$GRID_X</b> ],^checkout(columns)")
-out+=("Rows [ <b>$GRID_Y</b> ],^checkout(rows)")
+out+=("Columns [ <b>$COLUMNS</b> ],^checkout(columns)")
+out+=("Rows [ <b>$ROWS</b> ],^checkout(rows)")
 out+=("Gap between windows [ <b>$GAP</b> ],^checkout(gap)")
 out+=("Show outer gap [ <b>$show_outer_gap</b> ],^checkout(outer)")
 out+=("Notifications [ <b>$notifications</b> ],^checkout(notify)")
@@ -59,9 +59,9 @@ out+=("^sep()")
 out+=("Edit config file ,geany $CONFIG_FILE")
 
 out2+=("^tag(columns)")
-for i in 8 12 16 24 32; do out2+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar grid_x=${i} $CONFIG_FILE;$me")");done
+for i in 8 12 16 24 32; do out2+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar columns=${i} $CONFIG_FILE;$me")");done
 out2+=("^tag(rows)")
-for i in 6 8 12 16 24; do out2+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar grid_y=${i} $CONFIG_FILE;$me")");done
+for i in 6 8 12 16 24; do out2+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar rows=${i} $CONFIG_FILE;$me")");done
 out2+=("^tag(gap)")
 for i in 0 2 4 8 12 16 24 32 40; do out2+=("$(printf "<tt>%3s</tt>,%s" "$i" "mb-setvar gap=${i} $CONFIG_FILE;$me")");done
 out2+=("^tag(outer)")