Commit ec5c7168c8588a79f12a44a5155097552cde506e

Authored by Ian Foster
1 parent 5f865a17be
Exists in master

darmburn theme done

Showing 2 changed files with 20 additions and 33 deletions Side-by-side Diff

awesome/awesome/darkburn/theme.lua View file @ ec5c716
... ... @@ -7,7 +7,6 @@
7 7 theme = {}
8 8 theme.confdir = awful.util.getdir("config")
9 9 theme.themedir = theme.confdir .. "/darkburn/"
10   ---TODO better wallpaper handling
11 10 theme.wallpaper_cmd = { "awsetbg -a .wallpaper.jpg" }
12 11 -- }}}
13 12  
14 13  
... ... @@ -24,11 +23,10 @@
24 23 -- }}}
25 24  
26 25 -- {{{ Borders
27   ---theme.border_width = "1"
28   -theme.border_width = "0"
  26 +theme.border_width = 0
29 27 theme.border_normal = "#3F3F3F"
30 28 theme.border_focus = "#6F6F6F"
31   -theme.border_marked = "#CC9393"
  29 +--theme.border_marked = "#CC9393"
32 30 -- }}}
33 31  
34 32 -- {{{ Titlebars
35 33  
36 34  
... ... @@ -47,20 +45,19 @@
47 45 -- }}}
48 46  
49 47  
50   ---TODO use these variables
51 48 -- {{{ Widgets
52 49 -- You can add as many variables as
53 50 -- you wish and access them by using
54   --- beautiful.variable in your rc.lua
55   ---theme.fg_widget = "#AECF96"
56   ---theme.fg_center_widget = "#88A175"
57   ---theme.fg_end_widget = "#FF5656"
58   ---theme.bg_widget = "#494B4F"
  51 +-- beautiful.variableName in your rc.lua
  52 +theme.fg_widget = "#AECF96"
  53 +theme.fg_center_widget = "#FFCF00"
  54 +theme.fg_end_widget = "#FF5656"
  55 +theme.bg_widget = "#111111"
59 56 --theme.border_widget = "#3F3F3F"
60 57 -- }}}
61 58  
62 59 -- {{{ Mouse finder
63   -theme.mouse_finder_color = "#CC9393"
  60 +--theme.mouse_finder_color = "#CC9393"
64 61 -- mouse_finder_[timeout|animate_timeout|radius|factor]
65 62 -- }}}
66 63  
... ... @@ -68,8 +65,8 @@
68 65 -- Variables set for theming the menu:
69 66 -- menu_[bg|fg]_[normal|focus]
70 67 -- menu_[border_color|border_width]
71   -theme.menu_height = "16"
72   -theme.menu_width = "100"
  68 +theme.menu_height = 16
  69 +theme.menu_width = 100
73 70 -- }}}
74 71  
75 72 -- {{{ Icons
awesome/awesome/rc.lua View file @ ec5c716
... ... @@ -151,7 +151,7 @@
151 151 table.insert(menu_items, { "awesome", myawesomemenu, beautiful.awesome_icon })
152 152 table.insert(menu_items, { "Exit", exit_command })
153 153  
154   -mymainmenu = awful.menu.new({ items = menu_items, width = 150 })
  154 +mymainmenu = awful.menu.new({ items = menu_items, width = beautiful.menu_width })
155 155  
156 156 mylauncher = awful.widget.launcher({ image = image(beautiful.awesome_icon),
157 157 menu = mymainmenu })
... ... @@ -165,9 +165,6 @@
165 165 -- {{{ Wibox
166 166 -- Create a textclock widget
167 167 mytextclock = awful.widget.textclock({ align = "right" })
168   -mytextclock.buttons = awful.util.table.join(
169   - awful.button({ }, 1, function() naughty.notify({text = "it works"}) end)
170   -)
171 168  
172 169 --calendar plugin
173 170 calendar2.addCalendarToWidget(mytextclock)
174 171  
175 172  
176 173  
... ... @@ -180,22 +177,15 @@
180 177 space = widget({ type = "textbox" })
181 178 space.text = " "
182 179  
183   -local fg_end_color = "#FF5656"
184   -local fg_color = "#AECF96"
185   -local fg_center_color = "#FFCF00"
186   -local bg_color = "#111111"
187 180  
188   ---TODO height of bar for widgets and wibox should be set in theme
189   ---TODO rename theme
190   -
191 181 -- RAM usage widget
192 182 memwidget = awful.widget.progressbar()
193 183 memwidget:set_width(8)
194   -memwidget:set_height(15)
  184 +memwidget:set_height(beautiful.menu_height)
195 185 memwidget:set_vertical(true)
196   -memwidget:set_background_color(bg_color)
197   -memwidget:set_color(fg_color)
198   -memwidget:set_gradient_colors({ fg_color, fg_center_color, fg_end_color })
  186 +memwidget:set_background_color(beautiful.bg_widget)
  187 +memwidget:set_color(beautiful.fg_widget)
  188 +memwidget:set_gradient_colors({ beautiful.fg_widget, beautiful.fg_center_widget, beautiful.fg_end_widget })
199 189 -- RAM usage tooltip
200 190 memwidget_t = awful.tooltip({ objects = { memwidget.widget },})
201 191 vicious.cache(vicious.widgets.mem)
202 192  
... ... @@ -209,11 +199,11 @@
209 199 -- CPU usage widget
210 200 cpuwidget = awful.widget.graph()
211 201 cpuwidget:set_width(30)
212   -cpuwidget:set_height(15)
213   -cpuwidget:set_background_color(bg_color)
214   -cpuwidget:set_color(fg_color)
  202 +cpuwidget:set_height(beautiful.menu_height)
  203 +cpuwidget:set_background_color(beautiful.bg_widget)
  204 +cpuwidget:set_color(beautiful.fg_widget)
215 205 cpuwidget:set_gradient_angle(180)
216   -cpuwidget:set_gradient_colors({ fg_color, fg_center_color, fg_end_color })
  206 +cpuwidget:set_gradient_colors({ beautiful.fg_widget, fg_center_widget, beautiful.fg_end_widget })
217 207 cpuwidget_t = awful.tooltip({ objects = { cpuwidget.widget },})
218 208 -- Register CPU widget
219 209 vicious.register(cpuwidget, vicious.widgets.cpu,
... ... @@ -290,7 +280,7 @@
290 280 end, mytasklist.buttons)
291 281  
292 282 -- Create the wibox
293   - mywibox[s] = awful.wibox({ position = "top", screen = s, height = "16" })
  283 + mywibox[s] = awful.wibox({ position = "top", screen = s, height = beautiful.menu_height })
294 284 -- Add widgets to the wibox - order matters
295 285 mywibox[s].widgets = {
296 286 {