Merge lp:~jmiguelbenitez/pantheon-photos/fix-1360068 into lp:~pantheon-photos/pantheon-photos/trunk

[José M. Benítez]

Improved button's sensitivity state in the "Adjust" tool dialog to reflect the item's current state (fix to bug #1360068).

[Zisu Andrei (matzipan)]

Can you please advise on how I can see the effects of this change?

review: Needs Information

Unmerged revisions

2834. By José M. Benítez on 2015-11-30

Improved buttons' sensitivity state in the Adjustment Tool dialog.

=== modified file 'src/Photo.vala'
--- src/Photo.vala	2014-08-25 01:41:46 +0000
+++ src/Photo.vala	2015-12-26 18:04:06 +0000
@@ -5490,4 +5490,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/editing_tools/EditingTools.vala'
--- src/editing_tools/EditingTools.vala	2015-08-09 23:40:46 +0000
+++ src/editing_tools/EditingTools.vala	2015-12-26 18:04:06 +0000
@@ -456,6 +456,12 @@
     protected Cairo.Surface surface;
     public string name;
 
+    /**
+     * Whether the item this instance is associated to is edited when the object
+     * is created.
+     */
+    protected bool item_initially_edited = false;
+    
     [CCode (has_target = false)]
     public delegate EditingTool Factory ();
 
@@ -485,6 +491,8 @@
 
         this.canvas = canvas;
 
+        item_initially_edited = canvas.get_photo ().has_transformations () || canvas.get_photo ().has_editable ();
+        
         tool_window = get_tool_window ();
         if (tool_window != null)
             tool_window.key_press_event.connect (on_keypress);
@@ -2259,6 +2267,33 @@
 
             add (pane_layouter);
         }
+        
+        /**
+         * Sets this editing tool into the "edited" state.
+         *
+         * A tool is said to be in its "edited" state when the item is
+         * associated to has any modification with respect to its initial state.
+         *
+         * Please note that the initial state of the item may be different from
+         * the original one (because of a previous saved transformation).
+         *
+         * @param modified Whether the editing tool is in the "edited" state.
+         */
+        public void set_edited_state (bool modified) {
+            ok_button.sensitive = modified;
+        }
+        
+        /**
+         * Sets this editing tool into the "reset" state.
+         *
+         * A tool is said to be in its "reset" state when the item is associated
+         * to has no modifications at all with respect to its original state.
+         *
+         * @param reset Whether the editing tool is in the "reset" state.
+         */
+        public void set_reset_state (bool reset) {
+            reset_button.sensitive = !reset;
+        }
     }
 
     private abstract class AdjustToolCommand : Command {
@@ -2538,6 +2573,9 @@
             owner.items_altered.connect (on_photos_altered);
 
         base.activate (canvas);
+
+        adjust_tool_window.set_edited_state (false);
+        adjust_tool_window.set_reset_state (!item_initially_edited);
     }
 
     public override EditingToolWindow? get_tool_window () {
@@ -2594,6 +2632,10 @@
     private void on_reset () {
         AdjustResetCommand command = new AdjustResetCommand (this, transformations);
         AppWindow.get_command_manager ().execute (command);
+        adjust_tool_window.set_reset_state (true);
+        /* it will be edited if the reset state is different from the one which
+           the dialog was started in (a modified version of the original item) */
+        adjust_tool_window.set_edited_state (item_initially_edited);
     }
 
     private void on_ok () {
@@ -2628,6 +2670,8 @@
         SliderAdjustmentCommand command = new SliderAdjustmentCommand (this, old_transformation,
                 new_transformation, name);
         AppWindow.get_command_manager ().execute (command);
+        adjust_tool_window.set_edited_state (true);
+        adjust_tool_window.set_reset_state (false);
     }
 
     private void on_temperature_adjustment () {