1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
|
From: Josselin Mouette <joss@debian.org>
Date: Fri, 18 Jul 2008 16:18:32 +0000
Subject: Split Science out of the Education menu
Use "science" icon for Science, "accessories" for Education, and
"utilities" for Accessories, since that fits better how the icons were
designed.
Origin: vendor, Debian
Forwarded: no
---
desktop-directories/Education.directory.desktop.in | 2 +-
desktop-directories/Utility.directory.desktop.in | 2 +-
layout/gnome-applications.menu | 13 +++++++++++++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/desktop-directories/Education.directory.desktop.in b/desktop-directories/Education.directory.desktop.in
index 263224a..58a471d 100644
--- a/desktop-directories/Education.directory.desktop.in
+++ b/desktop-directories/Education.directory.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=Education
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=applications-science
+Icon=applications-accessories
Type=Directory
diff --git a/desktop-directories/Utility.directory.desktop.in b/desktop-directories/Utility.directory.desktop.in
index 9721f21..ee0d0b0 100644
--- a/desktop-directories/Utility.directory.desktop.in
+++ b/desktop-directories/Utility.directory.desktop.in
@@ -2,5 +2,5 @@
Name=Accessories
Comment=Desktop accessories
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=applications-accessories
+Icon=applications-utilities
Type=Directory
diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
index b2a6907..f86d808 100644
--- a/layout/gnome-applications.menu
+++ b/layout/gnome-applications.menu
@@ -86,10 +86,23 @@
<Include>
<And>
<Category>Education</Category>
+ <Not><Category>Science</Category></Not>
</And>
</Include>
</Menu> <!-- End Education -->
+ <!-- Science -->
+ <Menu>
+ <Name>Science</Name>
+ <Directory>GnomeScience.directory</Directory>
+ <Include>
+ <And>
+ <Category>Education</Category>
+ <Category>Science</Category>
+ </And>
+ </Include>
+ </Menu> <!-- End Science -->
+
<!-- Games -->
<Menu>
<Name>Games</Name>
|