Photos

Merge lp:~meese/pantheon-photos/fix1275112 into lp:~pantheon-photos/pantheon-photos/trunk

  1. fix1275112
  2. Merge into trunk
Proposed by meese
Status: Merged
Approved by: Danielle Foré
Approved revision: 2546
Merged at revision: 2546
Proposed branch: lp:~meese/pantheon-photos/fix1275112
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 69 lines (+6/-13)
4 files modified
src/CollectionPage.vala (+0/-10)
ui/collection.ui (+3/-0)
ui/photo.ui (+0/-3)
ui/photo_context.ui (+3/-0)
To merge this branch: bzr merge lp:~meese/pantheon-photos/fix1275112
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+226104@code.launchpad.net

Commit message

Moves copy and paste color adjustments out of menubar and into context menu

Description of the change

Fixes bug #1275112

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Works here! Thanks Madelynn!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CollectionPage.vala'
2--- src/CollectionPage.vala 2014-05-22 07:11:31 +0000
3+++ src/CollectionPage.vala 2014-07-09 10:46:06 +0000
4@@ -96,15 +96,6 @@
5
6 return group;
7 }
8-
9- private static InjectionGroup create_photos_menu_edits_injectables() {
10- InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasEditsPlaceholder");
11-
12- group.add_menu_item("CopyColorAdjustments");
13- group.add_menu_item("PasteColorAdjustments");
14-
15- return group;
16- }
17
18 private static InjectionGroup create_photos_menu_date_injectables() {
19 InjectionGroup group = new InjectionGroup("/MenuBar/PhotosMenu/PhotosExtrasDateTimePlaceholder");
20@@ -229,7 +220,6 @@
21 groups += create_file_menu_injectables();
22 groups += create_edit_menu_injectables();
23 groups += create_view_menu_fullscreen_injectables();
24- groups += create_photos_menu_edits_injectables();
25 groups += create_photos_menu_date_injectables();
26 groups += create_photos_menu_externals_injectables();
27
28
29=== modified file 'ui/collection.ui'
30--- ui/collection.ui 2014-05-27 06:18:57 +0000
31+++ ui/collection.ui 2014-07-09 10:46:06 +0000
32@@ -3,6 +3,9 @@
33 <menuitem name="ContextEnhance" action="Enhance" />
34 <menuitem name="ContextRevert" action="Revert" />
35 <separator />
36+ <menuitem name="ContextCopyColorAdjustments" action="CopyColorAdjustments" />
37+ <menuitem name="ContextPasteColorAdjustments" action="PasteColorAdjustments" />
38+ <separator />
39 <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
40 <menuitem name="ContextModifyTags" action="ModifyTags" />
41 <placeholder name="ContextTagsPlaceholder" />
42
43=== modified file 'ui/photo.ui'
44--- ui/photo.ui 2014-06-06 01:18:33 +0000
45+++ ui/photo.ui 2014-07-09 10:46:06 +0000
46@@ -25,9 +25,6 @@
47 <menuitem name="FlipHorizontally" action="FlipHorizontally" />
48 <menuitem name="FlipVertically" action="FlipVertically" />
49 <separator />
50- <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
51- <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
52- <separator/>
53 <menuitem name="AdjustDateTime" action="AdjustDateTime" />
54 </menu>
55
56
57=== modified file 'ui/photo_context.ui'
58--- ui/photo_context.ui 2013-02-28 01:46:30 +0000
59+++ ui/photo_context.ui 2014-07-09 10:46:06 +0000
60@@ -3,6 +3,9 @@
61 <menuitem name="ContextEnhance" action="Enhance" />
62 <menuitem name="ContextRevert" action="Revert" />
63 <separator />
64+ <menuitem name="ContextCopyColorAdjustments" action="CopyColorAdjustments" />
65+ <menuitem name="ContextPasteColorAdjustments" action="PasteColorAdjustments" />
66+ <separator />
67 <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
68 <menuitem name="ContextModifyTags" action="ModifyTags" />
69 <placeholder name="ContextTagsPlaceholder" />

Subscribers

People subscribed via source and target branches

to all changes: