From 900b2e2e8fdb07164d087a43d1fb92b9c9d17762 Mon Sep 17 00:00:00 2001
From: Daniel Napora <napcok@gmail.com>
Date: Sun, 29 Dec 2024 01:14:45 +0100
Subject: [PATCH] menu and theme

---
 config/labwc/MENU_BOTTOM.txt        |  36 +++---
 config/labwc/MENU_IGNORE.txt        |   1 -
 config/labwc/MENU_TOP.txt           |   2 +-
 config/labwc/menu.xml               | 193 +++++++++++++++++++++++++---
 config/mabox-labwc/MENU_BOTTOM.txt  |  35 ++---
 config/mabox-labwc/MENU_IGNORE.txt  |   1 -
 config/mabox-labwc/menu.xml         | 190 ++++++++++++++++++++++++---
 config/mabox-labwc/themerc-override |   8 +-
 8 files changed, 386 insertions(+), 80 deletions(-)

diff --git a/config/labwc/MENU_BOTTOM.txt b/config/labwc/MENU_BOTTOM.txt
index e5637e6..709c9e2 100644
--- a/config/labwc/MENU_BOTTOM.txt
+++ b/config/labwc/MENU_BOTTOM.txt
@@ -2,13 +2,29 @@
   <item label="Labwc Tweaks">
     <action name="Execute" command="labwc-tweaks" />
   </item>
-  <item label="Regenerate menu">
+  <menu id="regmenu" label="Regenerate menu">
+  <separator label="Menu type"/>
+  <item label="Static (apps in rootmenu)">
     <action name="Execute" command="mabox-labwc-menu" />
   </item>
+  <item label="Dynamic (apps in submenu)">
+    <action name="Execute" command="mabox-labwc-menu -p" />
+  </item>
+  <separator label="Edit..." />
+  <item label="MENU_TOP.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_TOP.txt" />
+  </item>
+  <item label="MENU_BOTTOM.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_BOTTOM.txt" />
+  </item>
+  <item label="MENU_IGNORE.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_IGNORE.txt" />
+  </item>
+  </menu>
   <item label="Reconfigure Labwc">
     <action name="Reconfigure" />
   </item>
-  <separator label="Exit.." />
+  <separator label="Exit..." />
   <item label="Exit">
     <action name="Exit" />
   </item>
@@ -17,19 +33,5 @@
   </item>
 </menu>
 
-<menu id="some-custom-menu">
-  <!--
-    Creates menu title.
-    To create an empty header with no text,
-    set label=" ", not label=""
-  -->
-  <separator label="custom menu" />
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Exit">
-    <action name="Exit" />
-  </item>
-</menu>
-
 </openbox_menu>
+
diff --git a/config/labwc/MENU_IGNORE.txt b/config/labwc/MENU_IGNORE.txt
index 3a997fe..66580dd 100644
--- a/config/labwc/MENU_IGNORE.txt
+++ b/config/labwc/MENU_IGNORE.txt
@@ -11,7 +11,6 @@ exo-preferred-applications.desktop
 exo-terminal-emulator.desktop
 exo-web-browser.desktop
 gxkb.desktop
-lxappearance.desktop
 lxrandr.desktop
 lxinput.desktop
 mcc.desktop
diff --git a/config/labwc/MENU_TOP.txt b/config/labwc/MENU_TOP.txt
index ecddd3b..0a964f1 100644
--- a/config/labwc/MENU_TOP.txt
+++ b/config/labwc/MENU_TOP.txt
@@ -5,7 +5,7 @@
   <!-- Make client-list-combined-menu a submenu of root-menu 
        You must supply a label or it will not appear in root-menu -->
  
-  <separator label="Mabox Labwc" />
+  <separator label="Labwc 0.8.2" />
   <item label="[ W-f ] File Manager">
     <action name="Execute" command="pcmanfm" />
   </item>
diff --git a/config/labwc/menu.xml b/config/labwc/menu.xml
index d554676..3668fc0 100644
--- a/config/labwc/menu.xml
+++ b/config/labwc/menu.xml
@@ -5,7 +5,7 @@
   <!-- Make client-list-combined-menu a submenu of root-menu 
        You must supply a label or it will not appear in root-menu -->
  
-  <separator label="Mabox Labwc" />
+  <separator label="Labwc 0.8.2" />
   <item label="[ W-f ] File Manager">
     <action name="Execute" command="pcmanfm" />
   </item>
@@ -17,19 +17,186 @@
   </item>
   <separator />
   <menu id="client-list-combined-menu" label="Running..." />
