Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Code Issues Releases Activity

xftfont is renamed to font

Browse Source 
whether the font setting specifies an X or an Xft font depends on the use_xft setting.
This commit is contained in:
Pavel Labath 2010-11-17 14:49:03 +01:00
parent b7a80fa449
commit 87415d6e36
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
convert.lua
View File

@ -72,9 +72,10 @@ local function handle(setting, value)
elseif not num_setting[setting] then elseif not num_setting[setting] then
if setting == 'alignment' and value:len() == 2 then if setting == 'alignment' and value:len() == 2 then
value = alignment_map(value:sub(1,1)) .. '_' .. alignment_map(value:sub(2,2)); value = alignment_map(value:sub(1,1)) .. '_' .. alignment_map(value:sub(2,2));
end; elseif colour_setting[setting] and value:match('^[0-9a-fA-F]+$') then
if colour_setting[setting] and value:match('^[0-9a-fA-F]+$') then
value = '#' .. value; value = '#' .. value;
elseif setting == 'xftfont' then
setting = 'font';
end; end;
value = quote(value); value = quote(value);
end; end;

9
doc/config_settings.xml
View File

@ -1043,13 +1043,4 @@
1 and 0. 1 and 0.
<para /></listitem> <para /></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term>
<command>
<option>xftfont</option>
</command>
</term>
<listitem>Xft font to use.
<para /></listitem>
</varlistentry>
</variablelist> </variablelist>