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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed May 9 12:39:09 EEST 2007 
Author: jobi
Date: 2007-05-09 12:39:07 +0300 (Wed, 09 May 2007)
New Revision: 11538

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

2007-05-09  Johan Bilien  <johan.bilien at nokia.com>

	* rc/hildonnavigator.rc:
	- moved focus and pressed images to bg_pixmaps so that they
	can be applied by the compositing TN instead
	- removed deceased button5



Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-05-09 09:28:05 UTC (rev 11537)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-05-09 09:39:07 UTC (rev 11538)
@@ -1,3 +1,10 @@
+2007-05-09  Johan Bilien  <johan.bilien at nokia.com>
+
+	* rc/hildonnavigator.rc:
+	- moved focus and pressed images to bg_pixmaps so that they
+	can be applied by the compositing TN instead
+	- removed deceased button5
+
 2007-05-09  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
 
 	* data/layout.txt: Moved submenu arrow graphics around to make

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc	2007-05-09 09:28:05 UTC (rev 11537)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc	2007-05-09 09:39:07 UTC (rev 11538)
@@ -2,15 +2,15 @@
 ##############################################
 # Task Navigator Tooltip
 ##############################################
-style "osso-task-navigator-tooltip" 
+style "osso-task-navigator-tooltip"
 {
-    engine "sapwood" 
+    engine "sapwood"
     {
-        image 
+        image
         {
             function = FLAT_BOX
             state = NORMAL
-            file = "../images/qgn_plat_tool_tip.png"	
+            file = "../images/qgn_plat_tool_tip.png"
 	    border = { 20, 20, 20, 20 }
         }
     }
@@ -26,36 +26,32 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_button_01_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_button_01_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
 			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
 		}
 		image {
 			function = BOX
 			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
 		}
 		image {
 			function = BOX
 			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_01_normal.png"
 		}
 		image {
 			function = BOX
 			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_01_pressed.png"
 		}
 		image {
 			function = BOX
 			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_01_pressed.png"
 		}
 		image {
 		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_01_focused.png"
                 }
 	}
 }
@@ -65,37 +61,33 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_button_02_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_button_02_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
 			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
 		}
 		image {
 			function = BOX
 			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
 		}
 		image {
 			function = BOX
 			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_02_normal.png"
 		}
 		image {
 			function = BOX
 			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_02_pressed.png"
 		}
 		image {
 			function = BOX
 			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_02_pressed.png"
 		}
 		image {
 		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_02_focused.png"
-                }	
+                }
 	}
 }
 widget "*.hildon-navigator-button-two" style "osso-navigator-button-two"
@@ -104,36 +96,32 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_button_03_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_button_03_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
 			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
 		}
 		image {
 			function = BOX
 			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
 		}
 		image {
 			function = BOX
 			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_button_03_normal.png"
 		}
 		image {
 			function = BOX
 			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_button_03_pressed.png"
 		}
 		image {
 			function = BOX
 			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_button_03_pressed.png"
 		}
 		image {
 		        function = FOCUS
-        		file = "../images/qgn_plat_task_navigation_button_03_focused.png"
                 }
 	}
 }
@@ -143,16 +131,16 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_01_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_normal.png"
 		}
 		image {
 			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_focused.png"
-		}	
+		}
 	}
 }
 
@@ -162,16 +150,16 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_02_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_normal.png"
 		}
 		image {
 			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_focused.png"
-		}	
+		}
 	}
 }
 
@@ -181,16 +169,16 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_03_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_normal.png"
 		}
 		image {
 			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_focused.png"
-		}	
+		}
 	}
 }
 
@@ -200,79 +188,36 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_04_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_normal.png"
 		}
 		image {
 			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_focused.png"
-		}	
+		}
 	}
 }
 
 widget "*.hildon-navigator-small-button4" style "osso-navigator-small-button4"
 
-style "osso-navigator-small-button5"
-{   
-   GtkButton::child_displacement_x = 0
-   GtkButton::child_displacement_y = 0
-
-	engine "sapwood" {
-		image {
-			function = BOX
-			state = NORMAL
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-		}
-		image {
-			function = BOX
-			state = PRELIGHT
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-		}
-		image {
-			function = BOX
-			state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_pressed.png"
-		}
-		image {
-			function = BOX
-			state = SELECTED
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_pressed.png"
-		}
-		image {
-			function = BOX
-			state = INSENSITIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_normal.png"
-		}
-		image {
-			function = FOCUS
-			file = "../images/qgn_plat_task_navigation_application_switcher_05_focused.png"
-		}	
-	}
-}
-
-widget "*.hildon-navigator-small-button5" style "osso-navigator-small-button5"
-
-
-
-
 style "osso-navigator-small-button1-pressed"
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_01_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
 		}
 		image {
 			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_01_pressed.png"
-		}	
+                        state = ACTIVE
+		}
 	}
 }
 
@@ -282,17 +227,17 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_02_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
 		}
 		image {
 			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_02_pressed.png"
-		}	
+                        state = ACTIVE
+		}
 	}
 }
 
@@ -302,17 +247,17 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_03_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
 		}
 		image {
 			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_03_pressed.png"
-		}	
+                        state = ACTIVE
+		}
 	}
 }
 
@@ -322,17 +267,17 @@
 {
    GtkButton::child_displacement_x = 0
    GtkButton::child_displacement_y = 0
+   bg_pixmap[ACTIVE] = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
+   bg_pixmap[PRELIGHT] = "../images/qgn_plat_task_navigation_application_switcher_04_focused.png"
 
 	engine "sapwood" {
 		image {
 			function = BOX
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
 		}
 		image {
 			function = FOCUS
-            state = ACTIVE
-			file = "../images/qgn_plat_task_navigation_application_switcher_04_pressed.png"
-		}	
+                        state = ACTIVE
+		}
 	}
 }
More information about the maemo-commits mailing list