taffybar 0.1.2 → 0.1.3

raw patch · 5 files changed

+29/−8 lines, 5 filesdep +utf8-stringdep ~gtkdep ~gtk-traymanager

Dependencies added: utf8-string

Dependency ranges changed: gtk, gtk-traymanager

Files

• src/System/Taffybar.hs +4/−0
• src/System/Taffybar/FreedesktopNotifications.hs +1/−1
• src/System/Taffybar/XMonadLog.hs +8/−2
• taffybar.cabal +15/−4
• taffybar.rc +1/−1

@@ -196,6 +196,7 @@     True -> screenGetMonitorGeometry screen (monitorNumber cfg)    window <- windowNew+  widgetSetName window "Taffybar"   let Rectangle x y w _ = monitorSize   windowSetTypeHint window WindowTypeHintDock   windowSetScreen window screen@@ -217,6 +218,9 @@             wid <- io             widgetSetSizeRequest wid (-1) (barHeight cfg)             boxPackEnd box wid PackNatural 0) (endWidgets cfg)++  _ <- on box sizeRequest $ return (Requisition w (barHeight cfg))+   widgetShow window   widgetShow box   mainGUI

@@ -291,7 +291,7 @@ defaultNotificationConfig :: NotificationConfig defaultNotificationConfig =   NotificationConfig { notificationMaxTimeout = 10-                     , notificationMaxLength = 50+                     , notificationMaxLength = 100                      , notificationFormatter = defaultFormatter                      } 

@@ -12,6 +12,7 @@ -- top-level module. module System.Taffybar.XMonadLog ( xmonadLogNew, dbusLog ) where +import Codec.Binary.UTF8.String ( decodeString ) import DBus.Client.Simple ( connectSession, emit, Client ) import DBus.Client ( listen, MatchRule(..) ) import DBus.Types@@ -28,8 +29,13 @@   dynamicLogWithPP pp { ppOutput = outputThroughDBus client }  outputThroughDBus :: Client -> String -> IO ()-outputThroughDBus client str =-  emit client "/org/xmonad/Log" "org.xmonad.Log" "Update" [ toVariant str ]+outputThroughDBus client str = do+  -- The string that we get from XMonad here isn't quite a normal+  -- string - each character is actually a byte in a utf8 encoding.+  -- We need to decode the string back into a real String before we+  -- send it over dbus.+  let str' = decodeString str+  emit client "/org/xmonad/Log" "org.xmonad.Log" "Update" [ toVariant str' ]  setupDbus :: Label -> IO () setupDbus w = do

@@ -1,5 +1,5 @@ name: taffybar-version: 0.1.2+version: 0.1.3 synopsis: A desktop bar similar to xmobar, but with more GUI license: BSD3 license-file: LICENSE@@ -18,6 +18,17 @@   gtk2hs and provides several widgets (including a few graphical ones).   It also sports an optional snazzy system tray.   .+  Changes in v0.1.3:+  .+    * Depend on gtk 0.12.1+ to be able to build under ghc 7.2+  .+    * Fix the background colors in the calendar so that it follows the GTK theme instead+      of the bar-specific color settings+  .+    * Fix the display of non-ASCII window titles in the XMonad log applet (assuming you use the dbusLog function)+  .+    * Add a horrible hack to force the bar to not resize to be larger than the screen due to notifications or long window titles+  .   Changes in v0.1.2:   .     * Readable widget for freedesktop notifications@@ -31,9 +42,9 @@   default-language: Haskell2010   build-depends: base > 3 && < 5, time, old-locale, containers, text, HTTP,                  parsec >= 3.1, mtl >= 2, network, web-encodings, cairo,-                 dbus-core >= 0.9.1 && < 1.0, gtk >= 0.12, dyre >= 0.8.6,-                 HStringTemplate, gtk-traymanager, xmonad-contrib, xmonad,-                 xdg-basedir, filepath+                 dbus-core >= 0.9.1 && < 1.0, gtk >= 0.12.1, dyre >= 0.8.6,+                 HStringTemplate, gtk-traymanager >= 0.1.2 && < 0.2, xmonad-contrib, xmonad,+                 xdg-basedir, filepath, utf8-string   hs-source-dirs: src   pkgconfig-depends: gtk+-2.0   exposed-modules: System.Taffybar,

@@ -9,5 +9,5 @@   fg[NORMAL] = "#FF0000" } -class "GtkWidget" style "default"+widget "Taffybar*" style "default" widget "*NotificationCloseButton" style "notification-button"