GNOME.org
 

gnome-menus r886 - in trunk: . desktop-directories layout po

Author: vuntz
Date: Thu Apr 17 14:10:53 2008
New Revision: 886
URL: http://svn.gnome.org/viewvc/gnome-menus?rev=886&view=rev

Log:
2008-04-17  Vincent Untz  <vuntz gnome org>

	* desktop-directories/Accessibility.directory.in:
	* desktop-directories/Accessories.directory.in:
	* desktop-directories/Applications.directory.in:
	* desktop-directories/Desktop.directory.in:
	* desktop-directories/Games.directory.in:
	* desktop-directories/Internet.directory.in:
	* desktop-directories/Makefile.am:
	* desktop-directories/Multimedia.directory.in:
	* desktop-directories/Other.directory.in:
	* desktop-directories/Preferences.directory.in:
	* desktop-directories/System-Settings.directory.in:
	Rename most of those files according to real categories defined in the
	fd.o spec.
	* layout/Makefile.am:
	* layout/applications.menu:
	* layout/preferences.menu:
	* layout/settings.menu:
	Updated for those changes. Also remove preferences.menu and directly
	include its content in settings.menu.
	Will help with bug #396994.

2008-04-17  Vincent Untz  <vuntz gnome org>

	* po/POTFILES.in: update after file renaming


Added:
   trunk/desktop-directories/AudioVideo.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Multimedia.directory.in
   trunk/desktop-directories/Game.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Games.directory.in
   trunk/desktop-directories/Network.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Internet.directory.in
   trunk/desktop-directories/Settings-System.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/System-Settings.directory.in
   trunk/desktop-directories/Settings.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Preferences.directory.in
   trunk/desktop-directories/Utility-Accessibility.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Accessibility.directory.in
   trunk/desktop-directories/Utility.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Accessories.directory.in
   trunk/desktop-directories/X-GNOME-Menu-Applications.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Applications.directory.in
   trunk/desktop-directories/X-GNOME-Menu-System.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Desktop.directory.in
   trunk/desktop-directories/X-GNOME-Other.directory.in   (props changed)
      - copied unchanged from r872, /trunk/desktop-directories/Other.directory.in
Removed:
   trunk/desktop-directories/Accessibility.directory.in
   trunk/desktop-directories/Accessories.directory.in
   trunk/desktop-directories/Applications.directory.in
   trunk/desktop-directories/Desktop.directory.in
   trunk/desktop-directories/Games.directory.in
   trunk/desktop-directories/Internet.directory.in
   trunk/desktop-directories/Multimedia.directory.in
   trunk/desktop-directories/Other.directory.in
   trunk/desktop-directories/Preferences.directory.in
   trunk/desktop-directories/System-Settings.directory.in
   trunk/layout/preferences.menu
Modified:
   trunk/ChangeLog
   trunk/desktop-directories/Makefile.am
   trunk/layout/Makefile.am
   trunk/layout/applications.menu
   trunk/layout/settings.menu
   trunk/po/ChangeLog
   trunk/po/POTFILES.in

Modified: trunk/desktop-directories/Makefile.am
==============================================================================
--- trunk/desktop-directories/Makefile.am	(original)
+++ trunk/desktop-directories/Makefile.am	Thu Apr 17 14:10:53 2008
@@ -2,29 +2,32 @@
 
 @INTLTOOL_DIRECTORY_RULE@
 directorydir = $(datadir)/desktop-directories
+# Should be moved to gnome-control-center:
+directory_in_controlcenterfiles =		\
+	Hardware.directory.in			\
+	InternetAndNetwork.directory.in		\
+	LookAndFeel.directory.in		\
+	Personal.directory.in			\
+	System.directory.in			\
+	$(NULL)
 directory_in_files =				\
-	Accessibility.directory.in		\
-	Accessories.directory.in		\
-	Applications.directory.in		\
+	AudioVideo.directory.in			\
 	Development.directory.in		\
-	Desktop.directory.in			\
 	Education.directory.in			\
-	Games.directory.in			\
+	Game.directory.in			\
 	Graphics.directory.in			\
-	Hardware.directory.in			\
-	Internet.directory.in			\
-	InternetAndNetwork.directory.in		\
-	LookAndFeel.directory.in		\
-	Multimedia.directory.in			\
+	Network.directory.in			\
 	Office.directory.in			\
-	Other.directory.in			\
-	Personal.directory.in			\
-	Preferences.directory.in		\
-	Settings-Accessibility.directory.in	\
 	Settings.directory.in			\
-	System.directory.in			\
-	System-Settings.directory.in		\
+	Settings-Accessibility.directory.in	\
+	Settings-System.directory.in		\
 	System-Tools.directory.in		\
+	Utility.directory.in			\
+	Utility-Accessibility.directory.in	\
+	X-GNOME-Other.directory.in		\
+	X-GNOME-Menu-Applications.directory.in	\
+	X-GNOME-Menu-System.directory.in	\
+	$(directory_in_controlcenterfiles)	\
 	$(NULL)
 
 directory_DATA = $(directory_in_files:.directory.in=.directory)

Modified: trunk/layout/Makefile.am
==============================================================================
--- trunk/layout/Makefile.am	(original)
+++ trunk/layout/Makefile.am	Thu Apr 17 14:10:53 2008
@@ -4,7 +4,6 @@
 
 menu_DATA =               		\
 	applications.menu		\
-	preferences.menu		\
 	settings.menu			\
 	$(NULL)
 

