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

[From: subversion at stage.maemo.org]

Author: tjunnone
Date: 2007-05-11 11:06:37 +0300 (Fri, 11 May 2007)
New Revision: 11590

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/hildonkeyboard.rc
   projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
Log:
* rc/hildonkeyboard.rc:
Updated Input Method theming to use current class names.
Added a scaling version of the word completion widget.

* rc/themespecificgtk.rc, data/layout.txt: Added a few IM colors


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-05-10 15:34:05 UTC (rev 11589)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-05-11 08:06:37 UTC (rev 11590)
@@ -1,3 +1,11 @@
+2007-05-11  Tomas Junnonen  <tomas.junnonen at nokia.com>
+
+	* rc/hildonkeyboard.rc:
+	Updated Input Method theming to use current class names.
+	Added a scaling version of the word completion widget.
+
+	* rc/themespecificgtk.rc, data/layout.txt: Added a few IM colors
+	
 2007-05-10  Xan Lopez  <xan.lopez at nokia.com>
 
 	* rc/base.rc (gtk-icon-sizes): add binding for Esc key on GtkMenu

Modified: projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-05-10 15:34:05 UTC (rev 11589)
+++ projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-05-11 08:06:37 UTC (rev 11590)
@@ -23,7 +23,7 @@
 ClearButtonTextColor=7942,283,30,16
 MemButtonTextColor=7942,298,30,16
 
-# HW recognition
+# Input Method
 HWRAlphaTextColor=7691,358,30,16
 HWRNumberTextColor=7691,373,30,16
 HWRDimmedTextColor=7691,388,30,16
@@ -38,6 +38,10 @@
 HWRUserColor=7691,523,30,16
 HWRUserBackgrdColor=7691,538,30,16
 HWRHintColor=7691,553,30,16
+VKBButtonTextColor=7691,583,30,16
+WCFrameColor=7691,598,30,16
+WCIndicatorColor=7691,613,30,16
+WCIndicatorFNColor=7691,628,30,16
 
 # Web browser
 WebTextColor=7942,43,30,16
@@ -74,9 +78,6 @@
 #HomeFrameResize=7960,768,30,10
 #HomeFrameReject=7960,780,30,10
 
-# Virtual keyboard
-VKBButtonTextColor=7691,583,30,16
-
 #new ones, check!
 HWRWhiteTextColor=7691,568,30,16
 TreeViewOddRowColor=7691,238,30,16

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc	2007-05-10 15:34:05 UTC (rev 11589)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonkeyboard.rc	2007-05-11 08:06:37 UTC (rev 11590)
@@ -22,7 +22,7 @@
     }
   }
 }
-class "HildonIMKeyboard" style "osso-input-method-frame"
+class "HildonIMUI" style "osso-input-method-frame"
 
 #close buttons
 style "osso-input-method-side-close-button"
@@ -634,3 +634,51 @@
     }
 }
 widget "*osso-im-fkb-accent-key" style "osso-input-method-fkb-accent-key"
+
+style "hildon-input-method-wc-frame" = "osso-logical-colors"
+{
+    bg[NORMAL] = @WCFrameColor
+}
+widget "*.hildon-input-method-wc-frame" style "hildon-input-method-wc-frame"
+
+style "hildon-input-method-wc-indicator" = "osso-logical-colors"
+{
+    font_name = "Nokia Sans 24"
+    fg[NORMAL] = @WCIndicatorColor
+}
+widget "*.hildon-input-method-wc-indicator" style "hildon-input-method-wc-indicator"
+
+style "hildon-input-method-wc-finger-candidates"
+{
+    engine "sapwood"
+    {
+        image
+        {
+            function = BOX
+            state = NORMAL
+            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_normal.png"
+            border = { 5, 5, 5, 5 }
+        }
+        image
+        {
+            function = BOX
+            state = PRELIGHT
+            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_normal.png"
+            border = { 5, 5, 5, 5 }
+        }
+        image
+        {
+            function = BOX
+            state = ACTIVE
+            file = "../images/qgn_plat_inputmet_button_keyboard_word_compl_pressed.png"
+            border = { 5, 5, 5, 5 }
+        }
+    }
+}
+widget "*hildon-input-method-finger-wc.hildon-wc-candidate-button" style "hildon-input-method-wc-finger-candidates"
+
+style "hildon-input-method-wc-finger-candidate-label"
+{
+    font_name = "Nokia Sans 24"
+}
+widget "*hildon-input-method-finger-wc.hildon-wc-candidate-button.GtkLabel" style "hildon-input-method-wc-finger-candidate-label"

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-05-10 15:34:05 UTC (rev 11589)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-05-11 08:06:37 UTC (rev 11590)
@@ -64,7 +64,10 @@
 	color["CallHeaderOnHoldBlockBgColor"] = "@CallHeaderOnHoldBlockBgColor@"
 	
 	color["MenuInfoTextColor"]       = "@MenuInfoTextColor@"
-        color["VKBButtonTextColor"]      = "@VKBButtonTextColor@"
+	color["VKBButtonTextColor"]      = "@VKBButtonTextColor@"
+	color["WCFrameColor"]            = "@WCFrameColor@"
+	color["WCIndicatorColor"]        = "@WCIndicatorColor@"
+	color["WCIndicatorFNColor"]      = "@WCIndicatorFNColor@"
 }
 
 ##############################