Maya

Merge lp:~khampal/maya/fix-1365026 into lp:~elementary-apps/maya/trunk

  1. fix-1365026
  2. Merge into trunk
Proposed by Kiran Hampal
Status: Merged
Approved by: Corentin Noël
Approved revision: 637
Merged at revision: 643
Proposed branch: lp:~khampal/maya/fix-1365026
Merge into: lp:~elementary-apps/maya/trunk
Diff against target: 207 lines (+29/-29)
9 files modified
core/Utils.vala (+4/-4)
src/EventEdition/EventDialog.vala (+3/-3)
src/EventEdition/GuestsPanel.vala (+4/-4)
src/EventEdition/InfoPanel.vala (+3/-3)
src/EventEdition/LocationPanel.vala (+2/-2)
src/EventEdition/ReminderPanel.vala (+4/-4)
src/EventEdition/RepeatPanel.vala (+3/-3)
src/Sidebar/Sidebar.vala (+3/-3)
src/SourceDialog.vala (+3/-3)
To merge this branch: bzr merge lp:~khampal/maya/fix-1365026
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+233234@code.launchpad.net

Commit message

Replace margin_left/margin_right with margin_start/margin_end

Description of the change

margin_left/margin_right are deprecated since Gtk 3.12. This replaces all instances of:

margin_left with margin_start
margin_right with margin_end
set_margin_left () with set_margin_start ()
set_margin_right () with set_margin_end ()

To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) wrote :

