Cleanup/simplify colorsets.

4 files changed, 24 insertions, 74 deletions

diff --git a/colorset.config b/colorset.config
index af1fa2b..ad70d07 100644
--- a/colorset.config
+++ b/colorset.config
@@ -1,57 +1,8 @@
-#################
-# Colorsets 1 y 2
-#################
-# + TitleStyle AllActive Colorset 1
-# + TitleStyle AllInactive Colorset 2
-#####################################
-Colorset   1 bg black
-Colorset   2 fg white, bg black, Tint black 20
-# 1.- bg - barra de título activa, en decos planas solo!
-# 2.- bg - barra de título inactiva, en decos planas solo!
-
-#################
-# Colorsets 3 y 4
-#################
-# Style * Colorset 3
-# Style * HilightColorset 4
-###########################
-Colorset   3 bg black, fg grey75, sh black, fgsh black
-Colorset   4 bg black, fg white, sh black, fgsh black
-# 3.- bg barra de títulos y borde, ventana inactiva
-# 4.- bg barra de títulos y borde, ventana activa
-# 4.- sh - color de sombra en símbolos si @0
-# fgsh color de sombra del texto, por fin doy con él!! :P
-
-# FvwmForm-QV
-Colorset   5 bg grey80, DGradient 128 white grey80, fg black, hi grey70, sh grey70
-
-#Panel
-Colorset   6 RootTransparent, Tint black 30, bg black, hi grey40
-
-# Menú, selección
-Colorset   7 bg white, fg black, sh white, hi white
-# Menú, fondo
-Colorset   8 DGradient 64 grey20 black, fg white, sh white, hi white
-# Menú, fondo
-Colorset   8 Translucent black 50, bg black, fg white, sh grey40, hi grey40
-#Pager, inactive desk
-Colorset   9 bg black, RootTransparent, Tint black 30, fg white, sh black, hi white
-#Pager, active desk
-Colorset  10 RootTransparent, Tint LightSkyBlue3 70, fg grey60
-#Pager, inactive windows
-Colorset  11 RootTransparent, fg LightSkyBlue1, bg black, Tint black 60
-#Pager, active windows
-Colorset  12 RootTransparent, fg black, hi white, sh white, Tint "LightSkyBlue1" 60
-
-#FvwmIconMan, default
-Colorset  13 Transparent, sh grey80, fg white
-#FvwmIconMan, foco y selecionado
-Colorset  14 Transparent, fg white, sh grey90, hi white
-#FvwmIconMan, foco
-Colorset  15 bg black, fg white, sh grey90, hi grey80
-
-Colorset 16 Transparent, bg white, fg white
-Colorset 17 HGradient 24 3 white 1 grey15 98 grey60 1 black
-Colorset   18 bg black
-
-Colorset 19 bg grey10, fg grey90, DGradient 2000 grey10 grey80
+#Default
+Colorset   1 RootTransparent, fg LightSkyBlue4, Tint black 30, bg black
+#Default hilight
+Colorset   2 RootTransparent, fg black, hi white, sh white, Tint "LightSkyBlue1" 60
+#Default tinted
+Colorset   3 RootTransparent, fg LightSkyBlue1, bg black, Tint black 60
+# Menu active item
+Colorset   4 bg white, fg black, sh white, hi white
diff --git a/config b/config
index 82b589e..d1f126a 100644
--- a/config
+++ b/config
@@ -77,10 +77,10 @@ DestroyModuleconfig FvwmPager: *
 *FvwmPager: Balloons
 *FvwmPager: DeskHilight
 *FvwmPager: WindowBorderWidth 2
-*FvwmPager: BalloonColorset * 12
-*FvwmPager: Colorset * 6
-*FvwmPager: HilightColorset * 10
-*FvwmPager: WindowColorsets 11 12
+*FvwmPager: BalloonColorset * 3
+*FvwmPager: Colorset * 1
+*FvwmPager: HilightColorset * 2
+*FvwmPager: WindowColorsets 3 2
 *FvwmPager: BalloonFont $[ThemeTitleFont]
 *FvwmPager: Font none
 *FvwmPager: SmallFont $[ThemeMiniFont]
@@ -91,7 +91,7 @@ DestroyModuleconfig FvwmPager: *
 DestroyModuleConfig FvwmButtons: *
 *FvwmButtons: Frame 1
 *FvwmButtons: Font $[ThemeTitleFont]
-*FvwmButtons: Colorset 9
+*FvwmButtons: Colorset 1
 *FvwmButtons: Rows $[vp.height]
 *FvwmButtons: Columns 2
 *FvwmButtons: (2x$[fvwm_config_pagerheight], Swallow 'FvwmPager' 'FvwmPager')
diff --git a/deco.config b/deco.config
index 08e35bf..b86cc13 100644
--- a/deco.config
+++ b/deco.config
@@ -6,8 +6,8 @@ ButtonStyle 1 MiniIcon
 ButtonStyle All -- UseTitleStyle Flat
 
 
-TitleStyle AllActive Colorset 6
-TitleStyle AllInactive Colorset 2
+TitleStyle AllActive Colorset 2
+TitleStyle AllInactive Colorset 3
 TitleStyle -- Flat
 TitleStyle Centered Height 18
 BorderStyle -- HiddenHandles Raised
diff --git a/styles.config b/styles.config
index c679b1e..4b66f19 100644
--- a/styles.config
+++ b/styles.config
@@ -1,20 +1,18 @@
 #####################
 #   Global styles   #
 #####################
+Style * ParentalRelativity
 Style * Font         $[ThemeTitleFont]
 Style * HandleWidth  2
 Style * MiniIcon xapp.png
 Style * IconBox screen 0 15 10 -10 -10, IconGrid 24 24, \
 	IconFill left bottom, IconSize 128 96
-Style * IconTitleColorset 16
-Style * HilightIconTitleColorset 1
 Style * IconTitleRelief 0
 Style * IconFont $[ThemeHeadFont]
 Style * IconBackgroundPadding 5
 Style * StickyAcrossPagesIcon
 Style * StickyIcon
 Style * IconBackgroundRelief 0
-
 Style * WindowShadeShrinks
 Style * MinOverlapPlacement
 Style * MouseFocusClickRaises
@@ -31,10 +29,10 @@ Style * SnapGrid 1 1
 Style * SnapAttraction 8 Windows Screen
 Style * EdgeMoveDelay $[edgeres]
 Style * EdgeMoveResistance 20 20
-Style * Colorset 1
-Style * HilightColorset 2
 Style * SkipMapping
 
+Style * Colorset 3
+Style * HilightColorset 2
 
 ##################
 # Per-app styles #
@@ -70,8 +68,6 @@ 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
@@ -84,17 +80,20 @@ MenuStyle * TrianglesUseFore
 MenuStyle * TrianglesSolid
 MenuStyle * !TitleWarp
 MenuStyle * RemoveSubmenus
-#MenuStyle * Sidepic empty.png
 MenuStyle * SideColor $[bg.cs7]
 MenuStyle * ScrollOffPage
 MenuStyle * VerticalMargins 2 2
 
+MenuStyle * MenuColorset 3
+MenuStyle * ActiveColorset 4
+
 # 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
+
+MenuStyle WindowList ActiveColorset 4
+MenuStyle WindowList MenuColorset 3