Photos

Merge lp:~vikoadi/pantheon-photos/noeventsmenu into lp:~pantheon-photos/pantheon-photos/trunk

  1. noeventsmenu
  2. Merge into trunk
Proposed by Viko Adi Rahmawan
Status: Merged
Approved by: Corentin Noël
Approved revision: 2524
Merged at revision: 2529
Proposed branch: lp:~vikoadi/pantheon-photos/noeventsmenu
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 116 lines (+3/-26)
6 files modified
src/library/LibraryWindow.vala (+1/-5)
ui/collection.ui (+1/-1)
ui/event.ui (+0/-5)
ui/events_directory.ui (+0/-7)
ui/media.ui (+0/-6)
ui/top.ui (+1/-2)
To merge this branch: bzr merge lp:~vikoadi/pantheon-photos/noeventsmenu
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+222126@code.launchpad.net

Commit message

add "new event" on context menu where "Event-New Event" exist, remove Event/Events Menu from Menubar

Description of the change

add "new event" on context menu where "Event-New Event" exist, remove Event/Events Menu from Menubar

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

It's working indeed!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/library/LibraryWindow.vala'
2--- src/library/LibraryWindow.vala 2014-05-22 07:11:31 +0000
3+++ src/library/LibraryWindow.vala 2014-06-05 07:31:26 +0000
4@@ -364,10 +364,6 @@
5 photos.label = _("_Photos");
6 actions += photos;
7
8- Gtk.ActionEntry event = { "EventsMenu", null, TRANSLATABLE, null, null, null };
9- event.label = _("Even_ts");
10- actions += event;
11-
12 Gtk.ActionEntry tags = { "TagsMenu", null, TRANSLATABLE, null, null, null };
13 tags.label = _("Ta_gs");
14 actions += tags;
15@@ -1575,4 +1571,4 @@
16
17 return false;
18 }
19-}
20+}
21\ No newline at end of file
22
23=== modified file 'ui/collection.ui'
24--- ui/collection.ui 2013-02-28 01:46:30 +0000
25+++ ui/collection.ui 2014-06-05 07:31:26 +0000
26@@ -32,6 +32,7 @@
27 <menuitem name="ContextExternalEdit" action="ExternalEdit" />
28 <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
29 <separator />
30+ <menuitem name="NewEvent" action="NewEvent" />
31 <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
32 <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
33 <menuitem name="ContextSendTo" action="SendToContextMenu" />
34@@ -48,4 +49,3 @@
35 <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
36 </toolbar>
37 </ui>
38-
39
40=== modified file 'ui/event.ui'
41--- ui/event.ui 2013-05-10 19:16:48 +0000
42+++ ui/event.ui 2014-06-05 07:31:26 +0000
43@@ -5,10 +5,6 @@
44 <separator />
45 <menuitem name="MakePrimary" action="MakePrimary" />
46 </menu>
47- <menu name="EventsMenu" action="EventsMenu">
48- <menuitem name="EventRename" action="Rename" />
49- <menuitem name="EditComment" action="EditComment" />
50- </menu>
51 </menubar>
52
53 <popup name="CollectionContextMenu">
54@@ -22,4 +18,3 @@
55 </popup>
56
57 </ui>
58-
59
60=== modified file 'ui/events_directory.ui'
61--- ui/events_directory.ui 2014-05-22 07:11:31 +0000
62+++ ui/events_directory.ui 2014-06-05 07:31:26 +0000
63@@ -20,12 +20,6 @@
64 <menuitem name="Preferences" action="CommonPreferences" />
65 </menu>
66
67- <menu name="EventsMenu" action="EventsMenu">
68- <menuitem name="EventMerge" action="Merge" />
69- <menuitem name="EventRename" action="Rename" />
70- <menuitem name="EditComment" action="EditComment" />
71- </menu>
72-
73 <menu name="HelpMenu" action="HelpMenu">
74 <menuitem name="Contents" action="CommonHelpContents" />
75 <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
76@@ -60,4 +54,3 @@
77 </popup>
78
79 </ui>
80-
81
82=== modified file 'ui/media.ui'
83--- ui/media.ui 2014-05-22 07:11:31 +0000
84+++ ui/media.ui 2014-06-05 07:31:26 +0000
85@@ -30,11 +30,6 @@
86 <placeholder name="PhotosExtrasExternalsPlaceholder" />
87 </menu>
88
89- <menu name="EventsMenu" action="EventsMenu">
90- <menuitem name="NewEvent" action="NewEvent" />
91- <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
92- </menu>
93-
94 <placeholder name="FacesMenuPlaceholder" />
95
96 <menu name="HelpMenu" action="HelpMenu">
97@@ -75,4 +70,3 @@
98 </popup>
99
100 </ui>
101-
102
103=== modified file 'ui/top.ui'
104--- ui/top.ui 2014-05-22 05:26:34 +0000
105+++ ui/top.ui 2014-06-05 07:31:26 +0000
106@@ -4,8 +4,7 @@
107 <menu name="EditMenu" action="EditMenu" />
108 <menu name="PhotoMenu" action="PhotoMenu" />
109 <menu name="PhotosMenu" action="PhotosMenu" />
110- <menu name="EventsMenu" action="EventsMenu" />
111 <menu name="TagsMenu" action="TagsMenu" />
112 <menu name="HelpMenu" action="HelpMenu" />
113 </menubar>
114-</ui>
115+</ui>
116\ No newline at end of file

Subscribers

People subscribed via source and target branches