diff options
Diffstat (limited to 'menu')
13 files changed, 230 insertions, 187 deletions
diff --git a/menu/applications.menu.in b/menu/applications.menu.in index 85a4aa3..291fef9 100644 --- a/menu/applications.menu.in +++ b/menu/applications.menu.in @@ -7,7 +7,7 @@ <Menuname>Office</Menuname> <Menuname>Graphics</Menuname> <Menuname>SoundVideo</Menuname> - <Menuname>Accessories</Menuname> + <Menuname>Tools</Menuname> <Menuname>Development</Menuname> <Menuname>Games</Menuname> <Menuname>Education</Menuname> @@ -29,10 +29,8 @@ <DefaultDirectoryDirs/> <Directory>mandrivalinux.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux</Category> - <Filename>mandriva-rpmdrake-root.desktop</Filename> - </Or> + <Category>X-MandrivaLinux</Category> + <Filename>mandriva-rpmdrake-root.desktop</Filename> </Include> <Menu> <Name>Internet</Name> @@ -59,16 +57,14 @@ <Include> <And> <Not> - <Or> - <Category>@MAIN_DESKTOP@</Category> - <Category>@MAIN_TOOLKIT@</Category> - <Category>X-MandrivaLinux-CrossDesktop</Category> - <Category>WebDevelopment</Category> - </Or> + <Category>@MAIN_DESKTOP@</Category> + <Category>@MAIN_TOOLKIT@</Category> + <Category>X-MandrivaLinux-CrossDesktop</Category> </Not> - <Or> - <Category>Network</Category> - </Or> + <Not> + <Category>WebDevelopment</Category> + </Not> + <Category>Network</Category> </And> </Include> </Menu> @@ -81,7 +77,9 @@ <Filename>calc2.2.desktop</Filename> <Filename>impress2.2.desktop</Filename> <Separator/> - <Merge type="all"/> + <Merge type="files"/> + <Menuname>More</Menuname> + <Merge type="menus"/> </Layout> <Include> <And> @@ -100,16 +98,14 @@ </And> </Include> <Menu> - <Name>Other</Name> + <Name>More</Name> <Directory>mandriva-office-more.directory</Directory> <Include> <And> <Not> - <Or> - <Category>@MAIN_DESKTOP@</Category> - <Category>@MAIN_TOOLKIT@</Category> - <Category>X-MandrivaLinux-CrossDesktop</Category> - </Or> + <Category>@MAIN_DESKTOP@</Category> + <Category>@MAIN_TOOLKIT@</Category> + <Category>X-MandrivaLinux-CrossDesktop</Category> </Not> <Or> <Category>Office</Category> @@ -139,20 +135,16 @@ </And> </Include> <Menu> - <Name>Other</Name> - <Directory>mandriva-graphics-other.directory</Directory> + <Name>More</Name> + <Directory>mandriva-graphics-more.directory</Directory> <Include> <And> <Not> - <Or> - <Category>@MAIN_DESKTOP@</Category> - <Category>@MAIN_TOOLKIT@</Category> - <Category>X-MandrivaLinux-CrossDesktop</Category> - </Or> + <Category>@MAIN_DESKTOP@</Category> + <Category>@MAIN_TOOLKIT@</Category> + <Category>X-MandrivaLinux-CrossDesktop</Category> </Not> - <Or> - <Category>Graphics</Category> - </Or> + <Category>Graphics</Category> </And> </Include> </Menu> @@ -178,22 +170,22 @@ </And> </Include> <Menu> - <Name>Other</Name> - <Directory>mandriva-soundvideo-other.directory</Directory> + <Name>More</Name> + <Directory>mandriva-soundvideo-more.directory</Directory> <Include> <And> <Not> - <Or> - <Category>@MAIN_DESKTOP@</Category> - <Category>@MAIN_TOOLKIT@</Category> - <Category>X-MandrivaLinux-CrossDesktop</Category> - </Or> + <Category>@MAIN_DESKTOP@</Category> + <Category>@MAIN_TOOLKIT@</Category> + <Category>X-MandrivaLinux-CrossDesktop</Category> </Not> <Or> <Category>X-MandrivaLinux-Multimedia-Other</Category> <Category>X-MandrivaLinux-Multimedia-Sound</Category> <Category>X-MandrivaLinux-Multimedia-Video</Category> <Category>AudioVideo</Category> + <Category>Video</Category> + <Category>Audio</Category> </Or> </And> </Include> @@ -205,10 +197,11 @@ <Layout> <Menuname>SystemTools</Menuname> <Menuname>Accessibility</Menuname> - <Menuname>Emulator</Menuname> + <Menuname>Emulators</Menuname> + <Separator/> <Merge type="files"/> - <Menuname>Other</Menuname> - <Merge type="dirs"/> + <Menuname>More</Menuname> + <Merge type="menus"/> </Layout> <Include> <And> @@ -223,7 +216,20 @@ <And> <Category>Settings</Category> <Not> - <Category>KDE</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> + <Category>GNOME</Category> </Not> </And> </Or> @@ -232,6 +238,8 @@ <Category>Monitor</Category> <Category>System</Category> <Category>Emulator</Category> + <Category>HardwareSettings</Category> + <Category>PackageManager</Category> </Not> </And> </Include> @@ -246,8 +254,9 @@ <Include> <Or> <And> + <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE --> <Not> - <Category>@MAIN_DESKTOP@</Category> + <Category>GNOME</Category> </Not> <Category>HardwareSettings</Category> </And> @@ -257,8 +266,17 @@ <Category>X-MandrivaLinux-CrossDesktop</Category> </Or> <Or> - <Category>System</Category> + <And> + <Category>System</Category> + <Not> + <Category>GNOME</Category> + </Not> + <Not> + <Category>Settings</Category> + </Not> + </And> <Category>Monitor</Category> + <Category>PackageManager</Category> </Or> </And> <Filename>mandriva-drakconf.desktop</Filename> @@ -286,25 +304,55 @@ <Category>Emulator</Category> </Include> </Menu> + <!-- always present, just to ensure GNOME preferences don't appear in any menu --> <Menu> - <Name>Other</Name> - <Directory>mandriva-tools-other.directory</Directory> + <Name>GNOME Preferences</Name> + <Directory>mandriva-system-configuration-gnome.directory</Directory> + <Include> + <And> + <Category>GNOME</Category> + <Or> + <Category>Settings</Category> + <Category>DesktopSettings</Category> + </Or> + </And> + <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category> + <Category>X-MandrivaLinux-System-Configuration-GNOME</Category> + </Include> + </Menu> + <!-- always present, just to ensure KDE preferences don't appear in any menu --> + <Menu> + <Name>KDE Preferences</Name> + <Directory>mandriva-system-configuration-kde.directory</Directory> + <MergeFile>/etc/xdg/kde/menus/kde-settings.menu</MergeFile> + </Menu> + <Menu> + <Name>KDE Info Center</Name> + <Directory>mandriva-system-configuration-kde.directory</Directory> + <MergeFile>/etc/xdg/kde/menus/kde-information.menu</MergeFile> + </Menu> + <Menu> + <Name>More</Name> + <Directory>mandriva-tools-more.directory</Directory> <Include> <And> <Not> <Category>@MAIN_DESKTOP@</Category> - </Not> - <Not> <Category>@MAIN_TOOLKIT@</Category> - </Not> - <Category>X-MandrivaLinux-CrossDesktop</Category> - <Not> <Category>Accessibility</Category> + <Category>X-MandrivaLinux-CrossDesktop</Category> </Not> + <Not> + <And> + <Category>GNOME</Category> + <Category>Settings</Category> + </And> + </Not> <Or> <Category>Utility</Category> <Category>System</Category> <Category>TextEditor</Category> + <Category>Settings</Category> </Or> </And> </Include> @@ -319,7 +367,6 @@ <Menuname>Interpreters</Menuname> <Menuname>Tools</Menuname> <Menuname>Code Generators</Menuname> - <Menuname>Other</Menuname> <Merge type="menus"/> <Merge type="files"/> </Layout> @@ -655,163 +702,131 @@ <Directory>mandriva-sciences.directory</Directory> <OnlyUnallocated/> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences</Category> - <Category>Science</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences</Category> + <Category>Science</Category> </Include> <Menu> <Name>Artificial Intelligence</Name> <Directory>mandriva-sciences-artificialintelligence.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category> - <Category>ArtificialIntelligence</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category> + <Category>ArtificialIntelligence</Category> </Include> </Menu> <Menu> <Name>Astronomy</Name> <Directory>mandriva-sciences-astronomy.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category> - <Category>Astronomy</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category> + <Category>Astronomy</Category> </Include> </Menu> <Menu> <Name>Biology</Name> <Directory>mandriva-sciences-biology.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category> - <Category>Biology</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category> + <Category>Biology</Category> </Include> </Menu> <Menu> <Name>Chemistry</Name> <Directory>mandriva-sciences-chemistry.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category> - <Category>Chemistry</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category> + <Category>Chemistry</Category> </Include> </Menu> <Menu> <Name>Computer Science</Name> <Directory>mandriva-sciences-computerscience.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category> - <Category>ComputerScience</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category> + <Category>ComputerScience</Category> </Include> </Menu> <Menu> <Name>Data Visualization</Name> <Directory>mandriva-sciences-datavisualization.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category> - <Category>DataVisualization</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category> + <Category>DataVisualization</Category> </Include> </Menu> <Menu> <Name>Electricity</Name> <Directory>mandriva-sciences-electricity.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category> - <Category>Electricity</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category> + <Category>Electricity</Category> </Include> </Menu> <Menu> <Name>Geosciences</Name> <Directory>mandriva-sciences-geosciences.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category> - <Category>Geoscience</Category> - <Category>Geology</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category> + <Category>Geoscience</Category> + <Category>Geology</Category> </Include> </Menu> <Menu> <Name>Image Processing</Name> <Directory>mandriva-sciences-imageprocessing.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category> - <Category>ImageProcessing</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category> + <Category>ImageProcessing</Category> </Include> </Menu> <Menu> <Name>Mathematics</Name> <Directory>mandriva-sciences-mathematics.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category> - <Category>Math</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category> + <Category>Math</Category> </Include> </Menu> <Menu> <Name>Numeric Analysis</Name> <Directory>mandriva-sciences-numericanalysis.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category> - <Category>NumericAnalysis</Category> - <Category>NumericalAnalysis</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category> + <Category>NumericAnalysis</Category> + <Category>NumericalAnalysis</Category> </Include> </Menu> <Menu> <Name>Parallel Computing</Name> <Directory>mandriva-sciences-parallelcomputing.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category> - <Category>ParallelComptuting</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category> + <Category>ParallelComptuting</Category> </Include> </Menu> <Menu> <Name>Physics</Name> <Directory>mandriva-sciences-physics.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category> - <Category>Physics</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category> + <Category>Physics</Category> </Include> </Menu> <Menu> <Name>Robotics</Name> <Directory>mandriva-sciences-robotics.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category> - <Category>Robotics</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category> + <Category>Robotics</Category> </Include> </Menu> <Menu> <Name>Other</Name> <Directory>mandriva-sciences-other.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category> - <Category>MedicalSoftware</Category> - <Category>Electronics</Category> - <Category>Engineering</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category> + <Category>MedicalSoftware</Category> + <Category>Electronics</Category> + <Category>Engineering</Category> </Include> </Menu> </Menu> @@ -819,26 +834,11 @@ <Name>Documentation</Name> <Directory>mandriva-documentation.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Documentation</Category> - <Category>Documentation</Category> - </Or> + <Category>X-MandrivaLinux-MoreApplications-Documentation</Category> + <Category>Documentation</Category> </Include> </Menu> <!-- - <Menu> - <Name>@MAIN_DESKTOP@ Preferences</Name> - <Directory>mandriva-system-configuration.directory</Directory> - <Include> - <And> - <Category>@MAIN_DESKTOP@</Category> - <Or> - <Category>Settings</Category> - <Category>DesktopSettings</Category> - </Or> - </And> - </Include> - </Menu> <Menu> <Name>Other</Name> <Directory>mandriva-other.directory</Directory> @@ -854,9 +854,7 @@ <Name>.hidden</Name> <Directory>mandriva-hidden.directory</Directory> <Include> - <Or> - <Category>X-MandrivaLinux-.hidden</Category> - </Or> + <Category>X-MandrivaLinux-.hidden</Category> </Include> </Menu> <MergeFile>applications-kmenuedit.menu</MergeFile> diff --git a/menu/desktop-directories/mandriva-moreapplications-communications.directory.in b/menu/desktop-directories/mandriva-moreapplications-communications.directory.in deleted file mode 100644 index a52c0ba..0000000 --- a/menu/desktop-directories/mandriva-moreapplications-communications.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Communications -Icon=communications_section diff --git a/menu/desktop-directories/mandriva-moreapplications-editors.directory.in b/menu/desktop-directories/mandriva-moreapplications-editors.directory.in deleted file mode 100644 index 9d61e53..0000000 --- a/menu/desktop-directories/mandriva-moreapplications-editors.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Editors -Icon=editors_section diff --git a/menu/desktop-directories/mandriva-moreapplications-finances.directory.in b/menu/desktop-directories/mandriva-moreapplications-finances.directory.in deleted file mode 100644 index ed2c40f..0000000 --- a/menu/desktop-directories/mandriva-moreapplications-finances.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Finances -Icon=finances_section diff --git a/menu/desktop-directories/mandriva-moreapplications-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-other.directory.in deleted file mode 100644 index 85301a2..0000000 --- a/menu/desktop-directories/mandriva-moreapplications-other.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Other -Icon=more_applications_other_section diff --git a/menu/desktop-directories/mandriva-soundvideo-other.directory.in b/menu/desktop-directories/mandriva-soundvideo-more.directory.in index 010bf91..e0f013f 100644 --- a/menu/desktop-directories/mandriva-soundvideo-other.directory.in +++ b/menu/desktop-directories/mandriva-soundvideo-more.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] Type=Directory Encoding=UTF-8 -_Name=Other +_Name=More Icon=multimedia_section diff --git a/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in b/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in deleted file mode 100644 index abc84b4..0000000 --- a/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Accessibility -Icon=accessibility-directory diff --git a/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in b/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in deleted file mode 100644 index 1fa5fe7..0000000 --- a/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -_Name=Advanced -_Comment=Advanced Settings -Icon=advanced-directory diff --git a/menu/desktop-directories/mandriva-system-configuration-kde.directory.in b/menu/desktop-directories/mandriva-system-configuration-kde.directory.in index 40183dc..f732c46 100644 --- a/menu/desktop-directories/mandriva-system-configuration-kde.directory.in +++ b/menu/desktop-directories/mandriva-system-configuration-kde.directory.in @@ -4,3 +4,4 @@ Encoding=UTF-8 _Name=KDE X-KDE-BaseGroup=settings Icon=kde_section +NoDisplay=true diff --git a/menu/desktop-directories/mandriva-tools-other.directory.in b/menu/desktop-directories/mandriva-tools-more.directory.in index bf6f545..6d11a29 100644 --- a/menu/desktop-directories/mandriva-tools-other.directory.in +++ b/menu/desktop-directories/mandriva-tools-more.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] Type=Directory Encoding=UTF-8 -_Name=Other +_Name=More Icon=system_section diff --git a/menu/menu.dtd b/menu/menu.dtd new file mode 100644 index 0000000..1bca3ed --- /dev/null +++ b/menu/menu.dtd @@ -0,0 +1,84 @@ +<!-- For explanations see http://www.freedesktop.org/standards/menu-spec --> +<!ELEMENT Menu ( + Name, ( + Directory + | DefaultAppDirs + | AppDir + | DefaultDirectoryDirs + | DirectoryDir + | LegacyDir + | KDELegacyDirs + | MergeFile + | DefaultMergeDirs + | MergeDir + | OnlyUnallocated + | NotOnlyUnallocated + | Deleted + | NotDeleted + | Include + | Exclude + | Move + | Menu + | Layout + | DefaultLayout + )* +)> + +<!ELEMENT Name (#PCDATA)> + +<!ELEMENT Directory (#PCDATA)> + +<!ELEMENT DefaultAppDirs EMPTY> +<!ELEMENT AppDir (#PCDATA)> + +<!ELEMENT DefaultDirectoryDirs EMPTY> +<!ELEMENT DirectoryDir (#PCDATA)> + +<!ELEMENT LegacyDir (#PCDATA)> +<!ATTLIST LegacyDir prefix CDATA #IMPLIED> +<!ELEMENT KDELegacyDirs EMPTY> + +<!ELEMENT MergeFile (#PCDATA)> +<!ATTLIST MergeFile type (path|parent) #IMPLIED> + +<!ELEMENT DefaultMergeDirs EMPTY> +<!ELEMENT MergeDir (#PCDATA)> + +<!ELEMENT OnlyUnallocated EMPTY> +<!ELEMENT NotOnlyUnallocated EMPTY> + +<!ELEMENT Deleted EMPTY> +<!ELEMENT NotDeleted EMPTY> + +<!ELEMENT Exclude ((Category|Filename|And|Or|Not|All)*)> +<!ELEMENT Include ((Category|Filename|And|Or|Not|All)*)> + +<!ELEMENT And ((Category|Filename|And|Or|Not|All)*)> +<!ELEMENT Or ((Category|Filename|And|Or|Not|All)*)> +<!ELEMENT Not ((Category|Filename|And|Or|Not|All)*)> +<!ELEMENT Filename (#PCDATA)> +<!ELEMENT Category (#PCDATA)> +<!ELEMENT All EMPTY> + +<!ELEMENT Move ((Old,New)*)> +<!ELEMENT Old (#PCDATA)> +<!ELEMENT New (#PCDATA)> + +<!ELEMENT Layout ((Filename|Menuname|Separator|Merge)*)> +<!ELEMENT DefaultLayout ((Filename|Menuname|Separator|Merge)*)> +<!ATTLIST DefaultLayout show_empty (true|false) #IMPLIED> +<!ATTLIST DefaultLayout inline (true|false) #IMPLIED> +<!ATTLIST DefaultLayout inline_limit CDATA #IMPLIED> +<!ATTLIST DefaultLayout inline_header (true|false) #IMPLIED> +<!ATTLIST DefaultLayout inline_alias (true|false) #IMPLIED> + +<!ELEMENT Menuname (#PCDATA)> +<!ATTLIST Menuname inline (true|false) #IMPLIED> +<!ATTLIST Menuname inline_limit CDATA #IMPLIED> +<!ATTLIST Menuname inline_header (true|false) #IMPLIED> +<!ATTLIST Menuname inline_alias (true|false) #IMPLIED> + +<!ELEMENT Separator EMPTY> + +<!ELEMENT Merge EMPTY> +<!ATTLIST Merge type (menus|files|all) #REQUIRED> diff --git a/menu/menustyle.csh b/menu/menustyle.csh index 74776db..6c43314 100755 --- a/menu/menustyle.csh +++ b/menu/menustyle.csh @@ -1,8 +1,4 @@ -if ($META_CLASS == desktop ) then - set MDV_MENU_STYLE=discovery -else - set MDV_MENU_STYLE=mandriva -endif +set MDV_MENU_STYLE=mandriva foreach file (/etc/sysconfig/menustyle $HOME/.menustyle) if ( -f $file ) then @@ -11,7 +7,7 @@ foreach file (/etc/sysconfig/menustyle $HOME/.menustyle) end if ($MDV_MENU_STYLE == discovery && ! ${?XDG_CONFIG_DIRS}) then - setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg + set MDV_MENU_STYLE=mandriva endif setenv MDV_MENU_STYLE $MDV_MENU_STYLE diff --git a/menu/menustyle.sh b/menu/menustyle.sh index e1b5051..5a3d46e 100755 --- a/menu/menustyle.sh +++ b/menu/menustyle.sh @@ -1,15 +1,10 @@ -if [ "$META_CLASS" = "desktop" ]; then - MDV_MENU_STYLE=discovery -else - MDV_MENU_STYLE=mandriva -fi +MDV_MENU_STYLE=mandriva [ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle [ -r $HOME/.menustyle ] && source $HOME/.menustyle -if [ "$MDV_MENU_STYLE" = "discovery" -a "x$XDG_CONFIG_DIRS" = "x" ]; then - XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg - export XDG_CONFIG_DIRS +if [ "$MDV_MENU_STYLE" = "discovery" ]; then + MDV_MENU_STYLE=mandriva fi export MDV_MENU_STYLE |