applnk: menus/applications.menu - big revamp - removed archaic compatibilit...
baggins
baggins at pld-linux.org
Thu May 13 15:26:55 CEST 2010
Author: baggins Date: Thu May 13 13:26:55 2010 GMT
Module: applnk Tag: HEAD
---- Log message:
- big revamp
- removed archaic compatibility stuff
- XFCE4 layout merged
- removed almost empty, overcomplicating, submenus
- editors moved to accessories
- amusents moved to games
- general cleanup
- added "kitchen sink" submenu
- avoid duplicates in different menus
---- Files affected:
applnk/menus:
applications.menu (1.46 -> 1.47)
---- Diffs:
================================================================
Index: applnk/menus/applications.menu
diff -u applnk/menus/applications.menu:1.46 applnk/menus/applications.menu:1.47
--- applnk/menus/applications.menu:1.46 Tue May 11 16:57:45 2010
+++ applnk/menus/applications.menu Thu May 13 15:26:50 2010
@@ -3,6 +3,7 @@
<Menu>
<Name>Applications</Name>
+ <Directory>applications.directory</Directory>
<!-- Scan legacy dirs first, as later items take priority -->
<KDELegacyDirs/>
@@ -18,52 +19,62 @@
<Include>
<Or>
- <Category>Core</Category>
-<!-- <Category>X-KDE-MenuRoot</Category>-->
+<!-- <Category>Core</Category> -->
+ <Category>X-Xfce-Toplevel</Category>
+<!-- <Category>X-KDE-MenuRoot</Category> -->
</Or>
</Include>
- <Menu>
- <Name>Amusements</Name>
- <Directory>amusements.directory</Directory>
- <Include>
- <Category>Amusement</Category>
- </Include>
- </Menu>
- <Menu>
- <Name>Administration</Name>
- <Directory>administration.directory</Directory>
- <Include>
- <Or>
- <Category>SystemSetup</Category>
- <!-- to be backward compatible -->
- <Category>X-Administration</Category>
- </Or>
- </Include>
- </Menu>
- <Move>
- <Old>System/Administration</Old>
- <New>Administration</New>
- </Move>
+
+ <Layout>
+ <Filename>xfce4-run-program.desktop</Filename>
+ <Separator/>
+ <Filename>xfce4-terminal.desktop</Filename>
+ <Filename>xfce4-file-manager.desktop</Filename>
+ <Filename>xfce4-web-browser.desktop</Filename>
+ <Separator/>
+ <Merge type="menus"/>
+ <Merge type="files"/>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Separator/>
+ <Filename>xfce4-help.desktop</Filename>
+ <Filename>xfce4-about-xfce.desktop</Filename>
+ <Filename>xfce4-logout.desktop</Filename>
+ </Layout>
+
<Menu>
<Name>Development</Name>
<Directory>development.directory</Directory>
<Include>
<And>
- <Or>
<Category>Development</Category>
- <Category>GUIDesigner</Category>
- <Category>Building</Category>
- <Category>Debugger</Category>
- <Category>IDE</Category>
- <Category>Profiling</Category>
- </Or>
- <Not><Category>WebDevelopment</Category></Not>
- <Not><Category>RevisionControl</Category></Not>
+ <Not><Category>Debugger</Category></Not>
+ <Not><Category>IDE</Category></Not>
+ <Not><Category>Profiling</Category></Not>
<Not><Category>ProjectManagement</Category></Not>
+ <Not><Category>RevisionControl</Category></Not>
<Not><Category>Translation</Category></Not>
+ <Not><Category>WebDevelopment</Category></Not>
</And>
</Include>
<Menu>
+ <Name>IDE</Name>
+ <Directory>ide.directory</Directory>
+ <Include>
+ <Category>IDE</Category>
+ </Include>
+ </Menu>
+ <Menu>
+ <Name>Debugging</Name>
+ <Directory>debuger.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Debugger</Category>
+ <Category>Profiling</Category>
+ </Or>
+ </Include>
+ </Menu>
+ <Menu>
<Name>Internationalisation</Name>
<Directory>i18n.directory</Directory>
<Include>
@@ -87,149 +98,23 @@
</Menu>
</Menu>
<Menu>
- <Name>Editors</Name>
- <Directory>editors.directory</Directory>
- <Include>
- <Or>
- <Category>TextEditor</Category>
- <Category>X-HexEditor</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
<Name>Edutainment</Name>
<Directory>edutainment.directory</Directory>
<Include>
<And>
<Category>Education</Category>
- <Not><Category>Astronomy</Category></Not>
- <Not><Category>Chemistry</Category></Not>
- <Not><Category>Math</Category></Not>
- <Not><Category>Art</Category></Not>
- <Not><Category>Music</Category></Not>
- <Not><Category>Languages</Category></Not>
<Not><Category>Science</Category></Not>
- <Not><Category>Teaching</Category></Not>
</And>
</Include>
<Menu>
- <Name>Art</Name>
- <Directory>art.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Art</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Music</Name>
- <Directory>edu_music.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Music</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Languages</Name>
- <Directory>languages.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Languages</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Teaching</Name>
- <Directory>teaching.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Teaching</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
<Name>Science</Name>
<Directory>scientific.directory</Directory>
<Include>
<And>
<Category>Education</Category>
- <Or>
<Category>Science</Category>
- <Category>Astronomy</Category>
- <Category>Biology</Category>
- <Category>Geology</Category>
- <Category>MedicalSoftware</Category>
- </Or>
- <Not><Category>Astronomy</Category></Not>
- <Not><Category>Math</Category></Not>
- <Not><Category>Chemistry</Category></Not>
- <Not><Category>Physics</Category></Not>
- <Not><Category>X-Plotting</Category></Not>
</And>
</Include>
- <Menu>
- <Name>Astronomy</Name>
- <Directory>astronomy.directory</Directory>
- <Include>
- <And>
- <Category>Astronomy</Category>
- <Category>Science</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Chemistry</Name>
- <Directory>chemistry.directory</Directory>
- <Include>
- <And>
- <Category>Chemistry</Category>
- <Category>Science</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Mathematics</Name>
- <Directory>mathematics.directory</Directory>
- <Include>
- <And>
- <Category>Science</Category>
- <Category>Math</Category>
- </And>
- </Include>
- <Move>
- <Old>Scientific/Numerics</Old>
- <New>Mathematics</New>
- </Move>
- </Menu>
- <Menu>
- <Name>Physics</Name>
- <Directory>physics.directory</Directory>
- <Include>
- <And>
- <Category>Science</Category>
- <Category>Physics</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Plotting</Name>
- <Directory>plotting.directory</Directory>
- <Include>
- <And>
- <Category>Science</Category>
- <Category>X-Plotting</Category>
- </And>
- </Include>
- <Move>
- <Old>Scientific/Plotting</Old>
- <New>Plotting</New>
- </Move>
- </Menu>
</Menu>
</Menu>
<Menu>
@@ -238,6 +123,7 @@
<Include>
<And>
<Category>Game</Category>
+ <Not><Category>Amusement</Category></Not>
<Not><Category>ActionGame</Category></Not>
<Not><Category>AdventureGame</Category></Not>
<Not><Category>ArcadeGame</Category></Not>
@@ -255,6 +141,13 @@
</And>
</Include>
<Menu>
+ <Name>Amusements</Name>
+ <Directory>games-amusements.directory</Directory>
+ <Include>
+ <Category>Amusement</Category>
+ </Include>
+ </Menu>
+ <Menu>
<Name>Action</Name>
<Directory>games-action.directory</Directory>
<Include>
@@ -279,8 +172,8 @@
<Directory>games-arcade.directory</Directory>
<Include>
<And>
- <Category>ArcadeGame</Category>
<Category>Game</Category>
+ <Category>ArcadeGame</Category>
</And>
</Include>
</Menu>
@@ -299,8 +192,8 @@
<Directory>games-board.directory</Directory>
<Include>
<And>
- <Category>BoardGame</Category>
<Category>Game</Category>
+ <Category>BoardGame</Category>
</And>
</Include>
</Menu>
@@ -309,8 +202,8 @@
<Directory>games-card.directory</Directory>
<Include>
<And>
- <Category>CardGame</Category>
<Category>Game</Category>
+ <Category>CardGame</Category>
</And>
</Include>
</Menu>
@@ -393,13 +286,7 @@
<Directory>graphics.directory</Directory>
<Include>
<And>
- <Or>
<Category>Graphics</Category>
- <Category>2DGraphics</Category>
- <Category>VectorGraphics</Category>
- <Category>RasterGraphics</Category>
- <Category>Photograph</Category>
- </Or>
<Not><Category>Viewer</Category></Not>
<Not><Category>Scanning</Category></Not>
<Not><Category>OCR</Category></Not>
@@ -433,40 +320,31 @@
<Name>Multimedia</Name>
<Directory>multimedia.directory</Directory>
<Include>
- <Or>
- <And>
- <Category>AudioVideo</Category>
- <Not><Category>AudioVideoEditing</Category></Not>
- <Not><Category>DiscBurning</Category></Not>
- <Not><Category>Mixer</Category></Not>
- <Not><Category>Player</Category></Not>
- <Not><Category>Recorder</Category></Not>
- </And>
<And>
<Or>
+ <Category>AudioVideo</Category>
<Category>Audio</Category>
- <Category>Midi</Category>
- <Category>Sequencer</Category>
+ <Category>Video</Category>
</Or>
+ <Not><Category>DiscBurning</Category></Not>
+ <Not><Category>Recorder</Category></Not>
+ <Not><Category>AudioVideoEditing</Category></Not>
<Not><Category>Mixer</Category></Not>
<Not><Category>Player</Category></Not>
- <Not><Category>Recorder</Category></Not>
<Not><Category>Tuner</Category></Not>
- </And>
- <And>
- <Category>Video</Category>
<Not><Category>TV</Category></Not>
- <Not><Category>Player</Category></Not>
- <Not><Category>Recorder</Category></Not>
</And>
- </Or>
</Include>
<Menu>
<Name>CD-RW</Name>
<Directory>cd-rw.directory</Directory>
<Include>
<And>
+ <Or>
<Category>AudioVideo</Category>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+ </Or>
<Category>DiscBurning</Category>
</And>
</Include>
@@ -543,6 +421,7 @@
<Category>Network</Category>
<Category>HamRadio</Category>
</Or>
+ <Not><Category>Chat</Category></Not>
<Not><Category>Email</Category></Not>
<Not><Category>FileTransfer</Category></Not>
<Not><Category>IRCClient</Category></Not>
@@ -555,6 +434,8 @@
<Not><Category>WebBrowser</Category></Not>
<Not><Category>Dialup</Category></Not>
<Not><Category>RemoteAccess</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>System</Category></Not>
</And>
</Include>
<Menu>
@@ -564,6 +445,7 @@
<And>
<Category>Network</Category>
<Or>
+ <Category>Chat</Category>
<Category>IRCClient</Category>
<Category>InstantMessaging</Category>
<Category>Telephony</Category>
@@ -576,8 +458,8 @@
<Directory>network-dialup.directory</Directory>
<Include>
<And>
- <Category>Dialup</Category>
<Category>Network</Category>
+ <Category>Dialup</Category>
</And>
</Include>
</Menu>
@@ -622,8 +504,8 @@
<Directory>network-remote.directory</Directory>
<Include>
<And>
- <Category>RemoteAccess</Category>
<Category>Network</Category>
+ <Category>RemoteAccess</Category>
</And>
</Include>
</Menu>
@@ -645,18 +527,14 @@
<And>
<Category>Office</Category>
<Not><Category>Calendar</Category></Not>
- <Not><Category>Chart</Category></Not>
<Not><Category>ContactManagement</Category></Not>
<Not><Category>Database</Category></Not>
<Not><Category>Dictionary</Category></Not>
<Not><Category>Email</Category></Not>
- <Not><Category>Finance</Category></Not>
<Not><Category>PDA</Category></Not>
<Not><Category>Presentation</Category></Not>
<Not><Category>Spreadsheet</Category></Not>
<Not><Category>WordProcessor</Category></Not>
- <Not><Category>X-Misc</Category></Not>
- <Not><Category>X-PIM</Category></Not>
</And>
</Include>
<Menu>
@@ -674,22 +552,8 @@
<Directory>dicts.directory</Directory>
<Include>
<And>
- <Category>Dictionary</Category>
<Category>Office</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Miscellaneous</Name>
- <Directory>misc.directory</Directory>
- <Include>
- <And>
- <Category>Office</Category>
- <Or>
- <Category>Chart</Category>
- <Category>Finance</Category>
- <Category>X-Misc</Category>
- </Or>
+ <Category>Dictionary</Category>
</And>
</Include>
</Menu>
@@ -698,8 +562,8 @@
<Directory>pda.directory</Directory>
<Include>
<And>
- <Category>PDA</Category>
<Category>Office</Category>
+ <Category>PDA</Category>
</And>
</Include>
</Menu>
@@ -712,7 +576,6 @@
<Or>
<Category>ContactManagement</Category>
<Category>Calendar</Category>
- <Category>X-PIM</Category>
</Or>
</And>
</Include>
@@ -758,6 +621,7 @@
<Category>DesktopSettings</Category>
<Category>HardwareSettings</Category>
<Category>PackageManager</Category>
+ <Category>Printing</Category>
</Or>
<Not><Category>X-XFCE</Category></Not>
<Not><Category>GNOME</Category></Not>
@@ -772,6 +636,12 @@
<Category>X-XFCE</Category>
</And>
</Include>
+ <Layout>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Separator/>
+ <Merge type="menus"/>
+ <Merge type="files"/>
+ </Layout>
</Menu>
<Menu>
<Name>GNOME</Name>
@@ -813,13 +683,12 @@
<Directory>system.directory</Directory>
<Include>
<And>
- <Or>
<Category>System</Category>
- <Category>Security</Category>
- </Or>
+ <Not><Category>Security</Category></Not>
<Not><Category>Filesystem</Category></Not>
<Not><Category>Monitor</Category></Not>
- <Not><Category>GNOME</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>Network</Category></Not>
</And>
</Include>
<Menu>
@@ -842,6 +711,23 @@
</And>
</Include>
</Menu>
+ <Menu>
+ <Name>Network</Name>
+ <Directory>system-network.directory</Directory>
+ <Include>
+ <And>
+ <Category>System</Category>
+ <Category>Network</Category>
+ </And>
+ </Include>
+ </Menu>
+ <Menu>
+ <Name>Security</Name>
+ <Directory>system-security.directory</Directory>
+ <Include>
+ <Category>Security</Category>
+ </Include>
+ </Menu>
</Menu>
<Menu>
<Name>Terminals</Name>
@@ -861,15 +747,28 @@
<Not><Category>Archiving</Category></Not>
<Not><Category>Calculator</Category></Not>
<Not><Category>Clock</Category></Not>
+ <Not><Category>Compression</Category></Not>
<Not><Category>DiscBurning</Category></Not>
<Not><Category>Electronics</Category></Not>
<Not><Category>Emulator</Category></Not>
<Not><Category>Engineering</Category></Not>
<Not><Category>FileManager</Category></Not>
+ <Not><Category>Security</Category></Not>
<Not><Category>TerminalEmulator</Category></Not>
<Not><Category>TextEditor</Category></Not>
<Not><Category>TrayIcon</Category></Not>
- <Not><Category>X-Docklet</Category></Not>
+ <!-- Skip other main categories -->
+ <Not><Category>AudioVideo</Category></Not>
+ <Not><Category>Audio</Category></Not>
+ <Not><Category>Video</Category></Not>
+ <Not><Category>Development</Category></Not>
+ <Not><Category>Education</Category></Not>
+ <Not><Category>Game</Category></Not>
+ <Not><Category>Graphics</Category></Not>
+ <Not><Category>Network</Category></Not>
+ <Not><Category>Office</Category></Not>
+ <Not><Category>Settings</Category></Not>
+ <Not><Category>System</Category></Not>
</And>
</Include>
<Menu>
@@ -888,7 +787,10 @@
<Include>
<And>
<Category>Utility</Category>
+ <Or>
<Category>Archiving</Category>
+ <Category>Compression</Category>
+ </Or>
</And>
</Include>
</Menu>
@@ -919,11 +821,17 @@
<Or>
<Category>Applet</Category>
<Category>TrayIcon</Category>
- <Category>X-Docklet</Category>
</Or>
</Include>
</Menu>
<Menu>
+ <Name>Editors</Name>
+ <Directory>editors.directory</Directory>
+ <Include>
+ <Category>TextEditor</Category>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/applnk/menus/applications.menu?r1=1.46&r2=1.47&f=u
More information about the pld-cvs-commit
mailing list