Merge lp:~vikoadi/pantheon-photos/flip-toolbar into lp:~pantheon-photos/pantheon-photos/trunk

[Viko Adi Rahmawan]

add horizontal and vertical flip ToolButton to CollectionPage and EditingPage toolbar

-add horizontal and vertical flip ToolButton to CollectionPage and EditingPage toolbar
-remove flip menu from menubar

[Cody Garver (codygarver)]

Needs trunk merged in and conflicts resolved

review: Needs Fixing

[lp:~vikoadi/pantheon-photos/flip-toolbar]

2572. By Viko Adi Rahmawan on 2014-08-14

merge trunk

[Viko Adi Rahmawan (vikoadi)]

done

[Danielle Foré (danrabbit)]

Hey Viko, please don't use Stock, it is deprecated.

Instead use Gtk.Button.from_icon_name

review: Needs Fixing

[Danielle Foré (danrabbit)]

Also, let's do the save behavior as the rotate button. Let's have the default be horizontal flip and do vertical flip when you hold "Ctrl"

[lp:~vikoadi/pantheon-photos/flip-toolbar]

2573. By Viko Adi Rahmawan on 2014-08-23

dont use stock, use same behaviour with rotate button

2574. By Viko Adi Rahmawan on 2014-08-23

merge trunk

[Viko Adi Rahmawan (vikoadi)]

done

[Danielle Foré (danrabbit)]

Works as expected :)

review: Approve (ux)

[meese (meese)]

works and style is fine. I think the tooltip should add "(press Ctrl to flip vertically)" like rotate has it.

[lp:~vikoadi/pantheon-photos/flip-toolbar]

2575. By Viko Adi Rahmawan on 2014-08-23

add (press Ctrl to flip vertically) to the tooltip

[Viko Adi Rahmawan (vikoadi)]

add (press Ctrl to flip vertically) to the tooltip"

[meese (meese)]

approved

review: Approve

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2014-08-17 07:06:58 +0000
+++ src/CollectionPage.vala	2014-08-23 09:05:01 +0000
@@ -144,12 +144,14 @@
                                   TRANSLATABLE, on_flip_horizontally
                                 };
         hflip.label = Resources.HFLIP_MENU;
+        hflip.tooltip = Resources.HFLIP_TOOLTIP;
         actions += hflip;
 
         Gtk.ActionEntry vflip = { "FlipVertically", Resources.VFLIP, TRANSLATABLE, null,
                                   TRANSLATABLE, on_flip_vertically
                                 };
         vflip.label = Resources.VFLIP_MENU;
+        vflip.tooltip = Resources.VFLIP_TOOLTIP;
         actions += vflip;
 
         Gtk.ActionEntry enhance = { "Enhance", Resources.ENHANCE, TRANSLATABLE, "<Ctrl>E",
@@ -775,6 +777,11 @@
         if (rotate_button != null)
             rotate_button.set_related_action (get_action ("RotateCounterclockwise"));
 
+        Gtk.ToolButton? flip_button = ui.get_widget ("/CollectionToolbar/ToolFlip")
+                                        as Gtk.ToolButton;
+        if (flip_button != null)
+            flip_button.set_related_action (get_action ("FlipVertically"));
+
         return base.on_ctrl_pressed (event);
     }
 
@@ -783,6 +790,11 @@
                                         as Gtk.ToolButton;
         if (rotate_button != null)
             rotate_button.set_related_action (get_action ("RotateClockwise"));
+            
+        Gtk.ToolButton? flip_button = ui.get_widget ("/CollectionToolbar/ToolFlip")
+                                        as Gtk.ToolButton;
+        if (flip_button != null)
+            flip_button.set_related_action (get_action ("FlipHorizontally"));
 
         return base.on_ctrl_released (event);
     }
@@ -791,4 +803,3 @@
         return search_filter;
     }
 }
-

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-08-23 07:13:38 +0000
+++ src/PhotoPage.vala	2014-08-23 09:05:01 +0000
@@ -392,6 +392,7 @@
     private Gdk.Pixbuf swapped = null;
     private bool pixbuf_dirty = true;
     private Gtk.ToolButton rotate_button = null;
+    private Gtk.ToolButton flip_button = null;
     private Gtk.ToggleToolButton crop_button = null;
     private Gtk.ToggleToolButton redeye_button = null;
     private Gtk.ToggleToolButton adjust_button = null;
@@ -440,6 +441,15 @@
         rotate_button.is_important = true;
         toolbar.insert (rotate_button, -1);
 
+        // horizontal flip tool
+        flip_button = new Gtk.ToolButton (null, null);
+        flip_button.set_icon_name (Resources.HFLIP);
+        flip_button.set_label (Resources.HFLIP_LABEL);
+        flip_button.set_tooltip_text (Resources.HFLIP_TOOLTIP);
+        flip_button.clicked.connect (on_flip_horizontally);
+        flip_button.is_important = true;
+        toolbar.insert (flip_button, -1);
+
         // crop tool
         crop_button = new Gtk.ToggleToolButton.from_stock (Resources.CROP);
         crop_button.set_label (Resources.CROP_LABEL);
