|
13213
|
1 |
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
|
|
|
2 |
--- nautilus-2.14.1/src/file-manager/fm-desktop-icon-view.c 2006-03-18 19:45:15.000000000 +1300
|
|
|
3 |
+++ nautilus-2.14.1-hacked/src/file-manager/fm-desktop-icon-view.c 2006-05-12 15:39:56.940987000 +1200
|
|
|
4 |
@@ -590,6 +590,24 @@
|
|
9060
|
5 |
}
|
|
|
6 |
|
|
|
7 |
static void
|
|
|
8 |
+action_help_callback (GtkAction *action,
|
|
|
9 |
+ gpointer data)
|
|
|
10 |
+{
|
|
|
11 |
+ GError *error = NULL;
|
|
|
12 |
+ g_assert (FM_DIRECTORY_VIEW (data));
|
|
|
13 |
+
|
|
|
14 |
+ gnome_help_display_desktop_on_screen (NULL, "user-guide", "user-guide.xml", NULL,
|
|
|
15 |
+ gtk_widget_get_screen (GTK_WIDGET (data)), &error);
|
|
|
16 |
+
|
|
|
17 |
+ if (error) {
|
|
9275
|
18 |
+ /* SUN_BRANDING */
|
|
9060
|
19 |
+ eel_show_error_dialog (_("There was an error displaying help."), error->message,
|
|
|
20 |
+ NULL);
|
|
|
21 |
+ g_error_free (error);
|
|
|
22 |
+ }
|
|
|
23 |
+}
|
|
|
24 |
+
|
|
|
25 |
+static void
|
|
|
26 |
action_new_launcher_callback (GtkAction *action, gpointer data)
|
|
|
27 |
{
|
|
|
28 |
char *desktop_directory;
|
|
13213
|
29 |
@@ -621,6 +639,21 @@
|
|
9060
|
30 |
}
|
|
|
31 |
|
|
|
32 |
static void
|
|
|
33 |
+action_change_resolution_callback (GtkAction *action,
|
|
|
34 |
+ gpointer data)
|
|
|
35 |
+{
|
|
|
36 |
+ g_assert (FM_DIRECTORY_VIEW (data));
|
|
|
37 |
+
|
|
|
38 |
+ nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (data)),
|
|
9275
|
39 |
+ /* SUN_BRANDING */
|
|
9060
|
40 |
+ _("Resolution"),
|
|
|
41 |
+ "gnome-display-properties",
|
|
|
42 |
+ NULL,
|
|
|
43 |
+ FALSE);
|
|
|
44 |
+}
|
|
|
45 |
+
|
|
|
46 |
+
|
|
|
47 |
+static void
|
|
|
48 |
action_empty_trash_conditional_callback (GtkAction *action,
|
|
|
49 |
gpointer data)
|
|
|
50 |
{
|
|
13213
|
51 |
@@ -687,6 +720,15 @@
|
|
9060
|
52 |
|
|
|
53 |
static const GtkActionEntry desktop_view_entries[] = {
|
|
|
54 |
/* name, stock id */
|
|
|
55 |
+ { "About JDS", "gtk-help",
|
|
|
56 |
+ /* label, accelerator */
|
|
9275
|
57 |
+ /* SUN_BRANDING */
|
|
9060
|
58 |
+ N_("_Help"), NULL,
|
|
|
59 |
+ /* tooltip */
|
|
9275
|
60 |
+ /* SUN_BRANDING */
|
|
9060
|
61 |
+ N_("About Sun Java Desktop System"),
|
|
|
62 |
+ G_CALLBACK (action_help_callback) },
|
|
|
63 |
+ /* name, stock id */
|
|
|
64 |
{ "New Launcher Desktop", NULL,
|
|
|
65 |
/* label, accelerator */
|
|
|
66 |
N_("Create L_auncher..."), NULL,
|
|
13213
|
67 |
@@ -694,13 +736,23 @@
|
|
9060
|
68 |
N_("Create a new launcher"),
|
|
|
69 |
G_CALLBACK (action_new_launcher_callback) },
|
|
|
70 |
/* name, stock id */
|
|
|
71 |
- { "Change Background", NULL,
|
|
13213
|
72 |
+ { "Desktop Background", NULL,
|
|
9060
|
73 |
/* label, accelerator */
|
|
|
74 |
- N_("Change Desktop _Background"), NULL,
|
|
9275
|
75 |
+ /* SUN_BRANDING */
|
|
13213
|
76 |
+ N_("Desktop _Background..."), NULL,
|
|
9060
|
77 |
/* tooltip */
|
|
|
78 |
N_("Show a window that lets you set your desktop background's pattern or color"),
|
|
|
79 |
G_CALLBACK (action_change_background_callback) },
|
|
|
80 |
/* name, stock id */
|
|
|
81 |
+ { "Screen Resolution", NULL,
|
|
|
82 |
+ /* label, accelerator */
|
|
9275
|
83 |
+ /* SUN_BRANDING */
|
|
9060
|
84 |
+ N_("Screen _Resolution..."), NULL,
|
|
|
85 |
+ /* tooltip */
|
|
9275
|
86 |
+ /* SUN_BRANDING */
|
|
9060
|
87 |
+ N_("Show a window that lets you set your desktop screen resolution"),
|
|
|
88 |
+ G_CALLBACK (action_change_resolution_callback) },
|
|
|
89 |
+ /* name, stock id */
|
|
|
90 |
{ "Empty Trash Conditional", NULL,
|
|
|
91 |
/* label, accelerator */
|
|
|
92 |
N_("Empty Trash"), NULL,
|
|
13213
|
93 |
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
|
|
|
94 |
--- nautilus-2.14.1/src/file-manager/nautilus-desktop-icon-view-ui.xml 2005-05-03 00:31:08.000000000 +1200
|
|
|
95 |
+++ nautilus-2.14.1-hacked/src/file-manager/nautilus-desktop-icon-view-ui.xml 2006-05-12 15:39:27.060581000 +1200
|
|
|
96 |
@@ -2,6 +2,8 @@
|
|
9060
|
97 |
<popup name="background">
|
|
|
98 |
<placeholder name="Before Zoom Items">
|
|
|
99 |
<placeholder name="New Window Items">
|
|
|
100 |
+ <menuitem name="About JDS" action="About JDS"/>
|
|
|
101 |
+ <separator/>
|
|
|
102 |
</placeholder>
|
|
|
103 |
<placeholder name="New Object Items">
|
|
|
104 |
<menuitem name="New Launcher" action="New Launcher Desktop"/>
|
|
13213
|
105 |
@@ -9,7 +11,8 @@
|
|
9060
|
106 |
</placeholder>
|
|
|
107 |
<placeholder name="After Zoom Items">
|
|
|
108 |
<placeholder name="Background Items">
|
|
|
109 |
- <menuitem name="Change Background" action="Change Background"/>
|
|
13213
|
110 |
+ <menuitem name="Desktop Background" action="Desktop Background"/>
|
|
9060
|
111 |
+ <menuitem name="Screen Resolution" action="Screen Resolution"/>
|
|
|
112 |
</placeholder>
|
|
|
113 |
</placeholder>
|
|
|
114 |
</popup>
|