[PC-BSD Commits] r12268 - pcbsd/current/src-sh/pc-xdgutil/menus
svn at pcbsd.org
svn at pcbsd.org
Wed Aug 24 15:02:31 PDT 2011
Author: kris
Date: 2011-08-24 15:02:31 -0700 (Wed, 24 Aug 2011)
New Revision: 12268
Modified:
pcbsd/current/src-sh/pc-xdgutil/menus/xfce-applications.menu
Log:
Fix the default xfce menu, it doesn't play well with mods
Modified: pcbsd/current/src-sh/pc-xdgutil/menus/xfce-applications.menu
===================================================================
--- pcbsd/current/src-sh/pc-xdgutil/menus/xfce-applications.menu 2011-08-24 19:59:18 UTC (rev 12267)
+++ pcbsd/current/src-sh/pc-xdgutil/menus/xfce-applications.menu 2011-08-24 22:02:31 UTC (rev 12268)
@@ -1,456 +1,172 @@
- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
- <Name>Applications</Name>
- <Directory>pcbsd-main.directory</Directory>
- <!-- Search the default locations -->
- <KDELegacyDirs/>
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <DefaultLayout>
- <Merge type="menus"/>
- <Merge type="files"/>
- <Separator/>
- <Menuname>More</Menuname>
- </DefaultLayout>
+ <Name>Xfce</Name>
- <Include>
- <Category>X-Xfce-Toplevel</Category>
- </Include>
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+ <DefaultMergeDirs/>
- <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/>
- <Menuname>Settings</Menuname>
- <Separator/>
- <Merge type="all"/>
- <Separator/>
- <Filename>xfce4-help.desktop</Filename>
- <Filename>xfce4-about-xfce.desktop</Filename>
- <Filename>xfce4-logout.desktop</Filename>
- </Layout>
+ <Include>
+ <Category>X-Xfce-Toplevel</Category>
+ </Include>
- <Menu>
- <Name>Applications</Name>
- <Directory>pcbsd-unknown.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Not>
- <!-- Don't list non-KDE core applications -->
- <And>
- <Category>Core</Category>
- <Not><Category>KDE</Category></Not>
- </And>
- <!-- Don't list SUSE's YaST in here -->
- <Category>X-SuSE-YaST</Category>
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-accessibility</Category>
- <Category>X-KDE-settings-components</Category>
- <Category>X-KDE-settings-desktop</Category>
- <Category>X-KDE-settings-looknfeel</Category>
- <Category>X-KDE-settings-network</Category>
- <Category>X-KDE-settings-webbrowsing</Category>
- <Category>X-KDE-settings-peripherals</Category>
- <Category>X-KDE-settings-hardware</Category>
- <Category>X-KDE-settings-power</Category>
- <Category>X-KDE-settings-security</Category>
- <Category>X-KDE-settings-sound</Category>
- <Category>X-KDE-settings-system</Category>
- <Category>X-KDE-information</Category>
- <Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
- <Filename>kde-medianotifications.desktop</Filename>
- <Filename>kde-audioencoding.desktop</Filename>
- </Not>
- </Include>
- </Menu>
- <Menu>
- <Name>Development</Name>
- <Directory>pcbsd-development.directory</Directory>
- <Menu>
- <Name>X-KDE-KDevelopIDE</Name>
- <Directory>pcbsd-development-kdevelop.directory</Directory>
- <Include>
- <And>
- <Category>Development</Category>
- <Category>X-KDE-KDevelopIDE</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Translation</Name>
- <Directory>pcbsd-development-translation.directory</Directory>
- <Include>
- <And>
- <Category>Development</Category>
- <Category>Translation</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Web Development</Name>
- <Directory>pcbsd-development-webdevelopment.directory</Directory>
- <Include>
- <And>
- <Category>Development</Category>
- <Category>WebDevelopment</Category>
- </And>
- </Include>
- </Menu>
- <Include>
- <And>
- <Category>Development</Category>
- <Not><Category>X-KDE-KDevelopIDE</Category></Not>
- <Not><Category>Translation</Category></Not>
- <Not><Category>WebDevelopment</Category></Not>
- </And>
- </Include>
+ <Layout>
+ <Filename>xfrun4.desktop</Filename>
+ <Separator/>
+ <Filename>exo-terminal-emulator.desktop</Filename>
+ <Filename>exo-file-manager.desktop</Filename>
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Separator/>
+ <Merge type="all"/>
+ <Separator/>
+ <Filename>xfhelp4.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Layout>
+
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
+ <Include>
+ <Category>Settings</Category>
+ </Include>
+
+ <Layout>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Separator/>
+ <Merge type="all"/>
+ </Layout>
+
+ <Menu>
+ <Name>Screensavers</Name>
+ <Directory>xfce-screensavers.directory</Directory>
+ <Include>
+ <Category>Screensaver</Category>
+ </Include>
</Menu>
- <Menu>
- <Name>Science</Name>
- <Directory>pcbsd-science.directory</Directory>
- <Include>
- <And><!-- Include /any/ Science app which is not an Education app -->
- <Or>
- <Category>Astronomy</Category>
- <Category>Biology</Category>
- <Category>Chemistry</Category>
- <Category>Geology</Category>
- <Category>MedicalSoftware</Category>
- <Category>Physics</Category>
- <Category>Math</Category>
- <Category>Science</Category>
- </Or>
- <Not><Category>Education</Category></Not>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Education</Name>
- <Directory>pcbsd-education.directory</Directory>
- <Menu>
- <Name>Languages</Name>
- <Directory>pcbsd-edu-languages.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Or>
- <Category>Languages</Category>
- <Category>X-KDE-Edu-Language</Category>
- </Or>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Mathematics</Name>
- <Directory>pcbsd-edu-mathematics.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Math</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Miscellaneous</Name>
- <Directory>pcbsd-edu-miscellaneous.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Not>
- <Category>Languages</Category>
- <Category>X-KDE-Edu-Language</Category>
- <Category>Math</Category>
- <Category>Science</Category>
- <Category>Teaching</Category>
- <Category>X-KDE-Edu-Teaching</Category>
- </Not>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Science</Name>
- <Directory>pcbsd-edu-science.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Category>Science</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Tools</Name>
- <Directory>pcbsd-edu-tools.directory</Directory>
- <Include>
- <And>
- <Category>Education</Category>
- <Or>
- <Category>Teaching</Category>
- <Category>X-KDE-Edu-Teaching</Category>
- </Or>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Games</Name>
- <Directory>pcbsd-games.directory</Directory>
- <Menu>
- <Name>Arcade</Name>
- <Directory>pcbsd-games-arcade.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Category>ArcadeGame</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Board</Name>
- <Directory>pcbsd-games-board.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Category>BoardGame</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Card</Name>
- <Directory>pcbsd-games-card.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Category>CardGame</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Kidsgames</Name>
- <Directory>pcbsd-games-kids.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Or>
- <Category>X-KDE-KidsGame</Category>
- <Category>KidsGame</Category>
- </Or>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>TacticStrategy</Name>
- <Directory>pcbsd-games-strategy.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Category>StrategyGame</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>Logic</Name>
- <Directory>pcbsd-games-logic.directory</Directory>
- <Include>
- <And>
- <Category>Game</Category>
- <Category>LogicGame</Category>
- </And>
- </Include>
- </Menu>
- <Include>
- <And>
- <Category>Game</Category>
- <Not>
- <Category>ArcadeGame</Category>
- <Category>BoardGame</Category>
- <Category>CardGame</Category>
- <Category>X-KDE-KidsGame</Category>
- <Category>KidsGame</Category>
- <Category>StrategyGame</Category>
- <Category>LogicGame</Category>
- </Not>
- </And>
- </Include>
- <Menu>
- <Name>Toys</Name>
- <Directory>pcbsd-toys.directory</Directory>
- <Include>
- <Category>Amusement</Category>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Graphics</Name>
- <Directory>pcbsd-graphics.directory</Directory>
- <Include>
- <And>
- <Category>Graphics</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- </Include>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>Graphics</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Internet</Name>
- <Directory>pcbsd-internet.directory</Directory>
- <Include>
- <And>
- <Category>Network</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- </Include>
- <Menu>
- <Name>Terminal</Name>
- <Directory>pcbsd-internet-terminal.directory</Directory>
- </Menu>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>Network</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Multimedia</Name>
- <Directory>pcbsd-multimedia.directory</Directory>
- <Include>
- <And>
- <Category>AudioVideo</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- </Include>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>AudioVideo</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Office</Name>
- <Directory>pcbsd-office.directory</Directory>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-koshell.desktop</Filename>
- <Filename>kde-Kontact.desktop</Filename>
- <Separator/>
- <Filename>kde-kword.desktop</Filename>
- <Filename>kde-kspread.desktop</Filename>
- <Filename>kde-kpresenter.desktop</Filename>
- <Merge type="files"/>
- <Separator/>
- <Menuname>More</Menuname>
- </Layout>
- <Include>
- <And>
- <Category>Office</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- </Include>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>Office</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Settingsmenu</Name>
- <Directory>pcbsd-settingsmenu.directory</Directory>
- <Include>
- <Category>Settings</Category>
- </Include>
- </Menu>
- <Menu>
- <Name>System</Name>
- <Directory>pcbsd-system.directory</Directory>
- <Include>
- <And>
- <Category>System</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- </Include>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>System</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- <Menu>
- <Name>ScreenSavers</Name>
- <Directory>pcbsd-system-screensavers.directory</Directory>
- </Menu>
- <Menu>
- <Name>Terminal</Name>
- <Directory>pcbsd-system-terminal.directory</Directory>
- </Menu>
- </Menu>
- <Menu>
- <Name>Utilities</Name>
- <Directory>pcbsd-utilities.directory</Directory>
- <Include>
- <And>
- <Category>Utility</Category>
- <Not><Category>X-KDE-More</Category></Not>
- </And>
- <Category>TextEditor</Category>
- <Category>Accessibility</Category>
- <Category>X-KDE-Utilities-Desktop</Category>
- <Category>X-KDE-Utilities-File</Category>
- <Category>X-KDE-Utilities-Peripherals</Category>
- <Category>X-KDE-Utilities-PIM</Category>
- </Include>
- <Menu>
- <Name>XUtilities</Name>
- <Directory>pcbsd-utilities-xutils.directory</Directory>
- </Menu>
- <Menu>
- <Name>More</Name>
- <Directory>pcbsd-more.directory</Directory>
- <Include>
- <And>
- <Category>Utility</Category>
- <Category>X-KDE-More</Category>
- </And>
- </Include>
- </Menu>
- </Menu>
- <Include>
- <And>
- <Category>KDE</Category>
- <Category>Core</Category>
- </And>
- </Include>
- <DefaultMergeDirs/>
- <MergeFile>applications-kmenuedit.menu</MergeFile>
+ </Menu>
+
+ <Menu>
+ <Name>Accessories</Name>
+ <Directory>xfce-accessories.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Accessibility</Category>
+ <Category>Core</Category>
+ <Category>Legacy</Category>
+ <Category>Utility</Category>
+ </Or>
+ </Include>
+ <Exclude>
+ <Or>
+ <Filename>exo-file-manager.desktop</Filename>
+ <Filename>exo-terminal-emulator.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfrun4.desktop</Filename>
+ </Or>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Development</Name>
+ <Directory>xfce-development.directory</Directory>
+ <Include>
+ <Category>Development</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Education</Name>
+ <Directory>xfce-education.directory</Directory>
+ <Include>
+ <Category>Education</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Games</Name>
+ <Directory>xfce-games.directory</Directory>
+ <Include>
+ <Category>Game</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Graphics</Name>
+ <Directory>xfce-graphics.directory</Directory>
+ <Include>
+ <Category>Graphics</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Multimedia</Name>
+ <Directory>xfce-multimedia.directory</Directory>
+ <Include>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+ <Category>AudioVideo</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Network</Name>
+ <Directory>xfce-network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+ <Exclude>
+ <Or>
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ </Or>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Office</Name>
+ <Directory>xfce-office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Science</Name>
+ <Directory>xfce-science.directory</Directory>
+ <Include>
+ <Category>Science</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Emulator</Category>
+ <Category>System</Category>
+ </Or>
+ </Include>
+ <Exclude>
+ <Or>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Or>
+ </Exclude>
+ </Menu>
+
+ <Menu>
+ <Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
+ <OnlyUnallocated/>
+ <Include>
+ <All/>
+ </Include>
+ </Menu>
+
</Menu>
More information about the Commits
mailing list