nautilus-05-context-menu.diff revision 14017
14017N/Adiff -ur nautilus-2.23.6.1-orig/src/file-manager/fm-desktop-icon-view.c nautilus-2.23.6.1/src/file-manager/fm-desktop-icon-view.c
14017N/A--- nautilus-2.23.6.1-orig/src/file-manager/fm-desktop-icon-view.c 2008-07-21 17:53:43.000000000 +0800
14017N/A+++ nautilus-2.23.6.1/src/file-manager/fm-desktop-icon-view.c 2008-08-19 14:27:01.481290399 +0800
14017N/A@@ -589,6 +589,24 @@
9802N/A }
9802N/A
9802N/A static void
9802N/A+action_help_callback (GtkAction *action,
9802N/A+ gpointer data)
9802N/A+{
9802N/A+ GError *error = NULL;
9802N/A+ g_assert (FM_DIRECTORY_VIEW (data));
9802N/A+
9802N/A+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml", NULL,
9802N/A+ gtk_widget_get_screen (GTK_WIDGET (data)), &error);
9802N/A+
9802N/A+ if (error) {
10017N/A+ /* SUN_BRANDING */
9802N/A+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
9802N/A+ NULL);
9802N/A+ g_error_free (error);
9802N/A+ }
9802N/A+}
9802N/A+
9802N/A+static void
9802N/A action_new_launcher_callback (GtkAction *action, gpointer data)
9802N/A {
9802N/A char *desktop_directory;
14017N/A@@ -620,6 +638,52 @@
9802N/A }
9802N/A
9802N/A static void
9802N/A+action_change_resolution_callback (GtkAction *action,
9802N/A+ gpointer data)
9802N/A+{
9802N/A+ g_assert (FM_DIRECTORY_VIEW (data));
9802N/A+
9802N/A+ nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
10017N/A+ /* SUN_BRANDING */
9802N/A+ _("Resolution"),
9802N/A+ "gnome-display-properties",
9802N/A+ NULL,
9802N/A+ FALSE);
9802N/A+}
9802N/A+
14017N/A+static void
14017N/A+action_run_application_callback (GtkAction *action,
14017N/A+ gpointer data)
14017N/A+{
14017N/A+ Display *display;
14017N/A+ Atom gnome_panel_atom, run_atom;
14017N/A+ XClientMessageEvent event;
14017N/A+
14017N/A+ display = XOpenDisplay(NULL);
14017N/A+ if (display == NULL)
14017N/A+ return;
14017N/A+
14017N/A+ gnome_panel_atom = XInternAtom(display, "_GNOME_PANEL_ACTION", False);
14017N/A+ run_atom = XInternAtom(display, "_GNOME_PANEL_ACTION_RUN_DIALOG", False);
14017N/A+
14017N/A+ if (gnome_panel_atom != None && run_atom != None) {
14017N/A+ event.type = ClientMessage;
14017N/A+ event.window = DefaultRootWindow(display);
14017N/A+ event.message_type = gnome_panel_atom;
14017N/A+ event.format = 32;
14017N/A+ event.data.l[0] = run_atom;
14017N/A+ event.data.l[1] = (Time)(time(NULL) * 1000);
14017N/A+
14017N/A+ XSendEvent(display, event.window, False, StructureNotifyMask,
14017N/A+ (XEvent *)&event);
14017N/A+
14017N/A+ }
14017N/A+ XCloseDisplay(display);
14017N/A+
14017N/A+ return;
14017N/A+}
9802N/A+
9802N/A+static void
9802N/A action_empty_trash_conditional_callback (GtkAction *action,
9802N/A gpointer data)
9802N/A {
14017N/A@@ -686,6 +750,15 @@
9802N/A
9802N/A static const GtkActionEntry desktop_view_entries[] = {
9802N/A /* name, stock id */
9802N/A+ { "About JDS", "gtk-help",
9802N/A+ /* label, accelerator */
10017N/A+ /* SUN_BRANDING */
9802N/A+ N_("_Help"), NULL,
9802N/A+ /* tooltip */
10017N/A+ /* SUN_BRANDING */
9802N/A+ N_("About Sun Java Desktop System"),
9802N/A+ G_CALLBACK (action_help_callback) },
9802N/A+ /* name, stock id */
9802N/A { "New Launcher Desktop", NULL,
9802N/A /* label, accelerator */
9802N/A N_("Create L_auncher..."), NULL,
14017N/A@@ -693,13 +766,32 @@
9802N/A N_("Create a new launcher"),
9802N/A G_CALLBACK (action_new_launcher_callback) },
9802N/A /* name, stock id */
9802N/A- { "Change Background", NULL,
14017N/A+ { "Run Application", NULL,
14017N/A+ /* label, accelerator */
14017N/A+ /* SUN_BRANDING */
14017N/A+ N_("Run Application..."), NULL,
14017N/A+ /* tooltip */
14017N/A+ /* SUN_BRANDING */
14017N/A+ N_("Run an application by typing a command or choosing from a list"),
14017N/A+ G_CALLBACK (action_run_application_callback) },
14017N/A+ /* name, stock id */
14017N/A+ { "Desktop Appearance", NULL,
9802N/A /* label, accelerator */
9802N/A- N_("Change Desktop _Background"), NULL,
10017N/A+ /* SUN_BRANDING */
14017N/A+ N_("Desktop A_ppearance..."), NULL,
9802N/A /* tooltip */
9802N/A N_("Show a window that lets you set your desktop background's pattern or color"),
9802N/A G_CALLBACK (action_change_background_callback) },
9802N/A /* name, stock id */
9802N/A+ { "Screen Resolution", NULL,
9802N/A+ /* label, accelerator */
10017N/A+ /* SUN_BRANDING */
9802N/A+ N_("Screen _Resolution..."), NULL,
9802N/A+ /* tooltip */
10017N/A+ /* SUN_BRANDING */
9802N/A+ N_("Show a window that lets you set your desktop screen resolution"),
9802N/A+ G_CALLBACK (action_change_resolution_callback) },
9802N/A+ /* name, stock id */
9802N/A { "Empty Trash Conditional", NULL,
9802N/A /* label, accelerator */
9802N/A N_("Empty Trash"), NULL,
14017N/Adiff -ur nautilus-2.23.6.1-orig/src/file-manager/nautilus-desktop-icon-view-ui.xml nautilus-2.23.6.1/src/file-manager/nautilus-desktop-icon-view-ui.xml
14017N/A--- nautilus-2.23.6.1-orig/src/file-manager/nautilus-desktop-icon-view-ui.xml 2008-07-01 00:09:59.000000000 +0800
14017N/A+++ nautilus-2.23.6.1/src/file-manager/nautilus-desktop-icon-view-ui.xml 2008-08-19 15:14:38.508835060 +0800
14017N/A@@ -2,14 +2,19 @@
9802N/A <popup name="background">
9802N/A <placeholder name="Before Zoom Items">
9802N/A <placeholder name="New Window Items">
9802N/A+ <menuitem name="About JDS" action="About JDS"/>
9802N/A+ <separator/>
9802N/A </placeholder>
9802N/A <placeholder name="New Object Items">
9802N/A <menuitem name="New Launcher" action="New Launcher Desktop"/>
14017N/A </placeholder>
9802N/A </placeholder>
9802N/A <placeholder name="After Zoom Items">
14017N/A+ <menuitem name="Run Application" action="Run Application"/>
14017N/A+ <separator/>
9802N/A <placeholder name="Background Items">
9802N/A- <menuitem name="Change Background" action="Change Background"/>
14017N/A+ <menuitem name="Desktop Appearance" action="Desktop Appearance"/>
9802N/A+ <menuitem name="Screen Resolution" action="Screen Resolution"/>
9802N/A </placeholder>
9802N/A </placeholder>
9802N/A </popup>