[maemo-commits] [maemo-commits] r12185 - in projects/haf/trunk/hildon-desktop: . data policies

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-06-07 17:27:23 +0300 (Thu, 07 Jun 2007)
New Revision: 12185

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/applications.menu
   projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in
   projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c
Log:

2007-06-07  Johan Bilien  <johan.bilien at nokia.com>

	* policies/tasknavigator-policy.c,
	  data/tasknavigator.conf.in:
	- replaced others-button with applications-menu
	* data/applications.menu:
	- uncommented the new layout, removed the old one



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-07 13:34:49 UTC (rev 12184)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-06-07 14:27:23 UTC (rev 12185)
@@ -1,5 +1,13 @@
 2007-06-07  Johan Bilien  <johan.bilien at nokia.com>
 
+	* policies/tasknavigator-policy.c,
+	  data/tasknavigator.conf.in:
+	- replaced others-button with applications-menu
+	* data/applications.menu:
+	- uncommented the new layout, removed the old one
+
+2007-06-07  Johan Bilien  <johan.bilien at nokia.com>
+
 	* libhildondesktop/hildon-home-area.c:
 	- do not call the parent_class remove handler, because it
 	generates a non-implemented warning.

Modified: projects/haf/trunk/hildon-desktop/data/applications.menu
===================================================================
--- projects/haf/trunk/hildon-desktop/data/applications.menu	2007-06-07 13:34:49 UTC (rev 12184)
+++ projects/haf/trunk/hildon-desktop/data/applications.menu	2007-06-07 14:27:23 UTC (rev 12185)
@@ -10,7 +10,6 @@
   <DefaultAppDirs/>
   <DefaultDirectoryDirs/>
   
-  <!--
   // My selection submenu 
   <Menu>
     <Name>tana_fi_my_selection</Name>
@@ -77,83 +76,5 @@
       <Filename>osso_lmarbles.desktop</Filename>
     </Include>
   </Menu>
-  -->
 
-  <!-- Favourites -->
-  <Include>
-    <Filename>mp_ui.desktop</Filename>
-    <Filename>osso_rss_feed_reader.desktop</Filename>
-    <Filename>image-viewer.desktop</Filename>
-    <Filename>filemanager.desktop</Filename>
-  </Include>
-
-  <Separator/>
-  
-  <!-- Web submenu -->
-  <Menu>
-    <Name>tana_fi_web</Name>
-    <Include>
-      <Filename>browser.desktop</Filename>
-      <Filename>bookmark.desktop</Filename>
-    </Include>
-  </Menu>
-  
-  <!-- Contact submenu -->
-  <Menu>
-    <Name>tana_fi_contact</Name>
-    <Include>
-      <Filename>osso-addressbook.desktop</Filename>
-      <Filename>modest.desktop</Filename>
-      <Filename>voip-ui.desktop</Filename>
-      <Filename>chat-ui.desktop</Filename>
-    </Include>
-  </Menu>
-  
-  <!-- Utilities submenu -->
-  <Menu>
-    <Name>tana_fi_utilities</Name>
-    <Include>
-      <Filename>osso_calculator.desktop</Filename>
-      <Filename>osso_worldclock.desktop</Filename>
-      <Filename>osso_notes.desktop</Filename>
-      <Filename>osso_pdfviewer.desktop</Filename>
-      <Filename>osso_sketch.desktop</Filename>
-    </Include>
-  </Menu>
- 
-  <!-- Games submenu -->
-  <Menu>
-    <Name>tana_fi_games</Name>
-    <Include>
-      <Filename>chess_startup.desktop</Filename>
-      <Filename>maemoblocks.desktop</Filename>
-      <Filename>mahjong_startup.desktop</Filename>
-      <Filename>osso_lmarbles.desktop</Filename>
-    </Include>
-  </Menu>
-
-  <!-- Tools submenu -->
-  <Menu>
-    <Name>tana_fi_tools</Name>
-    <Include>
-      <Filename>hildon-application-manager.desktop</Filename>
-      <Filename>osso-backup.desktop</Filename>
-      <Filename>hildon-control-panel.desktop</Filename>
-      <Filename>osso-connectivity-ui-connmgr.desktop</Filename>
-      <Filename>hwr-teacher.desktop</Filename>
-    </Include>
-  </Menu>
- 
-  <!-- Extras submenu -->
-  <Menu>
-    <Name>tana_fi_extras</Name>
-  </Menu>
-
-  <Separator/>
-
-  <Include>
-    <Filename>osso-global-search.desktop</Filename>
-    <Filename>osso_help.desktop</Filename>
-  </Include>
-
 </Menu>

Modified: projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in
===================================================================
--- projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in	2007-06-07 13:34:49 UTC (rev 12184)
+++ projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in	2007-06-07 14:27:23 UTC (rev 12185)
@@ -1,5 +1,5 @@
 [@hildonnavigatordesktopentrydir@/hildon-task-navigator-bookmarks.desktop]
 [@hildonnavigatordesktopentrydir@/osso-contact-plugin.desktop]
-[@hildonnavigatordesktopentrydir@/others-button.desktop]
+[@hildonnavigatordesktopentrydir@/applications-menu.desktop]
 [@hildonnavigatordesktopentrydir@/app-switcher.desktop]
 [@hildonnavigatordesktopentrydir@/switcher-menu.desktop]

Modified: projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c
===================================================================
--- projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c	2007-06-07 13:34:49 UTC (rev 12184)
+++ projects/haf/trunk/hildon-desktop/policies/tasknavigator-policy.c	2007-06-07 14:27:23 UTC (rev 12185)
@@ -35,7 +35,7 @@
 
 #define HD_TN_BROWSER_PLUGIN       "hildon-task-navigator-bookmarks.desktop"
 #define HD_TN_CONTACT_PLUGIN       "osso-contact-plugin.desktop"
-#define HD_TN_APPS_MENU_PLUGIN     "others-button.desktop"
+#define HD_TN_APPS_MENU_PLUGIN     "applications-menu.desktop"
 #define HD_TN_APP_SWITCHER_PLUGIN  "app-switcher.desktop"
 #define HD_TN_SWITCHER_MENU_PLUGIN "switcher-menu.desktop"