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

[From: subversion at stage.maemo.org]

Author: tigert
Date: 2007-06-14 00:53:42 +0300 (Thu, 14 Jun 2007)
New Revision: 12284

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:
new colors for dialog buttons

Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-13 16:17:30 UTC (rev 12283)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-06-13 21:53:42 UTC (rev 12284)
@@ -1,3 +1,11 @@
+2007-06-14  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
+
+	* Added 3 new logical colors for dialog buttons:
+	
+	DialogButtonTextColor
+	DialogButtonTextPressedColor
+	DialogButtonTextDisabledColor
+
 2007-06-13  Xan Lopez  <xan.lopez at nokia.com>
 
 	* rc/hildonbreadcrumbtrail.rc: fine tune border values for end graphics.

Modified: projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-06-13 16:17:30 UTC (rev 12283)
+++ projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-06-13 21:53:42 UTC (rev 12284)
@@ -97,11 +97,15 @@
 ThumbMenuSeparatorColor=7942,538,30,16
 
 #new for now
-DialogButtonTextColor=7942,568,30,16
-PluginMenuTextColor=7942,583,30,16
-HomeTitleTextColor=7942,598,30,16
+PluginMenuTextColor=7942,568,30,16
+HomeTitleTextColor=7942,583,30,16
 
+#new colors for dialog buttons, various states
+DialogButtonTextColor=7942,598,30,16
+DialogButtonTextPressedColor=7942,613,30,16
+DialogButtonTextDisabledColor=7942,628,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-13 16:17:30 UTC (rev 12283)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkbutton.rc	2007-06-13 21:53:42 UTC (rev 12284)
@@ -104,14 +104,15 @@
 
     fg[NORMAL] = @DialogButtonTextColor
     fg[PRELIGHT] = @DialogButtonTextColor
-    fg[ACTIVE] = @DialogButtonTextColor
-    fg[SELECTED] = @DialogButtonTextColor
-    fg[INSENSITIVE] = @DialogButtonTextColor
+    fg[ACTIVE] = @DialogButtonTextPressedColor
+    fg[SELECTED] = @DialogButtonTextPressedColor
+    fg[INSENSITIVE] = @DialogButtonTextDisabledColor
     text[NORMAL] = @DialogButtonTextColor
     text[PRELIGHT] = @DialogButtonTextColor
-    text[ACTIVE] = @DialogButtonTextColor
-    text[SELECTED] = @DialogButtonTextColor
-    text[INSENSITIVE] = @DialogButtonTextColor
+    text[ACTIVE] = @DialogButtonTextPressedColor
+    text[SELECTED] = @DialogButtonTextPressedColor
+    text[INSENSITIVE] = @DialogButtonTextDisabledColor
+
 }
 
 #Style for Dialog buttons

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-06-13 16:17:30 UTC (rev 12283)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-06-13 21:53:42 UTC (rev 12284)
@@ -94,9 +94,13 @@
         color["TaskSwitcherNotificationSeparatorColor"]	= "@TaskSwitcherNotificationSeparatorColor@"
         color["ThumbMenuSeparatorColor"]		= "@ThumbMenuSeparatorColor@"
 
-        color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
         color["PluginMenuTextColor"]		= "@PluginMenuTextColor@"
         color["HomeTitleTextColor"]		= "@HomeTitleTextColor@"
+
+        color["DialogButtonTextColor"]		= "@DialogButtonTextColor@"
+        color["DialogButtonTextPressedColor"]		= "@DialogButtonTextPressedColor@"
+        color["DialogButtonTextDisabledColor"]		= "@DialogButtonTextDisabledColor@"
+
 }
 
 ##############################