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

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-08-10 12:09:56 +0300 (Fri, 10 Aug 2007)
New Revision: 13094

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/rc/hildonappsmenu.rc
   projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc
   projects/haf/trunk/hildon-theme-layout-4/rc/hildonstatusbar.rc
Log:
Adding real color mappings instead of the hardcoded colors for new applcation menu and switcher.


Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-10 08:14:26 UTC (rev 13093)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-10 09:09:56 UTC (rev 13094)
@@ -1,3 +1,10 @@
+2007-08-10  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* rc/hildonappsmenu.rc:
+	* rc/hildonnavigator.rc:
+	* rc/hildonstatusbar.rc: Adding real color mappings instead of the
+	hardcoded colors for new applcation menu and switcher.
+
 2007-08-09  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* rc/hildonappsmenu.rc: Removing the prelight state from the arrow

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonappsmenu.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/hildonappsmenu.rc	2007-08-10 08:14:26 UTC (rev 13093)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonappsmenu.rc	2007-08-10 09:09:56 UTC (rev 13094)
@@ -16,10 +16,10 @@
    }
 }
 
-style "hildon-apps-menu-pane1"
+style "hildon-apps-menu-pane1" = "osso-color-themeing"
 {
-  bg[NORMAL] = "#555753"
-}
+  bg[NORMAL] = @PaneMenuColor1
+} 
 
 style "hildon-apps-menu-pane1-item"
 {
@@ -127,9 +127,9 @@
   }
 }
 
-style "hildon-apps-menu-pane2"
+style "hildon-apps-menu-pane2" = "osso-color-themeing"
 {
-  bg[NORMAL] = "#888A85"
+  bg[NORMAL] = @PaneMenuColor2
 }
 
 style "hildon-apps-menu-pane2-item"
@@ -238,11 +238,16 @@
   }
 }
 
-style "hildon-apps-menu-pane-label"
+style "hildon-apps-menu-pane1-label" = "osso-color-themeing"
 {
-  fg[NORMAL] = "#FFFFFF"
+  fg[NORMAL] = @PaneMenu1TextColor
 }
 
+style "hildon-apps-menu-pane2-label" = "osso-color-themeing"
+{
+  fg[NORMAL] = @PaneMenu2TextColor
+}
+
 style "hildon-apps-menu-pane-button"
 {
   engine "sapwood"
@@ -261,8 +266,8 @@
 widget "*.hildon-apps-menu-pane2.GtkViewport"  style "hildon-apps-menu-pane2"
 widget "*.hildon-apps-menu-pane1-item" style "hildon-apps-menu-pane1-item"
 widget "*.hildon-apps-menu-pane2-item" style "hildon-apps-menu-pane2-item"
-widget "*.hildon-apps-menu-pane1-item.*.GtkLabel"  style "hildon-apps-menu-pane-label"
-widget "*.hildon-apps-menu-pane2-item.*.GtkLabel"  style "hildon-apps-menu-pane-label"
+widget "*.hildon-apps-menu-pane1-item.*.GtkLabel"  style "hildon-apps-menu-pane1-label"
+widget "*.hildon-apps-menu-pane2-item.*.GtkLabel"  style "hildon-apps-menu-pane2-label"
 widget "*.hildon-apps-menu-pane1-button"  style "hildon-apps-menu-pane-button"
 widget "*.hildon-apps-menu-pane2-button"  style "hildon-apps-menu-pane-button"
 widget "*.hildon-apps-menu-pane1.*.GtkArrow"  style "hildon-apps-menu-pane1-arrow"

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc	2007-08-10 08:14:26 UTC (rev 13093)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonnavigator.rc	2007-08-10 09:09:56 UTC (rev 13094)
@@ -308,9 +308,9 @@
    }
 }
 
-style "hildon-switcher-menu-app-menu"
+style "hildon-switcher-menu-app-menu" = "osso-color-themeing"
 {
-  bg[NORMAL] = "#555753"
+  bg[NORMAL] = @PaneMenuColor1
 }
 
 style "hildon-switcher-menu-app-item"
@@ -412,9 +412,9 @@
   }
 }
 
-style "hildon-switcher-menu-app-label"
+style "hildon-switcher-menu-app-label" = "osso-color-themeing"
 {
-  fg[NORMAL] = "#FFFFFF"
+  fg[NORMAL] = @TaskSwitcherFontColor
 }
 
 style "hildon-switcher-menu-app-button"
@@ -451,9 +451,9 @@
    }
 }
 
-style "hildon-switcher-menu-not-menu"
+style "hildon-switcher-menu-not-menu" = "osso-color-themeing"
 {
-  bg[NORMAL] = "#EDCD00"
+  //bg[NORMAL] = @TaskSwitcherNotificationMe
 }
 
 style "hildon-switcher-menu-not-item"
@@ -555,9 +555,9 @@
   }
 }
 
-style "hildon-switcher-menu-not-label"
+style "hildon-switcher-menu-not-label" = "osso-color-themeing"
 {
-  fg[NORMAL] = "#000000"
+  fg[NORMAL] = @TaskSwitcherNotificationMenuFontColor
 }
 
 style "hildon-switcher-menu-not-button"

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/hildonstatusbar.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/hildonstatusbar.rc	2007-08-10 08:14:26 UTC (rev 13093)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/hildonstatusbar.rc	2007-08-10 09:09:56 UTC (rev 13094)
@@ -22,7 +22,7 @@
         }
     }
 }
-widget "HildonStatusBarExtension" style "osso-status-bar-extension-background"
+widget "HildonDesktopPanelExpandable" style "osso-status-bar-extension-background"
 
 style "osso-status-bar-button" {
   GtkButton::default_border = { 0, 0, 0, 0 }