AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Replace all margin-left and margin-right with margin-start and margin-end

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=710238
This commit is contained in:
Yosef Or Boczko 2013-11-15 00:31:17 +02:00 committed by Benjamin Otte
parent 9921bec63a
commit 719dd636a9
24 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/gtk-demo/listbox.ui
View File

@ -38,8 +38,8 @@
<property name="valign">start</property> <property name="valign">start</property>
<property name="margin_top">8</property> <property name="margin_top">8</property>
<property name="margin_bottom">8</property> <property name="margin_bottom">8</property>
<property name="margin_left">8</property> <property name="margin_start">8</property>
<property name="margin_right">8</property> <property name="margin_end">8</property>
<property name="icon-name">image-missing</property> <property name="icon-name">image-missing</property>
</object> </object>
<packing> <packing>

32
demos/gtk-demo/overlay.c
View File

@ -51,8 +51,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_END); gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -65,8 +65,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_END); gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -79,8 +79,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -93,8 +93,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -107,8 +107,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -121,8 +121,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -135,8 +135,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_CENTER); gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 20); gtk_widget_set_margin_start (label, 20);
gtk_widget_set_margin_right (label, 20); gtk_widget_set_margin_end (label, 20);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);
@ -149,8 +149,8 @@ do_overlay (GtkWidget *do_widget)
gtk_widget_set_halign (label, GTK_ALIGN_CENTER); gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_END); gtk_widget_set_valign (label, GTK_ALIGN_END);
gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
gtk_widget_set_margin_left (label, 10); gtk_widget_set_margin_start (label, 10);
gtk_widget_set_margin_right (label, 10); gtk_widget_set_margin_end (label, 10);
gtk_widget_set_margin_top (label, 5); gtk_widget_set_margin_top (label, 5);
gtk_widget_set_margin_bottom (label, 5); gtk_widget_set_margin_bottom (label, 5);

4
demos/widget-factory/widget-factory.ui
View File

@ -1756,8 +1756,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="margin-bottom">10</property> <property name="margin-bottom">10</property>
<property name="margin-left">10</property> <property name="margin-start">10</property>
<property name="margin-right">10</property> <property name="margin-end">10</property>
<property name="spacing">20</property> <property name="spacing">20</property>
<child> <child>
<object class="GtkLabel" id="page2note"> <object class="GtkLabel" id="page2note">

4
gtk/deprecated/gtktable.c
View File

