diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-12-05 02:47:43 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-12-05 02:47:43 +0000 |
| commit | d641aaccde19af0a03d40fbe4aeb44224d5a1abb (patch) | |
| tree | d415d7b4722e22d7bee490fb3ddbebc9a56f09cc /menu | |
| parent | ee2482229ba905e333382fa102674c49b6d71bb4 (diff) | |
| download | common-data-d641aaccde19af0a03d40fbe4aeb44224d5a1abb.tar common-data-d641aaccde19af0a03d40fbe4aeb44224d5a1abb.tar.gz common-data-d641aaccde19af0a03d40fbe4aeb44224d5a1abb.tar.bz2 common-data-d641aaccde19af0a03d40fbe4aeb44224d5a1abb.tar.xz common-data-d641aaccde19af0a03d40fbe4aeb44224d5a1abb.zip | |
sanify Education and Science menus
- drop "Other" submenus, simply show those applications under main level
(note: this is not the famous "More", this is something else)
- do not show applications under Education -> Science if they are
already shown somewhere under Science (bug #1633)
- remove specific <Layout>s to use <DefaultLayout> and its inlining
settings, dropping single-entry submenus up one level on desktops
that support the inline_attribute (GNOME does, KDE applets don't)
Diffstat (limited to 'menu')
| -rw-r--r-- | menu/applications.menu.in | 61 |
1 files changed, 4 insertions, 57 deletions
diff --git a/menu/applications.menu.in b/menu/applications.menu.in index 6d7cbd7..559f21f 100644 --- a/menu/applications.menu.in +++ b/menu/applications.menu.in @@ -735,23 +735,12 @@ </Menu> <Menu> <Name>Education</Name> - <Layout> - <Menuname>Economy</Menuname> - <Menuname>Geography</Menuname> - <Menuname>History</Menuname> - <Menuname>Languages</Menuname> - <Menuname>Literature</Menuname> - <Menuname>Sciences</Menuname> - <Menuname>Sports</Menuname> - <Menuname>Other</Menuname> - <Merge type="menus"/> - <Merge type="files"/> - </Layout> <Directory>mandriva-education.directory</Directory> <OnlyUnallocated/> <Include> <Or> <Category>X-MandrivaLinux-MoreApplications-Education</Category> + <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category> <Category>Education</Category> </Or> </Include> @@ -808,6 +797,8 @@ <Menu> <Name>Sciences</Name> <Directory>mandriva-education-sciences.directory</Directory> + <!-- do not include those already under Science --> + <OnlyUnallocated/> <Include> <Or> <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category> @@ -828,48 +819,14 @@ </Or> </Include> </Menu> - <Menu> - <Name>Other</Name> - <Directory>mandriva-education-other.directory</Directory> - <Include> - <Or> - <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category> - <Category>Art</Category> - <Category>Construction</Category> - <Category>Teaching</Category> - <And> - <Category>Education</Category> - <Category>Music</Category> - </And> - </Or> - </Include> - </Menu> </Menu> <Menu> <Name>Sciences</Name> - <Layout> - <Menuname>Artificial Intelligence</Menuname> - <Menuname>Astronomy</Menuname> - <Menuname>Biology</Menuname> - <Menuname>Chemistry</Menuname> - <Menuname>Computer Science</Menuname> - <Menuname>Data Visualization</Menuname> - <Menuname>Electricity</Menuname> - <Menuname>Geosciences</Menuname> - <Menuname>Image Processing</Menuname> - <Menuname>Mathematics</Menuname> - <Menuname>Numeric Analysis</Menuname> - <Menuname>Parallel Computing</Menuname> - <Menuname>Physics</Menuname> - <Menuname>Robotics</Menuname> - <Menuname>Other</Menuname> - <Merge type="menus"/> - <Merge type="files"/> - </Layout> <Directory>mandriva-sciences.directory</Directory> <OnlyUnallocated/> <Include> <Category>X-MandrivaLinux-MoreApplications-Sciences</Category> + <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category> <Category>Science</Category> </Include> <Menu> @@ -986,16 +943,6 @@ <Category>Robotics</Category> </Include> </Menu> - <Menu> - <Name>Other</Name> - <Directory>mandriva-sciences-other.directory</Directory> - <Include> - <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category> - <Category>MedicalSoftware</Category> - <Category>Electronics</Category> - <Category>Engineering</Category> - </Include> - </Menu> </Menu> <Menu> <Name>Documentation</Name> |