-<separator />
-<menu id="applications" label="Applications" execute="labwc-menu-generator -p" />
+<separator label="Applications"/>
+  <menu id="Accessories" label="Accessories">
+    <item label="CherryTree">
+      <action name="Execute"><command>cherrytree --new_window</command></action>
+    </item>
+    <item label="Double Commander">
+      <action name="Execute"><command>doublecmd</command></action>
+    </item>
+    <item label="File Manager PCManFM">
+      <action name="Execute"><command>pcmanfm</command></action>
+    </item>
+    <item label="FSearch">
+      <action name="Execute"><command>fsearch</command></action>
+    </item>
+    <item label="Galculator">
+      <action name="Execute"><command>galculator</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Terminator">
+      <action name="Execute"><command>terminator</command></action>
+    </item>
+    <item label="Xarchiver">
+      <action name="Execute"><command>xarchiver</command></action>
+    </item>
+    <item label="Xpad">
+      <action name="Execute"><command>xpad</command></action>
+    </item>
+  </menu> <!-- Accessories -->
+  <menu id="Development" label="Development">
+    <item label="Geany">
+      <action name="Execute"><command>geany</command></action>
+    </item>
+    <item label="Meld">
+      <action name="Execute"><command>meld</command></action>
+    </item>
+  </menu> <!-- Development -->
+  <menu id="Graphics" label="Graphics">
+    <item label="Viewnior">
+      <action name="Execute"><command>viewnior</command></action>
+    </item>
+  </menu> <!-- Graphics -->
+  <menu id="Internet" label="Internet">
+    <item label="Advanced Network Configuration">
+      <action name="Execute"><command>nm-connection-editor</command></action>
+    </item>
+    <item label="Firefox">
+      <action name="Execute"><command>/usr/lib/firefox/firefox</command></action>
+    </item>
+    <item label="HexChat">
+      <action name="Execute"><command>hexchat --existing</command></action>
+    </item>
+    <item label="PyRadio">
+      <action name="Execute"><command>foot 'pyradio'</command></action>
+    </item>
+  </menu> <!-- Internet -->
+  <menu id="Multimedia" label="Multimedia">
+    <item label="Audacious">
+      <action name="Execute"><command>audacious</command></action>
+    </item>
+    <item label="mpv Media Player">
+      <action name="Execute"><command>mpv --player-operation-mode=pseudo-gui --</command></action>
+    </item>
+    <item label="Qt V4L2 test Utility">
+      <action name="Execute"><command>qv4l2</command></action>
+    </item>
+    <item label="Qt V4L2 video capture utility">
+      <action name="Execute"><command>qvidcap</command></action>
+    </item>
+    <item label="Volume Control">
+      <action name="Execute"><command>pavucontrol</command></action>
+    </item>
+  </menu> <!-- Multimedia -->
+  <menu id="Settings" label="Settings">
+    <item label="Add/Remove Software">
+      <action name="Execute"><command>pamac-manager</command></action>
+    </item>
+    <item label="Advanced Network Configuration">
+      <action name="Execute"><command>nm-connection-editor</command></action>
+    </item>
+    <item label="Bluetooth Adapters">
+      <action name="Execute"><command>blueman-adapters</command></action>
+    </item>
+    <item label="Bluetooth Manager">
+      <action name="Execute"><command>blueman-manager</command></action>
+    </item>
+    <item label="Customize Look and Feel">
+      <action name="Execute"><command>lxappearance</command></action>
+    </item>
+    <item label="Labwc Tweaks">
+      <action name="Execute"><command>labwc-tweaks</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Manjaro Settings Manager">
+      <action name="Execute"><command>manjaro-settings-manager</command></action>
+    </item>
+    <item label="Notifications">
+      <action name="Execute"><command>xfce4-notifyd-config</command></action>
+    </item>
+    <item label="Power Manager">
+      <action name="Execute"><command>xfce4-power-manager-settings</command></action>
+    </item>
+    <item label="Volume Control">
+      <action name="Execute"><command>pavucontrol</command></action>
+    </item>
+  </menu> <!-- Settings -->
+  <menu id="System" label="System">
+    <item label="About Mabox Linux">
+      <action name="Execute"><command>about-mabox</command></action>
+    </item>
+    <item label="Add/Remove Software">
+      <action name="Execute"><command>pamac-manager</command></action>
+    </item>
+    <item label="btop++">
+      <action name="Execute"><command>foot 'btop'</command></action>
+    </item>
+    <item label="File Manager PCManFM">
+      <action name="Execute"><command>pcmanfm</command></action>
+    </item>
+    <item label="Foot">
+      <action name="Execute"><command>foot</command></action>
+    </item>
+    <item label="Foot Client">
+      <action name="Execute"><command>footclient</command></action>
+    </item>
+    <item label="Foot Server">
+      <action name="Execute"><command>foot --server</command></action>
+    </item>
+    <item label="gmrun">
+      <action name="Execute"><command>gmrun</command></action>
+    </item>
+    <item label="GParted">
+      <action name="Execute"><command>/usr/bin/gparted</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Mabox Welcome">
+      <action name="Execute"><command>/usr/bin/mwelcome</command></action>
+    </item>
+    <item label="Manjaro Settings Manager">
+      <action name="Execute"><command>manjaro-settings-manager</command></action>
+    </item>
+    <item label="Task Manager">
+      <action name="Execute"><command>lxtask</command></action>
+    </item>
+    <item label="Terminator">
+      <action name="Execute"><command>terminator</command></action>
+    </item>
+  </menu> <!-- System -->
   <separator label="Labwc settings"/>
   <item label="Labwc Tweaks">
     <action name="Execute" command="labwc-tweaks" />
   </item>
