Move the rootmenu to the machine-specific directories.

Most of these menus are machine-specific, and it's just too much to try and
share code here.

diff --git a/artemis/config b/artemis/config
index d9d74e793f91587c51827060014fb69dad77d3aa..3e69f0c6c12036bde653af5997defb3bdc58a560 100644 (file)
--- a/artemis/config
+++ b/artemis/config
@@ -8,7 +8,7 @@ Style * IconFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=tru
 MenuStyle * Font 'xft:M+1P+IPAG:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
 MenuStyle * TitleFont 'xft:M+1P+IPAG:Bold:size=9:minspace=true:rgba=rgb:antialias=true:encoding=iso10646-1'
 
-Read common/rootmenu
+Read artemis/rootmenu
 Read common/wallpaper
 Read common/panels
 Read common/modifier

diff --git a/common/rootmenu b/artemis/rootmenu
similarity index 100%
rename from common/rootmenu
rename to artemis/rootmenu

diff --git a/atropos/config b/atropos/config
index 29507c10638ee3f62cbb3bdec93d2a5e613da30f..0d7eef722a296811e64fd361d75f3260ae38bbef 100644 (file)
--- a/atropos/config
+++ b/atropos/config
@@ -1,7 +1,7 @@
 # Import common features
 Read common/bindings
 Read common/nickstheme
-Read common/rootmenu
+Read atropos/rootmenu
 Read common/wallpaper
 Read common/panels
 Read common/modifier

diff --git a/atropos/rootmenu b/atropos/rootmenu
new file mode 100644 (file)
index 0000000..74001e8
--- /dev/null
+++ b/atropos/rootmenu
@@ -0,0 +1,50 @@
+MenuStyle * !TitleWarp
+
+CopyMenuStyle * MenuMPD
+MenuStyle MenuMPD ItemFormat "%.2|%3.5l%.5l%2.3>%-80.5r%.5i%1|"
+
+DestroyMenu MenuFvwmRoot
+AddToMenu   MenuFvwmRoot
++ DynamicPopupAction MakeMenuFvwmRoot
+
+DestroyFunc MakeMenuFvwmRoot
+AddToFunc   MakeMenuFvwmRoot
++ I DestroyMenu recreate MenuFvwmRoot
++ I PipeRead 'echo AddToMenu MenuFvwmRoot "$USER@`hostname`" Title'
++ I AddToMenu MenuFvwmRoot "Terminal%terminal.svg:16x16%" Exec exec $[TERMINAL]
++ I AddToMenu MenuFvwmRoot "Firefox%firefox.png%" Exec exec firefox
++ I PipeRead "xlsclients -a | grep ' xchat$' >/dev/null || echo\
+       AddToMenu MenuFvwmRoot 'Xchat%xchat.png%' Exec exec xchat"
++ I PipeRead "xlsclients -a | grep ' gmpc$' >/dev/null || echo\
+       AddToMenu MenuFvwmRoot 'GMPC%gmpc.png%' Exec exec gmpc"
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Network%network.svg:16x16%" Popup MenuNetwork
++ I AddToMenu MenuFvwmRoot "Games%games.svg:16x16%" Popup MenuGames
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Wallpaper%wallpaper.svg:16x16%" Popup MenuWallpaper
++ I AddToMenu MenuFvwmRoot "Music%music.svg:16x16%" Popup MenuMPD
++ I AddToMenu MenuFvwmRoot "" Nop
++ I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
++ I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
+       Module FvwmForm FvwmForm-QuitVerify
+
+DestroyMenu MenuNetwork
+AddToMenu   MenuNetwork
++ "Pan Newsreader%pan.png%" Exec exec env LC_ALL=en_CA.UTF-8 pan
+
+DestroyMenu MenuGames
+AddToMenu   MenuGames
++ "Gens%sonic.png%" Exec exec gens
+
+DestroyMenu MenuMPD
+AddToMenu   MenuMPD
++ DynamicPopUpAction   MakeMenuMPD
++ DynamicPopDownAction KillMenuMPD
+ChangeMenuStyle MenuMPD MenuMPD
+
+DestroyFunc MakeMenuMPD
+AddToFunc   MakeMenuMPD
++ I DestroyMenu recreate MenuMPD
++ I PipeRead "exec $[FVWM_USERDIR]/mpdmenu.pl --menu MenuMPD"
+
+Mouse 3 R A Menu MenuFvwmRoot