From: martin f. krafft Date: Sun, 29 Jun 2008 16:08:09 +0000 (+0200) Subject: follow HEAD config file changes X-Git-Url: https://git.madduck.net/etc/awesome.git/commitdiff_plain/36c5c8132c20e4f507b4f35c31154c5d085695c1 follow HEAD config file changes --- diff --git a/.awesomerc.lua b/.awesomerc.lua index 216f8ae..fcc64a0 100644 --- a/.awesomerc.lua +++ b/.awesomerc.lua @@ -71,7 +71,7 @@ for s = 1, screen.count() do tags[s] = {} -- Create 9 tags per screen for tagnumber = 1, 9 do - tags[s][tagnumber] = tag.new({ name = tagnumber }) + tags[s][tagnumber] = tag.new({ name = tagnumber, layout = layouts[1] }) -- Add tags to screen one by one -- split at 0.5/50% exactly tags[s][tagnumber]:mwfact_set(0.5) @@ -91,24 +91,24 @@ mytaglist:mouse_add(mouse.new({}, 3, function (object, tag) tag:view(not tag:iss mytaglist:mouse_add(mouse.new({ modkey }, 3, function (object, tag) awful.client.toggletag(tag) end)) mytaglist:mouse_add(mouse.new({ }, 4, awful.tag.viewnext)) mytaglist:mouse_add(mouse.new({ }, 5, awful.tag.viewprev)) -mytaglist:text_set({ ["focus"] = " </span> " }) +mytaglist.text_focus = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> " -- Create a tasklist widget mytasklist = widget.new({ type = "tasklist", name = "mytasklist" }) mytasklist:mouse_add(mouse.new({ }, 1, function (object, c) c:focus_set(); c:raise() end)) mytasklist:mouse_add(mouse.new({ }, 4, function () awful.client.focus(1) end)) mytasklist:mouse_add(mouse.new({ }, 5, function () awful.client.focus(-1) end)) -mytasklist:text_set({ ["focus"] = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> " }) +mytasklist.text_focus = "<bg color='"..bg_focus.."'/> <span color='"..fg_focus.."'><title/></span> " -- Create a textbox widget mytextbox = widget.new({ type = "textbox", name = "mytextbox", align = "right" }) -- Set the default text in textbox -mytextbox:text_set("<b><small> awesome " .. AWESOME_VERSION .. " </small></b>") +mytextbox.text = "<b><small> awesome " .. AWESOME_VERSION .. " </small></b>" mypromptbox = widget.new({ type = "textbox", name = "mypromptbox", align = "left" }) -- Create an iconbox widget myiconbox = widget.new({ type = "textbox", name = "myiconbox", align = "left" }) -myiconbox:text_set("<bg image=\"/usr/local/share/awesome/icons/awesome16.png\" resize=\"true\"/>") +myiconbox.text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/awesome16.png\" resize=\"true\"/>" -- Create a systray mysystray = widget.new({ type = "systray", name = "mysystray", align = "right" }) @@ -122,7 +122,7 @@ for s = 1, screen.count() do mylayoutbox[s]:mouse_add(mouse.new({ }, 3, function () awful.layout.inc(layouts, -1) end)) mylayoutbox[s]:mouse_add(mouse.new({ }, 4, function () awful.layout.inc(layouts, 1) end)) mylayoutbox[s]:mouse_add(mouse.new({ }, 5, function () awful.layout.inc(layouts, -1) end)) - mylayoutbox[s]:text_set("<bg image=\"/usr/local/share/awesome/icons/layouts/tilew.png\" resize=\"true\"/>") + mylayoutbox[s].text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/layouts/tilew.png\" resize=\"true\"/>" end -- Create a statusbar for each screen and add it @@ -341,7 +341,7 @@ end -- (tag switch, new client, etc) function hook_arrange(screen) local layout = awful.layout.get(screen) - mylayoutbox[screen]:text_set("<bg image=\"/usr/local/share/awesome/icons/layouts/" .. layout .. "w.png\" resize=\"true\"/>") + mylayoutbox[screen].text = "<bg image=\"" .. AWESOME_DATADIR .. "/icons/layouts/" .. layout .. "w.png\" resize=\"true\"/>" -- Uncomment if you want mouse warping --[[ @@ -364,9 +364,9 @@ end -- Hook called every second function hook_timer () -- For unix time_t lovers - -- mytextbox:text_set(" " .. os.time() .. " time_t ") + -- mytextbox.text = " " .. os.time() .. " time_t " -- Otherwise use: - mytextbox:text_set(" " .. os.date() .. " ") + mytextbox.text = " " .. os.date() .. " " end -- Set up some hooks