[maemo-commits] [maemo-commits] r10607 - in projects/haf/trunk/hildon-theme-layout-4: . rc
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Mar 16 15:23:03 EET 2007
- Previous message: [maemo-commits] r10606 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10608 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: xan Date: 2007-03-16 15:23:02 +0200 (Fri, 16 Mar 2007) New Revision: 10607 Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog projects/haf/trunk/hildon-theme-layout-4/rc/afterthemespecificgtk.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtkcalendar.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtkdialog.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtkpaned.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtkprogressbar.rc projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc projects/haf/trunk/hildon-theme-layout-4/rc/hildonbreadcrumbbutton.rc projects/haf/trunk/hildon-theme-layout-4/rc/hildonhome.rc projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc Log: * rc/*.rc: Use the @ format for logical color references. Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/ChangeLog 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog 2007-03-16 13:23:02 UTC (rev 10607) @@ -1,6 +1,12 @@ +2007-03-16 Xan Lopez <xan.lopez at nokia.com> + + * rc/*.rc: + + Use the @ format for logical color references. + 2007-03-12 Xan Lopez <xan.lopez at nokia.com> - * rc/gtktreeview.r: + * rc/gtktreeview.rc: Use the new tree-view-separator-area property. Modified: projects/haf/trunk/hildon-theme-layout-4/rc/afterthemespecificgtk.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/afterthemespecificgtk.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/afterthemespecificgtk.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -2,34 +2,34 @@ class "GtkWidget" style "osso-logical-colors" style "osso-color-themeing" = "osso-logical-colors" { - fg[NORMAL] = "DefaultTextColor" - bg[NORMAL] = "DefaultBackgrdColor" + fg[NORMAL] = @DefaultTextColor + bg[NORMAL] = @DefaultBackgrdColor - fg[PRELIGHT] = "DefaultTextColor" - bg[PRELIGHT] = "DefaultBackgrdColor" + fg[PRELIGHT] = @DefaultTextColor + bg[PRELIGHT] = @DefaultBackgrdColor - fg[ACTIVE] = "DefaultTextColor" - bg[ACTIVE] = "PaintedBackgrdColor" + fg[ACTIVE] = @DefaultTextColor + bg[ACTIVE] = @PaintedBackgrdColor - fg[SELECTED] = "DefaultTextColor" - bg[SELECTED] = "PaintedBackgrdColor" + fg[SELECTED] = @DefaultTextColor + bg[SELECTED] = @PaintedBackgrdColor - fg[INSENSITIVE] = "DisabledTextColor" - bg[INSENSITIVE] = "DefaultBackgrdColor" + fg[INSENSITIVE] = @DisabledTextColor + bg[INSENSITIVE] = @DefaultBackgrdColor - text[NORMAL] = "DefaultTextColor" - base[NORMAL] = "DefaultBackgrdColor" + text[NORMAL] = @DefaultTextColor + base[NORMAL] = @DefaultBackgrdColor - text[PRELIGHT] = "DefaultTextColor" - base[PRELIGHT] = "DefaultBackgrdColor" + text[PRELIGHT] = @DefaultTextColor + base[PRELIGHT] = @DefaultBackgrdColor - text[ACTIVE] = "PaintedDefaultTextColor" - base[ACTIVE] = "PaintedBackgrdColor" + text[ACTIVE] = @PaintedDefaultTextColor + base[ACTIVE] = @PaintedBackgrdColor - text[SELECTED] = "PaintedDefaultTextColor" - base[SELECTED] = "PaintedBackgrdColor" + text[SELECTED] = @PaintedDefaultTextColor + base[SELECTED] = @PaintedBackgrdColor - text[INSENSITIVE] = "DisabledTextColor" - base[INSENSITIVE] = "DefaultBackgrdColor" + text[INSENSITIVE] = @DisabledTextColor + base[INSENSITIVE] = @DefaultBackgrdColor } class "GtkWidget" style "osso-color-themeing" Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkcalendar.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtkcalendar.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkcalendar.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -14,7 +14,7 @@ GtkWidget::scroll-arrow-hlength = 26 xthickness = 0 ythickness = 0 - text[SELECTED] = "DefaultTextColor" + text[SELECTED] = @DefaultTextColor engine "sapwood" { Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkdialog.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtkdialog.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkdialog.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -6,7 +6,7 @@ # Theming instructions for GtkDialog -widget # # The outer border/frame graphics are themed in matchbox -# theme files located in ../matchbox/* +# theme files located in ../matchbox/ # # Only change is setting the button spacing to 5 # pixels. Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkpaned.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtkpaned.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkpaned.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -9,8 +9,8 @@ style "osso-paned" = "osso-logical-colors" { - bg[NORMAL] = "PaintedBackgrdColor" - bg[PRELIGHT] = "PaintedBackgrdColor" + bg[NORMAL] = @PaintedBackgrdColor + bg[PRELIGHT] = @PaintedBackgrdColor GtkPaned::handle_size = 10 engine "sapwood" Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkprogressbar.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtkprogressbar.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkprogressbar.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -11,8 +11,8 @@ GtkProgressBar::xspacing = 5 GtkProgressBar::yspacing = 5 - fg[NORMAL] = "ProgressTextColor1" - fg[PRELIGHT] = "ProgressTextColor2" + fg[NORMAL] = @ProgressTextColor1 + fg[PRELIGHT] = @ProgressTextColor2 engine "sapwood" { Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/gtktreeview.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -3,8 +3,8 @@ style "osso-listview" = "osso-logical-colors" { - text[ACTIVE] = "DefaultTextColor" - text[SELECTED] = "DefaultTextColor" + text[ACTIVE] = @DefaultTextColor + text[SELECTED] = @DefaultTextColor GtkTreeView::expander-size = 0 GtkTreeView::vertical-separator = 2 Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonbreadcrumbbutton.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/hildonbreadcrumbbutton.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonbreadcrumbbutton.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -43,7 +43,7 @@ xthickness = 0 ythickness = 0 - fg[INSENSITIVE] = "DefaultTextColor" + fg[INSENSITIVE] = @DefaultTextColor engine "sapwood" { Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonhome.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/hildonhome.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonhome.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -24,11 +24,11 @@ GtkWidget::focus-line-width = 4 # Normal state border - fg[NORMAL] = "HomeFrameNormal" + fg[NORMAL] = @HomeFrameNormal # Conflicting state border - fg[PRELIGHT] = "HomeFrameReject" + fg[PRELIGHT] = @HomeFrameReject # Resize border - fg[ACTIVE] = "HomeFrameResize" + fg[ACTIVE] = @HomeFrameResize } Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -60,9 +60,9 @@ #common control buttons style "osso-input-method-side-button" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" - fg[ACTIVE] = "VKBButtonTextColor" - fg[PRELIGHT] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor + fg[ACTIVE] = @VKBButtonTextColor + fg[PRELIGHT] = @VKBButtonTextColor engine "sapwood" { @@ -118,9 +118,9 @@ #common control toggle buttons style "osso-input-method-side-toggle-button" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" - fg[ACTIVE] = "VKBButtonTextColor" - fg[PRELIGHT] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor + fg[ACTIVE] = @VKBButtonTextColor + fg[PRELIGHT] = @VKBButtonTextColor engine "sapwood" { @@ -159,7 +159,7 @@ #ordinary keys in vkb and special character view style "osso-input-method-vkb-key" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor GtkButton::child_spacing = 0 engine "sapwood" @@ -205,7 +205,7 @@ #accent dead keys in vkb style "osso-input-method-accent-key" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor engine "sapwood" { @@ -346,14 +346,14 @@ #hwr area mixmode background color style "osso-input-method-hwr-area-mixmode-background" = "osso-logical-colors" { - bg[NORMAL] = "HWRAlphaBackgrdColor" + bg[NORMAL] = @HWRAlphaBackgrdColor } widget "*.hildonhwrarea_mix" style "osso-input-method-hwr-area-mixmode-background" #hwr area punctuationmode background color style "osso-input-method-hwr-area-puncmode-background" = "osso-logical-colors" { - bg[NORMAL] = "HWRPunctBackgrdColor" + bg[NORMAL] = @HWRPunctBackgrdColor } widget "*.hildonhwrarea_pun" style "osso-input-method-hwr-area-puncmode-background" @@ -506,7 +506,7 @@ #finger keyboard input keys style "osso-input-method-fkb-key" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor GtkButton::child_spacing = 0 engine "sapwood" @@ -599,7 +599,7 @@ #accent dead keys in fkb style "osso-input-method-fkb-accent-key" = "osso-logical-colors" { - fg[NORMAL] = "VKBButtonTextColor" + fg[NORMAL] = @VKBButtonTextColor engine "sapwood" { Modified: projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc =================================================================== --- projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc 2007-03-16 13:15:26 UTC (rev 10606) +++ projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc 2007-03-16 13:23:02 UTC (rev 10607) @@ -7,68 +7,68 @@ ############################## style "osso-logical-colors" { - color["DefaultTextColor"] = "@DefaultTextColor@" - color["EmpTextColor"] = "@EmpTextColor@" - color["PaintedDefaultTextColor"] = "@PaintedDefaultTextColor@" - color["DisabledTextColor"] = "@DisabledTextColor@" - color["ProgressTextColor1"] = "@ProgressTextColor1@" - color["ProgressTextColor2"] = "@ProgressTextColor2@" - color["SecondaryTextColor"] = "@SecondaryTextColor@" - color["TitleTextColor"] = "@TitleTextColor@" - color["DialogTitleTextColor"] = "@DialogTitleTextColor@" + color["DefaultTextColor"] = @@DefaultTextColor@ + color["EmpTextColor"] = @@EmpTextColor@ + color["PaintedDefaultTextColor"] = @@PaintedDefaultTextColor@ + color["DisabledTextColor"] = @@DisabledTextColor@ + color["ProgressTextColor1"] = @@ProgressTextColor1@ + color["ProgressTextColor2"] = @@ProgressTextColor2@ + color["SecondaryTextColor"] = @@SecondaryTextColor@ + color["TitleTextColor"] = @@TitleTextColor@ + color["DialogTitleTextColor"] = @@DialogTitleTextColor@ - color["ClearButtonTextColor"] = "@ClearButtonTextColor@" - color["MemButtonTextColor"] = "@MemButtonTextColor@" + color["ClearButtonTextColor"] = @@ClearButtonTextColor@ + color["MemButtonTextColor"] = @@MemButtonTextColor@ - color["HWRAlphaTextColor"] = "@HWRAlphaTextColor@" - color["HWRNumberTextColor"] = "@HWRNumberTextColor@" - color["HWRDimmedTextColor"] = "@HWRDimmedTextColor@" - color["HWRIllegalTextColor"] = "@HWRIllegalTextColor@" + color["HWRAlphaTextColor"] = @@HWRAlphaTextColor@ + color["HWRNumberTextColor"] = @@HWRNumberTextColor@ + color["HWRDimmedTextColor"] = @@HWRDimmedTextColor@ + color["HWRIllegalTextColor"] = @@HWRIllegalTextColor@ - color["WebTextColor"] = "@WebTextColor@" - color["DimWebTextColor"] = "@DimWebTextColor@" - color["LinkTextColor"] = "@LinkTextColor@" - color["VisitedLinkTextColor"] = "@VisitedLinkTextColor@" + color["WebTextColor"] = @@WebTextColor@ + color["DimWebTextColor"] = @@DimWebTextColor@ + color["LinkTextColor"] = @@LinkTextColor@ + color["VisitedLinkTextColor"] = @@VisitedLinkTextColor@ - color["DefaultBackgrdColor"] = "@DefaultBackgrdColor@" - color["PaintedBackgrdColor"] = "@PaintedBackgrdColor@" - color["ImageBackgrdColor"] = "@ImageBackgrdColor@" + color["DefaultBackgrdColor"] = @@DefaultBackgrdColor@ + color["PaintedBackgrdColor"] = @@PaintedBackgrdColor@ + color["ImageBackgrdColor"] = @@ImageBackgrdColor@ - color["InputBackgrdColor"] = "@InputBackgrdColor@" - color["HWRAlphaBackgrdColor"] = "@HWRAlphaBackgrdColor@" - color["HWRPunctBackgrdColor"] = "@HWRPunctBackgrdColor@" - color["HWRContBackgrdColor"] = "@HWRContBackgrdColor@" - color["HWRHyphBackgrdColor"] = "@HWRHyphBackgrdColor@" + color["InputBackgrdColor"] = @@InputBackgrdColor@ + color["HWRAlphaBackgrdColor"] = @@HWRAlphaBackgrdColor@ + color["HWRPunctBackgrdColor"] = @@HWRPunctBackgrdColor@ + color["HWRContBackgrdColor"] = @@HWRContBackgrdColor@ + color["HWRHyphBackgrdColor"] = @@HWRHyphBackgrdColor@ - color["WebBackgrdColor"] = "@WebBackgrdColor@" + color["WebBackgrdColor"] = @@WebBackgrdColor@ - color["ImageBorderColor"] = "@ImageBorderColor@" - color["FocusColor"] = "@FocusColor@" - color["SelectionColor"] = "@SelectionColor@" + color["ImageBorderColor"] = @@ImageBorderColor@ + color["FocusColor"] = @@FocusColor@ + color["SelectionColor"] = @@SelectionColor@ - color["MapTopLeftColor"] = "@MapTopLeftColor@" - color["MapBottomRightColor"] = "@MapBottomRightColor@" - color["ClockHandColor"] = "@ClockHandColor@" + color["MapTopLeftColor"] = @@MapTopLeftColor@ + color["MapBottomRightColor"] = @@MapBottomRightColor@ + color["ClockHandColor"] = @@ClockHandColor@ - color["HWRBaselineColor"] = "@HWRBaselineColor@" - color["HWRRecogColor"] = "@HWRRecogColor@" - color["HWRUserColor"] = "@HWRUserColor@" - color["HWRUserBackgrdColor"] = "@HWRUserBackgrdColor@" - color["HWRHintColor"] = "@HWRHintColor@" + color["HWRBaselineColor"] = @@HWRBaselineColor@ + color["HWRRecogColor"] = @@HWRRecogColor@ + color["HWRUserColor"] = @@HWRUserColor@ + color["HWRUserBackgrdColor"] = @@HWRUserBackgrdColor@ + color["HWRHintColor"] = @@HWRHintColor@ - color["ChatUserNameColor"] = "@ChatUserNameColor@" - color["ChatParticipantNameColor"]= "@ChatParticipantNameColor@" - color["ChatEventColor"] = "@ChatEventColor@" + color["ChatUserNameColor"] = @@ChatUserNameColor@ + color["ChatParticipantNameColor"]= @@ChatParticipantNameColor@ + color["ChatEventColor"] = @@ChatEventColor@ - color["CallHeaderBlockBgColor"] = "@CallHeaderBlockBgColor@" - color["CallHeaderOnHoldBlockBgColor"] = "@CallHeaderOnHoldBlockBgColor@" + color["CallHeaderBlockBgColor"] = @@CallHeaderBlockBgColor@ + color["CallHeaderOnHoldBlockBgColor"] = @@CallHeaderOnHoldBlockBgColor@ - color["HomeFrameNormal"] = "@HomeFrameNormal@" - color["HomeFrameResize"] = "@HomeFrameResize@" - color["HomeFrameReject"] = "@HomeFrameReject@" + color["HomeFrameNormal"] = @@HomeFrameNormal@ + color["HomeFrameResize"] = @@HomeFrameResize@ + color["HomeFrameReject"] = @@HomeFrameReject@ - color["MenuInfoTextColor"] = "@MenuInfoTextColor@" - color["VKBButtonTextColor"] = "@VKBButtonTextColor@" + color["MenuInfoTextColor"] = @@MenuInfoTextColor@ + color["VKBButtonTextColor"] = @@VKBButtonTextColor@ } ##############################
- Previous message: [maemo-commits] r10606 - projects/haf/hafbuildbot
- Next message: [maemo-commits] r10608 - projects/haf/hafbuildbot
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]