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

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-08-27 16:36:04 +0300 (Mon, 27 Aug 2007)
New Revision: 13416

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/ossortc.rc
Log:
Fixes for the new chavo theming. Fixes NB#66801.


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-27 11:53:08 UTC (rev 13415)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-27 13:36:04 UTC (rev 13416)
@@ -1,5 +1,9 @@
 2007-08-27  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
+	* rc/ossortc.rc: Fixes for the new chavo theming. Fixes NB#66801.
+
+2007-08-27  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
 	* data/layout.txt: Fixing the search applet alpha.
 
 2007-08-27  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/ossortc.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/ossortc.rc	2007-08-27 11:53:08 UTC (rev 13415)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/ossortc.rc	2007-08-27 13:36:04 UTC (rev 13416)
@@ -1,52 +1,112 @@
 # Copyright Nokia Corporation 2007
 # Licensed under Creative Commons Attribution-ShareAlike 2.5 license
 
-style "osso-rtc-button"
+style "osso-rtc-video-out-frame"
 {
+  xthickness = 2
+  ythickness = 2
+  
   engine "sapwood"
     {
+      image
+        {
+	  function = SHADOW
+	  file     = "../images/qgn_plat_voip_video_out_frame.png"
+	  border   = { 105, 105, 86, 86 }
+	}
+    }
+}
+
+style "osso-rtc-video-in-frame"
+{
+  xthickness = 2
+  ythickness = 2
+  
+  engine "sapwood"
+    {
+      image
+        {
+	  function = SHADOW
+	  file     = "../images/qgn_plat_voip_video_in_frame.png"
+	  border   = { 189, 189, 155, 155 }
+	}
+    }
+}
+
+style "osso-rtc-button-voip"
+{
+  engine "sapwood"
+    {
         image {
             function = FOCUS
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_voip_pressed.png"
-                border   = { 38, 38, 0, 0 }
+                border   = { 35, 35, 35, 35 }
         }
         image {
             function = FOCUS
                 file     = "../images/qgn_plat_button_voip_focused.png"
-                border   = { 38, 38, 0, 0 }
+                border   = { 35, 35, 35, 35 }
         }
         image {
             function = BOX
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_voip_pressed.png"
-                border   = { 38, 38, 0, 0 }
+                border   = { 35, 35, 35, 35 }
         }
         image {
             function = BOX
                 state    = INSENSITIVE
                 file     = "../images/qgn_plat_button_voip_disabled.png"
-                border   = { 38, 38, 0, 0 }
+                border   = { 35, 35, 35, 35 }
         }
         image {
             function = BOX
                 file     = "../images/qgn_plat_button_voip_normal.png"
-                border   = { 38, 38, 0, 0 }
+                border   = { 35, 35, 35, 35 }
         }
     }
 }
 
+style "osso-rtc-button-contact"
+{
+  engine "sapwood"
+    {
+        image {
+            function = FOCUS
+                state    = ACTIVE
+                file     = "../images/qgn_plat_button_contact_pressed.png"
+                border   = { 24, 24, 0, 0 }
+        }
+        image {
+            function = FOCUS
+                file     = "../images/qgn_plat_button_contact_focused.png"
+                border   = { 24, 24, 0, 0 }
+        }
+        image {
+            function = BOX
+                state    = ACTIVE
+                file     = "../images/qgn_plat_button_contact_pressed.png"
+                border   = { 24, 24, 0, 0 }
+        }
+        image {
+            function = BOX
+                state    = INSENSITIVE
+                file     = "../images/qgn_plat_button_contact_disabled.png"
+                border   = { 24, 24, 0, 0 }
+        }
+        image {
+            function = BOX
+                file     = "../images/qgn_plat_button_contact_normal.png"
+                border   = { 24, 24, 0, 0 }
+        }
+    }
+}
 
-widget "*.ChavoButton" style "osso-rtc-button"
 
-style "osso-ChavoSystemFont" {
-    font_name = "Nokia Sans 22.11"
-}
-widget "*.ChavoLabel" style "osso-ChavoSystemFont"
+widget "*.rtcom-voip-button" style "osso-rtc-button-voip"
+widget "*.rtcom-contact-button" style "osso-rtc-button-contact"
 
+widget "*.rtcom-video-out-frame" style "osso-rtc-video-out-frame"
+widget "*.rtcom-video-in-frame" style "osso-rtc-video-in-frame"
 
-style "osso-ChavoButtonFont" {
-    font_name = "Nokia Sans 30.15"
-}
-widget "*.ChavoButton.GtkLabel" style "osso-ChavoButtonFont"
-