Photos

Merge lp:~elementary-apps/pantheon-photos/deprecatemarginleftright into lp:~pantheon-photos/pantheon-photos/trunk

  1. deprecatemarginleftright
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Cody Garver
Approved revision: 2646
Merged at revision: 2646
Proposed branch: lp:~elementary-apps/pantheon-photos/deprecatemarginleftright
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 117 lines (+12/-13)
4 files modified
src/Dialogs.vala (+3/-3)
src/camera/ImportPage.vala (+2/-2)
src/editing_tools/EditingTools.vala (+6/-6)
src/library/TrashPage.vala (+1/-2)
To merge this branch: bzr merge lp:~elementary-apps/pantheon-photos/deprecatemarginleftright
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+236240@code.launchpad.net

Commit message

replace margin.left and .right with .start and .end

Description of the change

replace margin.left and .right with .start and .end

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Dialogs.vala'
2--- src/Dialogs.vala 2014-08-28 05:05:31 +0000
3+++ src/Dialogs.vala 2014-09-27 23:26:10 +0000
4@@ -236,8 +236,8 @@
5 table.set_column_spacing (4);
6 table.set_margin_top (4);
7 table.set_margin_bottom (4);
8- table.set_margin_left (4);
9- table.set_margin_right (4);
10+ table.set_margin_start (4);
11+ table.set_margin_end (4);
12
13 ((Gtk.Box) get_content_area ()).add (table);
14
15@@ -2494,4 +2494,4 @@
16 progress.close ();
17
18 AppWindow.get_instance ().set_normal_cursor ();
19-}
20+}
21\ No newline at end of file
22
23=== modified file 'src/camera/ImportPage.vala'
24--- src/camera/ImportPage.vala 2014-08-08 21:13:09 +0000
25+++ src/camera/ImportPage.vala 2014-09-27 23:26:10 +0000
26@@ -836,7 +836,7 @@
27
28 // Import all
29 Gtk.ToolItem import_all_ti = new Gtk.ToolItem ();
30- import_all_ti.margin_left = 6;
31+ import_all_ti.margin_start = 6;
32 toolbar.insert (import_all_ti, -1);
33
34 Gtk.Button import_all_button = new Gtk.Button.with_label ("Import All");
35@@ -1821,4 +1821,4 @@
36 public override SearchViewFilter get_search_view_filter () {
37 return search_filter;
38 }
39-}
40+}
41\ No newline at end of file
42
43=== modified file 'src/editing_tools/EditingTools.vala'
44--- src/editing_tools/EditingTools.vala 2014-09-04 23:41:45 +0000
45+++ src/editing_tools/EditingTools.vala 2014-09-27 23:26:10 +0000
46@@ -2224,7 +2224,7 @@
47 slider_organizer.set_column_homogeneous (false);
48 slider_organizer.set_row_spacing (12);
49 slider_organizer.set_column_spacing (12);
50- slider_organizer.set_margin_left (12);
51+ slider_organizer.set_margin_start (12);
52 slider_organizer.set_margin_bottom (12);
53
54 Gtk.Label exposure_label = new Gtk.Label.with_mnemonic (_ ("Exposure:"));
55@@ -2233,7 +2233,7 @@
56 slider_organizer.attach (exposure_slider, 1, 0, 1, 1);
57 exposure_slider.set_size_request (SLIDER_WIDTH, -1);
58 exposure_slider.set_draw_value (false);
59- exposure_slider.set_margin_right (0);
60+ exposure_slider.set_margin_end (0);
61
62 Gtk.Label saturation_label = new Gtk.Label.with_mnemonic (_ ("Saturation:"));
63 saturation_label.set_alignment (0.0f, 0.5f);
64@@ -2241,7 +2241,7 @@
65 slider_organizer.attach (saturation_slider, 1, 1, 1, 1);
66 saturation_slider.set_size_request (SLIDER_WIDTH, -1);
67 saturation_slider.set_draw_value (false);
68- saturation_slider.set_margin_right (0);
69+ saturation_slider.set_margin_end (0);
70
71 Gtk.Label tint_label = new Gtk.Label.with_mnemonic (_ ("Tint:"));
72 tint_label.set_alignment (0.0f, 0.5f);
73@@ -2249,7 +2249,7 @@
74 slider_organizer.attach (tint_slider, 1, 2, 1, 1);
75 tint_slider.set_size_request (SLIDER_WIDTH, -1);
76 tint_slider.set_draw_value (false);
77- tint_slider.set_margin_right (0);
78+ tint_slider.set_margin_end (0);
79
80 Gtk.Label temperature_label =
81 new Gtk.Label.with_mnemonic (_ ("Temperature:"));
82@@ -2258,7 +2258,7 @@
83 slider_organizer.attach (temperature_slider, 1, 3, 1, 1);
84 temperature_slider.set_size_request (SLIDER_WIDTH, -1);
85 temperature_slider.set_draw_value (false);
86- temperature_slider.set_margin_right (0);
87+ temperature_slider.set_margin_end (0);
88
89 Gtk.Label shadows_label = new Gtk.Label.with_mnemonic (_ ("Shadows:"));
90 shadows_label.set_alignment (0.0f, 0.5f);
91@@ -2266,7 +2266,7 @@
92 slider_organizer.attach (shadows_slider, 1, 4, 1, 1);
93 shadows_slider.set_size_request (SLIDER_WIDTH, -1);
94 shadows_slider.set_draw_value (false);
95- shadows_slider.set_margin_right (0);
96+ shadows_slider.set_margin_end (0);
97
98 Gtk.Label highlights_label = new Gtk.Label.with_mnemonic (_ ("Highlights:"));
99 highlights_label.set_alignment (0.0f, 0.5f);
100
101=== modified file 'src/library/TrashPage.vala'
102--- src/library/TrashPage.vala 2014-09-07 21:44:48 +0000
103+++ src/library/TrashPage.vala 2014-09-27 23:26:10 +0000
104@@ -90,7 +90,7 @@
105 foreach (var child in tool_item.get_children ())
106 tool_item.remove (child);
107
108- wrap_btn.margin_left = wrap_btn.margin_right = 2;
109+ wrap_btn.margin_start = wrap_btn.margin_end = 2;
110 wrap_btn.label = action.get_label ();
111 wrap_btn.use_underline = true;
112 wrap_btn.tooltip_text = action.tooltip;
113@@ -183,4 +183,3 @@
114 update_sidebar_action (!app.is_metadata_sidebar_visible ());
115 }
116 }
117-

Subscribers

People subscribed via source and target branches