From 8e30a5f4bfa09d11debfdd2b1f27785cc82ca068 Mon Sep 17 00:00:00 2001
From: "Anton V. Boyarshinov" <boyarsh@altlinux.org>
Date: Tue, 26 Apr 2011 13:27:56 +0400
Subject: [PATCH] menus customizations

---
 branding.spec                                 |  5 +-
 ...enueditor.menu => gnome-applications.menu} |  1 +
 gnome-settings/settings.menu                  | 57 +++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 rename gnome-settings/{applications-menueditor.menu => gnome-applications.menu} (91%)
 create mode 100644 gnome-settings/settings.menu

diff --git a/branding.spec b/branding.spec
index 2e4ddf6..bfa46cc 100644
--- a/branding.spec
+++ b/branding.spec
@@ -171,7 +171,7 @@ Requires: gtk2-theme-mist
 Provides: gnome-theme-%brand-%theme = %version-%release
 Provides: metacity-theme-%brand-%theme = %version-%release
 Provides: metacity-theme
-#Provides: gnome-menus
+Provides: gnome-menus = 2.30.4
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
 
 %description gnome-settings
@@ -295,7 +295,8 @@ mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
 install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
 install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
 mkdir -p '%buildroot/etc/xdg/menus/'
-install -m 644 applications-menueditor.menu '%buildroot/etc/xdg/menus/'
+install -m 644 gnome-applications.menu '%buildroot/etc/xdg/menus/'
+install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
 cp -a skel/.gconf  '%buildroot/etc/skel/'
 popd
 
diff --git a/gnome-settings/applications-menueditor.menu b/gnome-settings/gnome-applications.menu
similarity index 91%
rename from gnome-settings/applications-menueditor.menu
rename to gnome-settings/gnome-applications.menu
index 5c25794..e5dbc38 100644
--- a/gnome-settings/applications-menueditor.menu
+++ b/gnome-settings/gnome-applications.menu
@@ -2,6 +2,7 @@
  "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
 
 <Menu>
+  <MergeFile>altlinux-applications.menu</MergeFile>
   <Name>Applications</Name>
   <Menu>
     <Name>Multimedia</Name>
diff --git a/gnome-settings/settings.menu b/gnome-settings/settings.menu
new file mode 100644
index 0000000..588d4cb
--- /dev/null
+++ b/gnome-settings/settings.menu
@@ -0,0 +1,57 @@
+<!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 -->