nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename activedisabled in xml to active-disabled

Browse source
This commit is contained in:
Dana Jansens 2007-06-02 18:58:10 +00:00
parent 9cc523aa71
commit 1091e38908
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
render/theme.c
View file

@ -355,7 +355,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
if (!FIND(color, L("menu","disabled","primary"), if (!FIND(color, L("menu","disabled","primary"),
&theme->menu_disabled_color, NULL)) &theme->menu_disabled_color, NULL))
theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0); theme->menu_disabled_color = RrColorNew(inst, 0, 0, 0);
if (!FIND(color, L("menu","activedisabled","text","primary"), if (!FIND(color, L("menu","active-disabled","text","primary"),
&theme->menu_disabled_selected_color, NULL)) &theme->menu_disabled_selected_color, NULL))
theme->menu_disabled_selected_color = theme->menu_disabled_selected_color =
RrColorNew(inst, RrColorNew(inst,
@ -420,7 +420,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->menu_text_disabled_shadow_alpha = theme->menu_text_disabled_shadow_alpha =
theme->menu_text_normal_shadow_alpha; theme->menu_text_normal_shadow_alpha;
} }
if (!FIND(color, L("menu","activedisabled","shadow","primary"), if (!FIND(color, L("menu","active-disabled","shadow","primary"),
&theme->menu_text_disabled_selected_shadow_color, &theme->menu_text_disabled_selected_shadow_color,
&theme->menu_text_disabled_selected_shadow_alpha)) &theme->menu_text_disabled_selected_shadow_alpha))
{ {
@ -583,7 +583,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
set_default_appearance(theme->a_menu_title); set_default_appearance(theme->a_menu_title);
if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE)) if (!FIND(appearance, L("menu", "active"), theme->a_menu_selected, TRUE))
set_default_appearance(theme->a_menu_selected); set_default_appearance(theme->a_menu_selected);
if (!FIND(appearance, L("menu", "activedisabled"), if (!FIND(appearance, L("menu", "active-disabled"),
theme->a_menu_disabled_selected, TRUE)) theme->a_menu_disabled_selected, TRUE))
theme->a_menu_disabled_selected = theme->a_menu_disabled_selected =
RrAppearanceCopy(theme->a_menu_selected); RrAppearanceCopy(theme->a_menu_selected);
@ -883,7 +883,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name,
theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x = theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_x =
theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y = theme->a_menu_text_disabled->texture[0].data.text.shadow_offset_y =
0; 0;
if (!FIND(shadow, L("menu","activedisabled","shadow","offset"), if (!FIND(shadow, L("menu","active-disabled","shadow","offset"),
theme->a_menu_text_disabled_selected)) theme->a_menu_text_disabled_selected))
theme->a_menu_text_disabled_selected-> theme->a_menu_text_disabled_selected->
texture[0].data.text.shadow_offset_x = 0; texture[0].data.text.shadow_offset_x = 0;

12
tools/themetoxml/themetoxml.c
View file

@ -448,7 +448,7 @@ int main(int argc, char **argv)
COLOR3("menu","disabled","primary",i,j,k,255); COLOR3("menu","disabled","primary",i,j,k,255);
read_color(db, "menu.items.active.disabled.text.color", read_color(db, "menu.items.active.disabled.text.color",
&i, &j, &k); /* read this if we can */ &i, &j, &k); /* read this if we can */
COLOR4("menu","activedisabled","text","primary",i,j,k,255); COLOR4("menu","active-disabled","text","primary",i,j,k,255);
} }
if (read_color(db, "menu.items.active.text.color", if (read_color(db, "menu.items.active.text.color",
@ -465,7 +465,7 @@ int main(int argc, char **argv)
APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip"); APPEARANCE3("window.inactive.grip.bg", "window", "inactive", "grip");
APPEARANCE2("menu.items.bg", "menu", "entries"); APPEARANCE2("menu.items.bg", "menu", "entries");
APPEARANCE2("menu.items.active.bg", "menu", "active"); APPEARANCE2("menu.items.active.bg", "menu", "active");
APPEARANCE2("menu.items.active.bg", "menu", "activedisabled"); APPEARANCE2("menu.items.active.bg", "menu", "active-disabled");
APPEARANCE2("menu.title.bg", "menu", "title"); APPEARANCE2("menu.title.bg", "menu", "title");
APPEARANCE4("window.active.button.disabled.bg", APPEARANCE4("window.active.button.disabled.bg",
@ -565,8 +565,10 @@ int main(int argc, char **argv)
ATTR5("menu","active","text","shadow","offset","y",NUM(i)); ATTR5("menu","active","text","shadow","offset","y",NUM(i));
ATTR4("menu","disabled","shadow","offset","x",NUM(i)); ATTR4("menu","disabled","shadow","offset","x",NUM(i));
ATTR4("menu","disabled","shadow","offset","y",NUM(i)); ATTR4("menu","disabled","shadow","offset","y",NUM(i));
ATTR5("menu","activedisabled","text","shadow","offset","x",NUM(i)); ATTR5("menu","active-disabled","text","shadow","offset","x",
ATTR5("menu","activedisabled","text","shadow","offset","y",NUM(i)); NUM(i));
ATTR5("menu","active-disabled","text","shadow","offset","y",
NUM(i));
} }
if ((p = strstr(s, "shadowtint="))) if ((p = strstr(s, "shadowtint=")))
{ {
@ -576,7 +578,7 @@ int main(int argc, char **argv)
COLOR4("menu","inactive","shadow","primary",j,j,j,i); COLOR4("menu","inactive","shadow","primary",j,j,j,i);
COLOR5("menu","active","text","shadow","primary",j,j,j,i); COLOR5("menu","active","text","shadow","primary",j,j,j,i);
COLOR4("menu","disabled","shadow","primary",j,j,j,i); COLOR4("menu","disabled","shadow","primary",j,j,j,i);
COLOR5("menu","activedisabled","text","shadow","primary",j,j,j,i); COLOR5("menu","active-disabled","text","shadow","primary",j,j,j,i);
} }
} }