-  <item label="Regenerate menu">
+  <menu id="regmenu" label="Regenerate menu">
+  <separator label="Menu type"/>
+  <item label="Static (apps in rootmenu)">
     <action name="Execute" command="mabox-labwc-menu" />
   </item>
+  <item label="Dynamic (apps in submenu)">
+    <action name="Execute" command="mabox-labwc-menu -p" />
+  </item>
+  <separator label="Edit..." />
+  <item label="MENU_TOP.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_TOP.txt" />
+  </item>
+  <item label="MENU_BOTTOM.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_BOTTOM.txt" />
+  </item>
+  <item label="MENU_IGNORE.txt">
+    <action name="Execute" command="geany ~/.config/labwc/MENU_IGNORE.txt" />
+  </item>
+  </menu>
   <item label="Reconfigure Labwc">
     <action name="Reconfigure" />
   </item>
-  <separator label="Exit.." />
+  <separator label="Exit..." />
   <item label="Exit">
     <action name="Exit" />
   </item>
@@ -38,19 +205,5 @@
   </item>
 </menu>
 
-<menu id="some-custom-menu">
-  <!--
-    Creates menu title.
-    To create an empty header with no text,
-    set label=" ", not label=""
-  -->
-  <separator label="custom menu" />
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Exit">
-    <action name="Exit" />
-  </item>
-</menu>
-
 </openbox_menu>
+
diff --git a/config/mabox-labwc/MENU_BOTTOM.txt b/config/mabox-labwc/MENU_BOTTOM.txt
index e5637e6..7fa0d0b 100644
--- a/config/mabox-labwc/MENU_BOTTOM.txt
+++ b/config/mabox-labwc/MENU_BOTTOM.txt
@@ -2,13 +2,29 @@
   <item label="Labwc Tweaks">
     <action name="Execute" command="labwc-tweaks" />
   </item>
-  <item label="Regenerate menu">
+  <menu id="regmenu" label="Regenerate menu">
+  <separator label="Menu type"/>
+  <item label="Static (apps in rootmenu)">
     <action name="Execute" command="mabox-labwc-menu" />
   </item>
+  <item label="Dynamic (apps in submenu)">
+    <action name="Execute" command="mabox-labwc-menu -p" />
+  </item>
+  <separator label="Edit..." />
+  <item label="MENU_TOP.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_TOP.txt" />
+  </item>
+  <item label="MENU_BOTTOM.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_BOTTOM.txt" />
+  </item>
+  <item label="MENU_IGNORE.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_IGNORE.txt" />
+  </item>
+  </menu>
   <item label="Reconfigure Labwc">
     <action name="Reconfigure" />
   </item>
-  <separator label="Exit.." />
+  <separator label="Exit..." />
   <item label="Exit">
     <action name="Exit" />
   </item>
@@ -17,19 +33,4 @@
   </item>
 </menu>
 
-<menu id="some-custom-menu">
-  <!--
-    Creates menu title.
-    To create an empty header with no text,
-    set label=" ", not label=""
-  -->
-  <separator label="custom menu" />
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Exit">
-    <action name="Exit" />
-  </item>
-</menu>
-
 </openbox_menu>
diff --git a/config/mabox-labwc/MENU_IGNORE.txt b/config/mabox-labwc/MENU_IGNORE.txt
index 3a997fe..66580dd 100644
--- a/config/mabox-labwc/MENU_IGNORE.txt
+++ b/config/mabox-labwc/MENU_IGNORE.txt
@@ -11,7 +11,6 @@ exo-preferred-applications.desktop
 exo-terminal-emulator.desktop
 exo-web-browser.desktop
 gxkb.desktop
