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

[From: subversion at stage.maemo.org]

Author: tigert
Date: 2007-06-12 11:29:35 +0300 (Tue, 12 Jun 2007)
New Revision: 12246

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
   projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
   projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
Log:
dialogbutton color + some new logical colors

Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-12 06:45:37 UTC (rev 12245)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-12 08:29:35 UTC (rev 12246)
@@ -1,3 +1,17 @@
+2007-06-12  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
+
+	* data/layout.txt: Added 3 new logical colors:
+	DialogButtonTextColor=7942,568,30,16
+	PluginMenuTextColor=7942,583,30,16
+	HomeTitleTextColor=7942,598,30,16
+
+	* rc/themespecificgtk.rc: added here:
+        color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
+        color["PluginMenuTextColor"]		= "@PluginMenuTextColor@"
+        color["HomeTitleTextColor"]		= "@HomeTitleTextColor@"
+
+	* rc/gtkbutton.rc: added color def's here, inherited the color style.
+
 2007-06-11  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* rc/gtksettings.rc: Disabling the gtk animations.

Modified: projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-06-12 06:45:37 UTC (rev 12245)
+++ projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-06-12 08:29:35 UTC (rev 12246)
@@ -96,6 +96,12 @@
 TaskSwitcherNotificationSeparatorColor=7942,523,30,16
 ThumbMenuSeparatorColor=7942,538,30,16
 
+#new for now
+DialogButtonTextColor=7942,568,30,16
+PluginMenuTextColor=7942,583,30,16
+HomeTitleTextColor=7942,598,30,16
+
+
 [Elements]
 qgn_plat_application_frame_bottom.png=3271,619,50,24
 qgn_plat_application_frame_left.png=3271,223,12,2

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-12 06:45:37 UTC (rev 12245)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-12 08:29:35 UTC (rev 12246)
@@ -100,7 +100,7 @@
 widget_class "*.GtkToggleButton.GtkLabel" style "osso-ButtonFont"
 
 #Style for Dialog buttons
-style "osso-dialogbutton" {
+style "osso-dialogbutton" = "osso-logical-colors" {
 
   # The spec specifies the padding for the button and label. Button
   # padding is specified in sapwoods. The following are for labels.
@@ -111,6 +111,17 @@
   # 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" {
 
     #######################

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-06-12 06:45:37 UTC (rev 12245)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-06-12 08:29:35 UTC (rev 12246)
@@ -94,6 +94,9 @@
         color["TaskSwitcherNotificationSeparatorColor"]	= "@TaskSwitcherNotificationSeparatorColor@"
         color["ThumbMenuSeparatorColor"]		= "@ThumbMenuSeparatorColor@"
 
+        color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
+        color["PluginMenuTextColor"]		= "@PluginMenuTextColor@"
+        color["HomeTitleTextColor"]		= "@HomeTitleTextColor@"
 }
 
 ##############################