Merge menu/menu.config to styles.config.

3 files changed, 47 insertions, 35 deletions

diff --git a/config b/config
index 66a27d9..7b6efc3 100644
--- a/config
+++ b/config
@@ -37,7 +37,6 @@ AddToFunc StartFunction
 + I Read styles.config
 + I Read deco.config
 + I Read panel.config
-+ I Read menu/menu.config
 + I Read menu/menu_data.config
 + I Read menu/menu_windowops.config
 + I All (maximized) WindowStyle !Borders, !Title, ResizeHintOverride
diff --git a/menu/menu.config b/menu/menu.config
deleted file mode 100644
index 71cb2b7..0000000
--- a/menu/menu.config
+++ /dev/null
@@ -1,34 +0,0 @@
-MenuStyle * Font $[ThemeMenuFont]
-MenuStyle * TitleUnderlines1
-MenuStyle * TitleFont $[ThemeMenuTitleFont]
-MenuStyle * MouseWheel ScrollsMenuBackwards
-MenuStyle * Animation
-MenuStyle * HilightBack, Hilight3DThin
-MenuStyle * ActiveColorset 7
-MenuStyle * MenuColorset 8
-MenuStyle * ItemFormat "%2.0|%0.0i%5.5l%5.2>%0.2|"
-MenuStyle * PopupOffset 0 99
-MenuStyle * PopupImmediately
-MenuStyle * PopdownImmediately
-MenuStyle * BorderWidth 1
-MenuStyle * VerticalItemSpacing 3 3
-MenuStyle * VerticalTitleSpacing 4 4
-MenuStyle * SeparatorsShort
-MenuStyle * TrianglesUseFore
-MenuStyle * TrianglesSolid
-MenuStyle * !TitleWarp
-MenuStyle * RemoveSubmenus
-#MenuStyle * Sidepic empty.png
-MenuStyle * SideColor $[bg.cs7]
-MenuStyle * ScrollOffPage
-MenuStyle * VerticalMargins 2 2
-
-# Alt+tab menu configuration
-MenuStyle WindowList Font $[ThemeWindowListFont]
-MenuStyle WindowList HilightBack, Hilight3DThin
-MenuStyle WindowList ActiveColorset 7
-MenuStyle WindowList MenuColorset 6
-MenuStyle WindowList ItemFormat "%2.17|%0.7i%0.5l%17.2|"
-MenuStyle WindowList BorderWidth 3
-MenuStyle WindowList VerticalItemSpacing  10 10
-MenuStyle WindowList VerticalMargins 2 2
diff --git a/styles.config b/styles.config
index 5f61b9c..02665b3 100644
--- a/styles.config
+++ b/styles.config
@@ -1,3 +1,6 @@
+#####################
+#   Global styles   #
+#####################
 Style * Font         $[ThemeTitleFont]
 Style * HandleWidth  2
 Style * MiniIcon xapp.png
@@ -31,6 +34,11 @@ Style * EdgeMoveResistance 20 20
 Style * Colorset 1
 Style * HilightColorset 2
 
+
+##################
+# Per-app styles #
+##################
+
 Style FvwmPager FixedPosition, FixedSize, BorderWidth 0, HandleWidth 0, \
 	!Title, WindowListSkip, Sticky, NeverFocus, Layer 1
 
@@ -53,3 +61,42 @@ Style "Xchat"           StartsOnPage 0 1
 Style "Iceweasel"       StartsOnPage 0 0, SkipMapping
 Style "psi"             StartsOnPage 0 4
 Style "MPlayer"         Sticky
+
+
+#################
+# Menu styles   #
+#################
+MenuStyle * Font $[ThemeMenuFont]
+MenuStyle * TitleUnderlines1
+MenuStyle * TitleFont $[ThemeMenuTitleFont]
+MenuStyle * MouseWheel ScrollsMenuBackwards
+MenuStyle * Animation
+MenuStyle * HilightBack, Hilight3DThin
+MenuStyle * ActiveColorset 7
+MenuStyle * MenuColorset 8
+MenuStyle * ItemFormat "%2.0|%0.0i%5.5l%5.2>%0.2|"
+MenuStyle * PopupOffset 0 99
+MenuStyle * PopupImmediately
+MenuStyle * PopdownImmediately
+MenuStyle * BorderWidth 1
+MenuStyle * VerticalItemSpacing 3 3
+MenuStyle * VerticalTitleSpacing 4 4
+MenuStyle * SeparatorsShort
+MenuStyle * TrianglesUseFore
+MenuStyle * TrianglesSolid
+MenuStyle * !TitleWarp
+MenuStyle * RemoveSubmenus
+#MenuStyle * Sidepic empty.png
+MenuStyle * SideColor $[bg.cs7]
+MenuStyle * ScrollOffPage
+MenuStyle * VerticalMargins 2 2
+
+# Alt+tab menu configuration
+MenuStyle WindowList Font $[ThemeWindowListFont]
+MenuStyle WindowList HilightBack, Hilight3DThin
+MenuStyle WindowList ActiveColorset 7
+MenuStyle WindowList MenuColorset 6
+MenuStyle WindowList ItemFormat "%2.17|%0.7i%0.5l%17.2|"
+MenuStyle WindowList BorderWidth 3
+MenuStyle WindowList VerticalItemSpacing  10 10
+MenuStyle WindowList VerticalMargins 2 2