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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed Aug 22 15:10:33 EEST 2007
Author: tigert
Date: 2007-08-22 15:10:30 +0300 (Wed, 22 Aug 2007)
New Revision: 13337

Modified:
   projects/haf/trunk/hildon-theme-layout-4/ChangeLog
   projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
   projects/haf/trunk/hildon-theme-layout-4/rc/ossomediaplayer.rc
   projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
Log:
mediaplayer updates, new logical colors

Modified: projects/haf/trunk/hildon-theme-layout-4/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-22 11:43:35 UTC (rev 13336)
+++ projects/haf/trunk/hildon-theme-layout-4/ChangeLog	2007-08-22 12:10:30 UTC (rev 13337)
@@ -1,3 +1,57 @@
+2007-08-22  Tuomas Kuosmanen  <tuomas.kuosmanen at nokia.com>
+
+	* rc/ossomediaplayer.rc: removed focused and pressed-focused
+	states as those are never used.
+
+	* data/layout.txt: updates: 
+
+	Added logical colors:
+		RssAppletBgColor=7942,703,30,16
+		SpeedContactAppletBgColor=7942,718,30,16
+		VkbBgColor=7942,733,30,16
+
+	Updated graphics (yeah, these don't really belong in the desktop theme..):
+		qgn_plat_task_pane_menu1_separator.png=2527,45,26,1
+		qgn_plat_task_pane_menu2_separator.png=2635,45,26,1
+		qgn_plat_task_switcher_menu_separator.png=2845,45,26,1
+		qgn_plat_task_notification_menu_separator.png=3001,45,26,1
+		qgn_plat_task_navigation_plugin_menu_separator=113,666,26,1
+
+		qgn_plat_button_mplayer1_normal.png=5219,192,88,75
+		qgn_plat_button_mplayer2_normal.png=5219,273,88,75
+		qgn_plat_button_mplayer3_normal.png=5219,354,88,75
+		qgn_plat_button_mplayer4_normal.png=5219,435,88,75
+
+		qgn_plat_button_mplayer1_pressed.png=5313,192,88,75
+		qgn_plat_button_mplayer2_pressed.png=5313,273,88,75
+		qgn_plat_button_mplayer3_pressed.png=5313,354,88,75
+		qgn_plat_button_mplayer4_pressed.png=5313,435,88,75
+
+		qgn_plat_button_mplayer1_disabled.png=5407,192,88,75
+		qgn_plat_button_mplayer2_disabled.png=5407,273,88,75
+		qgn_plat_button_mplayer3_disabled.png=5407,354,88,75
+		qgn_plat_button_mplayer4_disabled.png=5407,435,88,75
+
+	Added graphics:
+		qgn_plat_button_mplayer2_pause_normal.png=5500,273,88,75
+		qgn_plat_button_mplayer2_pause_presssed.png=5500,273,88,75
+
+		qgn_plat_button_mplayer_now_playing_normal.png=5676,186,72,49
+		qgn_plat_button_mplayer_now_playing_pressed.png=5676,241,72,49
+		qgn_plat_button_mplayer_playlist_normal.png=5598,186,72,49
+		qgn_plat_button_mplayer_playlist_pressed.png=5598,241,72,49
+
+	Removed images - these were never used anyway.
+		qgn_plat_button_mplayer1_focused
+		qgn_plat_button_mplayer2_focused
+		qgn_plat_button_mplayer3_focused
+		qgn_plat_button_mplayer4_focused
+
+		qgn_plat_button_mplayer1_pressed_focused
+		qgn_plat_button_mplayer2_pressed_focused
+		qgn_plat_button_mplayer3_pressed_focused
+		qgn_plat_button_mplayer4_pressed_focused
+
 2007-08-22  Xan Lopez  <xan.lopez at nokia.com>
 
 	* rc/gtkcombobox.rc:

Modified: projects/haf/trunk/hildon-theme-layout-4/data/layout.txt
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-08-22 11:43:35 UTC (rev 13336)
+++ projects/haf/trunk/hildon-theme-layout-4/data/layout.txt	2007-08-22 12:10:30 UTC (rev 13337)
@@ -80,21 +80,21 @@
 CropFrameColor=7691,328,30,16
 MediaPlayerToolbarFontColor=7942,298,30,16
 RssAppletFeedTextColor=7942,283,30,16
+RssAppletBgColor=7942,703,30,16
 PaneMenuColor1=7942,343,30,16
 PaneMenuColor2=7942,358,30,16
 PaneMenu1TextColor=7942,373,30,16
 PaneMenu2TextColor=7942,388,30,16
 
-#PaneSeparatorColor1=7942,403,30,16
-#PaneSeparatorColor2=7942,418,30,16
 SpeedContactDefaultTextColor=7942,433,30,16
 SpeedContactSecondaryTextColor=7942,448,30,16
+SpeedContactAppletBgColor=7942,718,30,16
+
 TaskSwitcherFontColor=7942,463,30,16
 TaskSwitcherSecondaryFontColor=7942,478,30,16
 TaskSwitcherNotificationMenuFontColor=7942,493,30,16
 TaskSwitcherBgColor=7942,508,30,16
 TaskSwitcherNotificationBgColor=7942,523,30,16
-#ThumbMenuSeparatorColor=7942,538,30,16
 
 #new for now
 PluginMenuTextColor=7942,568,30,16
@@ -109,7 +109,8 @@
 ButtonTextColor=7942,643,30,16
 ButtonTextPressedColor=7942,659,30,16
 ButtonTextDisabledColor=7942,673,30,16
-
+VkbBgColor=7942,733,30,16
+ 
 [Elements]
 qgn_plat_application_frame_bottom.png=3271,619,50,24
 qgn_plat_application_frame_left.png=3271,223,12,2
@@ -162,26 +163,31 @@
 qgn_plat_button_contact_disabled.png=5399,517,50,72
 qgn_plat_button_minimize_normal.png=3911,83,40,50
 qgn_plat_button_minimize_pressed.png=3821,83,40,50
-qgn_plat_button_mplayer1_disabled.png=5543,192,72,72
-qgn_plat_button_mplayer1_focused.png=5300,192,72,72
-qgn_plat_button_mplayer1_normal.png=5219,192,72,72
-qgn_plat_button_mplayer1_pressed.png=5381,192,72,72
-qgn_plat_button_mplayer1_pressed_focused.png=5462,192,72,72
-qgn_plat_button_mplayer2_disabled.png=5543,273,72,72
-qgn_plat_button_mplayer2_focused.png=5300,273,72,72
-qgn_plat_button_mplayer2_normal.png=5219,273,72,72
-qgn_plat_button_mplayer2_pressed.png=5381,273,72,72
-qgn_plat_button_mplayer2_pressed_focused.png=5462,273,72,72
-qgn_plat_button_mplayer3_disabled.png=5543,354,72,72
-qgn_plat_button_mplayer3_focused.png=5300,354,72,72
-qgn_plat_button_mplayer3_normal.png=5219,354,72,72
-qgn_plat_button_mplayer3_pressed.png=5381,354,72,72
-qgn_plat_button_mplayer3_pressed_focused.png=5462,354,72,72
-qgn_plat_button_mplayer4_disabled.png=5543,435,72,72
-qgn_plat_button_mplayer4_focused.png=5300,435,72,72
-qgn_plat_button_mplayer4_normal.png=5219,435,72,72
-qgn_plat_button_mplayer4_pressed.png=5381,435,72,72
-qgn_plat_button_mplayer4_pressed_focused.png=5462,435,72,72
+
+# new fixed-size buttons
+qgn_plat_button_mplayer1_normal.png=5219,192,88,75
+qgn_plat_button_mplayer2_normal.png=5219,273,88,75
+qgn_plat_button_mplayer3_normal.png=5219,354,88,75
+qgn_plat_button_mplayer4_normal.png=5219,435,88,75
+
+qgn_plat_button_mplayer1_pressed.png=5313,192,88,75
+qgn_plat_button_mplayer2_pressed.png=5313,273,88,75
+qgn_plat_button_mplayer3_pressed.png=5313,354,88,75
+qgn_plat_button_mplayer4_pressed.png=5313,435,88,75
+
qgn_plat_button_mplayer1_disabled.png=5407,192,88,75
+qgn_plat_button_mplayer2_disabled.png=5407,273,88,75
+qgn_plat_button_mplayer3_disabled.png=5407,354,88,75
+qgn_plat_button_mplayer4_disabled.png=5407,435,88,75
+
+qgn_plat_button_mplayer2_pause_normal.png=5500,273,88,75
+qgn_plat_button_mplayer2_pause_presssed.png=5500,273,88,75
+
+qgn_plat_button_mplayer_now_playing_normal.png=5676,186,72,49
+qgn_plat_button_mplayer_now_playing_pressed.png=5676,241,72,49
+qgn_plat_button_mplayer_playlist_normal.png=5598,186,72,49
+qgn_plat_button_mplayer_playlist_pressed.png=5598,241,72,49
+
+
 qgn_plat_button_radio_empty_disabled.png=155,414,26,26
 qgn_plat_button_radio_empty_focused.png=155,354,26,26
 qgn_plat_button_radio_empty_normal.png=155,294,26,26
@@ -539,10 +545,11 @@
 qgn_plat_task_switcher_focus_active.png=2827,45,14,14
 
 # new separator gfx
-qgn_plat_task_pane_menu1_separator.png=2527,45,18,3
-qgn_plat_task_pane_menu2_separator.png=2635,45,18,3
-qgn_plat_task_switcher_menu_separator.png=2845,45,18,3
-qgn_plat_task_notification_menu_separator.png=3001,45,18,3
+qgn_plat_task_pane_menu1_separator.png=2527,45,26,1
+qgn_plat_task_pane_menu2_separator.png=2635,45,26,1
+qgn_plat_task_switcher_menu_separator.png=2845,45,26,1
+qgn_plat_task_notification_menu_separator.png=3001,45,26,1
+qgn_plat_task_navigation_plugin_menu_separator=113,666,26,1
 
 qgn_plat_task_switcher_menu_bg.png=2779,45,42,42,alpha
 qgn_plat_task_switcher_menu_down_arrow_disabled.png=2779,249,72,72 

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/ossomediaplayer.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/ossomediaplayer.rc	2007-08-22 11:43:35 UTC (rev 13336)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/ossomediaplayer.rc	2007-08-22 12:10:30 UTC (rev 13337)
@@ -6,17 +6,6 @@
   engine "sapwood"
     {
         image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer1_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer1_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
             function = BOX
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_mplayer1_pressed.png"
@@ -43,17 +32,6 @@
   engine "sapwood"
     {
         image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer2_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer2_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
             function = BOX
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_mplayer2_pressed.png"
@@ -80,17 +58,6 @@
   engine "sapwood"
     {
         image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer3_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer3_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
             function = BOX
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_mplayer3_pressed.png"
@@ -117,17 +84,6 @@
   engine "sapwood"
     {
         image {
-            function = FOCUS
-                state    = ACTIVE
-                file     = "../images/qgn_plat_button_mplayer4_pressed_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
-            function = FOCUS
-                file     = "../images/qgn_plat_button_mplayer4_focused.png"
-                border   = { 35, 35, 35, 35 }
-        }
-        image {
             function = BOX
                 state    = ACTIVE
                 file     = "../images/qgn_plat_button_mplayer4_pressed.png"

Modified: projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc
===================================================================
--- projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-08-22 11:43:35 UTC (rev 13336)
+++ projects/haf/trunk/hildon-theme-layout-4/rc/themespecificgtk.rc	2007-08-22 12:10:30 UTC (rev 13337)
@@ -79,12 +79,14 @@
         color["CropFrameColor"]				= "@CropFrameColor@"
         color["MediaPlayerToolbarFontColor"]		= "@MediaPlayerToolbarFontColor@"
         color["RssAppletFeedTextColor"]			= "@RssAppletFeedTextColor@"
+        color["RssAppletBgColor"]			= "@RssAppletBgColor@"
         color["PaneMenuColor1"]				= "@PaneMenuColor1@"
         color["PaneMenuColor2"]				= "@PaneMenuColor2@"
         color["PaneMenu1TextColor"]			= "@PaneMenu1TextColor@"
         color["PaneMenu2TextColor"]			= "@PaneMenu2TextColor@"
         color["SpeedContactDefaultTextColor"]		= "@SpeedContactDefaultTextColor@"
         color["SpeedContactSecondaryTextColor"]		= "@SpeedContactSecondaryTextColor@"
+        color["SpeedContactAppletBgColor"]		= "@SpeedContactAppletBgColor@"
         color["TaskSwitcherFontColor"]			= "@TaskSwitcherFontColor@"
         color["TaskSwitcherSecondaryFontColor"]		= "@TaskSwitcherSecondaryFontColor@"
         color["TaskSwitcherNotificationMenuFontColor"]	= "@TaskSwitcherNotificationMenuFontColor@"
@@ -102,6 +104,8 @@
         color["ButtonTextPressedColor"]		= "@ButtonTextPressedColor@"
         color["ButtonTextDisabledColor"]	= "@ButtonTextDisabledColor@"
 
+        color["VkbBgColor"]	= "@VkbBgColor@"
+
 }
 
 ##############################


More information about the maemo-commits mailing list