diff -Nru rox-2.3-orig/ROX-Filer/src/global.h rox-2.3/ROX-Filer/src/global.h --- rox-2.3-orig/ROX-Filer/src/global.h 2005-04-25 22:22:37 +0300 +++ rox-2.3/ROX-Filer/src/global.h 2005-08-13 12:09:53 +0300 @@ -179,6 +179,9 @@ #define SITE "rox.sourceforge.net" /* Stock icons */ +#define ROX_STOCK_PREFERENCES "rox-preferences" +#define ROX_STOCK_APPS "rox-apps" +#define ROX_STOCK_SESSION "rox-session" #define ROX_STOCK_SHOW_DETAILS "rox-show-details" #define ROX_STOCK_SHOW_HIDDEN "rox-show-hidden" #define ROX_STOCK_SELECT "rox-select" diff -Nru rox-2.3-orig/ROX-Filer/src/icon.c rox-2.3/ROX-Filer/src/icon.c --- rox-2.3-orig/ROX-Filer/src/icon.c 2005-06-25 19:05:58 +0300 +++ rox-2.3/ROX-Filer/src/icon.c 2005-08-13 12:10:47 +0300 @@ -136,7 +136,6 @@ {">" N_("Manual"), NULL, menu_rox_help, HELP_MANUAL, NULL}, {">", NULL, NULL, 0, ""}, {">" N_("Options..."), NULL, menu_show_options, 0, "", GTK_STOCK_PREFERENCES}, -{">" N_("Home Directory"), NULL, open_home, 0, "", GTK_STOCK_HOME}, {N_("File"), NULL, NULL, 0, ""}, {">" N_("Shift Open"), NULL, file_op, ACTION_SHIFT, NULL}, {">" N_("Properties"), NULL, file_op, ACTION_PROPERTIES, "", GTK_STOCK_PROPERTIES}, @@ -145,6 +144,10 @@ {N_("Edit Item"), NULL, file_op, ACTION_EDIT, "", GTK_STOCK_PROPERTIES}, {N_("Show Location"), NULL, file_op, ACTION_LOCATION, "", GTK_STOCK_JUMP_TO}, {N_("Remove Item(s)"), NULL, remove_items, 0, "", GTK_STOCK_REMOVE}, +{N_("Preferences"), NULL, open_preferences, 0, "", ROX_STOCK_PREFERENCES}, +{N_("Applications"), NULL, open_apps, 0, "", ROX_STOCK_APPS}, +{N_("Home Directory"), NULL, open_home, 0, "", GTK_STOCK_HOME}, +{N_("Session..."), NULL, open_session_manager, 0, "", ROX_STOCK_SESSION}, {"", NULL, NULL, 0, ""}, }; diff -Nru rox-2.3-orig/ROX-Filer/src/menu.c rox-2.3/ROX-Filer/src/menu.c --- rox-2.3-orig/ROX-Filer/src/menu.c 2005-08-01 10:10:20 +0300 +++ rox-2.3/ROX-Filer/src/menu.c 2005-08-13 12:13:08 +0300 @@ -1266,6 +1266,17 @@ filer_opendir(home_dir, NULL, NULL); } +void open_preferences(gpointer data, guint action, GtkWidget *widget) +{ + filer_opendir(g_getenv("ROX_CONTROL"), NULL, NULL); +} + +void open_apps(gpointer data, guint action, GtkWidget *widget) +{ + filer_opendir(g_getenv("ROX_APPS"), NULL, NULL); +} + + static void open_vfs_avfs(FilerWindow *filer_window, DirItem *item) { gchar *path; @@ -1692,6 +1703,21 @@ gtk_widget_destroy(window_with_focus->window); } +void open_session_manager(gpointer data, guint action, GtkWidget *widget) +{ + const char *argv[] = {"sh", "-c", NULL, NULL}; + gboolean close = action; + +/* argv[2] = o_menu_xterm.value;*/ + argv[2] = g_getenv("ROX_SESSION_MANAGER"); + + /*g_return_if_fail(window_with_focus != NULL);*/ + + rox_spawn(NULL, argv); + +} + + static void home_directory(gpointer data, guint action, GtkWidget *widget) { g_return_if_fail(window_with_focus != NULL); diff -Nru rox-2.3-orig/ROX-Filer/src/menu.h rox-2.3/ROX-Filer/src/menu.h --- rox-2.3-orig/ROX-Filer/src/menu.h 2003-09-28 17:44:03 +0300 +++ rox-2.3/ROX-Filer/src/menu.h 2005-08-13 12:13:39 +0300 @@ -39,6 +39,9 @@ void menu_rox_help(gpointer data, guint action, GtkWidget *widget); void menu_show_options(gpointer data, guint action, GtkWidget *widget); void open_home(gpointer data, guint action, GtkWidget *widget); +void open_preferences(gpointer data, guint action, GtkWidget *widget); +void open_apps(gpointer data, guint action, GtkWidget *widget); +void open_session_manager(gpointer data, guint action, GtkWidget *widget); void menu_show_shift_action(GtkWidget *menu_item, DirItem *item, gboolean next); #endif /* _MENU_H */ diff -Nru rox-2.3-orig/ROX-Filer/src/pixmaps.c rox-2.3/ROX-Filer/src/pixmaps.c --- rox-2.3-orig/ROX-Filer/src/pixmaps.c 2005-04-25 21:02:13 +0300 +++ rox-2.3/ROX-Filer/src/pixmaps.c 2005-08-13 12:15:04 +0300 @@ -98,6 +98,9 @@ }; static const char *stocks[] = { + ROX_STOCK_PREFERENCES, + ROX_STOCK_APPS, + ROX_STOCK_SESSION, ROX_STOCK_SHOW_DETAILS, ROX_STOCK_SHOW_HIDDEN, ROX_STOCK_SELECT,