Permalink
Browse files

bump vicious version

  • Loading branch information...
1 parent 5838c19 commit 6f007b6b10a145dfa5a705216471d0231376af74 @dodo committed Oct 3, 2012
Showing with 9 additions and 6 deletions.
  1. +4 −3 notifications/init.lua
  2. +2 −1 widget/cpugraphs.lua
  3. +3 −2 widget/netgraphs.lua
View
@@ -9,6 +9,7 @@ local util = require("awful.util")
local menu = require("uzful.menu.popup")
local naughty = require("naughty")
local vicious = require("vicious")
+local helpers = require("vicious.helpers")
local beautiful = require("beautiful")
local setmetatable = setmetatable
local ipairs = ipairs
@@ -71,7 +72,7 @@ function add(wid, args)
wid.number = wid.number + 1
local setMarkup = function ()
- wid.text:set_markup(vicious.helpers.format(conf.format, { wid.number }))
+ wid.text:set_markup(helpers.format(conf.format, { wid.number }))
end
setMarkup()
local item
@@ -130,7 +131,7 @@ function enable(wid)
local conf = widgets[wid]
if conf == nil or conf.visible then return end
conf.visible = true
- wid.text:set_markup(vicious.helpers.format(conf.format, { wid.number }))
+ wid.text:set_markup(helpers.format(conf.format, { wid.number }))
naughty.suspend()
end
@@ -173,7 +174,7 @@ function new(screen, args)
args = args or {}
local conf = {
- disabled = vicious.helpers.format(args.disabled or "$1", { "" }),
+ disabled = helpers.format(args.disabled or "$1", { "" }),
format = args.text or "$1",
menu = args.menu or {},
visible = args.visible ~= nil and args.visible,
View
@@ -10,6 +10,7 @@ local pairs = pairs
local ipairs = ipairs
local table = table
local vicious = require("vicious")
+local helpers = require("vicious.helpers")
local layout = require("uzful.layout.util")
local widget = require("uzful.widget.util")
local getinfo = require("uzful.getinfo")
@@ -78,7 +79,7 @@ function new(args)
ret.load = wibox.widget.textbox()
if args.load.font then ret.load:set_font(args.load.font) end
vicious.register(ret.load, vicious.widgets.uptime,
- vicious.helpers.format(args.load.text or "$1 $2 $3",
+ helpers.format(args.load.text or "$1 $2 $3",
{"$4", "$5", "$6"}), args.load.interval)
local _, h = ret.load:fit(-1, -1)
height = height + h
View
@@ -11,6 +11,7 @@ local pairs = pairs
local table = table
local ipairs = ipairs
local vicious = require("vicious")
+local helpers = require("vicious.helpers")
local widget = require("uzful.widget.util")
local layout = require("uzful.layout.util")
local getinfo = require("uzful.getinfo")
@@ -115,8 +116,8 @@ function new(args)
local if_text = function (interface)
return (args.big and args.small and interface == cur) and
- vicious.helpers.format(args.highlight or "$1", { interface }) or
- vicious.helpers.format(args.normal or "$1", { interface })
+ helpers.format(args.highlight or "$1", { interface }) or
+ helpers.format(args.normal or "$1", { interface })
end
local set_color = function (bg, interface)
local theme = args.theme or beautiful.get()

0 comments on commit 6f007b6

Please sign in to comment.