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

[From: subversion at stage.maemo.org]

Author: tigert
Date: 2007-06-20 14:16:52 +0300 (Wed, 20 Jun 2007)
New Revision: 12403

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
Log:
applied button text colors to gtkrc

Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-20 09:51:14 UTC (rev 12402)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-20 11:16:52 UTC (rev 12403)
@@ -1,3 +1,7 @@
+2007-06-20  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
+
+	* rc/gtkbutton.rc: Applied colors to gtkbutton, seems to work.	
+
 2007-06-19  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
 
 	* rc/themespecificgtk.rc: Added colors here too (oops) - still need to 

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-20 09:51:14 UTC (rev 12402)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-20 11:16:52 UTC (rev 12403)
@@ -1,6 +1,22 @@
 # Copyright Nokia Corporation 2007
 # Licensed under Creative Commons Attribution-ShareAlike 2.5 license
 
+# Normal Button text color
+style "osso-button-text-color" = "osso-color-themeing" {
+
+    fg[NORMAL] = @ButtonTextColor
+    fg[PRELIGHT] = @ButtonTextColor
+    fg[ACTIVE] = @ButtonTextPressedColor
+    fg[SELECTED] = @ButtonTextPressedColor
+    fg[INSENSITIVE] = @ButtonTextDisabledColor
+    text[NORMAL] = @ButtonTextColor
+    text[PRELIGHT] = @ButtonTextColor
+    text[ACTIVE] = @ButtonTextPressedColor
+    text[SELECTED] = @ButtonTextPressedColor
+    text[INSENSITIVE] = @ButtonTextDisabledColor
+
+}
+
 # Normal Button styles:
 style "osso-button" {
 
@@ -99,7 +115,10 @@
 widget_class "*.GtkButton.GtkLabel" style "osso-ButtonFont"
 widget_class "*.GtkToggleButton.GtkLabel" style "osso-ButtonFont"
 
-# Button text color
+widget_class "*.GtkButton.GtkLabel" style "osso-button-text-color"
+widget_class "*.GtkToggleButton.GtkLabel" style "osso-button-text-color"
+
+# Dialog Button text color
 style "osso-dialogbutton-text-color" = "osso-color-themeing" {
 
     fg[NORMAL] = @DialogButtonTextColor
@@ -303,5 +322,3 @@
 
 widget_class "*.GtkHButtonBox.GtkButton.GtkLabel" style "osso-dialogbutton-text-color"
 widget_class "*.GtkHButtonBox.GtkToggleButton.GtkLabel" style "osso-dialogbutton-text-color"
-
-