Updating branch refs/heads/master
to cdd22b6f27567f978e1bdf2c9aabd9262f699aac (commit)
from 66fac6bc616ca541c2bc9ac3fce619692e6a777d (commit)
commit cdd22b6f27567f978e1bdf2c9aabd9262f699aac
Author: Nick Schermer <[email protected]>
Date: Wed Apr 28 23:44:00 2010 +0200
Add Xfce menu data from Xfdesktop (bug #6272).
Because this data is used by both Xfdesktop and Xfce4-panel, we
need to move it to a module both packages depend on.
Makefile.am | 3 +-
configure.in.in | 2 +
data/Makefile.am | 21 ++++
data/xfce/Makefile.am | 47 +++++++++
data/xfce/xfce-accessories.directory.in | 7 ++
data/xfce/xfce-applications.menu | 152 ++++++++++++++++++++++++++++++
data/xfce/xfce-development.directory.in | 7 ++
data/xfce/xfce-education.directory.in | 7 ++
data/xfce/xfce-games.directory.in | 7 ++
data/xfce/xfce-graphics.directory.in | 7 ++
data/xfce/xfce-multimedia.directory.in | 7 ++
data/xfce/xfce-network.directory.in | 7 ++
data/xfce/xfce-office.directory.in | 7 ++
data/xfce/xfce-other.directory.in | 7 ++
data/xfce/xfce-science.directory.in | 7 ++
data/xfce/xfce-screensavers.directory.in | 7 ++
data/xfce/xfce-settings.directory.in | 7 ++
data/xfce/xfce-system.directory.in | 7 ++
po/POTFILES.in | 13 +++
19 files changed, 328 insertions(+), 1 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index e6b3d94..fff8707 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,9 @@
# Boston, MA 02110-1301, USA.
SUBDIRS = \
- garcon \
+ garcon \
docs \
+ data \
tests \
po
diff --git a/configure.in.in b/configure.in.in
index fa06465..2be2050 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -199,6 +199,8 @@ esac
AC_OUTPUT([
Makefile
+data/Makefile
+data/xfce/Makefile
docs/Makefile
docs/reference/Makefile
docs/reference/version.xml
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..147b74a
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,21 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+#
+# Copyright (c) 2010 Xfce Development Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General
+# Public License along with this library; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+SUBDIRS = \
+ xfce
diff --git a/data/xfce/Makefile.am b/data/xfce/Makefile.am
new file mode 100644
index 0000000..513a4cc
--- /dev/null
+++ b/data/xfce/Makefile.am
@@ -0,0 +1,47 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+#
+# Copyright (c) 2010 Xfce Development Team
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General
+# Public License along with this library; if not, write to the
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+
+menudir = $(sysconfdir)/xdg/menus
+menu_DATA = \
+ xfce-applications.menu
+
+directorydir = $(datadir)/desktop-directories
+directory_in_files = \
+ xfce-accessories.directory.in \
+ xfce-development.directory.in \
+ xfce-education.directory.in \
+ xfce-games.directory.in \
+ xfce-graphics.directory.in \
+ xfce-multimedia.directory.in \
+ xfce-network.directory.in \
+ xfce-office.directory.in \
+ xfce-other.directory.in \
+ xfce-science.directory.in \
+ xfce-screensavers.directory.in \
+ xfce-settings.directory.in \
+ xfce-system.directory.in
+
+directory_DATA = $(directory_in_files:.directory.in=.directory)
+...@intltool_directory_rule@
+
+EXTRA_DIST = \
+ $(directory_in_files)
+
+DISTCLEANFILES = \
+ $(directory_DATA)
diff --git a/data/xfce/xfce-accessories.directory.in
b/data/xfce/xfce-accessories.directory.in
new file mode 100644
index 0000000..c42e201
--- /dev/null
+++ b/data/xfce/xfce-accessories.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-accessories
+_Name=Accessories
+_Comment=Common desktop tools and applications
diff --git a/data/xfce/xfce-applications.menu b/data/xfce/xfce-applications.menu
new file mode 100644
index 0000000..2a54a10
--- /dev/null
+++ b/data/xfce/xfce-applications.menu
@@ -0,0 +1,152 @@
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
+ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd";>
+
+<Menu>
+ <Name>Xfce</Name>
+
+ <DefaultAppDirs/>
+ <DefaultDirectoryDirs/>
+
+ <Include>
+ <Category>X-Xfce-Toplevel</Category>
+ </Include>
+
+ <Layout>
+ <Filename>xfrun4.desktop</Filename>
+ <Separator/>
+ <Filename>exo-terminal-emulator.desktop</Filename>
+ <Filename>exo-file-manager.desktop</Filename>
+ <Filename>exo-mail-reader.desktop</Filename>
+ <Filename>exo-web-browser.desktop</Filename>
+ <Separator/>
+ <Menuname>Settings</Menuname>
+ <Separator/>
+ <Merge type="all"/>
+ <Separator/>
+ <Filename>xfhelp4.desktop</Filename>
+ <Filename>xfce4-about.desktop</Filename>
+ <Filename>xfce4-session-logout.desktop</Filename>
+ </Layout>
+
+ <Menu>
+ <Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
+ <Include>
+ <Category>Settings</Category>
+ </Include>
+
+ <Layout>
+ <Filename>xfce-settings-manager.desktop</Filename>
+ <Separator/>
+ <Merge type="all"/>
+ </Layout>
+
+ <Menu>
+ <Name>Screensavers</Name>
+ <Directory>xfce-screensavers.directory</Directory>
+ <Include>
+ <Category>Screensaver</Category>
+ </Include>
+ </Menu>
+ </Menu>
+
+ <Menu>
+ <Name>Accessories</Name>
+ <Directory>xfce-accessories.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Accessibility</Category>
+ <Category>Core</Category>
+ <Category>Legacy</Category>
+ <Category>Utility</Category>
+ </Or>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Development</Name>
+ <Directory>xfce-development.directory</Directory>
+ <Include>
+ <Category>Development</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Education</Name>
+ <Directory>xfce-education.directory</Directory>
+ <Include>
+ <Category>Education</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Games</Name>
+ <Directory>xfce-games.directory</Directory>
+ <Include>
+ <Category>Game</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Graphics</Name>
+ <Directory>xfce-graphics.directory</Directory>
+ <Include>
+ <Category>Graphics</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Multimedia</Name>
+ <Directory>xfce-multimedia.directory</Directory>
+ <Include>
+ <Category>Audio</Category>
+ <Category>Video</Category>
+ <Category>AudioVideo</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Network</Name>
+ <Directory>xfce-network.directory</Directory>
+ <Include>
+ <Category>Network</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Office</Name>
+ <Directory>xfce-office.directory</Directory>
+ <Include>
+ <Category>Office</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Science</Name>
+ <Directory>xfce-science.directory</Directory>
+ <Include>
+ <Category>Science</Category>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
+ <Include>
+ <Or>
+ <Category>Emulator</Category>
+ <Category>System</Category>
+ </Or>
+ </Include>
+ </Menu>
+
+ <Menu>
+ <Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
+ <OnlyUnallocated/>
+ <Include>
+ <All/>
+ </Include>
+ </Menu>
+
+</Menu>
diff --git a/data/xfce/xfce-development.directory.in
b/data/xfce/xfce-development.directory.in
new file mode 100644
index 0000000..d88bf80
--- /dev/null
+++ b/data/xfce/xfce-development.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-development
+_Name=Development
+_Comment=Software development tools
diff --git a/data/xfce/xfce-education.directory.in
b/data/xfce/xfce-education.directory.in
new file mode 100644
index 0000000..4aff4ef
--- /dev/null
+++ b/data/xfce/xfce-education.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-education
+_Name=Education
+_Comment=Educational software
diff --git a/data/xfce/xfce-games.directory.in
b/data/xfce/xfce-games.directory.in
new file mode 100644
index 0000000..564a41b
--- /dev/null
+++ b/data/xfce/xfce-games.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-games
+_Name=Games
+_Comment=Games, puzzles, and other fun software
diff --git a/data/xfce/xfce-graphics.directory.in
b/data/xfce/xfce-graphics.directory.in
new file mode 100644
index 0000000..ea75ba6
--- /dev/null
+++ b/data/xfce/xfce-graphics.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-graphics
+_Name=Graphics
+_Comment=Graphics creation and manipulation applications
diff --git a/data/xfce/xfce-multimedia.directory.in
b/data/xfce/xfce-multimedia.directory.in
new file mode 100644
index 0000000..a70203e
--- /dev/null
+++ b/data/xfce/xfce-multimedia.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-multimedia
+_Name=Multimedia
+_Comment=Audio and video players and editors
diff --git a/data/xfce/xfce-network.directory.in
b/data/xfce/xfce-network.directory.in
new file mode 100644
index 0000000..6648181
--- /dev/null
+++ b/data/xfce/xfce-network.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-internet
+_Name=Network
+_Comment=Network applications and utilities
diff --git a/data/xfce/xfce-office.directory.in
b/data/xfce/xfce-office.directory.in
new file mode 100644
index 0000000..4d70517
--- /dev/null
+++ b/data/xfce/xfce-office.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-office
+_Name=Office
+_Comment=Office and productivity applications
diff --git a/data/xfce/xfce-other.directory.in
b/data/xfce/xfce-other.directory.in
new file mode 100644
index 0000000..f00f240
--- /dev/null
+++ b/data/xfce/xfce-other.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-other
+_Name=Other
+_Comment=Applications that don't fit into other categories
diff --git a/data/xfce/xfce-science.directory.in
b/data/xfce/xfce-science.directory.in
new file mode 100644
index 0000000..990ea3a
--- /dev/null
+++ b/data/xfce/xfce-science.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-science
+_Name=Science
+_Comment=Scientific software
diff --git a/data/xfce/xfce-screensavers.directory.in
b/data/xfce/xfce-screensavers.directory.in
new file mode 100644
index 0000000..4f93e1c
--- /dev/null
+++ b/data/xfce/xfce-screensavers.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=preferences-desktop-screensaver
+_Name=Screensavers
+_Comment=Screensaver applets
diff --git a/data/xfce/xfce-settings.directory.in
b/data/xfce/xfce-settings.directory.in
new file mode 100644
index 0000000..6dc9bde
--- /dev/null
+++ b/data/xfce/xfce-settings.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=preferences-desktop
+_Name=Settings
+_Comment=Desktop and system settings applications
diff --git a/data/xfce/xfce-system.directory.in
b/data/xfce/xfce-system.directory.in
new file mode 100644
index 0000000..516cb61
--- /dev/null
+++ b/data/xfce/xfce-system.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-system
+_Name=System
+_Comment=System tools and utilities
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3a88f36..d384271 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,16 @@
+data/xfce/xfce-accessories.directory.in
+data/xfce/xfce-development.directory.in
+data/xfce/xfce-education.directory.in
+data/xfce/xfce-games.directory.in
+data/xfce/xfce-graphics.directory.in
+data/xfce/xfce-multimedia.directory.in
+data/xfce/xfce-network.directory.in
+data/xfce/xfce-office.directory.in
+data/xfce/xfce-other.directory.in
+data/xfce/xfce-science.directory.in
+data/xfce/xfce-screensavers.directory.in
+data/xfce/xfce-settings.directory.in
+data/xfce/xfce-system.directory.in
garcon/garcon-config.c
garcon/garcon-environment.c
garcon/garcon-menu.c
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
