Merge lp:~elementary-apps/pantheon-photos/editing-tools-cleanup into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Clean up EditingTools.vala
* Don't set shadow type on 0 width frame
* Don't unset resize grip (they're not used anymore)
* Don't set window opacity (deprecated method)
* Don't set button image positon (button images are not used anymore)
* set_halign, set_alignment is deprecated
* Don't set end margin to 0 when already 0

This branch seeks to clean up some old junk code in EditingTools.vala

[Adam Bieńkowski (donadigo)]

Everything works & looks greate here.

review: Approve

=== modified file 'src/editing_tools/EditingTools.vala'
--- src/editing_tools/EditingTools.vala	2014-09-27 23:06:48 +0000
+++ src/editing_tools/EditingTools.vala	2015-08-08 21:10:38 +0000
@@ -40,7 +40,6 @@
 
         Gtk.Frame outer_frame = new Gtk.Frame (null);
         outer_frame.set_border_width (0);
-        outer_frame.set_shadow_type (Gtk.ShadowType.OUT);
 
         layout_frame.set_border_width (FRAME_BORDER);
         layout_frame.set_shadow_type (Gtk.ShadowType.NONE);
@@ -52,7 +51,6 @@
         focus_on_map = true;
         set_accept_focus (true);
         set_can_focus (true);
-        set_has_resize_grip (false);
 
         // Needed to prevent the (spurious) 'This event was synthesised outside of GDK'
         // warnings after a keypress.
@@ -88,12 +86,6 @@
 
         return true;
     }
-
-    public override void realize () {
-        set_opacity (Resources.TRANSIENT_WINDOW_OPACITY);
-
-        base.realize ();
-    }
 }
 
 // The PhotoCanvas is an interface object between an EditingTool and its host.  It provides objects
@@ -663,10 +655,8 @@
             base (container);
 
             cancel_button.set_tooltip_text (_ ("Return to current photo dimensions"));
-            cancel_button.set_image_position (Gtk.PositionType.LEFT);
 
             ok_button.set_tooltip_text (_ ("Set the crop for this photo"));
-            ok_button.set_image_position (Gtk.PositionType.LEFT);
 
             constraint_combo = new Gtk.ComboBox ();
             Gtk.CellRendererText combo_text_renderer = new Gtk.CellRendererText ();
@@ -1875,10 +1865,8 @@
             slider.set_draw_value (false);
 
             close_button.set_tooltip_text (_ ("Close the red-eye tool"));
-            close_button.set_image_position (Gtk.PositionType.LEFT);
 
             apply_button.set_tooltip_text (_ ("Remove any red-eye effects in the selected region"));
-            apply_button.set_image_position (Gtk.PositionType.LEFT);
 
             Gtk.Box layout = new Gtk.Box (Gtk.Orientation.HORIZONTAL, CONTROL_SPACING);
             layout.add (slider_label);
@@ -2228,48 +2216,43 @@
             slider_organizer.set_margin_bottom (12);
 
             Gtk.Label exposure_label = new Gtk.Label.with_mnemonic (_ ("Exposure:"));
-            exposure_label.set_alignment (0.0f, 0.5f);
+            exposure_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (exposure_label, 0, 0, 1, 1);
             slider_organizer.attach (exposure_slider, 1, 0, 1, 1);
             exposure_slider.set_size_request (SLIDER_WIDTH, -1);
             exposure_slider.set_draw_value (false);
-            exposure_slider.set_margin_end (0);
 
             Gtk.Label saturation_label = new Gtk.Label.with_mnemonic (_ ("Saturation:"));
-            saturation_label.set_alignment (0.0f, 0.5f);
+            saturation_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (saturation_label, 0, 1, 1, 1);
             slider_organizer.attach (saturation_slider, 1, 1, 1, 1);
             saturation_slider.set_size_request (SLIDER_WIDTH, -1);
             saturation_slider.set_draw_value (false);
-            saturation_slider.set_margin_end (0);
 
             Gtk.Label tint_label = new Gtk.Label.with_mnemonic (_ ("Tint:"));
-            tint_label.set_alignment (0.0f, 0.5f);
+            tint_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (tint_label, 0, 2, 1, 1);
             slider_organizer.attach (tint_slider, 1, 2, 1, 1);
             tint_slider.set_size_request (SLIDER_WIDTH, -1);
             tint_slider.set_draw_value (false);
-            tint_slider.set_margin_end (0);
 
             Gtk.Label temperature_label =
                 new Gtk.Label.with_mnemonic (_ ("Temperature:"));
-            temperature_label.set_alignment (0.0f, 0.5f);
+            temperature_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (temperature_label, 0, 3, 1, 1);
             slider_organizer.attach (temperature_slider, 1, 3, 1, 1);
             temperature_slider.set_size_request (SLIDER_WIDTH, -1);
             temperature_slider.set_draw_value (false);
-            temperature_slider.set_margin_end (0);
 
             Gtk.Label shadows_label = new Gtk.Label.with_mnemonic (_ ("Shadows:"));
-            shadows_label.set_alignment (0.0f, 0.5f);
+            shadows_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (shadows_label, 0, 4, 1, 1);
             slider_organizer.attach (shadows_slider, 1, 4, 1, 1);
             shadows_slider.set_size_request (SLIDER_WIDTH, -1);
             shadows_slider.set_draw_value (false);
-            shadows_slider.set_margin_end (0);
 
             Gtk.Label highlights_label = new Gtk.Label.with_mnemonic (_ ("Highlights:"));
-            highlights_label.set_alignment (0.0f, 0.5f);
+            highlights_label.set_halign (Gtk.Align.END);
             slider_organizer.attach (highlights_label, 0, 5, 1, 1);
             slider_organizer.attach (highlights_slider, 1, 5, 1, 1);
             highlights_slider.set_size_request (SLIDER_WIDTH, -1);
@@ -2931,4 +2914,4 @@
 }
 
 
-}
\ No newline at end of file
+}