Author: kelnos
Date: 2007-03-19 03:36:36 +0000 (Mon, 19 Mar 2007)
New Revision: 25203
Added:
xfdesktop/trunk/modules/menu/directory-data/
xfdesktop/trunk/modules/menu/directory-data/Makefile.am
xfdesktop/trunk/modules/menu/directory-data/xfce-accessories.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-development.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-education.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-games.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-graphics.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-multimedia.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-network.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-office.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-other.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-settings.directory.in
xfdesktop/trunk/modules/menu/directory-data/xfce-system.directory.in
Modified:
xfdesktop/trunk/configure.ac.in
xfdesktop/trunk/modules/menu/Makefile.am
xfdesktop/trunk/modules/menu/desktop-menu.c
xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu
Log:
add and implement .directory stuff. we have category icons now!
Modified: xfdesktop/trunk/configure.ac.in
===================================================================
--- xfdesktop/trunk/configure.ac.in 2007-03-19 02:46:50 UTC (rev 25202)
+++ xfdesktop/trunk/configure.ac.in 2007-03-19 03:36:36 UTC (rev 25203)
@@ -247,6 +247,7 @@
menueditor/Makefile
modules/Makefile
modules/menu/Makefile
+modules/menu/directory-data/Makefile
modules/menu/frapmenu/Makefile
modules/menu/frapmenu/tdb/Makefile
modules/menu/frapmenu/tdb/tdbconfig.h
Modified: xfdesktop/trunk/modules/menu/Makefile.am
===================================================================
--- xfdesktop/trunk/modules/menu/Makefile.am 2007-03-19 02:46:50 UTC (rev
25202)
+++ xfdesktop/trunk/modules/menu/Makefile.am 2007-03-19 03:36:36 UTC (rev
25203)
@@ -1,6 +1,7 @@
SUBDIRS = \
- menu-data \
- frapmenu
+ directory-data \
+ frapmenu \
+ menu-data
plugindir = $(libdir)/xfce4/modules
Modified: xfdesktop/trunk/modules/menu/desktop-menu.c
===================================================================
--- xfdesktop/trunk/modules/menu/desktop-menu.c 2007-03-19 02:46:50 UTC (rev
25202)
+++ xfdesktop/trunk/modules/menu/desktop-menu.c 2007-03-19 03:36:36 UTC (rev
25203)
@@ -102,19 +102,43 @@
GtkWidget *menu)
{
GSList *layout_items, *l;
- GtkWidget *submenu, *mi;
+ GtkWidget *submenu, *mi, *img;
FrapMenu *frap_submenu;
+ FrapMenuDirectory *frap_directory;
FrapMenuItem *frap_item;
+ const gchar *name, *icon_name;
layout_items = frap_menu_get_layout_items(frap_menu);
for(l = layout_items; l; l = l->next) {
if(FRAP_IS_MENU(l->data)) {
frap_submenu = l->data;
+ frap_directory = frap_menu_get_directory(frap_submenu);
+ if(frap_directory
+ && (frap_menu_directory_get_no_display(frap_directory)
+ || !frap_menu_directory_show_in_environment(frap_directory)))
+ {
+ continue;
+ }
+
submenu = gtk_menu_new();
gtk_widget_show(submenu);
- mi =
gtk_menu_item_new_with_label(frap_menu_get_name(frap_submenu));
+ if(frap_directory) {
+ name = frap_menu_directory_get_name(frap_directory);
+ icon_name = frap_menu_directory_get_icon(frap_directory);
+ } else {
+ name = frap_menu_get_name(frap_menu);
+ icon_name = NULL;
+ }
+
+ mi = gtk_image_menu_item_new_with_label(name);
+ if(icon_name) {
+ img = gtk_image_new_from_icon_name(icon_name,
+ GTK_ICON_SIZE_MENU);
+ gtk_widget_show(img);
+ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img);
+ }
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi), submenu);
Property changes on: xfdesktop/trunk/modules/menu/directory-data
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile
.deps
.libs
*.directory
Added: xfdesktop/trunk/modules/menu/directory-data/Makefile.am
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/Makefile.am
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/Makefile.am 2007-03-19
03:36:36 UTC (rev 25203)
@@ -0,0 +1,20 @@
+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-settings.directory.in \
+ xfce-system.directory.in
+directory_DATA = $(directory_in_files:.directory.in=.directory)
[EMAIL PROTECTED]@
+
+EXTRA_DIST = $(directorydata_in_files)
+
+DISTCLEANFILES = $(directorydata_DATA)
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-accessories.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-accessories.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-accessories.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-development.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-development.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-development.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-development
+_Name=Development
+_Comment=Software development tools
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-education.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-education.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-education.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=
+_Name=Education
+_Comment=Educational software
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-games.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-games.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-games.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-graphics.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-graphics.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-graphics.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-multimedia.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-multimedia.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-multimedia.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-network.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-network.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-network.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-internet
+_Name=Network
+_Comment=Network applications and utilities
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-office.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-office.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-office.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-office
+_Name=Office
+_Comment=Office and productivity applications
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-other.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-other.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-other.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-science.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-science
+_Name=Science
+_Comment=Scientific applications and tools
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-settings.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-settings.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-settings.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -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
Added: xfdesktop/trunk/modules/menu/directory-data/xfce-system.directory.in
===================================================================
--- xfdesktop/trunk/modules/menu/directory-data/xfce-system.directory.in
(rev 0)
+++ xfdesktop/trunk/modules/menu/directory-data/xfce-system.directory.in
2007-03-19 03:36:36 UTC (rev 25203)
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Type=Directory
+Icon=applications-system
+_Name=System
+_Comment=System tools and utilities
Modified: xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu
===================================================================
--- xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu
2007-03-19 02:46:50 UTC (rev 25202)
+++ xfdesktop/trunk/modules/menu/menu-data/xfce-applications.menu
2007-03-19 03:36:36 UTC (rev 25203)
@@ -29,6 +29,7 @@
<Menu>
<Name>Settings</Name>
+ <Directory>xfce-settings.directory</Directory>
<Include>
<Category>Settings</Category>
</Include>
@@ -42,6 +43,7 @@
<Menu>
<Name>Accessories</Name>
+ <Directory>xfce-accessories.directory</Directory>
<Include>
<Or>
<Category>Accessibility</Category>
@@ -54,6 +56,7 @@
<Menu>
<Name>Development</Name>
+ <Directory>xfce-development.directory</Directory>
<Include>
<Category>Development</Category>
</Include>
@@ -61,6 +64,7 @@
<Menu>
<Name>Education</Name>
+ <Directory>xfce-education.directory</Directory>
<Include>
<Category>Education</Category>
</Include>
@@ -68,6 +72,7 @@
<Menu>
<Name>Games</Name>
+ <Directory>xfce-games.directory</Directory>
<Include>
<Category>Game</Category>
</Include>
@@ -75,6 +80,7 @@
<Menu>
<Name>Graphics</Name>
+ <Directory>xfce-graphics.directory</Directory>
<Include>
<Category>Graphics</Category>
</Include>
@@ -82,6 +88,7 @@
<Menu>
<Name>Multimedia</Name>
+ <Directory>xfce-multimedia.directory</Directory>
<Include>
<Category>AudioVideo</Category>
</Include>
@@ -89,6 +96,7 @@
<Menu>
<Name>Network</Name>
+ <Directory>xfce-network.directory</Directory>
<Include>
<Category>Network</Category>
</Include>
@@ -96,6 +104,7 @@
<Menu>
<Name>Office</Name>
+ <Directory>xfce-office.directory</Directory>
<Include>
<Category>Office</Category>
</Include>
@@ -103,6 +112,7 @@
<Menu>
<Name>Science</Name>
+ <Directory>xfce-science.directory</Directory>
<Include>
<Category>Science</Category>
</Include>
@@ -110,6 +120,7 @@
<Menu>
<Name>System</Name>
+ <Directory>xfce-system.directory</Directory>
<Include>
<Or>
<Category>Emulator</Category>
@@ -120,6 +131,7 @@
<Menu>
<Name>Other</Name>
+ <Directory>xfce-other.directory</Directory>
<OnlyUnallocated/>
<Include>
<All/>
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
