[maemo-commits] [maemo-commits] r12261 - in projects/haf/trunk/hildon-theme-layout-4: . rc

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-06-13 11:12:57 +0300 (Wed, 13 Jun 2007)
New Revision: 12261

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
Log:
Adding new style "osso-dialogbutton-text-color" so that the actual dialog button colors get applied to GTkLabel inside the dialog buttons.


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-12 19:02:20 UTC (rev 12260)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-13 08:12:57 UTC (rev 12261)
@@ -1,3 +1,9 @@
+2007-06-13  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* rc/gtkbutton.rc: Adding new style "osso-dialogbutton-text-color" so that
+	the actual dialog button colors get applied to GTkLabel inside the dialog
+	buttons.
+
 2007-06-12  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
 
 	* data/layout.txt: Added 3 new logical colors:
@@ -6,9 +12,9 @@
 	HomeTitleTextColor=7942,598,30,16
 
 	* rc/themespecificgtk.rc: added here:
-        color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
-        color["PluginMenuTextColor"]		= "@PluginMenuTextColor@"
-        color["HomeTitleTextColor"]		= "@HomeTitleTextColor@"
+	color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
+	color["PluginMenuTextColor"]		= "@PluginMenuTextColor@"	
+	color["HomeTitleTextColor"]		= "@HomeTitleTextColor@"
 
 	* rc/gtkbutton.rc: added color def's here, inherited the color style.
 

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-12 19:02:20 UTC (rev 12260)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-13 08:12:57 UTC (rev 12261)
@@ -99,8 +99,23 @@
 widget_class "*.GtkButton.GtkLabel" style "osso-ButtonFont"
 widget_class "*.GtkToggleButton.GtkLabel" style "osso-ButtonFont"
 
+# Button text color
+style "osso-dialogbutton-text-color" = "osso-color-themeing" {
+
+    fg[NORMAL] = @DialogButtonTextColor
+    fg[PRELIGHT] = @DialogButtonTextColor
+    fg[ACTIVE] = @DialogButtonTextColor
+    fg[SELECTED] = @DialogButtonTextColor
+    fg[INSENSITIVE] = @DialogButtonTextColor
+    text[NORMAL] = @DialogButtonTextColor
+    text[PRELIGHT] = @DialogButtonTextColor
+    text[ACTIVE] = @DialogButtonTextColor
+    text[SELECTED] = @DialogButtonTextColor
+    text[INSENSITIVE] = @DialogButtonTextColor
+}
+
 #Style for Dialog buttons
-style "osso-dialogbutton" = "osso-logical-colors" {
+style "osso-dialogbutton" {
 
   # The spec specifies the padding for the button and label. Button
   # padding is specified in sapwoods. The following are for labels.
@@ -111,17 +126,6 @@
   # pixels is added automagically somewhere in code
   GtkButton::minimum_width  = 90
 
-  fg[NORMAL] = @DialogButtonTextColor
-  fg[PRELIGHT] = @DialogButtonTextColor
-  fg[ACTIVE] = @DialogButtonTextColor
-  fg[SELECTED] = @DialogButtonTextColor
-  fg[INSENSITIVE] = @DialogButtonTextColor
-  text[NORMAL] = @DialogButtonTextColor
-  text[PRELIGHT] = @DialogButtonTextColor
-  text[ACTIVE] = @DialogButtonTextColor
-  text[SELECTED] = @DialogButtonTextColor
-  text[INSENSITIVE] = @DialogButtonTextColor
-
   engine "sapwood" {
 
     #######################
@@ -295,3 +299,8 @@
   }
 }
 widget_class "*.GtkHButtonBox.GtkButton" style "osso-dialogbutton"
+
+widget_class "*.GtkHButtonBox.GtkButton.GtkLabel" style "osso-dialogbutton-text-color"
+widget_class "*.GtkHButtonBox.GtkToggleButton.GtkLabel" style "osso-dialogbutton-text-color"
+
+