patches/nautilus-07-context-menu.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8514 5a2ed0a547ed
permissions -rw-r--r--
Merged trunk changes r9797:9829 into 217update branch.

diff -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
--- nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c	2006-03-18 19:45:15.000000000 +1300
+++ nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c	2006-05-12 15:39:56.940987000 +1200
@@ -590,6 +590,23 @@
 }
 
 static void
+action_help_callback (GtkAction *action,
+                      gpointer data)
+{
+        GError *error = NULL;
+        g_assert (FM_DIRECTORY_VIEW (data));
+
+        gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml", NULL,
+                                              gtk_widget_get_screen (GTK_WIDGET (data)), &error);
+
+        if (error) {
+                eel_show_error_dialog (_("There was an error displaying help."), error->message,
+                                       NULL);
+                g_error_free (error);
+        }
+}
+
+static void
 action_new_launcher_callback (GtkAction *action, gpointer data)
 {
 	char *desktop_directory;
@@ -621,6 +638,20 @@
 }
 
 static void
+action_change_resolution_callback (GtkAction *action,
+                                   gpointer data)
+{
+        g_assert (FM_DIRECTORY_VIEW (data));
+
+        nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
+                                                  _("Resolution"),
+                                                  "gnome-display-properties",
+                                                  NULL,
+                                                  FALSE);
+}
+
+
+static void
 action_empty_trash_conditional_callback (GtkAction *action,
 					 gpointer data)
 {
@@ -687,6 +718,13 @@
 
 static const GtkActionEntry desktop_view_entries[] = {
 	/* name, stock id */
+	{ "About JDS", "gtk-help",
+	  /* label, accelerator */
+	  N_("_Help"), NULL,
+	  /* tooltip */
+	  N_("About Sun Java Desktop System"),
+	  G_CALLBACK (action_help_callback) },
+	/* name, stock id */
 	{ "New Launcher Desktop", NULL,
 	  /* label, accelerator */
 	  N_("Create L_auncher..."), NULL,
@@ -694,13 +732,20 @@
 	  N_("Create a new launcher"),
 	  G_CALLBACK (action_new_launcher_callback) },
 	/* name, stock id */
-	{ "Change Background", NULL,
+	{ "Desktop Background", NULL,
 	  /* label, accelerator */
-	  N_("Change Desktop _Background"), NULL,
+	  N_("Desktop _Background..."), NULL,
 	  /* tooltip */
 	  N_("Show a window that lets you set your desktop background's pattern or color"),
 	  G_CALLBACK (action_change_background_callback) },
 	/* name, stock id */
+	{ "Screen Resolution", NULL,
+	  /* label, accelerator */
+	  N_("Screen _Resolution..."), NULL,
+	  /* tooltip */
+	  N_("Show a window that lets you set your desktop screen resolution"),
+	  G_CALLBACK (action_change_resolution_callback) },
+	/* name, stock id */
 	{ "Empty Trash Conditional", NULL,
 	  /* label, accelerator */
 	  N_("Empty Trash"), NULL,
diff -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
--- nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml	2005-05-03 00:31:08.000000000 +1200
+++ nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml	2006-05-12 15:39:27.060581000 +1200
@@ -2,6 +2,8 @@
 <popup name="background">
         <placeholder name="Before Zoom Items">
                 <placeholder name="New Window Items">
+                        <menuitem name="About JDS" action="About JDS"/>
+                        <separator/>
                 </placeholder>
                 <placeholder name="New Object Items">
                         <menuitem name="New Launcher" action="New Launcher Desktop"/>
@@ -9,7 +11,8 @@
         </placeholder>
         <placeholder name="After Zoom Items">
                 <placeholder name="Background Items">
-                        <menuitem name="Change Background" action="Change Background"/>
+                        <menuitem name="Desktop Background" action="Desktop Background"/>
+			<menuitem name="Screen Resolution" action="Screen Resolution"/>
                 </placeholder>
         </placeholder>
 </popup>