-lxappearance.desktop
 lxrandr.desktop
 lxinput.desktop
 mcc.desktop
diff --git a/config/mabox-labwc/menu.xml b/config/mabox-labwc/menu.xml
index d554676..221df51 100644
--- a/config/mabox-labwc/menu.xml
+++ b/config/mabox-labwc/menu.xml
@@ -17,19 +17,186 @@
   </item>
   <separator />
   <menu id="client-list-combined-menu" label="Running..." />
-<separator />
-<menu id="applications" label="Applications" execute="labwc-menu-generator -p" />
+<separator label="Applications"/>
+  <menu id="Accessories" label="Accessories">
+    <item label="CherryTree">
+      <action name="Execute"><command>cherrytree --new_window</command></action>
+    </item>
+    <item label="Double Commander">
+      <action name="Execute"><command>doublecmd</command></action>
+    </item>
+    <item label="File Manager PCManFM">
+      <action name="Execute"><command>pcmanfm</command></action>
+    </item>
+    <item label="FSearch">
+      <action name="Execute"><command>fsearch</command></action>
+    </item>
+    <item label="Galculator">
+      <action name="Execute"><command>galculator</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Terminator">
+      <action name="Execute"><command>terminator</command></action>
+    </item>
+    <item label="Xarchiver">
+      <action name="Execute"><command>xarchiver</command></action>
+    </item>
+    <item label="Xpad">
+      <action name="Execute"><command>xpad</command></action>
+    </item>
+  </menu> <!-- Accessories -->
+  <menu id="Development" label="Development">
+    <item label="Geany">
+      <action name="Execute"><command>geany</command></action>
+    </item>
+    <item label="Meld">
+      <action name="Execute"><command>meld</command></action>
+    </item>
+  </menu> <!-- Development -->
+  <menu id="Graphics" label="Graphics">
+    <item label="Viewnior">
+      <action name="Execute"><command>viewnior</command></action>
+    </item>
+  </menu> <!-- Graphics -->
+  <menu id="Internet" label="Internet">
+    <item label="Advanced Network Configuration">
+      <action name="Execute"><command>nm-connection-editor</command></action>
+    </item>
+    <item label="Firefox">
+      <action name="Execute"><command>/usr/lib/firefox/firefox</command></action>
+    </item>
+    <item label="HexChat">
+      <action name="Execute"><command>hexchat --existing</command></action>
+    </item>
+    <item label="PyRadio">
+      <action name="Execute"><command>foot 'pyradio'</command></action>
+    </item>
+  </menu> <!-- Internet -->
+  <menu id="Multimedia" label="Multimedia">
+    <item label="Audacious">
+      <action name="Execute"><command>audacious</command></action>
+    </item>
+    <item label="mpv Media Player">
+      <action name="Execute"><command>mpv --player-operation-mode=pseudo-gui --</command></action>
+    </item>
+    <item label="Qt V4L2 test Utility">
+      <action name="Execute"><command>qv4l2</command></action>
+    </item>
+    <item label="Qt V4L2 video capture utility">
+      <action name="Execute"><command>qvidcap</command></action>
+    </item>
+    <item label="Volume Control">
+      <action name="Execute"><command>pavucontrol</command></action>
+    </item>
+  </menu> <!-- Multimedia -->
+  <menu id="Settings" label="Settings">
+    <item label="Add/Remove Software">
+      <action name="Execute"><command>pamac-manager</command></action>
+    </item>
+    <item label="Advanced Network Configuration">
+      <action name="Execute"><command>nm-connection-editor</command></action>
+    </item>
+    <item label="Bluetooth Adapters">
+      <action name="Execute"><command>blueman-adapters</command></action>
+    </item>
+    <item label="Bluetooth Manager">
+      <action name="Execute"><command>blueman-manager</command></action>
+    </item>
+    <item label="Customize Look and Feel">
+      <action name="Execute"><command>lxappearance</command></action>
+    </item>
+    <item label="Labwc Tweaks">
+      <action name="Execute"><command>labwc-tweaks</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Manjaro Settings Manager">
+      <action name="Execute"><command>manjaro-settings-manager</command></action>
+    </item>
+    <item label="Notifications">
+      <action name="Execute"><command>xfce4-notifyd-config</command></action>
+    </item>
+    <item label="Power Manager">
+      <action name="Execute"><command>xfce4-power-manager-settings</command></action>
+    </item>
+    <item label="Volume Control">
+      <action name="Execute"><command>pavucontrol</command></action>
+    </item>
+  </menu> <!-- Settings -->
+  <menu id="System" label="System">
+    <item label="About Mabox Linux">
+      <action name="Execute"><command>about-mabox</command></action>
+    </item>
+    <item label="Add/Remove Software">
+      <action name="Execute"><command>pamac-manager</command></action>
+    </item>
+    <item label="btop++">
+      <action name="Execute"><command>foot 'btop'</command></action>
+    </item>
+    <item label="File Manager PCManFM">
+      <action name="Execute"><command>pcmanfm</command></action>
+    </item>
+    <item label="Foot">
+      <action name="Execute"><command>foot</command></action>
+    </item>
+    <item label="Foot Client">
+      <action name="Execute"><command>footclient</command></action>
+    </item>
+    <item label="Foot Server">
+      <action name="Execute"><command>foot --server</command></action>
+    </item>
+    <item label="gmrun">
+      <action name="Execute"><command>gmrun</command></action>
+    </item>
+    <item label="GParted">
+      <action name="Execute"><command>/usr/bin/gparted</command></action>
+    </item>
+    <item label="LightDM GTK Greeter settings">
+      <action name="Execute"><command>lightdm-gtk-greeter-settings-pkexec</command></action>
+    </item>
+    <item label="Mabox Welcome">
+      <action name="Execute"><command>/usr/bin/mwelcome</command></action>
+    </item>
+    <item label="Manjaro Settings Manager">
+      <action name="Execute"><command>manjaro-settings-manager</command></action>
+    </item>
+    <item label="Task Manager">
+      <action name="Execute"><command>lxtask</command></action>
+    </item>
+    <item label="Terminator">
+      <action name="Execute"><command>terminator</command></action>
+    </item>
+  </menu> <!-- System -->
   <separator label="Labwc settings"/>
   <item label="Labwc Tweaks">
     <action name="Execute" command="labwc-tweaks" />
   </item>
