Permalink
Browse files

Merge remote branch 'ierton/laptop'

* ierton/laptop:
  readme: switch links to point ti github
  mainmenu.lua: add default menu icon
  themes: add fallback to default awesome resources

Conflicts:
	themes/blue-black-red/theme.lua
	themes/blue-black-red2/theme.lua
  • Loading branch information...
2 parents 541430d + 518a150 commit 798db28994460e0c773bae6d27d9262d03717ceb @kalbasit committed Dec 28, 2010
Showing with 18 additions and 7 deletions.
  1. +3 −5 README
  2. +3 −0 freedesktop/utils.lua
  3. +1 −0 myrc/mainmenu.lua
  4. +4 −1 themes/blue-black-red/theme.lua
  5. +4 −1 themes/blue-black-red2/theme.lua
  6. +3 −0 themes/sky2/theme.lua
View
@@ -13,7 +13,7 @@ INSTALL
* pkill
* acpitool
* notify-send
-* xkb-switch (see http://git.ierton.ru)
+* xkb-switch (see http://github.com/ierton/xkb-switch)
* Search for "Environment programs" in rc.lua for more
* xvkbd for laptop branch
@@ -26,13 +26,11 @@ and some well-known files
Also rfkill pipelet uses hardcoded WIFI_RFKILL_ID value. Change it to one your
wifi card uses (see rfkill list). Well, all pipelets are hackish a bit .
-1. git clone git://ierton.ru/awesomerc
-
-Server may be inaccessible sometimes:( Just wait few hours.
+1. git clone git@github.com:ierton/awesomerc-ierton.git
2. mv ~/.config/awesome ~/.config/awesome.old
-3. ln -s `pwd`/awesomerc ~/.config/awesome
+3. ln -s `pwd`/awesomerc-ierton ~/.config/awesome
DIRECTORY STRUCTURE
@@ -8,6 +8,8 @@ module("freedesktop.utils")
terminal = 'xterm'
+default_icon = ''
+
icon_theme = nil
all_icon_sizes = {
@@ -75,6 +77,7 @@ function lookup_icon(arg)
return directory .. arg.icon .. '.png'
end
end
+ return default_icon
end
end
View
@@ -41,6 +41,7 @@ function build()
freedesktop_utils.terminal = terminal
freedesktop_utils.icon_theme = beautiful.icon_theme
freedesktop_utils.icon_sizes = {beautiful.icon_theme_size}
+ freedesktop_utils.default_icon = beautiful.default_client_icon
local myquitmenu = {
{ "&Poweroff", poweroff, freedesktop_utils.lookup_icon({ icon = 'system-shutdown' })},
@@ -4,7 +4,10 @@
theme = {}
theme.name = "blue-black-red"
-theme.shared = "/usr/share/awesome"
+theme.shared = "/usr/local/share/awesome"
+if not awful.util.file_readable(theme.shared.."/icons/awesome16.png") then
+ theme.shared = "/usr/share/awesome"
+end
theme.config = awful.util.getdir("config")
theme.path = theme.config .. "/themes/" .. theme.name
@@ -4,7 +4,10 @@
theme = {}
theme.name = "blue-black-red"
-theme.shared = "/usr/share/awesome"
+theme.shared = "/usr/local/share/awesome"
+if not awful.util.file_readable(theme.shared.."/icons/awesome16.png") then
+ theme.shared = "/usr/share/awesome"
+end
theme.config = awful.util.getdir("config")
theme.path = theme.config .. "/themes/" .. theme.name
@@ -29,6 +29,9 @@ theme.menu_border_color = "#7985A3"
theme.name = "sky2"
theme.shared = "/usr/local/share/awesome"
+if not awful.util.file_readable(theme.shared.."/icons/awesome16.png") then
+ theme.shared = "/usr/share/awesome"
+end
theme.config = awful.util.getdir("config")
theme.path = theme.config .. "/themes/" .. theme.name

0 comments on commit 798db28

Please sign in to comment.