@@ -1074,6 +1084,7 @@
     protected virtual void update_ui (bool missing) {
         bool sensitivity = !missing;
 
+        flip_button.sensitive = sensitivity;
         rotate_button.sensitive = sensitivity;
         crop_button.sensitive = sensitivity;
         straighten_button.sensitive = sensitivity;
@@ -2006,6 +2017,12 @@
         rotate_button.clicked.disconnect (on_rotate_clockwise);
         rotate_button.clicked.connect (on_rotate_counterclockwise);
 
+        flip_button.set_icon_name (Resources.VFLIP);
+        flip_button.set_label (Resources.VFLIP_LABEL);
+        flip_button.set_tooltip_text (Resources.VFLIP_TOOLTIP);
+        flip_button.clicked.disconnect (on_flip_horizontally);
+        flip_button.clicked.connect (on_flip_vertically);
+
         if (current_tool == null)
             swap_out_original ();
 
@@ -2019,6 +2036,12 @@
         rotate_button.clicked.disconnect (on_rotate_counterclockwise);
         rotate_button.clicked.connect (on_rotate_clockwise);
 
+        flip_button.set_icon_name (Resources.HFLIP);
+        flip_button.set_label (Resources.HFLIP_LABEL);
+        flip_button.set_tooltip_text (Resources.HFLIP_TOOLTIP);
+        flip_button.clicked.disconnect (on_flip_vertically);
+        flip_button.clicked.connect (on_flip_horizontally);
+
         if (current_tool == null && get_shift_pressed () && !get_alt_pressed ())
             swap_in_original ();
 

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-08-23 02:56:29 +0000
+++ src/Resources.vala	2014-08-23 09:05:01 +0000
@@ -148,9 +148,11 @@
 
 public const string HFLIP_MENU = _("Flip Hori_zontally");
 public const string HFLIP_LABEL = _("Flip Horizontally");
+public const string HFLIP_TOOLTIP = _("Flip the image horizontally (press Ctrl to flip vertically)");
 
 public const string VFLIP_MENU = _("Flip Verti_cally");
 public const string VFLIP_LABEL = _("Flip Vertically");
+public const string VFLIP_TOOLTIP = _("Flip the image vertically");
 
 public const string ENHANCE_MENU = _("_Enhance");
 public const string ENHANCE_LABEL = _("Enhance");

=== modified file 'ui/collection.ui'
--- ui/collection.ui	2014-08-17 07:06:58 +0000
+++ ui/collection.ui	2014-08-23 09:05:01 +0000
@@ -49,6 +49,7 @@
     
     <toolbar name="CollectionToolbar">
         <toolitem name="ToolRotate" action="RotateClockwise" />
+        <toolitem name="ToolFlip" action="FlipHorizontally" />
         <toolitem name="ToolEnhance" action="Enhance" />
         <separator />
         <toolitem name="ToolPublish" action="Publish" />

=== modified file 'ui/direct.ui'
--- ui/direct.ui	2014-08-08 15:28:05 +0000
+++ ui/direct.ui	2014-08-23 09:05:01 +0000
@@ -35,8 +35,6 @@
             <separator />
             <menuitem name="RotateClockwise" action="RotateClockwise" />
             <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
             <separator />
             <menu name="Tools" action="Tools">
                 <menuitem name="Enhance" action="Enhance" />

=== modified file 'ui/media.ui'
--- ui/media.ui	2014-07-27 04:42:53 +0000
+++ ui/media.ui	2014-08-23 09:05:01 +0000
@@ -20,9 +20,6 @@
         </menu>
 
         <menu name="PhotosMenu" action="PhotosMenu">
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
-            <separator />
             <placeholder name="PhotosExtrasEditsPlaceholder" />
             <separator />
             <placeholder name="PhotosExtrasExternalsPlaceholder" />
@@ -63,4 +60,4 @@
         <menuitem name="SelectAll" action="CommonSelectAll" />
     </popup>
     
-</ui>
+</ui>
\ No newline at end of file

=== modified file 'ui/photo.ui'
--- ui/photo.ui	2014-08-08 15:28:05 +0000
+++ ui/photo.ui	2014-08-23 09:05:01 +0000
@@ -18,11 +18,6 @@
             <separator />
             <menuitem name="Preferences" action="CommonPreferences" />
         </menu>
-        
-        <menu name="PhotoMenu" action="PhotoMenu">
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
-        </menu>
 
         <menu name="HelpMenu" action="HelpMenu">
             <menuitem name="About" action="CommonAbout" />