Merge menu_data and menu_windowops to menu.config.

3 files changed, 40 insertions, 40 deletions

diff --git a/config b/config
index 7b6efc3..ca25326 100644
--- a/config
+++ b/config
@@ -37,8 +37,7 @@ AddToFunc StartFunction
 + I Read styles.config
 + I Read deco.config
 + I Read panel.config
-+ I Read menu/menu_data.config
-+ I Read menu/menu_windowops.config
++ I Read menu.config
 + I All (maximized) WindowStyle !Borders, !Title, ResizeHintOverride
 + I UpdateStyles
 + I Module FvwmCommandS
diff --git a/menu/menu_windowops.config b/menu.config
index 9e8c9b6..ac65991 100644
--- a/menu/menu_windowops.config
+++ b/menu.config
@@ -1,3 +1,42 @@
+####################
+# FVWM Config Menu #
+####################
+
+DestroyMenu menu_fvwmConfig
+AddToMenu menu_fvwmConfig "FVWM" Title
++ MissingSubmenuFunction ConfigBrowser
++ "" Nop
+Test (x convert) + "&g. $[gt.Wallpaper]" Popup WallpaperBrowser Menu 100 0
+
+DestroyFunc ConfigBrowser
+AddToFunc ConfigBrowser
++ I DestroyMenu WallpaperBrowser
++ I AddToMenu WallpaperBrowser "$[gt.Wallpaper]" Title
++ I + DynamicPopDownAction DestroyMenu WallpaperBrowser
++ I Test (EnvMatch slideshow 0) + "&Slideshow On" SlideshowOn
++ I Test (EnvMatch slideshow 1) + "&Slideshow Off" SlideshowOff
++ I + "&Next Random Wall" RandomWall
+
+DestroyMenu menu_RootOps
+AddToMenu   menu_RootOps
++ DynamicPopupAction Function RootOpsMenuFunc
+
+AddToFunc RootOpsMenuFunc
++ I DestroyMenu recreate menu_RootOps
++ I AddToMenu menu_RootOps "$[gt.Menu raíz]" Title
++ I Test (x xscreensaver-command) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec xscreensaver-command -lock
++ I Test (!x xscreensaver-command, x alock) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec alock -auth none -bg blank -cursor glyph
++ I Test (!x xscreensaver-command, !x alock, x slock) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec slock
++ I + "%xapp_big.png%&2. $[gt.Restart]" Restart
++ I + "%xapp_big.png%&3. $[gt.Close]" Popup Quit-Verify
+
+DestroyMenu Quit-Verify
+AddToMenu   Quit-Verify
++I "Really quit FVWM?" Title
++I "Yes."              Quit
++I ""                  Nop
++I "Cancel."           Nop
+
 DestroyMenu menu_WindowOps
 AddToMenu menu_WindowOps
 + DynamicPopupAction Function WindowOpsFunc
diff --git a/menu/menu_data.config b/menu/menu_data.config
deleted file mode 100644
index ffa0e1c..0000000
--- a/menu/menu_data.config
+++ /dev/null
@@ -1,38 +0,0 @@
-####################
-# FVWM Config Menu #
-####################
-
-DestroyMenu menu_fvwmConfig
-AddToMenu menu_fvwmConfig "FVWM" Title
-+ MissingSubmenuFunction ConfigBrowser
-+ "" Nop
-Test (x convert) + "&g. $[gt.Wallpaper]" Popup WallpaperBrowser Menu 100 0
-
-DestroyFunc ConfigBrowser
-AddToFunc ConfigBrowser
-+ I DestroyMenu WallpaperBrowser
-+ I AddToMenu WallpaperBrowser "$[gt.Wallpaper]" Title
-+ I + DynamicPopDownAction DestroyMenu WallpaperBrowser
-+ I Test (EnvMatch slideshow 0) + "&Slideshow On" SlideshowOn
-+ I Test (EnvMatch slideshow 1) + "&Slideshow Off" SlideshowOff
-+ I + "&Next Random Wall" RandomWall
-
-DestroyMenu menu_RootOps
-AddToMenu   menu_RootOps
-+ DynamicPopupAction Function RootOpsMenuFunc
-
-AddToFunc RootOpsMenuFunc
-+ I DestroyMenu recreate menu_RootOps
-+ I AddToMenu menu_RootOps "$[gt.Menu raíz]" Title
-+ I Test (x xscreensaver-command) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec xscreensaver-command -lock
-+ I Test (!x xscreensaver-command, x alock) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec alock -auth none -bg blank -cursor glyph
-+ I Test (!x xscreensaver-command, !x alock, x slock) + "%xapp_big.png%&1. $[gt.Lock Screen]" Exec exec slock
-+ I + "%xapp_big.png%&2. $[gt.Restart]" Restart
-+ I + "%xapp_big.png%&3. $[gt.Close]" Popup Quit-Verify
-
-DestroyMenu Quit-Verify
-AddToMenu   Quit-Verify
-+I "Really quit FVWM?" Title
-+I "Yes."              Quit
-+I ""                  Nop
-+I "Cancel."           Nop