Merge lp:~elementary-apps/pantheon-photos/no-top-ui into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by Danielle Foré
Status: Merged
Approved by: David Hewitt
Approved revision: 3162
Merged at revision: 3164
Proposed branch: lp:~elementary-apps/pantheon-photos/no-top-ui
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 32 lines (+0/-17)
2 files modified
data/ui/top.ui (+0/-10)
src/library/LibraryWindow.vala (+0/-7)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-photos/no-top-ui
Reviewer Review Type Date Requested Status
David Hewitt Approve
Review via email: mp+317533@code.launchpad.net

Commit message

* Remove top.ui
* LibraryWindow.vala: Remove reference to top.ui

Description of the change

This menubar is never shown so it serves no purpose

To post a comment you must log in.
Revision history for this message
David Hewitt (davidmhewitt) wrote :

Compiles fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'data/ui/top.ui'
2--- data/ui/top.ui 2014-05-27 06:18:57 +0000
3+++ data/ui/top.ui 1970-01-01 00:00:00 +0000
4@@ -1,10 +0,0 @@
5-<ui>
6- <menubar name="MenuBar">
7- <menu name="FileMenu" action="FileMenu" />
8- <menu name="EditMenu" action="EditMenu" />
9- <menu name="PhotoMenu" action="PhotoMenu" />
10- <menu name="PhotosMenu" action="PhotosMenu" />
11- <menu name="TagsMenu" action="TagsMenu" />
12- <menu name="HelpMenu" action="HelpMenu" />
13- </menubar>
14-</ui>
15\ No newline at end of file
16
17=== modified file 'src/library/LibraryWindow.vala'
18--- src/library/LibraryWindow.vala 2017-02-15 08:31:37 +0000
19+++ src/library/LibraryWindow.vala 2017-02-16 18:12:56 +0000
20@@ -166,13 +166,6 @@
21
22 header.pack_end (search_entry);
23
24- try {
25- File ui_file = Resources.get_ui ("top.ui");
26- ui.add_ui_from_file (ui_file.get_path ());
27- } catch (Error e) {
28- error (e.message);
29- }
30-
31 // create the main layout & start at the Library page
32 create_layout (library_branch.photos_entry.get_page ());
33

Subscribers

People subscribed via source and target branches