From 55d32f5432479c377ab35129a63ef8bea7e481c2 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Tue, 10 Sep 2024 06:38:29 +0200
Subject: [PATCH] main menu and left sidepanel small update

---
 bin/mb-jgtools | 52 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/bin/mb-jgtools b/bin/mb-jgtools
index 0aee1a6..f7a99a4 100755
--- a/bin/mb-jgtools
+++ b/bin/mb-jgtools
@@ -168,6 +168,18 @@ CONFIG_FILE=$(mktemp)
 trap "rm -f ${CONFIG_FILE}" EXIT
 
 POSITION_MODE=${1:-pointer}
+case "$1" in
+	top)
+	MENU_HALIGN=center
+	MENU_VALIGN=top
+	;;
+	center)
+	MENU_HALIGN=center
+	MENU_VALIGN=center;;
+	*):;;
+esac
+MENU_MARGIN_Y=80
+
 HIDE_BACK_ITEMS=1
 
 panels_topmargin=0
@@ -176,6 +188,7 @@ case $LANG in
     APPS="Programy"
     KEYS="Skróty klawiszowe"
     SCREENSHOT="Zrzut ekranu"
+    WALLMENU="Ustaw tapetę"
     LOCKSCR="Zablokuj ekran"
     EXIT="Wyjście..."
     HELP="Pomoc"
@@ -185,6 +198,7 @@ case $LANG in
     es*) TYPE_TO_SEARCH="Buscar"
     APPS="Aplicationes"
     KEYS="Atajos del teclado"
+    WALLMENU="Wallpaper..."
     SCREENSHOT="Capturar Pantalla"
     LOCKSCR="Bloquear pantalla"
     EXIT="Salir..."
@@ -195,6 +209,7 @@ case $LANG in
     TYPE_TO_SEARCH="Tippe für Suche"
     APPS="Programme"
     KEYS="Tastenkombinationen"
+    WALLMENU="Wallpaper..."
     SCREENSHOT="Bildschirmfoto"
     LOCKSCR="Sperrbildschirm"
     EXIT="Verlassen..."
@@ -204,6 +219,7 @@ case $LANG in
     *) TYPE_TO_SEARCH="Type to Search"
     APPS="Applications"
     KEYS="Keybindings"
+    WALLMENU="Wallpaper..."
     SCREENSHOT="Screenshot"
     LOCKSCR="Lock screen"
     EXIT="Exit..."
@@ -275,6 +291,8 @@ $SCREENSHOT,mb-jgtools screenshot,emblem-photos
 ^sep()
 $LOCKSCR,mbscreenlocker,system-lock-screen
 ^sep()
+$WALLMENU,jgwallpaperchanger -s,wallpaper
+^sep()
 $EXIT,mb-jgtools mblogout,system-shutdown
 
 ^tag($SETTINGS)
@@ -662,12 +680,12 @@ case $LANG in
         SHORTCUTS="Skróty klawiszowe"
         MENUPANELS="Ustawienia Menu/Paneli"
         TINT2SETTINGS="Ustawienia panelu Tint2"
-        CONKYSETTINGS="Ustawienia Conky"
+        CONKYSETTINGS="Zarządzaj Conky"
         SSH_CONN="Połącz po SSH"
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Pulpity i Okna"
         SUPERCLICK="SuperClick"
-        WALLCHANGER="Tapeta"
+        WALLCHANGER="Menu Tapet"
         LOCKSCREEN="Blokada Ekranu"
         MBHELPER="Paleta komend"
         ;;
@@ -681,12 +699,12 @@ case $LANG in
         SHORTCUTS="Atajos del teclado"
         MENUPANELS="Menu/Paneles laterales"
         TINT2SETTINGS="Tint2 panel settings"
-        CONKYSETTINGS="Conky settings"
+        CONKYSETTINGS="Conky Manager"
         SSH_CONN="Conexiones SSH"
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Desktops and Windows"
         SUPERCLICK="SuperClick"
