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

Wed Apr 4 15:04:16 EEST 2007

Author: xan
Date: 2007-04-04 15:04:16 +0300 (Wed, 04 Apr 2007)
New Revision: 10960

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc
Log:
Fix docs.

	* rc/gtkcombobox.rc: Update to use new graphics. Still missing the
	arrows pointing up.


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-04-04 11:28:36 UTC (rev 10959)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-04-04 12:04:16 UTC (rev 10960)
@@ -1,3 +1,8 @@
+2007-04-04  Xan Lopez  <xan.lopez at nokia.com>
+
+	* rc/gtkcombobox.rc: Update to use new graphics. Still missing the
+	arrows pointing up.
+
 2007-04-03  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	[0.5.0-1 release]

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc	2007-04-04 11:28:36 UTC (rev 10959)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc	2007-04-04 12:04:16 UTC (rev 10960)
@@ -28,7 +28,7 @@
   GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
   GtkComboBox::autodimmed_button = 1
   GtkComboBox::appears-as-list = 1
-  GtkComboBox::arrow-size = 30
+  GtkComboBox::arrow-size = 26
 
 }
 class "GtkComboBox" style "osso-combobox-base"
@@ -47,22 +47,16 @@
         }
         image {
             function = BOX
-            file = "../images/qgn_plat_combobox_button_disabled.png"
+            file = "../images/qgn_plat_combobox_frame_right_disabled.png"
             state = INSENSITIVE
-	    border = { 0, 2, 2, 2 }
+	    border = { 0, 4, 4, 4 }
         }
         image {
             function = BOX
-            file = "../images/qgn_plat_combobox_button_pressed.png"
-            state = ACTIVE
-	    border = { 0, 2, 2, 2 }
+            file = "../images/qgn_plat_combobox_frame_right_normal.png"
+	    border = { 0, 4, 4, 4 }
         }
         image {
-            function = BOX
-            file = "../images/qgn_plat_combobox_button_normal.png"
-	    border = { 0, 2, 2, 2 }
-        }
-        image {
             function = TAB
         }
     }
@@ -80,14 +74,14 @@
         }
         image {
             function = SHADOW
-            file = "../images/qgn_plat_combobox_frame_disabled.png"
+            file = "../images/qgn_plat_combobox_frame_left_disabled.png"
             state = INSENSITIVE
-            border = { 2, 0, 2, 2 }
+            border = { 4, 0, 4, 4 }
         }
         image {
             function = SHADOW
-            file = "../images/qgn_plat_combobox_frame_normal.png"
-            border = { 2, 0, 2, 2 }
+            file = "../images/qgn_plat_combobox_frame_left_normal.png"
+            border = { 4, 0, 4, 4 }
         }
     }
 }
@@ -106,21 +100,30 @@
 style "osso-combobox-entry-base" {
 
   GtkEntry::inner-border = { 4, 4, 0, 0 }
-
-  GtkEntry::icon_width = 0
 }
+
 widget_class "*.GtkComboBoxEntry.GtkEntry" style "osso-combobox-entry-base"
 
-# We don't need gtk+ to draw it's arrow. The button drawing is enough for us.
-
 style "osso-combobox-entry-arrow"
 {
-	engine "sapwood" {
-		image {
-			function = ARROW
-		}
-	}
+  engine "sapwood"
+    {
+      image 
+        {
+          function = ARROW
+          state = ACTIVE
+          file = "../images/qgn_plat_combobox_button_pressed.png"
+          stretch = FALSE
+        }
+      image
+        {
+          function = ARROW
+          file = "../images/qgn_plat_combobox_button_normal.png"
+          stretch = FALSE
+        }
+    }
 }
+
 widget_class "*.GtkComboBox.GtkToggleButton.GtkArrow" style "osso-combobox-entry-arrow"
 widget_class "*.GtkComboBoxEntry.GtkToggleButton.GtkArrow" style "osso-combobox-entry-arrow"
 
@@ -133,14 +136,14 @@
         {
 	  function = SHADOW
 	  state    = INSENSITIVE
-  	  file = "../images/qgn_plat_listbox_border_with_icon_disabled.png"
-	  border   = { 1, 0, 1, 2 }
+  	  file = "../images/qgn_plat_combobox_entry_frame_left_disabled.png"
+	  border   = { 4, 0, 4, 4 }
 	}
       image
         {
 	  function = SHADOW
-  	  file = "../images/qgn_plat_listbox_border_with_icon_normal.png"
-	  border   = { 1, 0, 1, 2 }
+  	  file = "../images/qgn_plat_combobox_entry_frame_left_normal.png"
+	  border   = { 4, 0, 4, 4 }
 	}
     }
 }
@@ -155,57 +158,18 @@
 		}
 		image {
 			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_disabled.png"
+			file = "../images/qgn_plat_combobox_entry_frame_right_disabled.png"
 			state = INSENSITIVE
-			border = { 0, 1, 1, 2 }
+			border = { 0, 4, 4, 4 }
 		}
 		image {
 			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_pressed.png"
-			state = ACTIVE
-			border = { 0, 1, 1, 2 }
+			file = "../images/qgn_plat_combobox_entry_frame_right_normal.png"
+			border = { 0, 4, 4, 4 }
 		}
 		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_down_normal.png"
-			border = { 0, 1, 1, 2 }
-		}
-		image {
 			function = TAB
 		}
 	}
 }
 widget_class "*.GtkComboBoxEntry.GtkToggleButton" style "osso-combobox-entry-button-down"
-
-# Different themeing to combobox when it's in a toolbar. In this case the
-# arrow points upwards.
-style "osso-combobox-entry-button-up" {
-
-	engine "sapwood" {
-		image {
-			function = FOCUS
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_disabled.png"
-			state = INSENSITIVE
-			border = { 0, 1, 1, 2 }
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_pressed.png"
-			state = ACTIVE
-			border = { 0, 1, 1, 2 }
-		}
-		image {
-			function = BOX
-			file = "../images/qgn_plat_listbox_arrow_up_normal.png"
-			border = { 0, 1, 1, 2 }
-		}
-		image {
-			function = TAB
-		}
-	}
-
-}
-widget_class "*.GtkToolbar.GtkComboBoxEntry.GtkToggleButton" style "osso-combobox-entry-button-up"