Great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'core/Utils.vala'
2--- core/Utils.vala 2014-07-23 14:17:09 +0000
3+++ core/Utils.vala 2014-09-03 15:39:07 +0000
4@@ -686,11 +686,11 @@
5 }
6 }
7
8- public Gtk.Widget set_margins (Gtk.Widget widget, int top, int right, int bottom, int left) {
9+ public Gtk.Widget set_margins (Gtk.Widget widget, int top, int end, int bottom, int start) {
10 widget.margin_top = top;
11- widget.margin_right = right;
12+ widget.margin_end = end;
13 widget.margin_bottom = bottom;
14- widget.margin_left = left;
15+ widget.margin_start = start;
16
17 return widget;
18 }
19@@ -723,4 +723,4 @@
20 return "#%02X%02X%02X".printf ((uint)(color.red*255), (uint)(color.green*255), (uint)(color.blue*255));
21 }
22
23-}
24\ No newline at end of file
25+}
26
27=== modified file 'src/EventEdition/EventDialog.vala'
28--- src/EventEdition/EventDialog.vala 2014-07-06 14:42:04 +0000
29+++ src/EventEdition/EventDialog.vala 2014-09-03 15:39:07 +0000
30@@ -131,8 +131,8 @@
31 stack.add_named (repeat_panel, "repeatpanel");
32
33 var buttonbox = new Gtk.ButtonBox (Gtk.Orientation.HORIZONTAL);
34- buttonbox.margin_right = 12;
35- buttonbox.margin_left = 12;
36+ buttonbox.margin_end = 12;
37+ buttonbox.margin_start = 12;
38 buttonbox.baseline_position = Gtk.BaselinePosition.CENTER;
39 buttonbox.set_layout (Gtk.ButtonBoxStyle.END);
40
41@@ -210,4 +210,4 @@
42 this.destroy();
43 }
44 }
45-}
46\ No newline at end of file
47+}
48
49=== modified file 'src/EventEdition/GuestsPanel.vala'
50--- src/EventEdition/GuestsPanel.vala 2014-08-11 14:33:24 +0000
51+++ src/EventEdition/GuestsPanel.vala 2014-09-03 15:39:07 +0000
52@@ -33,8 +33,8 @@
53 this.parent_dialog = parent_dialog;
54 attendees = new Gee.ArrayList<unowned iCal.Property> ();
55
56- margin_left = 12;
57- margin_right = 12;
58+ margin_start = 12;
59+ margin_end = 12;
60 set_row_spacing (6);
61 set_column_spacing (12);
62 set_sensitive (parent_dialog.can_edit);
63@@ -216,8 +216,8 @@
64 individual = null;
65
66 set_margin_bottom (6);
67- set_margin_right (6);
68- set_margin_left (6);
69+ set_margin_end (6);
70+ set_margin_start (6);
71
72 string status = "";
73 unowned iCal.Parameter parameter = attendee.get_first_parameter (iCal.ParameterKind.PARTSTAT);
74
75=== modified file 'src/EventEdition/InfoPanel.vala'
76--- src/EventEdition/InfoPanel.vala 2014-07-23 13:45:54 +0000
77+++ src/EventEdition/InfoPanel.vala 2014-09-03 15:39:07 +0000
78@@ -33,8 +33,8 @@
79 public InfoPanel (EventDialog parent_dialog) {
80 this.parent_dialog = parent_dialog;
81
82- margin_left = 12;
83- margin_right = 12;
84+ margin_start = 12;
85+ margin_end = 12;
86 row_spacing = 6;
87 column_spacing = 12;
88 sensitive = parent_dialog.can_edit;
89@@ -374,4 +374,4 @@
90 // Different years, start should be smaller.
91 return start_date.get_year () < end_date.get_year ();
92 }
93-}
94\ No newline at end of file
95+}
96
97=== modified file 'src/EventEdition/LocationPanel.vala'
98--- src/EventEdition/LocationPanel.vala 2014-08-11 14:33:24 +0000
99+++ src/EventEdition/LocationPanel.vala 2014-09-03 15:39:07 +0000
100@@ -29,8 +29,8 @@
101 public LocationPanel (EventDialog parent_dialog) {
102 this.parent_dialog = parent_dialog;
103
104- margin_left = 12;
105- margin_right = 12;
106+ margin_start = 12;
107+ margin_end = 12;
108 set_row_spacing (6);
109 set_column_spacing (12);
110 set_sensitive (parent_dialog.can_edit);
111
112=== modified file 'src/EventEdition/ReminderPanel.vala'
113--- src/EventEdition/ReminderPanel.vala 2014-08-10 18:12:19 +0000
114+++ src/EventEdition/ReminderPanel.vala 2014-09-03 15:39:07 +0000
115@@ -29,7 +29,7 @@
116 sensitive = parent_dialog.can_edit;
117
118 var reminder_label = Maya.View.EventDialog.make_label (_("Reminders:"));
119- reminder_label.margin_left = 12;
120+ reminder_label.margin_start = 12;
121
122 var no_reminder_label = new Gtk.Label ("");
123 no_reminder_label.set_markup ("<b><span color=\'darkgrey\'>%s</span></b>".printf (_("No Reminders")));
124@@ -158,8 +158,8 @@
125 public ReminderGrid (string uid) {
126 this.uid = uid;
127 set_margin_bottom (6);
128- set_margin_left (6);
129- set_margin_right (6);
130+ set_margin_start (6);
131+ set_margin_end (6);
132
133 time = new Gtk.ComboBoxText ();
134 time.append_text (_("0 minutes"));
135@@ -315,4 +315,4 @@
136 return E.CalComponentAlarmAction.DISPLAY;
137 }
138 }
139-}
140\ No newline at end of file
141+}
142
143=== modified file 'src/EventEdition/RepeatPanel.vala'
144--- src/EventEdition/RepeatPanel.vala 2014-06-26 16:22:52 +0000
145+++ src/EventEdition/RepeatPanel.vala 2014-09-03 15:39:07 +0000
146@@ -40,8 +40,8 @@
147
148 public RepeatPanel (EventDialog parent_dialog) {
149 this.parent_dialog = parent_dialog;
150- margin_left = 12;
151- margin_right = 12;
152+ margin_start = 12;
153+ margin_end = 12;
154 row_spacing = 6;
155 column_spacing = 12;
156 sensitive = parent_dialog.can_edit;
157@@ -511,4 +511,4 @@
158 property.set_rrule (rrule);
159 comp.add_property (property);
160 }
161-}
162\ No newline at end of file
163+}
164
165=== modified file 'src/Sidebar/Sidebar.vala'
166--- src/Sidebar/Sidebar.vala 2014-03-15 15:28:52 +0000
167+++ src/Sidebar/Sidebar.vala 2014-09-03 15:39:07 +0000
168@@ -39,8 +39,8 @@
169 label.sensitive = false;
170 label.wrap = true;
171 label.wrap_mode = Pango.WrapMode.WORD;
172- label.margin_left = 12;
173- label.margin_right = 12;
174+ label.margin_start = 12;
175+ label.margin_end = 12;
176 label.justify = Gtk.Justification.CENTER;
177
178 agenda_view = new AgendaView ();
179@@ -88,4 +88,4 @@
180
181 }
182
183-}
184\ No newline at end of file
185+}
186
187=== modified file 'src/SourceDialog.vala'
188--- src/SourceDialog.vala 2014-08-11 01:27:37 +0000
189+++ src/SourceDialog.vala 2014-09-03 15:39:07 +0000
190@@ -39,8 +39,8 @@
191 main_grid.set_row_spacing (6);
192 main_grid.set_column_spacing (12);
193
194- margin_left = 6;
195- margin_right = 6;
196+ margin_start = 6;
197+ margin_end = 6;
198 margin_top = 6;
199 set_row_spacing (6);
200 set_column_spacing (12);
201@@ -231,4 +231,4 @@
202 go_back ();
203 }
204 }
205-}
206\ No newline at end of file
207+}

Subscribers

People subscribed via source and target branches