Modified: trunk/layout/applications.menu
==============================================================================
--- trunk/layout/applications.menu	(original)
+++ trunk/layout/applications.menu	Thu Apr 17 14:10:53 2008
@@ -4,7 +4,7 @@
 <Menu>
 
   <Name>Applications</Name>
-  <Directory>Applications.directory</Directory>
+  <Directory>X-GNOME-Menu-Applications.directory</Directory>
 
   <!-- Scan legacy dirs first, as later items take priority -->
   <KDELegacyDirs/>
@@ -21,7 +21,7 @@
   <!-- Accessories submenu -->
   <Menu>
     <Name>Accessories</Name>
-    <Directory>Accessories.directory</Directory>
+    <Directory>Utility.directory</Directory>
     <Include>
       <And>
         <Category>Utility</Category>
@@ -38,7 +38,7 @@
   <!-- Accessibility submenu -->
   <Menu>
     <Name>Universal Access</Name>
-    <Directory>Accessibility.directory</Directory>
+    <Directory>Utility-Accessibility.directory</Directory>
     <Include>
       <And>
         <Category>Accessibility</Category>
@@ -73,7 +73,7 @@
   <!-- Games -->
   <Menu>
     <Name>Games</Name>
-    <Directory>Games.directory</Directory>
+    <Directory>Game.directory</Directory>
     <Include>
       <And>
         <Category>Game</Category>
@@ -95,7 +95,7 @@
   <!-- Internet -->
   <Menu>
     <Name>Internet</Name>
-    <Directory>Internet.directory</Directory>
+    <Directory>Network.directory</Directory>
     <Include>
       <And>
         <Category>Network</Category>
@@ -106,7 +106,7 @@
   <!-- Multimedia -->
   <Menu>
     <Name>Multimedia</Name>
-    <Directory>Multimedia.directory</Directory>
+    <Directory>AudioVideo.directory</Directory>
     <Include>
       <And>
         <Category>AudioVideo</Category>
@@ -140,7 +140,7 @@
   <!-- Other -->
   <Menu>
     <Name>Other</Name>
-    <Directory>Other.directory</Directory>
+    <Directory>X-GNOME-Other.directory</Directory>
     <OnlyUnallocated/>
     <Include>
       <And>

Modified: trunk/layout/settings.menu
==============================================================================
--- trunk/layout/settings.menu	(original)
+++ trunk/layout/settings.menu	Thu Apr 17 14:10:53 2008
@@ -4,7 +4,7 @@
 <Menu>
 
   <Name>Desktop</Name>
-  <Directory>Desktop.directory</Directory>
+  <Directory>X-GNOME-Menu-System.directory</Directory>
 
   <!-- Read standard .directory and .desktop file locations -->
   <DefaultAppDirs/>
@@ -21,13 +21,37 @@
   <!-- Merge in these other files as submenus -->
   <Menu>
     <Name>Preferences</Name>
-    <MergeFile>preferences.menu</MergeFile>
+    <Directory>Settings.directory</Directory>
+    <Include>
+      <And>
+        <Category>Settings</Category>
+        <Not>
+          <Or>
+            <Category>System</Category>
+            <Category>Accessibility</Category>
+            <Filename>gnomecc.desktop</Filename>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+
+    <!-- Accessibility -->
+    <Menu>
+      <Name>Universal Access</Name>
+      <Directory>Settings-Accessibility.directory</Directory>
+      <Include>
+        <And>
+          <Category>Settings</Category>
+          <Category>Accessibility</Category>
+        </And>
+      </Include>
+    </Menu>
   </Menu>
 
   <!-- System Settings -->
   <Menu>
     <Name>Administration</Name>
-    <Directory>System-Settings.directory</Directory>
+    <Directory>Settings-System.directory</Directory>
     <Include>
       <And>
         <Category>Settings</Category>

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Thu Apr 17 14:10:53 2008
@@ -1,27 +1,26 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-desktop-directories/Accessibility.directory.in
-desktop-directories/Accessories.directory.in
-desktop-directories/Applications.directory.in
-desktop-directories/Desktop.directory.in
+desktop-directories/AudioVideo.directory.in
 desktop-directories/Development.directory.in
 desktop-directories/Education.directory.in
-desktop-directories/Games.directory.in
+desktop-directories/Game.directory.in
 desktop-directories/Graphics.directory.in
 desktop-directories/Hardware.directory.in
 desktop-directories/InternetAndNetwork.directory.in
-desktop-directories/Internet.directory.in
 desktop-directories/LookAndFeel.directory.in
-desktop-directories/Multimedia.directory.in
+desktop-directories/Network.directory.in
 desktop-directories/Office.directory.in
-desktop-directories/Other.directory.in
 desktop-directories/Personal.directory.in
-desktop-directories/Preferences.directory.in
 desktop-directories/Settings-Accessibility.directory.in
+desktop-directories/Settings-System.directory.in
 desktop-directories/Settings.directory.in
 desktop-directories/System.directory.in
-desktop-directories/System-Settings.directory.in
 desktop-directories/System-Tools.directory.in
+desktop-directories/Utility-Accessibility.directory.in
+desktop-directories/Utility.directory.in
+desktop-directories/X-GNOME-Menu-Applications.directory.in
+desktop-directories/X-GNOME-Menu-System.directory.in
+desktop-directories/X-GNOME-Other.directory.in
 simple-editor/gmenu-simple-editor.desktop.in
 simple-editor/gmenu-simple-editor.glade
 simple-editor/GMenuSimpleEditor/maindialog.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]