@ -897,8 +897,8 @@ gtk_table_get_row_spacing (GtkTable *table,
* Alters the amount of space between a given table column and the following * Alters the amount of space between a given table column and the following
* column. * column.
* *
* Deprecated: 3.4: Use gtk_widget_set_margin_left() and * Deprecated: 3.4: Use gtk_widget_set_margin_start() and
* gtk_widget_set_margin_right() on the widgets contained in the row if * gtk_widget_set_margin_end() on the widgets contained in the row if
* you need this functionality. #GtkGrid does not support per-row spacing. * you need this functionality. #GtkGrid does not support per-row spacing.
*/ */
void void

16
gtk/gtkcoloreditor.ui
View File

@ -38,8 +38,8 @@
<object class="GtkGrid" id="grid"> <object class="GtkGrid" id="grid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">30</property> <property name="margin_start">30</property>
<property name="margin_right">30</property> <property name="margin_end">30</property>
<property name="row_spacing">12</property> <property name="row_spacing">12</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -157,8 +157,8 @@
<object class="GtkGrid" id="grid4"> <object class="GtkGrid" id="grid4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="margin_right">12</property> <property name="margin_end">12</property>
<property name="margin_top">12</property> <property name="margin_top">12</property>
<property name="margin_bottom">12</property> <property name="margin_bottom">12</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
@ -215,8 +215,8 @@
<object class="GtkGrid" id="grid3"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="margin_right">12</property> <property name="margin_end">12</property>
<property name="margin_top">12</property> <property name="margin_top">12</property>
<property name="margin_bottom">12</property> <property name="margin_bottom">12</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
@ -273,8 +273,8 @@
<object class="GtkGrid" id="grid2"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="margin_right">12</property> <property name="margin_end">12</property>
<property name="margin_top">12</property> <property name="margin_top">12</property>
<property name="margin_bottom">12</property> <property name="margin_bottom">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>

2
gtk/gtkcustompaperunixdialog.c
View File

@ -963,7 +963,7 @@ wrap_in_frame (const gchar *label,
frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
gtk_widget_set_margin_left (child, 12); gtk_widget_set_margin_start (child, 12);
gtk_widget_set_halign (child, GTK_ALIGN_FILL); gtk_widget_set_halign (child, GTK_ALIGN_FILL);
gtk_widget_set_valign (child, GTK_ALIGN_FILL); gtk_widget_set_valign (child, GTK_ALIGN_FILL);

4
gtk/gtkfontchooserwidget.ui
View File

@ -113,8 +113,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">start</property> <property name="valign">start</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="margin_right">12</property> <property name="margin_end">12</property>
<property name="margin_top">12</property> <property name="margin_top">12</property>
<property name="margin_bottom">12</property> <property name="margin_bottom">12</property>
<property name="label" translatable="yes">No fonts matched your search. You can revise your search and try again.</property> <property name="label" translatable="yes">No fonts matched your search. You can revise your search and try again.</property>

4
gtk/gtkoverlay.c
View File

@ -104,8 +104,8 @@ gtk_overlay_compute_child_allocation (GtkOverlay *overlay,
/* put the margins outside the window; also arrange things /* put the margins outside the window; also arrange things
* so that the adjusted child allocation still ends up at 0, 0 * so that the adjusted child allocation still ends up at 0, 0
*/ */
left = gtk_widget_get_margin_left (child->widget); left = gtk_widget_get_margin_start (child->widget);
right = gtk_widget_get_margin_right (child->widget); right = gtk_widget_get_margin_end (child->widget);
top = gtk_widget_get_margin_top (child->widget); top = gtk_widget_get_margin_top (child->widget);
bottom = gtk_widget_get_margin_bottom (child->widget); bottom = gtk_widget_get_margin_bottom (child->widget);

14
gtk/gtkprintunixdialog.ui
View File

@ -268,7 +268,7 @@
<object class="GtkGrid" id="range_table"> <object class="GtkGrid" id="range_table">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -415,7 +415,7 @@
<object class="GtkGrid" id="grid1"> <object class="GtkGrid" id="grid1">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -575,7 +575,7 @@
<object class="GtkGrid" id="grid2"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -811,7 +811,7 @@
<object class="GtkGrid" id="grid3"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -1080,7 +1080,7 @@
<object class="GtkGrid" id="grid5"> <object class="GtkGrid" id="grid5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -1189,7 +1189,7 @@
<object class="GtkGrid" id="grid6"> <object class="GtkGrid" id="grid6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
@ -1328,7 +1328,7 @@
<object class="GtkGrid" id="grid7"> <object class="GtkGrid" id="grid7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>

4
gtk/gtkstatusbar.ui
View File

@ -5,8 +5,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="vexpand">False</property> <property name="vexpand">False</property>
<property name="spacing">2</property> <property name="spacing">2</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">6</property> <property name="margin_top">6</property>
<property name="margin_bottom">6</property> <property name="margin_bottom">6</property>
<child> <child>

4
gtk/gtkstatusicon.c
View File

@ -1469,8 +1469,8 @@ gtk_status_icon_padding_changed (GtkStatusIcon *status_icon)
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
gtk_widget_set_margin_left (priv->image, padding); gtk_widget_set_margin_start (priv->image, padding);
gtk_widget_set_margin_right (priv->image, padding); gtk_widget_set_margin_end (priv->image, padding);
} }
else else
{ {

13
gtk/gtkstylecontext.c
View File

@ -3634,23 +3634,26 @@ gtk_style_context_get_margin (GtkStyleContext *context,
GtkStateFlags state, GtkStateFlags state,
GtkBorder *margin) GtkBorder *margin)
{ {
int top, left, bottom, right; int top, start, bottom, end;
gboolean rtl;
g_return_if_fail (margin != NULL); g_return_if_fail (margin != NULL);
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
rtl = (gtk_style_context_get_state (context) & GTK_STATE_FLAG_DIR_RTL);
gtk_style_context_get (context, gtk_style_context_get (context,
state, state,
"margin-top", &top, "margin-top", &top,
"margin-left", &left, "margin-start", &start,
"margin-bottom", &bottom, "margin-bottom", &bottom,
"margin-right", &right, "margin-end", &end,
NULL); NULL);
margin->top = top; margin->top = top;
margin->left = left; margin->left = rtl ? start : end;
margin->bottom = bottom; margin->bottom = bottom;
margin->right = right; margin->right = rtl ? end : start;
} }
/** /**

4
gtk/gtktooltip.c
View File

@ -240,8 +240,8 @@ gtk_tooltip_init (GtkTooltip *tooltip)
/* FIXME: don't hardcode the padding */ /* FIXME: don't hardcode the padding */
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_widget_set_margin_left (box, 6); gtk_widget_set_margin_start (box, 6);
gtk_widget_set_margin_right (box, 6); gtk_widget_set_margin_end (box, 6);
gtk_widget_set_margin_top (box, 6); gtk_widget_set_margin_top (box, 6);
gtk_widget_set_margin_bottom (box, 6); gtk_widget_set_margin_bottom (box, 6);
gtk_container_add (GTK_CONTAINER (window), box); gtk_container_add (GTK_CONTAINER (window), box);

4
tests/testadjustsize.c
View File

@ -354,8 +354,8 @@ open_margin_window (void)
GtkWidget *box; GtkWidget *box;
int i; int i;
const char * margins[] = { const char * margins[] = {
"margin-left", "margin-start",
"margin-right", "margin-end",
"margin-top", "margin-top",
"margin-bottom", "margin-bottom",
"margin" "margin"

8
tests/testgtk.c
View File

@ -6020,8 +6020,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid); g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
gtk_widget_set_margin_left (pixwid, 3); gtk_widget_set_margin_start (pixwid, 3);
gtk_widget_set_margin_right (pixwid, 3); gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1); gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1); gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new_with_mnemonic (accel_buffer); label = gtk_label_new_with_mnemonic (accel_buffer);
@ -6034,8 +6034,8 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid); g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
gtk_widget_set_margin_left (pixwid, 3); gtk_widget_set_margin_start (pixwid, 3);
gtk_widget_set_margin_right (pixwid, 3); gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1); gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1); gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new (buffer); label = gtk_label_new (buffer);

