nautilus-05-context-menu.diff revision 9802
9802N/Adiff -urN nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c
9802N/A--- nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c 2006-03-18 19:45:15.000000000 +1300
9802N/A+++ nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c 2006-05-12 15:39:56.940987000 +1200
9802N/A@@ -590,6 +590,23 @@
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) {
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;
9802N/A@@ -621,6 +638,20 @@
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)),
9802N/A+ _("Resolution"),
9802N/A+ "gnome-display-properties",
9802N/A+ NULL,
9802N/A+ FALSE);
9802N/A+}
9802N/A+
9802N/A+
9802N/A+static void
9802N/A action_empty_trash_conditional_callback (GtkAction *action,
9802N/A gpointer data)
9802N/A {
9802N/A@@ -687,6 +718,13 @@
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 */
9802N/A+ N_("_Help"), NULL,
9802N/A+ /* tooltip */
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,
9802N/A@@ -694,13 +732,20 @@
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,
9802N/A+ { "Desktop Background", NULL,
9802N/A /* label, accelerator */
9802N/A- N_("Change Desktop _Background"), NULL,
9802N/A+ N_("Desktop _Background..."), 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 */
9802N/A+ N_("Screen _Resolution..."), NULL,
9802N/A+ /* tooltip */
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,
9802N/Adiff -urN nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml
9802N/A--- nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml 2005-05-03 00:31:08.000000000 +1200
9802N/A+++ nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml 2006-05-12 15:39:27.060581000 +1200
9802N/A@@ -2,6 +2,8 @@
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"/>
9802N/A@@ -9,7 +11,8 @@
9802N/A </placeholder>
9802N/A <placeholder name="After Zoom Items">
9802N/A <placeholder name="Background Items">
9802N/A- <menuitem name="Change Background" action="Change Background"/>
9802N/A+ <menuitem name="Desktop Background" action="Desktop Background"/>
9802N/A+ <menuitem name="Screen Resolution" action="Screen Resolution"/>
9802N/A </placeholder>
9802N/A </placeholder>
9802N/A </popup>