-        WALLCHANGER="Wallpaper"
+        WALLCHANGER="Wallpaper Menu"
         LOCKSCREEN="Screen Locker"
         MBHELPER="Cmd palette"
         ;;
@@ -700,12 +718,12 @@ case $LANG in
         SHORTCUTS="Keyboard shortcuts"
         MENUPANELS="Menu/Sidepanels settings"
         TINT2SETTINGS="Tint2 panel settings"
-        CONKYSETTINGS="Conky settings"
+        CONKYSETTINGS="Conky Manager"
         SSH_CONN="SSH connections"
         DESKMNGR="Desktop Session Manager"
         DESKTOPS="Desktops and Windows"
         SUPERCLICK="SuperClick"
-        WALLCHANGER="Wallpaper"
+        WALLCHANGER="Wallpaper Menu"
         LOCKSCREEN="Screen Locker"
         MBHELPER="Cmd palette"
       ;;
@@ -765,11 +783,11 @@ fi
 #[ $places_keyspipe == true ] && keyspipe="<big></big> $SHORTCUTS,^pipe(jgkeys-pipe -r)" && pipesep="^sep($PIPEMENUS)"
 [ $places_sshpipe == true ] && sshpipe="<big></big>  $SSH_CONN,^pipe(jgssh -r)" && pipesep="^sep($PIPEMENUS)"
 [ $places_softwarepipe == true ] && softwarepipe="<big></big>  $POPINSTALL,^pipe(jgsoftware-pipe -r)" && pipesep="^sep($PIPEMENUS)"
-[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe="<big></big> $CONKYSETTINGS,^pipe(jgconky-pipe -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_conkypipe == true || -z ${places_conkypipe} ]] && conkypipe="<big></big> $CONKYSETTINGS,colorizer-conky -s" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jgdeskmngr == true || -z ${places_jgdeskmngr} ]] && jgdeskmngr="<big></big>  $DESKMNGR,^pipe(jgdeskmngr -r)" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jgdesktops == true || -z ${places_jgdesktops} ]] && jgdesktops="<big></big>  $DESKTOPS,^pipe(jgdesktops -r)" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jgdeskgrid == true || -z ${places_jgdeskgrid} ]] && jgdeskgrid="<big></big>  $SUPERCLICK,^pipe(jgdeskgrid -r)" && pipesep="^sep($PIPEMENUS)"
-[[ $places_jgwallpaperchanger == true || -z ${places_jgwallpaperchanger} ]] && jgwallpaperchanger="<big></big>  $WALLCHANGER,^pipe(jgwallpaperchanger -r)" && pipesep="^sep($PIPEMENUS)"
+[[ $places_jgwallpaperchanger == true || -z ${places_jgwallpaperchanger} ]] && jgwallpaperchanger="<big></big>  $WALLCHANGER,jgwallpaperchanger -s" && pipesep="^sep($PIPEMENUS)"
 [[ $places_jglockscreen == true || -z ${places_jglockscreen} ]] && jglockscreen="<big></big>  $LOCKSCREEN,^pipe(jglockscreen -r)" && pipesep="^sep($PIPEMENUS)"
 
 # VBOXES
@@ -819,18 +837,18 @@ cat <<EOF > ${MENU_ITEMS}
 
 $(gtkbookmarks)
 $pipesep
-<big></big>  $MBHELPER	<span bgcolor="#333333" color="#d3d3d3"> <small> + F1</small> </span>,mbhelper -s
-$menusettingspipe
-$jgwallpaperchanger
-$jglockscreen
-$jgdesktops
-$jgdeskmngr
-$jgdeskgrid
-$sysinfopipe
-$sshpipe
 $softwarepipe
 $tint2pipe
 $conkypipe
+$jgwallpaperchanger
+$jglockscreen
+$jgdeskgrid
+$jgdesktops
+$jgdeskmngr
+$sysinfopipe
+$sshpipe
+<big></big>  $MBHELPER	<span bgcolor="#333333" color="#d3d3d3"> <small> + F1</small> </span>,mbhelper -s
+$menusettingspipe
 
 ${vboxes}
 . $HOME/.config/mabox/places-append.csv