2
tests/testoverlaystyleclass.c
View File

@ -116,7 +116,7 @@ main (int argc, char *argv[])
str = g_strdup_printf ("%p", child); str = g_strdup_printf ("%p", child);
gtk_label_set_text (GTK_LABEL (child), str); gtk_label_set_text (GTK_LABEL (child), str);
g_free (str); g_free (str);
gtk_widget_set_margin_left (child, 55); gtk_widget_set_margin_start (child, 55);
gtk_widget_set_margin_top (child, 4); gtk_widget_set_margin_top (child, 4);
g_print ("Left/Top margined child: %p\n", child); g_print ("Left/Top margined child: %p\n", child);
gtk_widget_set_halign (child, GTK_ALIGN_START); gtk_widget_set_halign (child, GTK_ALIGN_START);

8
tests/testrevealer.c
View File

@ -17,15 +17,15 @@ main (gint argc,
widget = gtk_label_new ("Some filler text to avoid\nresizing of the window"); widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
gtk_widget_set_margin_top (widget, 10); gtk_widget_set_margin_top (widget, 10);
gtk_widget_set_margin_bottom (widget, 10); gtk_widget_set_margin_bottom (widget, 10);
gtk_widget_set_margin_left (widget, 10); gtk_widget_set_margin_start (widget, 10);
gtk_widget_set_margin_right (widget, 10); gtk_widget_set_margin_end (widget, 10);
gtk_grid_attach (GTK_GRID (box), widget, 1, 1, 1, 1); gtk_grid_attach (GTK_GRID (box), widget, 1, 1, 1, 1);
widget = gtk_label_new ("Some filler text to avoid\nresizing of the window"); widget = gtk_label_new ("Some filler text to avoid\nresizing of the window");
gtk_widget_set_margin_top (widget, 10); gtk_widget_set_margin_top (widget, 10);
gtk_widget_set_margin_bottom (widget, 10); gtk_widget_set_margin_bottom (widget, 10);
gtk_widget_set_margin_left (widget, 10); gtk_widget_set_margin_start (widget, 10);
gtk_widget_set_margin_right (widget, 10); gtk_widget_set_margin_end (widget, 10);
gtk_grid_attach (GTK_GRID (box), widget, 3, 3, 1, 1); gtk_grid_attach (GTK_GRID (box), widget, 3, 3, 1, 1);
widget = gtk_toggle_button_new_with_label ("None"); widget = gtk_toggle_button_new_with_label ("None");

8
tests/visuals/osd-toolbars.ui
View File

@ -104,8 +104,8 @@
<object class="GtkLabel" id="status_label"> <object class="GtkLabel" id="status_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label">OSD Toolbar</property> <property name="label">OSD Toolbar</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
</object> </object>
</child> </child>
</object> </object>
@ -204,8 +204,8 @@
<object class="GtkLabel" id="tb5_label"> <object class="GtkLabel" id="tb5_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label">Another kind of OSD toolbar</property> <property name="label">Another kind of OSD toolbar</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
</object> </object>
</child> </child>
</object> </object>

12
testsuite/reftests/alignment-props.ui
View File

@ -79,8 +79,8 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="margin-bottom">30</property> <property name="margin-bottom">30</property>
<property name="margin-left">20</property> <property name="margin-start">20</property>
<property name="margin-right">40</property> <property name="margin-end">40</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@ -100,8 +100,8 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="margin-bottom">30</property> <property name="margin-bottom">30</property>
<property name="margin-left">20</property> <property name="margin-start">20</property>
<property name="margin-right">40</property> <property name="margin-end">40</property>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -121,8 +121,8 @@
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="margin-top">10</property> <property name="margin-top">10</property>
<property name="margin-bottom">30</property> <property name="margin-bottom">30</property>
<property name="margin-left">20</property> <property name="margin-start">20</property>
<property name="margin-right">40</property> <property name="margin-end">40</property>
</object> </object>
<packing> <packing>
<property name="left_attach">2</property> <property name="left_attach">2</property>

4
testsuite/reftests/inherit-and-initial.ref.ui
View File

@ -1771,8 +1771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<property name="name">inherit</property> <property name="name">inherit</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="margin_start">5</property>
<property name="margin_right">5</property> <property name="margin_end">5</property>
<property name="margin_bottom">5</property> <property name="margin_bottom">5</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>

4
testsuite/reftests/inherit-and-initial.ui
View File

@ -1643,8 +1643,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<object class="GtkBox" id="box5"> <object class="GtkBox" id="box5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="margin_start">5</property>
<property name="margin_right">5</property> <property name="margin_end">5</property>
<property name="margin_bottom">5</property> <property name="margin_bottom">5</property>
<property name="spacing">10</property> <property name="spacing">10</property>
<property name="homogeneous">True</property> <property name="homogeneous">True</property>

36
testsuite/reftests/misc-alignment.ui
View File

@ -30,8 +30,8 @@
<object class="GtkLabel" id="label2"> <object class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="halign">start</property> <property name="halign">start</property>
@ -51,8 +51,8 @@
<object class="GtkLabel" id="label3"> <object class="GtkLabel" id="label3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">20</property> <property name="margin_start">20</property>
<property name="margin_right">20</property> <property name="margin_end">20</property>
<property name="margin_top">20</property> <property name="margin_top">20</property>
<property name="margin_bottom">20</property> <property name="margin_bottom">20</property>
<property name="halign">center</property> <property name="halign">center</property>
@ -72,8 +72,8 @@
<object class="GtkLabel" id="label4"> <object class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="halign">end</property> <property name="halign">end</property>
@ -126,8 +126,8 @@
<object class="GtkArrow" id="arrow2"> <object class="GtkArrow" id="arrow2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="halign">start</property> <property name="halign">start</property>
@ -147,8 +147,8 @@
<property name="width_request">16</property> <property name="width_request">16</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">20</property> <property name="margin_start">20</property>
<property name="margin_right">20</property> <property name="margin_end">20</property>
<property name="margin_top">20</property> <property name="margin_top">20</property>
<property name="margin_bottom">20</property> <property name="margin_bottom">20</property>
<property name="halign">center</property> <property name="halign">center</property>
@ -167,8 +167,8 @@
<object class="GtkArrow" id="arrow4"> <object class="GtkArrow" id="arrow4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="halign">end</property> <property name="halign">end</property>
@ -224,8 +224,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="valign">start</property> <property name="valign">start</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -245,8 +245,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">center</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="margin_left">20</property> <property name="margin_start">20</property>
<property name="margin_right">20</property> <property name="margin_end">20</property>
<property name="margin_top">20</property> <property name="margin_top">20</property>
<property name="margin_bottom">20</property> <property name="margin_bottom">20</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -266,8 +266,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">end</property> <property name="valign">end</property>
<property name="margin_left">10</property> <property name="margin_start">10</property>
<property name="margin_right">10</property> <property name="margin_end">10</property>
<property name="margin_top">10</property> <property name="margin_top">10</property>
<property name="margin_bottom">10</property> <property name="margin_bottom">10</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>

12
testsuite/reftests/sizegroups-evolution-identity-page.ref.ui
View File

@ -44,7 +44,7 @@
<object class="GtkLabel" id="label3"> <object class="GtkLabel" id="label3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Type the name by which you would like to refer to this account. <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
For example, "Work" or "Personal".</property> For example, "Work" or "Personal".</property>
@ -60,7 +60,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label4"> <object class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">_Name:</property> <property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -106,7 +106,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Full Nam_e:</property> <property name="label" translatable="yes">Full Nam_e:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -137,7 +137,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label7"> <object class="GtkLabel" id="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="label" translatable="yes">Email _Address:</property> <property name="label" translatable="yes">Email _Address:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
@ -181,7 +181,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label9"> <object class="GtkLabel" id="label9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Re_ply-To:</property> <property name="label" translatable="yes">Re_ply-To:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label10"> <object class="GtkLabel" id="label10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Or_ganization:</property> <property name="label" translatable="yes">Or_ganization:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>

12
testsuite/reftests/sizegroups-evolution-identity-page.ui
View File

@ -49,7 +49,7 @@
<object class="GtkLabel" id="label3"> <object class="GtkLabel" id="label3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Type the name by which you would like to refer to this account. <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
For example, "Work" or "Personal".</property> For example, "Work" or "Personal".</property>
@ -65,7 +65,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label4"> <object class="GtkLabel" id="label4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">_Name:</property> <property name="label" translatable="yes">_Name:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -124,7 +124,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label6"> <object class="GtkLabel" id="label6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Full Nam_e:</property> <property name="label" translatable="yes">Full Nam_e:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -155,7 +155,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label7"> <object class="GtkLabel" id="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="label" translatable="yes">Email _Address:</property> <property name="label" translatable="yes">Email _Address:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
</object> </object>
@ -212,7 +212,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label9"> <object class="GtkLabel" id="label9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Re_ply-To:</property> <property name="label" translatable="yes">Re_ply-To:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
@ -243,7 +243,7 @@ For example, "Work" or "Personal".</property>
<object class="GtkLabel" id="label10"> <object class="GtkLabel" id="label10">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">12</property> <property name="margin_start">12</property>
<property name="xalign">1</property> <property name="xalign">1</property>
<property name="label" translatable="yes">Or_ganization:</property> <property name="label" translatable="yes">Or_ganization:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>