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

Stop using GtkBox's pack-type child prop in UI files

Browse Source
This commit is contained in:
Timm Bäder 2018-12-26 08:55:46 +01:00 committed by Matthias Clasen
parent ab6a67dbeb
commit 3a13515777
8 changed files with 15 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3057,9 +3057,6 @@ microphone-sensitivity-medium-symbolic</property>
<class name="small-button"/> <class name="small-button"/>
</style> </style>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -3090,9 +3087,6 @@ microphone-sensitivity-medium-symbolic</property>
<class name="small-button"/> <class name="small-button"/>
</style> </style>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

5
gtk/inspector/recorder.ui
View File

@ -31,6 +31,8 @@
<property name="icon-name">insert-object-symbolic</property> <property name="icon-name">insert-object-symbolic</property>
<property name="tooltip-text" translatable="yes">Add debug nodes</property> <property name="tooltip-text" translatable="yes">Add debug nodes</property>
<property name="active" bind-source="GtkInspectorRecorder" bind-property="debug-nodes" bind-flags="bidirectional|sync-create"/> <property name="active" bind-source="GtkInspectorRecorder" bind-property="debug-nodes" bind-flags="bidirectional|sync-create"/>
<property name="halign">start</property>
<property name="hexpand">1</property>
</object> </object>
</child> </child>
<child> <child>
@ -41,9 +43,6 @@
<property name="tooltip-text" translatable="yes">Save selected node</property> <property name="tooltip-text" translatable="yes">Save selected node</property>
<signal name="clicked" handler="render_node_save"/> <signal name="clicked" handler="render_node_save"/>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

5
gtk/ui/gtkappchooserdialog.ui
View File

@ -21,10 +21,9 @@
<child internal-child="action_area"> <child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="layout-style">end</property> <property name="layout-style">end</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="inner_box"> <object class="GtkBox" id="inner_box">

6
gtk/ui/gtkdialog.ui
View File

@ -28,14 +28,8 @@
<class name="dialog-action-area"/> <class name="dialog-action-area"/>
</style> </style>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

5
gtk/ui/gtkfilechooserdialog.ui
View File

@ -13,10 +13,9 @@
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="margin">6</property> <property name="margin">6</property>
<property name="layout-style">end</property> <property name="layout-style">end</property>
<property name="hexpand">1</property>
<property name="halign">end</property>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkFileChooserWidget" id="widget"> <object class="GtkFileChooserWidget" id="widget">

14
gtk/ui/gtkfilechooserwidget.ui
View File

@ -65,10 +65,6 @@
<property name="icon-name">folder-new-symbolic</property> <property name="icon-name">folder-new-symbolic</property>
<signal name="notify::active" handler="new_folder_popover_active"/> <signal name="notify::active" handler="new_folder_popover_active"/>
</object> </object>
<packing>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@ -101,9 +97,6 @@
<object class="GtkSpinner" id="search_spinner"> <object class="GtkSpinner" id="search_spinner">
<property name="visible">0</property> <property name="visible">0</property>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@ -367,9 +360,6 @@
<property name="valign">start</property> <property name="valign">start</property>
<signal name="changed" handler="filter_combo_changed" swapped="no"/> <signal name="changed" handler="filter_combo_changed" swapped="no"/>
</object> </object>
<packing>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
<packing> <packing>
@ -377,10 +367,6 @@
</packing> </packing>
</child> </child>
</object> </object>
<packing>
<property name="position">1</property>
<property name="pack-type">end</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

1
gtk/ui/gtkprintunixdialog.ui
View File

@ -1169,7 +1169,6 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="pack-type">end</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>

23
testsuite/gtk/builder.c
View File

@ -983,21 +983,15 @@ test_child_properties (void)
" <object class=\"GtkBox\" id=\"vbox1\">" " <object class=\"GtkBox\" id=\"vbox1\">"
" <child>" " <child>"
" <object class=\"GtkLabel\" id=\"label1\"/>" " <object class=\"GtkLabel\" id=\"label1\"/>"
" <packing>"
" <property name=\"pack-type\">start</property>"
" </packing>"
" </child>" " </child>"
" <child>" " <child>"
" <object class=\"GtkLabel\" id=\"label2\"/>" " <object class=\"GtkLabel\" id=\"label2\"/>"
" <packing>"
" <property name=\"pack-type\">end</property>"
" </packing>"
" </child>" " </child>"
" </object>" " </object>"
"</interface>"; "</interface>";
GObject *label, *vbox; GObject *label, *vbox;
GtkPackType pack_type; int position;
builder = builder_new_from_string (buffer1, -1, NULL); builder = builder_new_from_string (buffer1, -1, NULL);
vbox = gtk_builder_get_object (builder, "vbox1"); vbox = gtk_builder_get_object (builder, "vbox1");
@ -1007,19 +1001,19 @@ test_child_properties (void)
g_assert (GTK_IS_LABEL (label)); g_assert (GTK_IS_LABEL (label));
gtk_container_child_get (GTK_CONTAINER (vbox), gtk_container_child_get (GTK_CONTAINER (vbox),
GTK_WIDGET (label), GTK_WIDGET (label),
"pack-type", "position",
&pack_type, &position,
NULL); NULL);
g_assert (pack_type == GTK_PACK_START); g_assert_cmpint (position, ==, 0);
label = gtk_builder_get_object (builder, "label2"); label = gtk_builder_get_object (builder, "label2");
g_assert (GTK_IS_LABEL (label)); g_assert (GTK_IS_LABEL (label));
gtk_container_child_get (GTK_CONTAINER (vbox), gtk_container_child_get (GTK_CONTAINER (vbox),
GTK_WIDGET (label), GTK_WIDGET (label),
"pack-type", "position",
&pack_type, &position,
NULL); NULL);
g_assert (pack_type == GTK_PACK_END); g_assert_cmpint (position, ==, 1);
g_object_unref (builder); g_object_unref (builder);
} }
@ -1787,9 +1781,6 @@ test_reference_counting (void)
" <property name=\"orientation\">vertical</property>" " <property name=\"orientation\">vertical</property>"
" <child>" " <child>"
" <object class=\"GtkLabel\" id=\"label1\"/>" " <object class=\"GtkLabel\" id=\"label1\"/>"
" <packing>"
" <property name=\"pack-type\">start</property>"
" </packing>"
" </child>" " </child>"
" </object>" " </object>"
"</interface>"; "</interface>";