Skip to content

Commit

Permalink
Merge pull request #11 from actionless/devel
Browse files Browse the repository at this point in the history
fixed notifications transparency, spotify date tag; updated readme.
  • Loading branch information
actionless committed Sep 18, 2014
2 parents 14817ad + ec209db commit 64a59c9
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 17 deletions.
41 changes: 32 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,56 @@ example of config/local.lua: https://gist.github.com/actionless/229eef7795915068

![Screenshot](http://fc08.deviantart.net/fs70/f/2014/213/7/0/monovedek_set_____by_actionless-d7sr317.png "Screenshot")

### Keyboard widget appearance (with different themes)
### Widget popups

#### Monovedek theme with transparency and blur:
##### CPU (with transparency and blur)
![cpu_tb](http://i.imgur.com/JlRkAIm.png "cpu_tb")

##### CPU
![cpu](http://i.imgur.com/4G94o8i.png "cpu")

##### Memory
![mem](http://i.imgur.com/cg4dq17.png "mem")

##### Systray toggle
![st](http://i.imgur.com/Q4KjyfP.png "st")

##### Calendar (taken from Lain widgetkit)
![cal](http://i.imgur.com/pB5n12b.png "cal")

##### Music (supports mpd, cmus, clementine, spotify)
![music](http://i.imgur.com/W7ur5SQ.png "music")



### Hotkey- and other widgets appearance (with different themes)

##### Monovedek theme with transparency and blur:

![hotkeys_monovedek](http://i.imgur.com/auQdZC5.png "hotkeys_monovedek")

#### Monovedek theme without transparency and blur:
##### Monovedek theme without transparency and blur:

![hotkeys_monovedek](http://i.imgur.com/ygsVm7E.png "hotkeys_monovedek")

#### "LCARS modern" theme without transparency and blur:
##### "LCARS modern" theme without transparency and blur:

![hotkeys_lm](http://i.imgur.com/t6XRD7m.png "hotkeys_lm")

#### "LCARS xresources" with "jwr_dark" xresources theme without transparency and blur:
##### "LCARS xresources" with "jwr_dark" xresources theme without transparency and blur:

![hotkeys_xjwr](http://i.imgur.com/y4o3vY0.png "hotkeys_xjwr")
![hotkeys_xjwr](http://i.imgur.com/y4o3vY0.png "hotkeys_xjw
r")

#### "Pokemon Light" theme without transparency and blur:
##### "Pokemon Light" theme without transparency and blur:

![hotkeys_pokemon_light](http://i.imgur.com/hgijuIo.png "hotkeys_pokemon_light")

#### "Pokemon Dark" theme without transparency and blur:
##### "Pokemon Dark" theme without transparency and blur:

![pokemon_dark](http://i.imgur.com/BWnzpfh.png?1 "pokemon_dark")

#### "Gnome Noble Dark" theme without transparency and blur:
##### "Gnome Noble Dark" theme without transparency and blur:

![hotkeys_noble_dark](http://i.imgur.com/XfpBqrV.png "hotkeys_noble_dark")

Expand Down
8 changes: 6 additions & 2 deletions actionless/helpers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,12 @@ helpers.font = string.match(beautiful.get().font or "monospace 8", "([%a, ]+) %d
helpers.dir = debug.getinfo(1, 'S').source:match[[^@(.*/).*$]]
helpers.scripts_dir = helpers.dir .. 'scripts/'

helpers.mono_preset = { font=beautiful.get().notification_monofont,
opacity=beautiful.get().notification_opacity }
helpers.mono_preset = function()
return {
font=beautiful.get().notification_monofont,
opacity=beautiful.get().notification_opacity
}
end

-- {{{ Modules loader

Expand Down
2 changes: 1 addition & 1 deletion actionless/string.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function string_helpers.max_length(unicode_string, max_length)
return unicode_string
end
local result = ''
local counter = 0
local counter = 1
for uchar in string.gmatch(unicode_string, '([%z\1-\127\194-\244][\128-\191]*)') do
result = result .. uchar
counter = counter + 1
Expand Down
2 changes: 1 addition & 1 deletion actionless/widgets/calendar.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ local beautiful = require("beautiful")
local naughty = require("naughty")

local helpers = require('actionless.helpers')
local mono_preset = helpers.mono_preset
local mono_preset = helpers.mono_preset()


-- Calendar notification
Expand Down
2 changes: 1 addition & 1 deletion actionless/widgets/cpu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local helpers = require("actionless.helpers")
local parse = require("actionless.parse")
local newtimer = helpers.newtimer
local font = helpers.font
local mono_preset = helpers.mono_preset
local mono_preset = helpers.mono_preset()
local common_widget = require("actionless.widgets.common").widget


Expand Down
2 changes: 1 addition & 1 deletion actionless/widgets/manage_client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local common = require("actionless.widgets.common")
local helpers = require("actionless.helpers")
local newtimer = helpers.newtimer
local font = helpers.font
local mono_preset = helpers.mono_preset
local mono_preset = helpers.mono_preset()


local manage_client = {}
Expand Down
2 changes: 1 addition & 1 deletion actionless/widgets/mem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ local parse = require("actionless.parse")
local common_widget= require("actionless.widgets.common").widget
local newtimer = helpers.newtimer
local font = helpers.font
local mono_preset = helpers.mono_preset
local mono_preset = helpers.mono_preset()

-- Memory usage (ignoring caches)
local mem = {
Expand Down
2 changes: 2 additions & 0 deletions actionless/widgets/music/backends/spotify.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ local awful = require("awful")

local async = require("actionless.async")
local h_table = require("actionless.table")
local h_string = require("actionless.string")
local parse = require("actionless.parse")

-- @TODO: change to native dbus implementation instead of calling qdbus
Expand Down Expand Up @@ -66,6 +67,7 @@ function spotify.parse_metadata(result_string, parse_status_callback)
cover_url='artUrl'
}
)
player_status.date = h_string.max_length(player_status.date, 4)
player_status.file = 'spotify stream'
h_table.merge(spotify.player_status, player_status)
parse_status_callback(spotify.player_status)
Expand Down
2 changes: 1 addition & 1 deletion actionless/widgets/netctl.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local helpers = require("actionless.helpers")
local newtimer = helpers.newtimer
local font = helpers.font
local beautiful = require("beautiful")
local mono_preset = helpers.mono_preset
local mono_preset = helpers.mono_preset()
local common_widget = require("actionless.widgets.common").widget
local markup = require("actionless.markup")
local parse = require("actionless.parse")
Expand Down
Binary file removed themes/pokemon_light/pattern1.jpg
Binary file not shown.

0 comments on commit 64a59c9

Please sign in to comment.