Commit b68bcd27 authored by Vincent Untz's avatar Vincent Untz
Browse files

layout: Drop settings.menu

It doesn't fit in the GNOME 3 world, where we use gnomecc.menu.
parent 9ff2b267
[Desktop Entry]
_Name=Internet and Network
_Comment=Network-related settings
Icon=preferences-system-network
Type=Directory
[Desktop Entry]
_Name=Look and Feel
_Comment=Settings controlling the desktop appearance and behavior
Icon=preferences-desktop
Type=Directory
......@@ -3,8 +3,6 @@ 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
......@@ -16,14 +14,11 @@ directory_in_files = \
Graphics.directory.in \
Network.directory.in \
Office.directory.in \
Settings.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)
directory_DATA = $(directory_in_files:.directory.in=.directory)
......
[Desktop Entry]
Type=Directory
_Name=Administration
_Comment=Change system-wide settings (affects all users)
Icon=preferences-system
[Desktop Entry]
_Name=Preferences
_Comment=Personal preferences
Icon=preferences-desktop
Type=Directory
[Desktop Entry]
_Name=System
_Comment=Personal preferences and administration settings
Icon=preferences-other
Type=Directory
menudir = $(sysconfdir)/xdg/menus
menu_DATA = \
applications.menu \
settings.menu
applications.menu
EXTRA_DIST= $(menu_DATA)
......
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Desktop</Name>
<Directory>X-GNOME-Menu-System.directory</Directory>
<!-- Read standard .directory and .desktop file locations -->
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
<!-- Read in overrides and child menus from applications-merged/ -->
<DefaultMergeDirs/>
<!-- Add a link to the control center -->
<Include>
<Filename>gnomecc.desktop</Filename>
</Include>
<!-- Merge in these other files as submenus -->
<Menu>
<Name>Preferences</Name>
<Directory>Settings.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Not>
<Or>
<Category>System</Category>
<Filename>gnomecc.desktop</Filename>
</Or>
</Not>
</And>
</Include>
</Menu>
<!-- System Settings -->
<Menu>
<Name>Administration</Name>
<Directory>Settings-System.directory</Directory>
<Include>
<And>
<Category>Settings</Category>
<Category>System</Category>
</And>
</Include>
</Menu> <!-- End System Settings -->
<Layout>
<Menuname>Preferences</Menuname>
<Menuname>Administration</Menuname>
<Merge type="menus"/>
<Merge type="files"/>
</Layout>
</Menu> <!-- End Settings -->
......@@ -6,20 +6,14 @@ desktop-directories/Education.directory.in
desktop-directories/Game.directory.in
desktop-directories/Graphics.directory.in
desktop-directories/Hardware.directory.in
desktop-directories/InternetAndNetwork.directory.in
desktop-directories/LookAndFeel.directory.in
desktop-directories/Network.directory.in
desktop-directories/Office.directory.in
desktop-directories/Personal.directory.in
desktop-directories/Settings-System.directory.in
desktop-directories/Settings.directory.in
desktop-directories/System.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
[type: gettext/glade]simple-editor/gmenu-simple-editor.ui
simple-editor/GMenuSimpleEditor/main.py
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment