Font removed where style should be used now

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
marco candrian 2008-03-15 16:10:46 +01:00 committed by Julien Danjou
parent 31f6010eda
commit 0795334dd8
2 changed files with 2 additions and 11 deletions

View File

@ -48,8 +48,6 @@ titlebar::
This section defines the parameters of the windows titlebar. This section defines the parameters of the windows titlebar.
border:: border::
This defines the window borders size in pixel. This defines the window borders size in pixel.
font::
This defines the general font used in awesome.
new_become_master:: new_become_master::
If this is set to true, new windows will become the master window. If this is set to true, new windows will become the master window.
new_get_focus:: new_get_focus::
@ -407,12 +405,10 @@ This widget shows a text.
*mouse*:: *mouse*::
Set mouse bindings. Set mouse bindings.
*font*::
Font to use.
*width*:: *width*::
Set width. Set width.
*styles*:: *style*::
Styles section with a focus and normal subsection. Style section with <style section>
*text*:: *text*::
Text to change. Text to change.
*text_align*:: *text_align*::
@ -555,7 +551,6 @@ screen <integer> [MULTI]
general general
{ {
border = <integer> border = <integer>
font = <font>
new_become_master = <boolean> new_become_master = <boolean>
new_get_focus = <boolean> new_get_focus = <boolean>
opacity_unfocused = <integer> opacity_unfocused = <integer>
@ -644,7 +639,6 @@ screen <integer> [MULTI]
normal { <style section> } normal { <style section> }
focus { <style section> } focus { <style section> }
} }
font = <font>
show_icons = <boolean> show_icons = <boolean>
show = <{all,tags,focus}> show = <{all,tags,focus}>
text_align = <{center,left,right}> text_align = <{center,left,right}>

View File

@ -155,7 +155,6 @@ cfg_opt_t widget_textbox_opts[] =
CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
CFG_INT((char *) "width", 0, CFGF_NONE), CFG_INT((char *) "width", 0, CFGF_NONE),
CFG_STR((char *) "text", (char *) NULL, CFGF_NONE), CFG_STR((char *) "text", (char *) NULL, CFGF_NONE),
CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
CFG_STR((char *) "text_align", (char *) "center", CFGF_NONE), CFG_STR((char *) "text_align", (char *) "center", CFGF_NONE),
CFG_SEC((char *) "style", style_opts, CFGF_NONE), CFG_SEC((char *) "style", style_opts, CFGF_NONE),
CFG_AWESOME_END() CFG_AWESOME_END()
@ -166,7 +165,6 @@ cfg_opt_t widget_tasklist_opts[] =
CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), CFG_INT((char *) "y", 0xffffffff, CFGF_NONE),
CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI), CFG_SEC((char *) "mouse", mouse_generic_opts, CFGF_MULTI),
CFG_SEC((char *) "styles", styles_opts, CFGF_NONE), CFG_SEC((char *) "styles", styles_opts, CFGF_NONE),
CFG_STR((char *) "font", (char *) NULL, CFGF_NONE),
CFG_STR((char *) "text_align", (char *) "left", CFGF_NONE), CFG_STR((char *) "text_align", (char *) "left", CFGF_NONE),
CFG_STR((char *) "show", (char *) "tags", CFGF_NONE), CFG_STR((char *) "show", (char *) "tags", CFGF_NONE),
CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE), CFG_BOOL((char *) "show_icons", cfg_true, CFGF_NONE),
@ -331,7 +329,6 @@ cfg_opt_t menu_opts[] =
CFG_INT((char *) "height", 0, CFGF_NONE), CFG_INT((char *) "height", 0, CFGF_NONE),
CFG_INT((char *) "y", 0xffffffff, CFGF_NONE), CFG_INT((char *) "y", 0xffffffff, CFGF_NONE),
CFG_INT((char *) "x", 0xffffffff, CFGF_NONE), CFG_INT((char *) "x", 0xffffffff, CFGF_NONE),
CFG_STR((char *) "font", NULL, CFGF_NONE),
CFG_SEC((char *) "styles", styles_opts, CFGF_NONE), CFG_SEC((char *) "styles", styles_opts, CFGF_NONE),
CFG_AWESOME_END() CFG_AWESOME_END()
}; };