From 2d5c5892b18a7970b027a0fd4be471b0ccb456b0 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 29 Jul 2012 16:36:31 +0200 Subject: [PATCH] widgets: add many icons --- icons/dev.png | Bin 0 -> 179 bytes icons/im.png | Bin 0 -> 174 bytes icons/main.png | Bin 0 -> 184 bytes icons/web.png | Bin 0 -> 191 bytes icons/widgets/clock.png | Bin 0 -> 191 bytes icons/widgets/cpu.png | Bin 0 -> 198 bytes icons/widgets/disk.png | Bin 0 -> 173 bytes icons/widgets/down.png | Bin 0 -> 171 bytes icons/widgets/left.png | Bin 0 -> 199 bytes icons/widgets/mem.png | Bin 0 -> 160 bytes icons/widgets/right.png | Bin 0 -> 203 bytes icons/widgets/spacer.png | Bin 0 -> 287 bytes icons/widgets/up.png | Bin 0 -> 168 bytes icons/widgets/vol.png | Bin 0 -> 174 bytes rc.lua | 8 ++-- rc/tags.lua | 4 +- rc/widgets.lua | 80 ++++++++++++++++++++++++--------------- 17 files changed, 57 insertions(+), 35 deletions(-) create mode 100644 icons/dev.png create mode 100644 icons/im.png create mode 100644 icons/main.png create mode 100644 icons/web.png create mode 100644 icons/widgets/clock.png create mode 100644 icons/widgets/cpu.png create mode 100644 icons/widgets/disk.png create mode 100644 icons/widgets/down.png create mode 100644 icons/widgets/left.png create mode 100644 icons/widgets/mem.png create mode 100644 icons/widgets/right.png create mode 100644 icons/widgets/spacer.png create mode 100644 icons/widgets/up.png create mode 100644 icons/widgets/vol.png diff --git a/icons/dev.png b/icons/dev.png new file mode 100644 index 0000000000000000000000000000000000000000..6ce357e61c1e444aa49735afdc63c5d9928b5cb1 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0*Pol`>JIRGf+;OXKRqH+G|q=UQ+3Or2R&i5wh zM2Z`P_3A(MEdHP&_}+W-;ia`}1I=RaboFyt=akR{014+c7ytkO literal 0 HcmV?d00001 diff --git a/icons/im.png b/icons/im.png new file mode 100644 index 0000000000000000000000000000000000000000..01c079a5ebd6c81a4f781bc0bd30f511d19d4e3d GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0)!(weo}-2y0N?djqeqH#VsLE>M7;QS}6LRbGw z7Ut*XPF9H&_UY@4S#ESug&}Nh)K~eo&W}uS_LJ8L-egU&o}bvlz@U9j<*C8$Bzd4Q N44$rjF6*2UngGBKFTMZ( literal 0 HcmV?d00001 diff --git a/icons/main.png b/icons/main.png new file mode 100644 index 0000000000000000000000000000000000000000..d1225213492fd6fb5a58e767e221cae719f4f946 GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0*PU1`hYT>?NMS5Ftm5RLOsCm8ZEC~z>Z{n-2c zL|u@&82h50TfLLGx2&zzxov#=YqZ6liH!|q7B-=Aw&yac-xdE{q;;0*l_blHB^$!G ZGD!0pzEhm$^%`g(gQu&X%Q~loCIHRdISBv& literal 0 HcmV?d00001 diff --git a/icons/web.png b/icons/web.png new file mode 100644 index 0000000000000000000000000000000000000000..e776818a594b1d5291e1ff005e5838c2ae3735b2 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0*P-N0SzbOcby$J50zMC1J3iH2MZ1{}<5`@c;5 z?rF{WC`fkK4A+*HBO06JpSv>Hyifafh2ue}#P69FjB>&1k-$yiYr!yP=n5P`|0%$ISr>mdKI;Vst02{nJU;qFB literal 0 HcmV?d00001 diff --git a/icons/widgets/clock.png b/icons/widgets/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..ee6ed19baa5b61bdf931f0c17aa6fa78eaca2866 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Q!3HFy+4N(86kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w!!9YxFS2o)^bMepkEe@ch{fsT1PRs_2IXA`R)wzq zr~LWwp+gd#h8>*~6kjB<#JZdiaMDXYq~_7(ozTEKon;euhoQ)7$0fVil&=*?I{2Ik f)cxhon8?6zNn4G3QtQ1cpt%g5u6{1-oD!MjA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w!!9YxulStx{%@dAu&0Y-h{fsT1PRH6tE)o)Cz=?| zme||#qU`}wVq#*C%TAX0jxA3lB_t#w61F}3#C1lsCFY1rj)g$bVVAWXNlIo4FU4+L n>8(o=dh+;qzoev_8UsVqP46z=vgLk2;~6|%{an^LB{Ts5!K^&e literal 0 HcmV?d00001 diff --git a/icons/widgets/disk.png b/icons/widgets/disk.png new file mode 100644 index 0000000000000000000000000000000000000000..66cc0c96aa53555c7bc8637a2203ccc175950c9f GIT binary patch literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0+Cn(zBR!BC)(m8Xkih{pNk1c_e_g2y7ZW?ikX z;W~WikVGKMhfIfQ$x2r}Rk9NfrrVlrHx_*A=r!kvM~=tC&7~_C8M*?6d8z_hIDn=w Nc)I$ztaD0e0sur|F~jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w!!9W*z$?+dw+$$y>*?YcVsSb-L4wt#IdpZ{-{bC= zc?}lr=8)##=1x{g5fI)QWAcMX>exm59!3Vf<bP0l+XkKzSJn* literal 0 HcmV?d00001 diff --git a/icons/widgets/right.png b/icons/widgets/right.png new file mode 100644 index 0000000000000000000000000000000000000000..1e7b4add7d061f5eab697c957436577d7ccdd33b GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^oIotV!3HFcc!W9wDYhhUcNd2LAh=-f^2s121s;*b z3=G`DAk4@xYmNj^kiEpy*OmPayQHXq(Yl8db_0cEGeaUuobz*YQ}arITm}Z`qSVBa z)D(sC%#sWRcTeAd6une-pt!!Li(`n!`Q(HJVhJwKSXfy8v~M)expAN)Tzyj#8xW`^ kt&t9OnWH3Dqv%`9z`*~A{aaUnk~+vtPgg&ebxsLQ02xU&lK=n! literal 0 HcmV?d00001 diff --git a/icons/widgets/spacer.png b/icons/widgets/spacer.png new file mode 100644 index 0000000000000000000000000000000000000000..c3147ba85d28d42f782e049250fbeb618e499a46 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Q!3HFy+4N(86kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w!!9W*#Hh?ZSsy4Qn;8;O;+&tGo0?YwmdKI;Vst0A=xG$N&HU literal 0 HcmV?d00001 diff --git a/icons/widgets/up.png b/icons/widgets/up.png new file mode 100644 index 0000000000000000000000000000000000000000..ea435389600c66591db26f742801642de467f120 GIT binary patch literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPayQHW#^Won5oj@T|PZ!4!i_^&o608*mSB0+rCmeLx zqvzR%4F+zLcn+i)>p4q!7MhtkYkXr8Udm|ufvty$jg4XbU11KdPZj%s1~7QK`njxg HN@xNAm1Zva literal 0 HcmV?d00001 diff --git a/icons/widgets/vol.png b/icons/widgets/vol.png new file mode 100644 index 0000000000000000000000000000000000000000..65a9a5cbf805cf7fe83e5c8b423aa00c020ef3c6 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^JU}eK!3HFi66di4DYhhUcNd2LAh=-f^2tCE&H|6f zVg?3oVGw3ym^DWND9B#o>FdgVhh0+CnA_hs{}NEh+SA1`MB{vNg2b|ftE)o)7oIc} z4C*EH*Nl4#e7rqhf`0ZimNlwJQW{>uk%uwlYquB Nc)I$ztaD0e0stGBFsJ|k literal 0 HcmV?d00001 diff --git a/rc.lua b/rc.lua index ba5e6e2..871320c 100644 --- a/rc.lua +++ b/rc.lua @@ -50,10 +50,10 @@ config.layouts = { awful.layout.suit.floating, } config.tags = { - { layout = awful.layout.suit.fair }, -- 1 - { name = "emacs", mwfact = 0.6 }, - { name = "www", mwfact = 0.7 }, - { name = "im" , mwfact = 0.2 }, + { layout = awful.layout.suit.fair, icon = "main" }, -- 1 + { name = "emacs", mwfact = 0.6, icon = "dev" }, + { name = "www", mwfact = 0.7, icon = "web" }, + { name = "im" , mwfact = 0.2, icon = "im" }, { }, -- 5 { }, -- 6 { }, -- 7 diff --git a/rc/tags.lua b/rc/tags.lua index 6e165d9..8e312ba 100644 --- a/rc/tags.lua +++ b/rc/tags.lua @@ -35,7 +35,9 @@ for i = 1, #tags do -- Properties for pname, pvalue in pairs(otags[i]) do - if pname ~= "name" and pname ~= "layout" then + if pname == "icon" then + awful.tag.seticon(awful.util.getdir("config") .. "/icons/" .. pvalue .. ".png", tags[i]) + elseif pname ~= "name" and pname ~= "layout" then awful.tag.setproperty(tags[i], pname, pvalue) end end diff --git a/rc/widgets.lua b/rc/widgets.lua index fe801e4..5faa4bb 100644 --- a/rc/widgets.lua +++ b/rc/widgets.lua @@ -3,23 +3,30 @@ require("vicious") local icons = loadrc("icons", "vbe/icons") --- Separator -local separator = widget({ type = "textbox" }) -separator.text = ' ⋆ ' +-- Separators +local sepopen = widget({ type = "imagebox" }) +sepopen.image = image(awful.util.getdir("config") .. "/icons/widgets/left.png") +local sepclose = widget({ type = "imagebox" }) +sepclose.image = image(awful.util.getdir("config") .. "/icons/widgets/right.png") +local spacer = widget({ type = "imagebox" }) +spacer.image = image(awful.util.getdir("config") .. "/icons/widgets/spacer.png") -- Date local datewidget = widget({ type = "textbox" }) vicious.register(datewidget, vicious.widgets.date, '%a %d/%m, %H:%M', 61) +local dateicon = widget({ type = "imagebox" }) +dateicon.image = image(awful.util.getdir("config") .. "/icons/widgets/clock.png") -- CPU usage local cpuwidget = widget({ type = "textbox" }) vicious.register(cpuwidget, vicious.widgets.cpu, function (widget, args) - return string.format('CPU: ' .. - '%3d%%', + return string.format('%2d%%', args[1]) end, 2) +local cpuicon = widget({ type = "imagebox" }) +cpuicon.image = image(awful.util.getdir("config") .. "/icons/widgets/cpu.png") -- Battery local batwidget = { widget = "" } @@ -56,14 +63,20 @@ if config.hostname == "guybrush" then end -- Network -local netwidget = widget({ type = "textbox" }) +local netup = widget({ type = "textbox" }) +local netdown = widget({ type = "textbox" }) +local netupicon = widget({ type = "imagebox" }) +netupicon.image = image(awful.util.getdir("config") .. "/icons/widgets/up.png") +local netdownicon = widget({ type = "imagebox" }) +netdownicon.image = image(awful.util.getdir("config") .. "/icons/widgets/down.png") + local netgraph = awful.widget.graph() -netgraph:set_width(80):set_height(14) +netgraph:set_width(80):set_height(16) netgraph:set_stack(true):set_scale(true) netgraph:set_border_color(beautiful.fg_widget_border) netgraph:set_stack_colors({ "#FF0000", "#0000FF" }) netgraph:set_background_color("#00000000") -vicious.register(netwidget, vicious.widgets.net, +vicious.register(netup, vicious.widgets.net, function (widget, args) -- We sum up/down value for all interfaces local up = 0 @@ -87,22 +100,25 @@ vicious.register(netwidget, vicious.widgets.net, end return string.format("%d B", val) end - return string.format( - 'Up/Down: %08s/%08s ', format(up), format(down)) + -- Down + netdown.text = string.format('%08s', format(down)) + -- Up + return string.format('%08s', format(up)) end, 3) -- Memory usage local memwidget = widget({ type = "textbox" }) vicious.register(memwidget, vicious.widgets.mem, - 'Mem: ' .. - '$1%', + '$1%', 13) +local memicon = widget({ type = "imagebox" }) +memicon.image = image(awful.util.getdir("config") .. "/icons/widgets/mem.png") -- Volume level +local volicon = widget({ type = "imagebox" }) +volicon.image = image(awful.util.getdir("config") .. "/icons/widgets/vol.png") local volwidget = widget({ type = "textbox" }) vicious.register(volwidget, vicious.widgets.volume, '$2 $1%', @@ -121,6 +137,8 @@ local fs = { ["/"] = "root", ["/usr"] = "usr", ["/tmp"] = "tmp", ["/var/cache/build"] = "pbuilder" } +local fsicon = widget({ type = "imagebox" }) +fsicon.image = image(awful.util.getdir("config") .. "/icons/widgets/disk.png") local fswidget = widget({ type = "textbox" }) vicious.register(fswidget, vicious.widgets.fs, function (widget, args) @@ -135,7 +153,7 @@ vicious.register(fswidget, vicious.widgets.fs, result = string.format( '%s%s%s: ' .. '%2d%%', - result, #result > 0 and separator.text or "", name, used) + result, #result > 0 and " " or "", name, used) end end return result @@ -168,7 +186,6 @@ tasklist.buttons = awful.util.table.join( for s = 1, screen.count() do promptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright }) layoutbox[s] = awful.widget.layoutbox(s) - awful.widget.layout.margins[layoutbox[s]] = { left = 5 } tasklist[s] = awful.widget.tasklist( function(c) local fn = awful.widget.tasklist.label.currenttags @@ -192,7 +209,7 @@ for s = 1, screen.count() do fg = beautiful.fg_normal, bg = beautiful.bg_widget, position = "top", - height = 14, + height = 16, }) -- Add widgets to the wibox local on = function(n, what) @@ -202,19 +219,22 @@ for s = 1, screen.count() do wibox[s].widgets = { { - taglist[s], layoutbox[s], - separator, promptbox[s], + sepopen, + taglist[s], + spacer, + layoutbox[s], sepclose, + promptbox[s], layout = awful.widget.layout.horizontal.leftright }, - on(1, systray), on(1, separator), - datewidget, separator, - on(2, volwidget), on(2, separator), - on(2, batwidget.widget), on(2, batwidget.widget ~= "" and separator or ""), - on(2, fswidget), on(2, separator), - on(1, netgraph.widget), on(1, netwidget), on(1, separator), - on(1, memwidget), on(1, separator), - on(1, cpuwidget), on(1, separator), - tasklist[s], separator, + on(1, systray), + sepclose, datewidget, dateicon, spacer, + on(2, volwidget), on(2, volicon), on(2, spacer), + on(2, batwidget.widget), on(2, batwidget.widget ~= "" and spacer or ""), + on(2, fswidget), on(2, fsicon), on(2, sepopen), + on(1, netgraph.widget), on(1, netdownicon), on(1, netdown), on(1, netupicon), on(1, netup), on(1, spacer), + on(1, memwidget), on(1, memicon), on(1, spacer), + on(1, cpuwidget), on(1, cpuicon), on(1, sepopen), + tasklist[s], layout = awful.widget.layout.horizontal.rightleft } end