nautilus-05-context-menu.diff revision 16764
0N/A/jds/bin/diff -uprN nautilus-2.26.3.old/src/file-manager/fm-desktop-icon-view.c nautilus-2.26.3/src/file-manager/fm-desktop-icon-view.c
0N/A--- nautilus-2.26.3.old/src/file-manager/fm-desktop-icon-view.c 2009-05-18 20:44:27.000000000 +0100
0N/A+++ nautilus-2.26.3/src/file-manager/fm-desktop-icon-view.c 2009-07-13 11:36:17.871809000 +0100
0N/A@@ -592,6 +592,25 @@ fm_desktop_icon_view_init (FMDesktopIcon
0N/A }
0N/A
0N/A static void
0N/A+action_help_callback (GtkAction *action,
0N/A+ gpointer data)
0N/A+{
0N/A+ GError *error = NULL;
0N/A+ g_assert (FM_DIRECTORY_VIEW (data));
0N/A+
0N/A+ gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (data)),
0N/A+ "ghelp:user-guide", gtk_get_current_event_time (),
0N/A+ &error);
0N/A+
0N/A+ if (error) {
0N/A+ /* SUN_BRANDING */
0N/A+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
0N/A+ NULL);
0N/A+ g_error_free (error);
0N/A+ }
0N/A+}
0N/A+
0N/A+static void
0N/A action_new_launcher_callback (GtkAction *action, gpointer data)
0N/A {
0N/A char *desktop_directory;
0N/A@@ -623,6 +642,52 @@ action_change_background_callback (GtkAc
0N/A }
0N/A
0N/A static void
0N/A+action_change_resolution_callback (GtkAction *action,
0N/A+ gpointer data)
0N/A+{
0N/A+ g_assert (FM_DIRECTORY_VIEW (data));
0N/A+
0N/A+ nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
0N/A+ /* SUN_BRANDING */
0N/A+ _("Resolution"),
0N/A+ "gnome-display-properties",
0N/A+ NULL,
0N/A+ FALSE);
0N/A+}
0N/A+
0N/A+static void
0N/A+action_run_application_callback (GtkAction *action,
0N/A+ gpointer data)
0N/A+{
0N/A+ Display *display;
0N/A+ Atom gnome_panel_atom, run_atom;
0N/A+ XClientMessageEvent event;
0N/A+
0N/A+ display = XOpenDisplay(NULL);
0N/A+ if (display == NULL)
0N/A+ return;
0N/A+
0N/A+ gnome_panel_atom = XInternAtom(display, "_GNOME_PANEL_ACTION", False);
0N/A+ run_atom = XInternAtom(display, "_GNOME_PANEL_ACTION_RUN_DIALOG", False);
0N/A+
0N/A+ if (gnome_panel_atom != None && run_atom != None) {
0N/A+ event.type = ClientMessage;
0N/A+ event.window = DefaultRootWindow(display);
0N/A+ event.message_type = gnome_panel_atom;
0N/A+ event.format = 32;
0N/A+ event.data.l[0] = run_atom;
0N/A+ event.data.l[1] = (Time)(time(NULL) * 1000);
0N/A+
0N/A+ XSendEvent(display, event.window, False, StructureNotifyMask,
0N/A+ (XEvent *)&event);
0N/A+
0N/A+ }
0N/A+ XCloseDisplay(display);
0N/A+
0N/A+ return;
0N/A+}
0N/A+
0N/A+static void
0N/A action_empty_trash_conditional_callback (GtkAction *action,
0N/A gpointer data)
0N/A {
0N/A@@ -691,6 +756,15 @@ real_update_menus (FMDirectoryView *view
0N/A
0N/A static const GtkActionEntry desktop_view_entries[] = {
0N/A /* name, stock id */
0N/A+ { "About Solaris Desktop", "gtk-help",
0N/A+ /* label, accelerator */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("_Help"), NULL,
0N/A+ /* tooltip */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("About Sun Java Desktop System"),
0N/A+ G_CALLBACK (action_help_callback) },
0N/A+ /* name, stock id */
0N/A { "New Launcher Desktop", NULL,
0N/A /* label, accelerator */
0N/A N_("Create L_auncher..."), NULL,
0N/A@@ -698,13 +772,32 @@ static const GtkActionEntry desktop_view
0N/A N_("Create a new launcher"),
0N/A G_CALLBACK (action_new_launcher_callback) },
0N/A /* name, stock id */
0N/A- { "Change Background", NULL,
0N/A+ { "Run Application", NULL,
0N/A+ /* label, accelerator */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("Run Application..."), NULL,
0N/A+ /* tooltip */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("Run an application by typing a command or choosing from a list"),
0N/A+ G_CALLBACK (action_run_application_callback) },
0N/A+ /* name, stock id */
0N/A+ { "Desktop Appearance", NULL,
0N/A /* label, accelerator */
0N/A- N_("Change Desktop _Background"), NULL,
0N/A+ /* SUN_BRANDING */
0N/A+ N_("Desktop A_ppearance..."), NULL,
0N/A /* tooltip */
0N/A N_("Show a window that lets you set your desktop background's pattern or color"),
0N/A G_CALLBACK (action_change_background_callback) },
0N/A /* name, stock id */
0N/A+ { "Screen Resolution", NULL,
0N/A+ /* label, accelerator */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("Screen _Resolution..."), NULL,
0N/A+ /* tooltip */
0N/A+ /* SUN_BRANDING */
0N/A+ N_("Show a window that lets you set your desktop screen resolution"),
0N/A+ G_CALLBACK (action_change_resolution_callback) },
0N/A+ /* name, stock id */
0N/A { "Empty Trash Conditional", NULL,
0N/A /* label, accelerator */
0N/A N_("Empty Trash"), NULL,
0N/A/jds/bin/diff -uprN nautilus-2.26.3.old/src/file-manager/nautilus-desktop-icon-view-ui.xml nautilus-2.26.3/src/file-manager/nautilus-desktop-icon-view-ui.xml
0N/A--- nautilus-2.26.3.old/src/file-manager/nautilus-desktop-icon-view-ui.xml 2009-04-20 11:57:20.000000000 +0100
0N/A+++ nautilus-2.26.3/src/file-manager/nautilus-desktop-icon-view-ui.xml 2009-07-13 11:36:17.872197000 +0100
0N/A@@ -2,14 +2,19 @@
0N/A <popup name="background">
0N/A <placeholder name="Before Zoom Items">
0N/A <placeholder name="New Window Items">
0N/A+ <menuitem name="About JDS" action="About JDS"/>
0N/A+ <separator/>
0N/A </placeholder>
0N/A <placeholder name="New Object Items">
0N/A <menuitem name="New Launcher" action="New Launcher Desktop"/>
0N/A </placeholder>
0N/A </placeholder>
0N/A <placeholder name="After Zoom Items">
0N/A+ <menuitem name="Run Application" action="Run Application"/>
0N/A+ <separator/>
0N/A <placeholder name="Background Items">
0N/A- <menuitem name="Change Background" action="Change Background"/>
0N/A+ <menuitem name="Desktop Appearance" action="Desktop Appearance"/>
0N/A+ <menuitem name="Screen Resolution" action="Screen Resolution"/>
0N/A </placeholder>
0N/A </placeholder>
0N/A </popup>
0N/A