- Add discovery menu and script to support MDV_MENU_STYLE

4 files changed, 252 insertions, 4 deletions

diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 6d45cee..c8ddaa4 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -3,7 +3,7 @@
 Summary:	Desktop common files 
 Name:		desktop-common-data
 Version:	2007
-Release: 	%mkrel 6
+Release: 	%mkrel 7
 License:	GPL
 URL:		http://www.mandrivalinux.com/
 Group:		System/Configuration/Other
@@ -100,12 +100,13 @@ install -m 0644 menu/icons/large/*.png %buildroot/%_liconsdir
 install -m 0644 menu/icons/mini/*.png %buildroot/%_miconsdir
 
 # XDG menus
-install -d -m 0755 %buildroot/%_sysconfdir/xdg/menus/applications-merged
-install -d -m 0755 %buildroot/%_sysconfdir/menu.d
+install -d -m 0755 %buildroot/%_sysconfdir/xdg/menus/applications-merged  %buildroot/%_sysconfdir/xdg/discovery/menus/applications-merged
+install -d -m 0755 %buildroot/%_sysconfdir/menu.d %buildroot/%_sysconfdir/profile.d
 install -m 0644 menu/applications-mdk.menu %buildroot/%_sysconfdir/xdg/menus/applications.menu
+install -m 0644 menu/applications-discovery.menu %buildroot/%_sysconfdir/xdg/discovery/menus/applications.menu
 install -m 0755 menu/xdg_menu %buildroot/%_bindir
-#temporary name
 install -m 0755 menu/update-menus %buildroot/%_bindir/update-menus
+install -m 0755 menu/menustyle.sh menu/menustyle.csh %buildroot/%_sysconfdir/profile.d
 
 install -d -m 0755 %buildroot/%_datadir/desktop-directories
 mkdir tmp-l10n
@@ -154,11 +155,15 @@ rm -fr %buildroot
 %_sbindir/*
 
 %_sysconfdir/X11/xinit.d/*
+%_sysconfdir/profile.d/*
 %dir %_sysconfdir/menu.d
 %dir %_sysconfdir/xdg
 %dir %_sysconfdir/xdg/menus
 %dir %_sysconfdir/xdg/menus/applications-merged
+%dir %_sysconfdir/xdg/discovery/menus
+%dir %_sysconfdir/xdg/discovery/menus/applications-merged
 %config(noreplace) %_sysconfdir/xdg/menus/*.menu
+%config(noreplace) %_sysconfdir/xdg/discovery/menus/*.menu
 
 #
 %dir %_datadir/faces/
@@ -187,6 +192,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Thu Aug 17 2006 Frederic Crozat <fcrozat@mandriva.com> 2007-7mdv2007.0
+- Add discovery menu and script to support MDV_MENU_STYLE
+
 * Thu Aug 17 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-6
 - Change requires to mandriva-theme
 
diff --git a/menu/applications-discovery.menu b/menu/applications-discovery.menu
new file mode 100644
index 0000000..7998215
--- /dev/null
+++ b/menu/applications-discovery.menu
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Mandriva Linux</Name>
+  <Layout>
+    <Menuname>Games</Menuname>
+    <Menuname>Graphics</Menuname>
+    <Menuname>Internet</Menuname>
+    <Menuname>Multimedia</Menuname>
+    <Menuname>Office</Menuname>
+    <Menuname>System</Menuname>
+    <Menuname>Help</Menuname>
+    <Menuname>More Applications</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+  <DefaultLayout inline="true" inline_limit="1" inline_header="false">
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </DefaultLayout>
+
+  <DefaultMergeDirs/>
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>mandrivalinux.directory</Directory>
+  <Include>
+    <Or>
+	    <Category>X-MandrivaLinux</Category>
+	    <Category>X-MandrivaLinux-Other</Category>
+    </Or>
+  </Include>
+    <Menu>
+      <Name>Games</Name>
+      <Directory>mandriva-moreapplications-games.directory</Directory>
+      <Include>
+	      <Or>
+		      <Category>X-MandrivaLinux-MoreApplications-Games</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
+		</Or>
+        </Include>
+    </Menu>
+    <Menu>
+      <Name>Graphics</Name>
+      <Directory>mandriva-multimedia-graphics.directory</Directory>
+      <Include>
+	      <Or>
+		      <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
+	      </Or>
+      </Include>
+    </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>mandriva-internet.directory</Directory>
+    <Include>
+	    <Or>
+		    <Category>X-MandrivaLinux-Internet</Category>
+        <Category>X-MandrivaLinux-Internet-Chat</Category>
+        <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
+        <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
+		      <Category>X-MandrivaLinux-Internet-Mail</Category>
+		      <Category>X-MandrivaLinux-Internet-News</Category>
+		      <Category>X-MandrivaLinux-Internet-VideoConference</Category>
+		      <Category>X-MandrivaLinux-Internet-Other</Category>
+		      <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
+		      <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
+		      <Category>X-MandrivaLinux-Internet-WebEditors</Category>
+	      </Or>
+      </Include>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Layout>
+      <Menuname>Sound</Menuname>
+      <Menuname>Video</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-multimedia.directory</Directory>
+    <Include>
+	    <Or>
+		    <Category>X-MandrivaLinux-Multimedia</Category>
+		      <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+		      <Category>X-MandrivaLinux-Multimedia-Video</Category>
+		      <Category>X-MandrivaLinux-Multimedia-Other</Category>
+	      </Or>
+      </Include>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>mandriva-office.directory</Directory>
+    <Include>
+      <Or>
+		      <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
+        <Category>X-MandrivaLinux-Office</Category>
+         <Category>X-MandrivaLinux-Office-Accessories</Category>
+        <Category>X-MandrivaLinux-Office-AddressBooks</Category>
+        <Category>X-MandrivaLinux-Office-Communications</Category>
+          <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
+		  <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
+		  <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
+			<Category>X-MandrivaLinux-Office-Communications-Other</Category>
+		      <Category>X-MandrivaLinux-Office-Drawing</Category>
+		      <Category>X-MandrivaLinux-Office-Graphs</Category>
+		      <Category>X-MandrivaLinux-Office-Presentations</Category>
+		      <Category>X-MandrivaLinux-Office-Publishing</Category>
+		      <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
+		      <Category>X-MandrivaLinux-Office-TasksManagement</Category>
+		 <Category>X-MandrivaLinux-Office-TimeManagement</Category>
+        <Category>X-MandrivaLinux-Office-Other</Category>
+        <Category>X-MandrivaLinux-Office-WordProcessors</Category>
+	</Or>
+      </Include>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Directory>mandriva-system.directory</Directory>
+    <Include>
+	    <Or>
+		    <Category>X-MandrivaLinux-System</Category>
+		      <Category>X-MandrivaLinux-System-Archiving</Category>
+			<Category>X-MandrivaLinux-System-Archiving-Backup</Category>
+			<Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
+			<Category>X-MandrivaLinux-System-Archiving-Compression</Category>
+			<Category>X-MandrivaLinux-System-Archiving-Other</Category>
+		      <Category>X-MandrivaLinux-System-FileTools</Category>
+		      <Category>X-MandrivaLinux-System-Monitoring</Category>
+		      <Category>X-MandrivaLinux-System-Session</Category>
+			<Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
+		      <Category>X-MandrivaLinux-System-Terminals</Category>
+		      <Category>X-MandrivaLinux-System-TextTools</Category>
+		      <Category>X-MandrivaLinux-System-Configuration</Category>
+			<Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Networking</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Printing</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Users</Category>
+			<Category>X-MandrivaLinux-System-Configuration-Other</Category>
+		</Or>
+        </Include>
+  </Menu>
+    <Menu>
+      <Name>Documentation</Name>
+      <Directory>mandriva-moreapplications-documentation.directory</Directory>
+      <Include>
+	      <Or>
+		      <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
+	      </Or>
+      </Include>
+    </Menu>
+  <Menu>
+    <Name>More Applications</Name>
+    <Directory>mandriva-moreapplications.directory</Directory>
+    <Include>
+	    <Or>
+		    <Category>X-MandrivaLinux-MoreApplications</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Development</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Other</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Education</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
+		      <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
+			<Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
+		</Or>
+        </Include>
+  </Menu>
+</Menu>
diff --git a/menu/menustyle.csh b/menu/menustyle.csh
new file mode 100755
index 0000000..d2c6502
--- /dev/null
+++ b/menu/menustyle.csh
@@ -0,0 +1,18 @@
+#!/bin/csh
+if ($META_CLASS == desktop ) then 
+	set MDV_MENU_STYLE=discovery 
+else
+	set MDV_MENU_STYLE=mandriva
+endif
+
+foreach file (/etc/sysconfig/menustyle $HOME/.menustyle)
+ if ( -f $file ) then
+   eval `sed 's|^#.*||' $file | sed 's|\([^=]*\)=\([^=]*\)|set \1=\2|g' | sed 's|$|;|' `
+ endif
+end
+
+if ($MDV_MENU_STYLE  == discovery ) then
+	setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg
+endif
+
+setenv MDV_MENU_STYLE $MDV_MENU_STYLE
diff --git a/menu/menustyle.sh b/menu/menustyle.sh
new file mode 100755
index 0000000..d9788ab
--- /dev/null
+++ b/menu/menustyle.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$META_CLASS" = "desktop" ]; then 
+	MDV_MENU_STYLE=discovery 
+else
+	MDV_MENU_STYLE=mandriva
+fi
+
+[ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle
+[ -r $HOME/.menustyle ] && source $HOME/.menustyle
+
+if [ "$MDV_MENU_STYLE" = "discovery" ]; then
+	XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg
+	export XDG_CONFIG_DIRS
+fi
+
+export MDV_MENU_STYLE