From: Dave Foster Date: Thu, 13 Sep 2007 18:43:02 +0000 (-0400) Subject: Made specific buttons be button- instead of button. X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=cc0b1f756937bda7c7785b60b60ed61d08cf67e1;p=chaz%2Fopenbox Made specific buttons be button- instead of button. --- diff --git a/obrender/theme.c b/obrender/theme.c index ca74a92d..03372f7d 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -613,186 +613,186 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, /* now do individual buttons, if specified */ /* max button */ - READ_APPEARANCE_COPY("window.active.button.max.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-max.disabled.bg", theme->a_disabled_focused_max, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.disabled.bg", theme->a_disabled_unfocused_max, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", theme->a_hover_focused_max, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", theme->a_hover_unfocused_max, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.unpressed.bg", theme->a_focused_unpressed_max, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.pressed.bg", theme->a_focused_pressed_max, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.unpressed.bg", theme->a_unfocused_unpressed_max, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.pressed.bg", theme->a_unfocused_pressed_max, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.hover.bg", theme->a_toggled_hover_focused_max, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.hover.bg", theme->a_toggled_hover_unfocused_max, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_max, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-max.toggled.pressed.bg", theme->a_toggled_focused_pressed_max, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_max, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.max.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-max.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_max, TRUE, a_toggled_unfocused_pressed_tmp); /* close button */ - READ_APPEARANCE_COPY("window.active.button.close.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-close.disabled.bg", theme->a_disabled_focused_close, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.disabled.bg", theme->a_disabled_unfocused_close, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.close.hover.bg", + READ_APPEARANCE_COPY("window.active.button-close.hover.bg", theme->a_hover_focused_close, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.hover.bg", theme->a_hover_unfocused_close, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.close.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-close.unpressed.bg", theme->a_focused_unpressed_close, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.close.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-close.pressed.bg", theme->a_focused_pressed_close, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.unpressed.bg", theme->a_unfocused_unpressed_close, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.close.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-close.pressed.bg", theme->a_unfocused_pressed_close, TRUE, a_unfocused_pressed_tmp); /* desk button */ - READ_APPEARANCE_COPY("window.active.button.desk.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-desk.disabled.bg", theme->a_disabled_focused_desk, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.disabled.bg", theme->a_disabled_unfocused_desk, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", theme->a_hover_focused_desk, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", theme->a_hover_unfocused_desk, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.unpressed.bg", theme->a_focused_unpressed_desk, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.pressed.bg", theme->a_focused_pressed_desk, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.unpressed.bg", theme->a_unfocused_unpressed_desk, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.pressed.bg", theme->a_unfocused_pressed_desk, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.hover.bg", theme->a_toggled_hover_focused_desk, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.hover.bg", theme->a_toggled_hover_unfocused_desk, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_desk, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-desk.toggled.pressed.bg", theme->a_toggled_focused_pressed_desk, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_desk, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.desk.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-desk.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_desk, TRUE, a_toggled_unfocused_pressed_tmp); /* shade button */ - READ_APPEARANCE_COPY("window.active.button.shade.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-shade.disabled.bg", theme->a_disabled_focused_shade, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.disabled.bg", theme->a_disabled_unfocused_shade, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", theme->a_hover_focused_shade, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", theme->a_hover_unfocused_shade, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.unpressed.bg", theme->a_focused_unpressed_shade, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.pressed.bg", theme->a_focused_pressed_shade, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.unpressed.bg", theme->a_unfocused_unpressed_shade, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.pressed.bg", theme->a_unfocused_pressed_shade, TRUE, a_unfocused_pressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.hover.bg", theme->a_toggled_hover_focused_shade, TRUE, a_toggled_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.hover.bg", theme->a_toggled_hover_unfocused_shade, TRUE, a_toggled_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.unpressed.bg", theme->a_toggled_focused_unpressed_shade, TRUE, a_toggled_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-shade.toggled.pressed.bg", theme->a_toggled_focused_pressed_shade, TRUE, a_toggled_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.unpressed.bg", theme->a_toggled_unfocused_unpressed_shade, TRUE, a_toggled_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.shade.toggled.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-shade.toggled.pressed.bg", theme->a_toggled_unfocused_pressed_shade, TRUE, a_toggled_unfocused_pressed_tmp); /* iconify button */ - READ_APPEARANCE_COPY("window.active.button.iconify.disabled.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.disabled.bg", theme->a_disabled_focused_iconify, TRUE, a_disabled_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.disabled.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.disabled.bg", theme->a_disabled_unfocused_iconify, TRUE, a_disabled_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.hover.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.hover.bg", theme->a_hover_focused_iconify, TRUE, a_hover_focused_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.hover.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.hover.bg", theme->a_hover_unfocused_iconify, TRUE, a_hover_unfocused_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.unpressed.bg", theme->a_focused_unpressed_iconify, TRUE, a_focused_unpressed_tmp); - READ_APPEARANCE_COPY("window.active.button.iconify.pressed.bg", + READ_APPEARANCE_COPY("window.active.button-iconify.pressed.bg", theme->a_focused_pressed_iconify, TRUE, a_focused_pressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.unpressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.unpressed.bg", theme->a_unfocused_unpressed_iconify, TRUE, a_unfocused_unpressed_tmp); - READ_APPEARANCE_COPY("window.inactive.button.iconify.pressed.bg", + READ_APPEARANCE_COPY("window.inactive.button-iconify.pressed.bg", theme->a_unfocused_pressed_iconify, TRUE, a_unfocused_pressed_tmp);