diff options
| author | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-12-13 00:24:55 +0100 |
|---|---|---|
| committer | Jose Antonio Ortega Ruiz <jao@gnu.org> | 2010-12-13 00:24:55 +0100 |
| commit | 19f36a28d501773708da02ba149e8d8dae5756aa (patch) | |
| tree | e6012f6d7a1c21c8dad2e7f027dc921f361251ec /Plugins/Monitors/Common.hs | |
| parent | efd9bc7177c66d7bb9a994e919d915ecb5c75154 (diff) | |
| download | xmobar-19f36a28d501773708da02ba149e8d8dae5756aa.tar.gz xmobar-19f36a28d501773708da02ba149e8d8dae5756aa.tar.bz2 | |
Use -S in Network to control units display
We've made -P a synonym of -S, and renamed the option to useSuffix.
Diffstat (limited to 'Plugins/Monitors/Common.hs')
| -rw-r--r-- | Plugins/Monitors/Common.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Plugins/Monitors/Common.hs b/Plugins/Monitors/Common.hs index 6761e76..bbd9097 100644 --- a/Plugins/Monitors/Common.hs +++ b/Plugins/Monitors/Common.hs @@ -88,7 +88,7 @@ data MConfig = , barBack :: IORef String , barFore :: IORef String , barWidth :: IORef Int - , usePercent :: IORef Bool + , useSuffix :: IORef Bool } -- | from 'http:\/\/www.haskell.org\/hawiki\/MonadState' @@ -148,7 +148,7 @@ data Opts = HighColor String | BarBack String | BarFore String | BarWidth String - | UsePercent String + | UseSuffix String options :: [OptDescr Opts] options = @@ -158,7 +158,7 @@ options = , Option "n" ["normal"] (ReqArg NormalColor "color number" ) "Color for the normal threshold: ex \"#00FF00\"" , Option "l" ["low"] (ReqArg LowColor "color number" ) "Color for the low threshold: ex \"#0000FF\"" , Option "t" ["template"] (ReqArg Template "output template" ) "Output template." - , Option "P" ["percent"] (ReqArg UsePercent "True/False" ) "Use % to display percents." + , Option "PS" ["suffix"] (ReqArg UseSuffix "True/False" ) "Use % to display percents or other suffixes." , Option "p" ["ppad"] (ReqArg PercentPad "percent padding") "Minimum percentage width." , Option "m" ["minwidth"] (ReqArg MinWidth "minimum width" ) "Minimum field width" , Option "M" ["maxwidth"] (ReqArg MaxWidth "maximum width" ) "Maximum field width" @@ -202,7 +202,7 @@ doConfigOptions (o:oo) = BarBack bb -> setConfigValue bb barBack >> next BarFore bf -> setConfigValue bf barFore >> next BarWidth bw -> setConfigValue (nz bw) barWidth >> next - UsePercent up -> setConfigValue (bool up) usePercent >> next + UseSuffix up -> setConfigValue (bool up) useSuffix >> next runM :: [String] -> IO MConfig -> ([String] -> Monitor String) -> Int -> (String -> IO ()) -> IO () @@ -345,7 +345,7 @@ floatToPercent n = do pad <- getConfigValue ppad pc <- getConfigValue padChars pr <- getConfigValue padRight - up <- getConfigValue usePercent + up <- getConfigValue useSuffix let p = showDigits 0 (n * 100) ps = if up then "%" else "" return $ padString pad pad pc pr p ++ ps |