From 00d7e261ec864b9cdbdd3fa1cd90e4121d08630d Mon Sep 17 00:00:00 2001
From: Andrea Rossato <andrea.rossato@ing.unitn.it>
Date: Sun, 28 Oct 2007 22:47:20 +0100
Subject: Added support for text alignment commands in the output template

WARNING: this patch breaks old configuration files.
- removed align configuration option
- added alignSep configuration option, a 2 character string: the text
  before the first character will be align to left, the text in
  between the 2 characters will be centered, and the text after the
  second character will be align to the right. For instance:
  with alignSep

darcs-hash:20071028214720-d6583-be3839c8989a8075f4b1c94dcbc351b499342370.gz
---
 Config.hs                 | 6 +++---
 Plugins/helloworld.config | 4 ++--
 xmobar.config-sample      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Config.hs b/Config.hs
index acc8014..a1da93d 100644
--- a/Config.hs
+++ b/Config.hs
@@ -36,11 +36,11 @@ data Config =
            , bgColor        :: String     -- ^ Backgroud color
            , fgColor        :: String     -- ^ Default font color
            , position       :: XPosition  -- ^ Top Bottom or Static
-           , align          :: String     -- ^ text alignment
            , commands       :: [Runnable] -- ^ For setting the command, the command argujments 
                                           --   and refresh rate for the programs to run (optional)
            , sepChar        :: String     -- ^ The character to be used for indicating
                                           --   commands in the output template (default '%')
+           , alignSep       :: String     -- ^ Separators for left, center and right text alignment
            , template       :: String     -- ^ The output template 
            } deriving (Read)
 
@@ -53,10 +53,10 @@ defaultConfig =
            , bgColor  = "#000000"
            , fgColor  = "#BFBFBF"
            , position = Top
-           , align    = "left"
            , commands = []
            , sepChar  = "%"
-           , template = "Uptime: <fc=#00FF00>%uptime%</fc> ** <fc=#FF0000>%date%</fc>"
+           , alignSep = "}{"
+           , template = "Uptime: <fc=#00FF00>%uptime%</fc> }{ <fc=#FF0000>%date%</fc>"
            }
 
 -- | This is the list of types that can be hidden inside
diff --git a/Plugins/helloworld.config b/Plugins/helloworld.config
index 4dfc082..dcf99ff 100644
--- a/Plugins/helloworld.config
+++ b/Plugins/helloworld.config
@@ -2,11 +2,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
        , bgColor = "#000000"
        , fgColor = "#BFBFBF"
        , position = Top
-       , align = "right"
        , commands = [ Run Cpu [] 10
                     , Run Weather "LIPB" [] 36000
                     , Run HelloWorld
                     ]
        , sepChar = "%"
-       , template = "%cpu% | %helloWorld% | %LIPB% | <fc=yellow>%date%</fc>"
+       , alignSep = "}{"
+       , template = "%cpu% } %helloWorld% { %LIPB% | <fc=yellow>%date%</fc>"
        }
diff --git a/xmobar.config-sample b/xmobar.config-sample
index 0cd80a7..4dae218 100644
--- a/xmobar.config-sample
+++ b/xmobar.config-sample
@@ -2,7 +2,6 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
        , bgColor = "black"
        , fgColor = "grey"
        , position = Static { xpos = 0 , ypos = 0, width = 1024, height = 15 }
-       , align = "right"
        , commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"] 36000
                     , Run Network "eth0" ["-L","0","-H","32","--normal","green","--high","red"] 10
                     , Run Network "eth1" ["-L","0","-H","32","--normal","green","--high","red"] 10
@@ -13,5 +12,6 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
     		    , Run Date "%a %b %_d %Y %H:%M:%S" "date" 10
                     ]
        , sepChar = "%"
-       , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% | %EGPF% | <fc=#ee9a00>%date%</fc> %uname%"
+       , alignSep = "}{"
+       , template = "%cpu% | %memory% * %swap% | %eth0% - %eth1% }{ <fc=#ee9a00>%date%</fc>| %EGPF% | %uname%"
        }
-- 
cgit v1.2.3