From 6769de07f7e06ddf6eea728bd7072ebfe6eff017 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 28 May 2013 03:39:09 +0200 Subject: use Data.Default wherever possible, and deprecate the things it replaces Ignore-this: 898458b1d2868a70dfb09faf473dc7aa darcs-hash:20130528013909-76d51-863278165b6f149c47b08b31b34e85ddcab19f1f.gz --- XMonad/Util/Themes.hs | 231 +++++++++++++++++++++++++------------------------- 1 file changed, 115 insertions(+), 116 deletions(-) (limited to 'XMonad/Util/Themes.hs') diff --git a/XMonad/Util/Themes.hs b/XMonad/Util/Themes.hs index 61352d6..f753a50 100644 --- a/XMonad/Util/Themes.hs +++ b/XMonad/Util/Themes.hs @@ -45,8 +45,7 @@ import XMonad.Layout.Decoration -- do not apply to xmonad as a whole.) -- -- If you want to use one of them with one of your decorated layouts, --- you need to substitute defaultTheme with, for instance, (theme --- smallClean). +-- you need to substitute def with, for instance, (theme smallClean). -- -- Here is an example: -- @@ -80,7 +79,7 @@ data ThemeInfo = } newTheme :: ThemeInfo -newTheme = TI "" "" "" defaultTheme +newTheme = TI "" "" "" def ppThemeInfo :: ThemeInfo -> String ppThemeInfo t = themeName t <> themeDescription t <> "by" <> themeAuthor t @@ -112,7 +111,7 @@ xmonadTheme = newTheme { themeName = "xmonadTheme" , themeAuthor = "David Roundy" , themeDescription = "The default xmonad theme" - , theme = defaultTheme + , theme = def } -- | Small decorations with a Ion3 remembrance, by Andrea Rossato. @@ -121,14 +120,14 @@ smallClean = newTheme { themeName = "smallClean" , themeAuthor = "Andrea Rossato" , themeDescription = "Small decorations with a Ion3 remembrance" - , theme = defaultTheme { activeColor = "#8a999e" - , inactiveColor = "#545d75" - , activeBorderColor = "white" - , inactiveBorderColor = "grey" - , activeTextColor = "white" - , inactiveTextColor = "grey" - , decoHeight = 14 - } + , theme = def { activeColor = "#8a999e" + , inactiveColor = "#545d75" + , activeBorderColor = "white" + , inactiveBorderColor = "grey" + , activeTextColor = "white" + , inactiveTextColor = "grey" + , decoHeight = 14 + } } -- | Don's preferred colors - from DynamicLog...;) @@ -137,14 +136,14 @@ donaldTheme = newTheme { themeName = "donaldTheme" , themeAuthor = "Andrea Rossato" , themeDescription = "Don's preferred colors - from DynamicLog...;)" - , theme = defaultTheme { activeColor = "#2b4f98" - , inactiveColor = "#cccccc" - , activeBorderColor = "#2b4f98" - , inactiveBorderColor = "#cccccc" - , activeTextColor = "white" - , inactiveTextColor = "black" - , decoHeight = 16 - } + , theme = def { activeColor = "#2b4f98" + , inactiveColor = "#cccccc" + , activeBorderColor = "#2b4f98" + , inactiveBorderColor = "#cccccc" + , activeTextColor = "white" + , inactiveTextColor = "black" + , decoHeight = 16 + } } -- | Ffrom Robert Manea's prompt theme. @@ -153,15 +152,15 @@ robertTheme = newTheme { themeName = "robertTheme" , themeAuthor = "Andrea Rossato" , themeDescription = "From Robert Manea's prompt theme" - , theme = defaultTheme { activeColor = "#aecf96" - , inactiveColor = "#111111" - , activeBorderColor = "#aecf96" - , inactiveBorderColor = "#111111" - , activeTextColor = "black" - , inactiveTextColor = "#d5d3a7" - , fontName = "-*-profont-*-*-*-*-11-*-*-*-*-*-iso8859" - , decoHeight = 16 - } + , theme = def { activeColor = "#aecf96" + , inactiveColor = "#111111" + , activeBorderColor = "#aecf96" + , inactiveBorderColor = "#111111" + , activeTextColor = "black" + , inactiveTextColor = "#d5d3a7" + , fontName = "-*-profont-*-*-*-*-11-*-*-*-*-*-iso8859" + , decoHeight = 16 + } } -- | deifl\'s Theme, by deifl. @@ -170,15 +169,15 @@ deiflTheme = newTheme { themeName = "deiflTheme" , themeAuthor = "deifl" , themeDescription = "deifl's Theme" - , theme = defaultTheme { inactiveBorderColor = "#708090" - , activeBorderColor = "#5f9ea0" - , activeColor = "#000000" - , inactiveColor = "#333333" - , inactiveTextColor = "#888888" - , activeTextColor = "#87cefa" - , fontName = "-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*" - , decoHeight = 15 - } + , theme = def { inactiveBorderColor = "#708090" + , activeBorderColor = "#5f9ea0" + , activeColor = "#000000" + , inactiveColor = "#333333" + , inactiveTextColor = "#888888" + , activeTextColor = "#87cefa" + , fontName = "-xos4-terminus-*-*-*-*-12-*-*-*-*-*-*-*" + , decoHeight = 15 + } } -- | oxymor00n\'s theme, by Tom Rauchenwald. @@ -187,19 +186,19 @@ oxymor00nTheme = newTheme { themeName = "oxymor00nTheme" , themeAuthor = "Tom Rauchenwald" , themeDescription = "oxymor00n's theme" - , theme = defaultTheme { inactiveBorderColor = "#000" - , activeBorderColor = "aquamarine3" - , activeColor = "aquamarine3" - , inactiveColor = "DarkSlateGray4" - , inactiveTextColor = "#222" - , activeTextColor = "#222" - -- This font can be found in the package ttf-alee - -- on debian-systems - , fontName = "-*-Bandal-*-*-*-*-12-*-*-*-*-*-*-*" - , decoHeight = 15 - , urgentColor = "#000" - , urgentTextColor = "#63b8ff" - } + , theme = def { inactiveBorderColor = "#000" + , activeBorderColor = "aquamarine3" + , activeColor = "aquamarine3" + , inactiveColor = "DarkSlateGray4" + , inactiveTextColor = "#222" + , activeTextColor = "#222" + -- This font can be found in the package ttf-alee + -- on debian-systems + , fontName = "-*-Bandal-*-*-*-*-12-*-*-*-*-*-*-*" + , decoHeight = 15 + , urgentColor = "#000" + , urgentTextColor = "#63b8ff" + } } wfarrTheme :: ThemeInfo @@ -207,15 +206,15 @@ wfarrTheme = newTheme { themeName = "wfarrTheme" , themeAuthor = "Will Farrington" , themeDescription = "A nice blue/black theme." - , theme = defaultTheme { activeColor = "#4c7899" - , inactiveColor = "#333333" - , activeBorderColor = "#285577" - , inactiveBorderColor = "#222222" - , activeTextColor = "#ffffff" - , inactiveTextColor = "#888888" - , fontName = "-*-fixed-medium-r-*--10-*-*-*-*-*-iso8859-1" - , decoHeight = 12 - } + , theme = def { activeColor = "#4c7899" + , inactiveColor = "#333333" + , activeBorderColor = "#285577" + , inactiveBorderColor = "#222222" + , activeTextColor = "#ffffff" + , inactiveTextColor = "#888888" + , fontName = "-*-fixed-medium-r-*--10-*-*-*-*-*-iso8859-1" + , decoHeight = 12 + } } -- | Forest colours, by Kathryn Andersen @@ -224,13 +223,13 @@ kavonForestTheme = newTheme { themeName = "kavonForestTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Forest colours" - , theme = defaultTheme { activeColor = "#115422" - , activeBorderColor = "#1a8033" - , activeTextColor = "white" - , inactiveColor = "#543211" - , inactiveBorderColor = "#804c19" - , inactiveTextColor = "#ffcc33" - } + , theme = def { activeColor = "#115422" + , activeBorderColor = "#1a8033" + , activeTextColor = "white" + , inactiveColor = "#543211" + , inactiveBorderColor = "#804c19" + , inactiveTextColor = "#ffcc33" + } } -- | Lake (blue/green) colours, by Kathryn Andersen @@ -239,13 +238,13 @@ kavonLakeTheme = newTheme { themeName = "kavonLakeTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Lake (blue/green) colours" - , theme = defaultTheme { activeColor = "#001166" - , activeBorderColor = "#1f3999" - , activeTextColor = "white" - , inactiveColor = "#09592a" - , inactiveBorderColor = "#198044" - , inactiveTextColor = "#73e6a3" - } + , theme = def { activeColor = "#001166" + , activeBorderColor = "#1f3999" + , activeTextColor = "white" + , inactiveColor = "#09592a" + , inactiveBorderColor = "#198044" + , inactiveTextColor = "#73e6a3" + } } -- | Peacock colours, by Kathryn Andersen @@ -254,13 +253,13 @@ kavonPeacockTheme = newTheme { themeName = "kavonPeacockTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Peacock colours" - , theme = defaultTheme { activeColor = "#190f4c" - , activeBorderColor = "#2b1980" - , activeTextColor = "white" - , inactiveColor = "#225173" - , inactiveBorderColor = "#2a638c" - , inactiveTextColor = "#8fb2cc" - } + , theme = def { activeColor = "#190f4c" + , activeBorderColor = "#2b1980" + , activeTextColor = "white" + , inactiveColor = "#225173" + , inactiveBorderColor = "#2a638c" + , inactiveTextColor = "#8fb2cc" + } } -- | Violet-Green colours, by Kathryn Andersen @@ -269,13 +268,13 @@ kavonVioGreenTheme = newTheme { themeName = "kavonVioGreenTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Violet-Green colours" - , theme = defaultTheme { activeColor = "#37174c" - , activeBorderColor = "#333399" - , activeTextColor = "white" - , inactiveColor = "#174c17" - , inactiveBorderColor = "#336633" - , inactiveTextColor = "#aaccaa" - } + , theme = def { activeColor = "#37174c" + , activeBorderColor = "#333399" + , activeTextColor = "white" + , inactiveColor = "#174c17" + , inactiveBorderColor = "#336633" + , inactiveTextColor = "#aaccaa" + } } -- | Blue colours, by Kathryn Andersen @@ -284,13 +283,13 @@ kavonBluesTheme = newTheme { themeName = "kavonBluesTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Blue colours" - , theme = defaultTheme { activeColor = "#000066" - , activeBorderColor = "#111199" - , activeTextColor = "white" - , inactiveColor = "#9999ee" - , inactiveBorderColor = "#6666cc" - , inactiveTextColor = "black" - } + , theme = def { activeColor = "#000066" + , activeBorderColor = "#111199" + , activeTextColor = "white" + , inactiveColor = "#9999ee" + , inactiveBorderColor = "#6666cc" + , inactiveTextColor = "black" + } } -- | Christmas colours, by Kathryn Andersen @@ -299,13 +298,13 @@ kavonChristmasTheme = newTheme { themeName = "kavonChristmasTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Christmas (green + red) colours" - , theme = defaultTheme { activeColor = "#660000" - , activeBorderColor = "#990000" - , activeTextColor = "white" - , inactiveColor = "#006600" - , inactiveBorderColor = "#003300" - , inactiveTextColor = "#99bb99" - } + , theme = def { activeColor = "#660000" + , activeBorderColor = "#990000" + , activeTextColor = "white" + , inactiveColor = "#006600" + , inactiveBorderColor = "#003300" + , inactiveTextColor = "#99bb99" + } } -- | Autumn colours, by Kathryn Andersen @@ -314,13 +313,13 @@ kavonAutumnTheme = newTheme { themeName = "kavonAutumnTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Autumn (brown + red) colours" - , theme = defaultTheme { activeColor = "#660000" - , activeBorderColor = "#990000" - , activeTextColor = "white" - , inactiveColor = "#542d11" - , inactiveBorderColor = "#804d1A" - , inactiveTextColor = "#ffcc33" - } + , theme = def { activeColor = "#660000" + , activeBorderColor = "#990000" + , activeTextColor = "white" + , inactiveColor = "#542d11" + , inactiveBorderColor = "#804d1A" + , inactiveTextColor = "#ffcc33" + } } -- | Fire colours, by Kathryn Andersen @@ -329,12 +328,12 @@ kavonFireTheme = newTheme { themeName = "kavonFireTheme" , themeAuthor = "Kathryn Andersen" , themeDescription = "Fire (orange + red) colours" - , theme = defaultTheme { activeColor = "#660000" - , activeBorderColor = "#990000" - , activeTextColor = "white" - , inactiveColor = "#ff8000" - , inactiveBorderColor = "#d9b162" - , inactiveTextColor = "black" - } + , theme = def { activeColor = "#660000" + , activeBorderColor = "#990000" + , activeTextColor = "white" + , inactiveColor = "#ff8000" + , inactiveBorderColor = "#d9b162" + , inactiveTextColor = "black" + } } -- cgit v1.2.3