mutt: fix F macro to not write message to home

[dotfiles.git] / awesome / widgets / mpd_widget.lua

diff --git a/awesome/widgets/mpd_widget.lua b/awesome/widgets/mpd_widget.lua
index 180705492ec564a8336eede662a13fbdceb0b241..b6cfec8686d57ee94a47fbefbe4de727866e76d7 100644 (file)
--- a/awesome/widgets/mpd_widget.lua
+++ b/awesome/widgets/mpd_widget.lua
@@ -1,13 +1,10 @@
-local mpc = require("widgets/mpc")
-local textbox = require("wibox.widget.textbox")
-local gears = require("gears")
-local awful = require("awful")
+local awful   = require("awful")
+local gears   = require("gears")
+local mpc     = require("widgets/mpc")

 local naughty = require("naughty")
 local naughty = require("naughty")

-local timer = require("gears.timer")
-local wibox = require("wibox")
-
---TODO remove
-local dbg = require("gears.debug")
+local textbox = require("wibox.widget.textbox")
+local timer   = require("gears.timer")
+local wibox   = require("wibox")

 
 local widget = {}
 widget._textbox = textbox()
 
 local widget = {}
 widget._textbox = textbox()


@@ -15,14 +12,12 @@ widget._currentsong = {}
 
 widget.scroll = wibox.widget {
     layout = wibox.container.scroll.horizontal,
 
 widget.scroll = wibox.widget {
     layout = wibox.container.scroll.horizontal,

-    forced_width = 200,
-    expand = true,
+    max_size = 200,
+    extra_space = 10,

     step_function = wibox.container.scroll.step_functions.linear_increase,
     speed = 20,
     {
         widget = widget._textbox,
     step_function = wibox.container.scroll.step_functions.linear_increase,
     speed = 20,
     {
         widget = widget._textbox,

-        align = 'center',
-        valign = 'center'

     }
 }
 
     }
 }
 


@@ -31,7 +26,6 @@ function widget:update_widget()
     local artist = self._currentsong.artist
     local title = self._currentsong.title
     local file = self._currentsong.file
     local artist = self._currentsong.artist
     local title = self._currentsong.title
     local file = self._currentsong.file

-    text = text .. tostring(artist or "") .. " - " .. tostring(title or "")

     if not artist then
         text = string.format("%s", title or file )
     else
     if not artist then
         text = string.format("%s", title or file )
     else


@@ -60,10 +54,15 @@ function widget:get_info(callback)
 
         local info = {}
         info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)
 
         local info = {}
         info.title = status.state .. " " .. status.song .. "/" .. status.playlistlength .. " " .. song_duration(status.elapsed, status.duration)

-        info.text = tostring(song.artist or "") .. " - " .. tostring(song.title or "") .. "\n"
-            .. tostring(song.album or "")
+        if not song.artist then
+            info.text = string.format("%s", song.title or song.file)
+        else
+            info.text = string.format("%s - %s", song.artist, song.title)
+        end
+        if song.album then
+            info.text = info.text .. "\n" .. tostring(song.album or "")
+        end

         callback(info)
         callback(info)

-        return false

     end)
 end
 
     end)
 end
 


@@ -75,7 +74,7 @@ function widget:popup_show()
             -- , icon = img
             , text = table.text
             , timeout = 0
             -- , icon = img
             , text = table.text
             , timeout = 0

-            , destroy = function() self._timer:stop() end
+            , destroy = function() self._timer:stop(); self._notification = nil end

             })
         self._timer:start()
     end)
             })
         self._timer:start()
     end)


@@ -167,4 +166,11 @@ globalkeys = gears.table.join(globalkeys,
     awful.key({ modkey }, ".", function() widget._connection:send("next") end,
               { description = "next track", group = "mpd" })
 )
     awful.key({ modkey }, ".", function() widget._connection:send("next") end,
               { description = "next track", group = "mpd" })
 )

-return widget.scroll
+return {
+    layout = wibox.layout.align.horizontal,
+    forced_width = 200,
+    expand = "outside",
+    nil,
+    widget.scroll,
+    nil,
+}