Merge lp:~larsu/nautilus/lp1290067 into lp:~ubuntu-desktop/nautilus/ubuntu

Proposed by Lars Karlitski
Status: Merged
Merged at revision: 426
Proposed branch: lp:~larsu/nautilus/lp1290067
Merge into: lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target: 121 lines (+29/-18)
2 files modified
debian/patches/16_unity_new_documents.patch (+28/-17)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp:~larsu/nautilus/lp1290067
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+210425@code.launchpad.net

Commit message

traditional menubar patch: restore "New Empty Document" in the file menu

Also, move the unity-new-documents patch after the restore-traditional-menubar patch, because it depends on it.

Description of the change

traditional menubar patch: restore "New Empty Document" in the file menu

Also, move the unity-new-documents patch after the restore-traditional-menubar patch, because it depends on it.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/16_unity_new_documents.patch'
2--- debian/patches/16_unity_new_documents.patch 2014-01-24 21:27:00 +0000
3+++ debian/patches/16_unity_new_documents.patch 2014-03-11 14:51:23 +0000
4@@ -1,7 +1,8 @@
5-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-actions.h nautilus-3.8.2/src/nautilus-actions.h
6---- nautilus-3.8.2.orig/src/nautilus-actions.h 2013-06-21 13:50:33.936456773 +0200
7-+++ nautilus-3.8.2/src/nautilus-actions.h 2013-06-21 13:50:53.108457411 +0200
8-@@ -118,6 +118,7 @@
9+diff --git a/src/nautilus-actions.h b/src/nautilus-actions.h
10+index 8c8e575..2b9e642 100644
11+--- a/src/nautilus-actions.h
12++++ b/src/nautilus-actions.h
13+@@ -119,6 +119,7 @@
14 #define NAUTILUS_ACTION_SCRIPTS "Scripts"
15 #define NAUTILUS_ACTION_OPEN_SCRIPTS_FOLDER "Open Scripts Folder"
16 #define NAUTILUS_ACTION_NEW_DOCUMENTS "New Documents"
17@@ -9,10 +10,19 @@
18 #define NAUTILUS_ACTION_EMPTY_TRASH_CONDITIONAL "Empty Trash Conditional"
19 #define NAUTILUS_ACTION_MANUAL_LAYOUT "Manual Layout"
20 #define NAUTILUS_ACTION_REVERSED_ORDER "Reversed Order"
21-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml nautilus-3.8.2/src/nautilus-directory-view-ui.xml
22---- nautilus-3.8.2.orig/src/nautilus-directory-view-ui.xml 2013-06-21 13:50:33.960456773 +0200
23-+++ nautilus-3.8.2/src/nautilus-directory-view-ui.xml 2013-06-21 13:50:53.108457411 +0200
24-@@ -16,6 +16,8 @@
25+diff --git a/src/nautilus-directory-view-ui.xml b/src/nautilus-directory-view-ui.xml
26+index 64a9fc6..ad98f81 100644
27+--- a/src/nautilus-directory-view-ui.xml
28++++ b/src/nautilus-directory-view-ui.xml
29+@@ -12,6 +12,7 @@
30+ <menu action="New Documents">
31+ <placeholder name="New Documents Placeholder"/>
32+ <separator name="After New Documents"/>
33++ <menuitem name="New Empty Document" action="New Empty Document"/>
34+ </menu>
35+ </placeholder>
36+ <placeholder name="Open Placeholder">
37+@@ -95,6 +96,8 @@
38 <menuitem name="New Folder with Selection" action="New Folder with Selection"/>
39 <menu action="New Documents">
40 <placeholder name="New Documents Placeholder"/>
41@@ -21,7 +31,7 @@
42 </menu>
43 </placeholder>
44 <placeholder name="Global File Items Placeholder">
45-@@ -42,6 +44,8 @@
46+@@ -121,6 +124,8 @@
47 <menuitem name="New Folder" action="New Folder"/>
48 <menu action="New Documents">
49 <placeholder name="New Documents Placeholder"/>
50@@ -30,10 +40,11 @@
51 </menu>
52 </placeholder>
53 <separator name="Clipboard separator"/>
54-diff -Nur --exclude nautilus-view.c.orig nautilus-3.8.2.orig/src/nautilus-view.c nautilus-3.8.2/src/nautilus-view.c
55---- nautilus-3.8.2.orig/src/nautilus-view.c 2013-06-21 13:50:33.956456773 +0200
56-+++ nautilus-3.8.2/src/nautilus-view.c 2013-06-21 13:50:53.120457411 +0200
57-@@ -2102,6 +2102,15 @@
58+diff --git a/src/nautilus-view.c b/src/nautilus-view.c
59+index 481d039..049260e 100644
60+--- a/src/nautilus-view.c
61++++ b/src/nautilus-view.c
62+@@ -2133,6 +2133,15 @@ action_new_folder_with_selection_callback (GtkAction *action,
63 }
64
65 static void
66@@ -49,7 +60,7 @@
67 action_properties_callback (GtkAction *action,
68 gpointer callback_data)
69 {
70-@@ -7114,6 +7123,11 @@
71+@@ -7166,6 +7175,11 @@ static const GtkActionEntry directory_view_entries[] = {
72 /* label, accelerator */ N_("New Folder with Selection"), NULL,
73 /* tooltip */ N_("Create a new folder containing the selected items"),
74 G_CALLBACK (action_new_folder_with_selection_callback) },
75@@ -61,7 +72,7 @@
76 /* name, stock id */ { NAUTILUS_ACTION_OPEN, NULL,
77 /* label, accelerator */ N_("_Open"), "<control>o",
78 /* tooltip */ N_("Open the selected item in this window"),
79-@@ -7366,6 +7380,27 @@
80+@@ -7420,6 +7434,27 @@ static const GtkToggleActionEntry directory_view_toggle_entries[] = {
81 };
82
83 static void
84@@ -89,7 +100,7 @@
85 pre_activate (NautilusView *view,
86 GtkAction *action,
87 GtkActionGroup *action_group)
88-@@ -7428,6 +7463,9 @@
89+@@ -7482,6 +7517,9 @@ real_merge_menus (NautilusView *view)
90 g_object_unref (action);
91 g_free (tooltip);
92
93@@ -99,7 +110,7 @@
94 g_signal_connect_object (action_group, "pre-activate",
95 G_CALLBACK (pre_activate), G_OBJECT (view),
96 G_CONNECT_SWAPPED);
97-@@ -8797,7 +8797,11 @@
98+@@ -8813,7 +8851,11 @@ real_update_menus (NautilusView *view)
99 action = gtk_action_group_get_action (view->details->dir_action_group,
100 NAUTILUS_ACTION_NEW_DOCUMENTS);
101 gtk_action_set_sensitive (action, can_create_files);
102
103=== modified file 'debian/patches/series'
104--- debian/patches/series 2014-02-26 17:01:07 +0000
105+++ debian/patches/series 2014-03-11 14:51:23 +0000
106@@ -7,7 +7,6 @@
107 12_unity_launcher_support.patch
108 14_bring_del_instead_ctrl_del.patch
109 15_use-ubuntu-help.patch
110-16_unity_new_documents.patch
111 17_static_unity_quicklist.patch
112 18_unity_icon_color.patch
113 zg_activity_logging.patch
114@@ -23,6 +22,7 @@
115 interactive_search.patch
116 ubuntu_show_titlebar.patch
117 restore-traditional-menu-bar.patch
118+16_unity_new_documents.patch
119 ubuntu_titlebar_css.patch
120 ubuntu_backspace_behaviour.patch
121 git_valid_location_widget.patch

Subscribers

People subscribed via source and target branches

to all changes: