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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-02-14 11:31:24 +0200 (Wed, 14 Feb 2007)
New Revision: 9841

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

        Drop hildon-like properties, arrow-width and arrow-height for
        arrow-size, change border parameters for GtkToggle button, remove
        FOCUS rules.

        Once we get the graphics update we should re-enable the ARROW rule
        and the combobox should look ok again.




Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-02-14 09:05:02 UTC (rev 9840)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-02-14 09:31:24 UTC (rev 9841)
@@ -1,3 +1,14 @@
+2007-02-14  Xan Lopez  <xan.lopez at nokia.com>
+
+	* rc/gtkcombobox.rc:
+	
+	Drop hildon-like properties, arrow-width and arrow-height for
+	arrow-size, change border parameters for GtkToggle button, remove
+	FOCUS rules.
+
+	Once we get the graphics update we should re-enable the ARROW rule
+	and the combobox should look ok again.
+
 2007-02-13  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* NEWS:

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc	2007-02-14 09:05:02 UTC (rev 9840)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/gtkcombobox.rc	2007-02-14 09:31:24 UTC (rev 9841)
@@ -1,7 +1,7 @@
 ####################################################  
 # GTK COMBO BOX (ComboBox and ComboBoxEntry)
 #
-# Copyright 2004, 2005, 2006 Nokia Oyj
+# Copyright 2004, 2005, 2006, 2007 Nokia Oyj
 #
 # This file has the themeing of comboboxes.
 #
@@ -26,12 +26,10 @@
   GtkWidget::focus-line-width = 0
   GtkWidget::focus-padding = 0
   GtkWidget::focus-line-pattern = "\0\0\0\0\0\0\0\0"
-  GtkComboBox::hildonlike = 1
-  GtkComboBox::arrow-width = 26
-  GtkComboBox::arrow-height = 30
   GtkComboBox::minimum-width = 150
   GtkComboBox::autodimmed_button = 1
   GtkComboBox::appears-as-list = 1
+  GtkComboBox::arrow-size = 30
 
 }
 class "GtkComboBox" style "osso-combobox-base"
@@ -43,7 +41,6 @@
 ###################################################
 
 style "osso-combobox-button" {
-  GtkToggleButton::hildonlike = 1
     engine "sapwood" {
 
         image {
@@ -53,20 +50,17 @@
             function = BOX
             file = "../images/qgn_plat_combobox_button_disabled.png"
             state = INSENSITIVE
-            border = { 0, 0, 0, 0 }
             stretch = TRUE
         }
         image {
             function = BOX
             file = "../images/qgn_plat_combobox_button_pressed.png"
             state = ACTIVE
-            border = { 0, 0, 0, 0 }
             stretch = TRUE
         }
         image {
             function = BOX
             file = "../images/qgn_plat_combobox_button_normal.png"
-            border = { 0, 0, 0, 0 }
             stretch = TRUE
         }
         image {
@@ -78,8 +72,6 @@
 
 
 style "osso-combobox-frame" {
-
-   # GtkFrame::hildonlike = 1
     ythickness = 1
 
     engine "sapwood" {
@@ -164,36 +156,23 @@
 
 	engine "sapwood" {
 		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_down_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_down_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_down_disabled.png"
 			state = INSENSITIVE
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_down_pressed.png"
 			state = ACTIVE
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_down_normal.png"
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {
@@ -209,36 +188,23 @@
 
 	engine "sapwood" {
 		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_up_pressed.png"
-			state = ACTIVE
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_listbox_arrow_up_normal.png"
-			border = { 0, 0, 0, 0 }
-			stretch = TRUE
-		}
-		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_up_disabled.png"
 			state = INSENSITIVE
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_up_pressed.png"
 			state = ACTIVE
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {
 			function = BOX
 			file = "../images/qgn_plat_listbox_arrow_up_normal.png"
-			border = { 0, 0, 0, 0 }
+			border = { 0, 1, 1, 2 }
 			stretch = TRUE
 		}
 		image {