Various decorations related updates

 * remove deprecated TConf stuff
 * Remove 'style' from DeConf
 * Change DeConf to Theme
 * share defaultTheme across all decorations

darcs-hash:20080130064624-a5988-98fcf49dde956e318f801e934f2045cf94c951d5.gz

3 files changed, 17 insertions, 27 deletions

diff --git a/XMonad/Config/Arossato.hs b/XMonad/Config/Arossato.hs
index e169c3b..56740db 100644
--- a/XMonad/Config/Arossato.hs
+++ b/XMonad/Config/Arossato.hs
@@ -17,7 +17,7 @@ module XMonad.Config.Arossato
     ( -- * Usage
       -- $usage
       arossatoConfig
-    , arossatoTabbedConfig
+    , arossatoTheme
     ) where
 
 import qualified Data.Map as M
@@ -80,27 +80,16 @@ import XMonad.Util.Run
 
 -- | My configuration for the Tabbed Layout. Basically this is the
 -- Ion3 clean style.
-arossatoTabbedConfig :: DeConfig TabbedDecoration Window
-arossatoTabbedConfig = defaultTabbedConfig
-                       { activeColor         = "#8a999e"
-                       , inactiveColor       = "#545d75"
-                       , activeBorderColor   = "white"
-                       , inactiveBorderColor = "grey"
-                       , activeTextColor     = "white"
-                       , inactiveTextColor   = "grey"
-                       , decoHeight          = 14
-                       }
-
-arossatoSFConfig :: DeConfig SimpleDecoration Window
-arossatoSFConfig = defaultSFConfig
-                   { activeColor         = "#8a999e"
-                   , inactiveColor       = "#545d75"
-                   , activeBorderColor   = "white"
-                   , inactiveBorderColor = "grey"
-                   , activeTextColor     = "white"
-                   , inactiveTextColor   = "grey"
-                   , decoHeight          = 14
-                   }
+arossatoTheme :: Theme
+arossatoTheme = defaultTheme
+                { activeColor         = "#8a999e"
+                , inactiveColor       = "#545d75"
+                , activeBorderColor   = "white"
+                , inactiveBorderColor = "grey"
+                , activeTextColor     = "white"
+                , inactiveTextColor   = "grey"
+                , decoHeight          = 14
+                }
 
 arossatoConfig = do
     xmobar <- spawnPipe "xmobar"
@@ -120,8 +109,8 @@ arossatoConfig = do
          }
     where
       -- layouts
-      mytabs    =    tabDeco   shrinkText arossatoTabbedConfig
-      decorated = simpleFloat' shrinkText arossatoSFConfig
+      mytabs    =    tabbed    shrinkText arossatoTheme
+      decorated = simpleFloat' shrinkText arossatoTheme
       tiled     = Tall 1 (3/100) (1/2)
       otherLays = windowArrange $
                   magnifier tiled |||
diff --git a/XMonad/Config/Droundy.hs b/XMonad/Config/Droundy.hs
index a6f70c3..5538376 100644
--- a/XMonad/Config/Droundy.hs
+++ b/XMonad/Config/Droundy.hs
@@ -146,7 +146,7 @@ config = -- withUrgencyHook FocusUrgencyHook $
          , XMonad.keys = keys
          }
 
-mytab = tabbed CustomShrink defaultTConf
+mytab = tabbed CustomShrink defaultTheme
 
 instance Shrinker CustomShrink where
     shrinkIt shr s | Just s' <- dropFromHead " " s = shrinkIt shr s' 
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs
index a9c61fc..9707fec 100644
--- a/XMonad/Config/Sjanssen.hs
+++ b/XMonad/Config/Sjanssen.hs
@@ -13,6 +13,7 @@ import XMonad.Hooks.ManageDocks
 import XMonad.Prompt
 import XMonad.Prompt.Shell
 import XMonad.Util.Run (spawnPipe)
+import XMonad.Layout.DwmStyle
 
 import qualified Data.Map as M
 import System.IO (hPutStrLn)
@@ -29,7 +30,7 @@ sjanssenConfig = do
                 , ((modm, button2), (\w -> focus w >> windows W.swapMaster))
                 , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
         , keys = \c -> mykeys c `M.union` keys defaultConfig c
-        , layoutHook = avoidStruts $ smartBorders (tiled Tall ||| tiled Wide ||| Full ||| tabDeco shrinkText myTConf)
+        , layoutHook = dwmStyle shrinkText myTheme $ avoidStruts $ smartBorders (tiled Tall ||| tiled Wide ||| Full ||| tabbed shrinkText myTheme)
         , manageHook = manageHook defaultConfig <+> manageDocks
         }
  where
@@ -44,7 +45,7 @@ sjanssenConfig = do
         ]
 
     myFont = "xft:Bitstream Vera Sans Mono:pixelsize=10"
-    myTConf = defaultTabbedConfig { fontName = myFont }
+    myTheme = defaultTheme { fontName = myFont }
     myPromptConfig = defaultXPConfig
                         { position = Top
                         , font = myFont