-  <item label="Regenerate menu">
+  <menu id="regmenu" label="Regenerate menu">
+  <separator label="Menu type"/>
+  <item label="Static (apps in rootmenu)">
     <action name="Execute" command="mabox-labwc-menu" />
   </item>
+  <item label="Dynamic (apps in submenu)">
+    <action name="Execute" command="mabox-labwc-menu -p" />
+  </item>
+  <separator label="Edit..." />
+  <item label="MENU_TOP.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_TOP.txt" />
+  </item>
+  <item label="MENU_BOTTOM.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_BOTTOM.txt" />
+  </item>
+  <item label="MENU_IGNORE.txt">
+    <action name="Execute" command="geany ~/.config/mabox-labwc/MENU_IGNORE.txt" />
+  </item>
+  </menu>
   <item label="Reconfigure Labwc">
     <action name="Reconfigure" />
   </item>
-  <separator label="Exit.." />
+  <separator label="Exit..." />
   <item label="Exit">
     <action name="Exit" />
   </item>
@@ -38,19 +205,4 @@
   </item>
 </menu>
 
-<menu id="some-custom-menu">
-  <!--
-    Creates menu title.
-    To create an empty header with no text,
-    set label=" ", not label=""
-  -->
-  <separator label="custom menu" />
-  <item label="Reconfigure">
-    <action name="Reconfigure" />
-  </item>
-  <item label="Exit">
-    <action name="Exit" />
-  </item>
-</menu>
-
 </openbox_menu>
diff --git a/config/mabox-labwc/themerc-override b/config/mabox-labwc/themerc-override
index 1ca989a..54b0a3f 100644
--- a/config/mabox-labwc/themerc-override
+++ b/config/mabox-labwc/themerc-override
@@ -55,11 +55,11 @@
 #     window.active.button.iconify.unpressed.image.color: #333333
 
 # menu
-#menu.overlap.x: 0
-#menu.overlap.y: 0
+menu.overlap.x: 6
+menu.overlap.y: 6
 #menu.width.min: 20
 #menu.width.max: 200
-#menu.border.width: 1
+menu.border.width: 2
 #menu.border.color: #aaaaaa
 #menu.items.bg.color: #fcfbfa
 #menu.items.text.color: #000000
@@ -68,7 +68,7 @@
 #menu.items.padding.x: 7
 #menu.items.padding.y: 4
 #menu.separator.width: 1
-#menu.separator.padding.width: 6
+menu.separator.padding.width: 16
 #menu.separator.padding.height: 3
 #menu.separator.color: #888888
 #menu.title.bg.color: #589bda