From 7d616706bba168427214848c6fbb77da5a30e04d Mon Sep 17 00:00:00 2001 From: lanius Date: Sun, 9 Nov 2003 13:10:06 +0000 Subject: see changelog --- menu/ChangeLog | 11 ++ menu/menu-spec.xml | 324 ++++++++++++++++++++++++++++++++++++----------------- menu/menu.dtd | 81 ++++++++++++++ 3 files changed, 315 insertions(+), 101 deletions(-) create mode 100644 menu/menu.dtd diff --git a/menu/ChangeLog b/menu/ChangeLog index 7de8791..4e3edcb 100644 --- a/menu/ChangeLog +++ b/menu/ChangeLog @@ -1,3 +1,14 @@ +2003-11-09 Heinrich Wendel + * menu-spec.xml: patch for categories based on Suse 9.0 + * menu-spec.xml: Grahpics -> Graphics + * menu-spec.xml: DTD fix + * menu.dtd: added dtd + * testsuite: fixed errors highlighted by havoc + +2003-10-23 Havoc Pennington + + * menu-spec.xml: clarify how elements are resolved + 2003-10-21 Havoc Pennington * create autotools setup diff --git a/menu/menu-spec.xml b/menu/menu-spec.xml index 23f4771..380e2da 100644 --- a/menu/menu-spec.xml +++ b/menu/menu-spec.xml @@ -2,10 +2,10 @@ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ ]>
- + Desktop Menu Specification - Version 0.7 - 30 September 2003 + Version 0.8 + 9 November 2003 Waldo @@ -62,7 +62,7 @@ - + Introduction @@ -270,18 +270,18 @@ entries: Categories, - Public Identifier for 1.0 + Public Identifier for 0.8 - PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + PUBLIC "-//freedesktop//DTD Menu 0.8//EN" - System Identifier for 1.0 + System Identifier for 0.8 - http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd + http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd @@ -290,8 +290,8 @@ entries: Categories, Here is a sample doctype declaration: - <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" + "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd"> @@ -930,7 +930,7 @@ entries: Categories, Once all files have been loaded into a single tree, scan the tree - recursively performing these steps: + recursively performing these steps to remove duplicates: @@ -955,12 +955,6 @@ entries: Categories, and so forth. - - - Recurse into each child <Menu>, performing this list of - steps for each child in order. - - Resolve duplicate <Move> operations (with the same @@ -969,25 +963,34 @@ entries: Categories, - Execute <Move> operations in the order that they appear. If - the destination path does not exist, simply relocate the origin - <Menu> element, and change its <Name> field to match the - destination path. If the origin path does not exist, do nothing. - If both paths exist, take the origin <Menu> element, delete - its <Name> element, and prepend its remaining child elements - to the destination <Menu> element. Then, recursively re-run - the previous merge steps on the resulting combined <Menu> in order to - consolidate duplicates. - - - - - For each <Menu> containing a <Deleted> element which is - not followed by a <NotDeleted> element, remove that menu. + Recurse into each child <Menu>, performing this list of + steps for each child in order. + + After recursing once to remove duplicates, resolve <Move> elements + for each menu starting with the top level and recursing into child menus. + So the deepest menus have their <Move> operations performed last. + Within each <Menu>, execute <Move> operations in the order + that they appear. If the destination path does not exist, simply relocate + the origin <Menu> element, and change its <Name> field to + match the destination path. If the origin path does not exist, do + nothing. If both paths exist, take the origin <Menu> element, + delete its <Name> element, and prepend its remaining child elements + to the destination <Menu> element. + + + If any <Move> operations affect a menu, then re-run the + steps to resolve duplicates in case any duplicates have been + created. + + + Finally, for each <Menu> containing a <Deleted> element which + is not followed by a <NotDeleted> element, remove that menu and all + its child menus. + Merged menu elements are kept in order because <Include> and @@ -1142,8 +1145,8 @@ entries: Categories, Conceptually that is converted to the following <Menu>: - <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" + "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd"> <Menu> <AppDir>/usr/share/applnk</AppDir> @@ -1172,8 +1175,8 @@ entries: Categories, - <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" - "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> + <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 0.8//EN" + "http://www.freedesktop.org/standards/menu-spec/menu-0.8.dtd"> <Menu> <Name>Applications</Name> @@ -1270,6 +1273,11 @@ entries: Categories, An application for development + + Building + A tool to build applications + Development + Debugger A tool to debug applications @@ -1285,11 +1293,21 @@ entries: Categories, A GUI designer application Development + + Profiling + A profiling tool + Development + RevisionControl Applications like cvs or subversion Development + + Translation + A translation tool + Development + Office An office type application @@ -1307,7 +1325,12 @@ entries: Categories, Database Application to manage a database - Office;Development + Office or Development or AudioVideo + + + Dictionary + A dictionary + Office Chart @@ -1324,6 +1347,11 @@ entries: Categories, Application to manage your finance Office + + FlowChart + A flowchart application + Office + PDA Tool to manage your PDA @@ -1354,42 +1382,51 @@ entries: Categories, Graphical application - 3DGraphics - 3D based graphical application + 2DGraphics + 2D based graphical application Graphics + + VectorGraphics + Vector based graphical application + 2DGraphics + RasterGraphics Raster based graphical application + 2DGraphics + + + 3DGraphics + 3D based graphical application Graphics - ScanTool + Scanning Tool to scan a file/text Graphics - VectorGraphics - Vector based graphical application - Graphics + OCR + Tool to text + Scanning + + + Photograph + Camera tools, etc. + Graphics or Office Viewer Tool to view e.g. a graphic or pdf file - (Graphics) + Graphics or Office Settings Settings applications - AccessibilitySettings - Accessibility settings - Settings - - - - Desktop-Settings + DesktopSettings ConfigurationTool for the GUI Settings @@ -1398,28 +1435,19 @@ entries: Categories, A tool to manage hardware components, like soundcards, graphicards or printers Settings - - NetworkSettings - Application to manage network settings - Settings - PackageManager A package manager application Settings - - SystemSetup - System setup application, e.g. init level configuration - Settings - Network Network application such as a webbrowser + (Settings) - WebBrowser - A webbrowser + Dialup + A dialup program Network @@ -1432,14 +1460,24 @@ entries: Categories, An IRC Client Network + + FileTransfer + Tools like FTP or P2P programs + Network + + + HamRadio + HAM radio software + Network or Audio + News A newsreader or newsticker - Network - FileTransfer - Tools like FTP or P2P programs + P2P + A P2P program + Network Network @@ -1452,34 +1490,84 @@ entries: Categories, Telephony via PC Network + + WebBrowser + A webbrowser + Network + + + WebDevelopment + A tool for web developers + Network or Development + AudioVideo A multimedia (audio/video) application - AudioVideoEditing - Application to edit audio or video files + Audio + An audio application AudioVideo - DiscBurning - Application to burn a disc - AudioVideo + Midi + An app related to midi + Audio Mixer Just a mixer + Audio + + + Sequencer + a sequencer + Audio + + + Tuner + a tuner + Audio + + + Video + A video application AudioVideo + + TV + A TV application + Video + + + AudioVideoEditing + Application to edit audio or video files + Audio or Video or AudiVideo + Player Application to play audio/video files + Audio or Video or AudioVideo + + + Recorder + Application to record audio/video files + Audio or Video or AudioVideo + + + DiscBurning + Application to burn a disc AudioVideo Game A game + + ActionGame + An actiongame + Game + AdventureGame Adventure style game @@ -1505,11 +1593,6 @@ entries: Categories, A card game Game - - FirstPersonGame - First person perspective game - Game - KidsGame A game for kids @@ -1520,6 +1603,16 @@ entries: Categories, Logic games like puzzles, etc Game + + RolePlaying + A roleplaying game + Game + + + Simulation + A simulation game + Game + SportsGame A Sports game @@ -1534,6 +1627,21 @@ entries: Categories, Education Educational software + + Art + software to teach arts + Education + + + Art + + Education + + + Contruction + + Education + Music Musical Software @@ -1584,6 +1692,11 @@ entries: Categories, Physics software Science + + Teaching + An education program for teachers + Education + Amusement A simple amusement @@ -1599,17 +1712,11 @@ entries: Categories, A tool to archive/backup data - - Clock - A clock application/applet - - Electronics Electronics software, e.g. a circuit designer - Emulator Emulator of another platform, such as a DOS emulator @@ -1625,11 +1732,6 @@ entries: Categories, A Filemanager - - HamRadio - HAM radio software - - Shell A shell (an actual specific shell such as @@ -1641,29 +1743,34 @@ entries: Categories, - System - System application, "System Tools" such as say a log viewer or network monitor + TerminalEmulator + A terminal emulator application - Monitor - Monitor application/applet that monitors some resource or activity - System + TrayIcon + An application that is primarily an icon for the "system tray" or "notification area" (apps that open a normal window and just happen to have a tray icon as well should not list this category) + - TerminalEmulator - A terminal emulator application - + System + System application, "System Tools" such as say a log viewer or network monitor + (Settings) - TextEditor - A text editor - + Filesystem + A filesytem tool + System - TrayIcon - An application that is primarily an icon for the "system tray" or "notification area" (apps that open a normal window and just happen to have a tray icon as well should not list this category) - + Monitor + Monitor application/applet that monitors some resource or activity + System + + + Security + A security tool + Settings or System Utility @@ -1673,8 +1780,23 @@ entries: Categories, Accessibility Accessibility + Settings or Utility + + + Calculator + A calculator + Utilitiy + + + Clock + A clock application/applet Utility + + TextEditor + A text editor + Utilitiy + KDE Application based on KDE libraries diff --git a/menu/menu.dtd b/menu/menu.dtd new file mode 100644 index 0000000..893097e --- /dev/null +++ b/menu/menu.dtd @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2