diff options
| author | Jason Francis <jason@cycles.network> | 2020-08-16 21:32:21 -0400 |
|---|---|---|
| committer | Jason Francis <jason@cycles.network> | 2020-08-20 23:41:29 -0400 |
| commit | 2437622b5f0f444521c731758fdea85103bd20af (patch) | |
| tree | ed354484fbd21f1cbf5e517f15f6bcd1093470b5 /testsuite/tools | |
| parent | bb8c818ba14ffde882f31359e09efd6e9215c593 (diff) | |
| download | gtk+-2437622b5f0f444521c731758fdea85103bd20af.tar.gz | |
builder-tool: Rewrite GtkBox
Rewrite expand/fill properties on GtkBox to
hexpand/halign/vexpand/valign on the child widget.
Rewrite GtkVBox and GtkHBox to GtkBox, setting the orientation
property.
Added a test for boxes.
Diffstat (limited to 'testsuite/tools')
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/box.expected | 614 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/box.ui | 1131 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected | 4 | ||||
| -rw-r--r-- | testsuite/tools/simplify-data-3to4/office-runner.expected | 20 |
4 files changed, 1746 insertions, 23 deletions
diff --git a/testsuite/tools/simplify-data-3to4/box.expected b/testsuite/tools/simplify-data-3to4/box.expected new file mode 100644 index 0000000000..9f62a3b09e --- /dev/null +++ b/testsuite/tools/simplify-data-3to4/box.expected @@ -0,0 +1,614 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <requires lib="gtk+" version="3.0"/> + <object class="GtkWindow"> + <property name="child"> + <object class="GtkBox"> + <property name="can_focus">0</property> + <child> + <object class="GtkBox"> + <property name="hexpand">1</property> + <property name="can_focus">0</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="can_focus">0</property> + <property name="valign">center</property> + <property name="hexpand">1</property> + <property name="vexpand">0</property> + <child> + <object class="GtkButton"> + <property name="halign">center</property> + <property name="label" translatable="yes">_</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="halign">center</property> + <property name="hexpand">1</property> + <property name="label" translatable="yes">E</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="hexpand">1</property> + <property name="label" translatable="yes">FE</property> + <property name="receives_default">1</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="can_focus">0</property> + <property name="valign">center</property> + <property name="hexpand">1</property> + <property name="vexpand">0</property> + <child> + <object class="GtkButton"> + <property name="halign">center</property> + <property name="label" translatable="yes">_</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="halign">center</property> + <property name="hexpand">1</property> + <property name="label" translatable="yes">E</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="hexpand">1</property> + <property name="label" translatable="yes">FE</property> + <property name="receives_default">1</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="can_focus">0</property> + <property name="vexpand">1</property> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">_</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="vexpand">1</property> + <property name="label" translatable="yes">E</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FE</property> + <property name="receives_default">1</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="can_focus">0</property> + <property name="hexpand">0</property> + <property name="vexpand">1</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">_I</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="vexpand">1</property> + <property name="label" translatable="yes">EI</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FEI</property> + <property name="receives_default">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">ES</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FES</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">EN</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FEN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">EC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FEC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">EB</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="vexpand">1</property> + <property name="label" translatable="yes">FEB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="can_focus">0</property> + <property name="hexpand">0</property> + <property name="vexpand">1</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">_I</property> + <property name="receives_default">1</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="receives_default">1</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">EI</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEI</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">ES</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FES</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EN</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + <property name="vexpand">0</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EB</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + <property name="vexpand">1</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkBox"> + <property name="can_focus">0</property> + <property name="hexpand">0</property> + <property name="vexpand">1</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">_I</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="valign">center</property> + <property name="label" translatable="yes">EI</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEI</property> + <property name="receives_default">1</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">ES</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FES</property> + <property name="receives_default">1</property> + <property name="valign">start</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EN</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEN</property> + <property name="receives_default">1</property> + <property name="valign">end</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEC</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EB</property> + <property name="receives_default">1</property> + <property name="valign">center</property> + <property name="vexpand">1</property> + </object> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEB</property> + <property name="receives_default">1</property> + <property name="valign">baseline</property> + <property name="vexpand">1</property> + </object> + </child> + </object> + </child> + </object> + </property> + </object> +</interface> diff --git a/testsuite/tools/simplify-data-3to4/box.ui b/testsuite/tools/simplify-data-3to4/box.ui new file mode 100644 index 0000000000..fad61969e8 --- /dev/null +++ b/testsuite/tools/simplify-data-3to4/box.ui @@ -0,0 +1,1131 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.22.2 --> +<interface> + <requires lib="gtk+" version="3.0"/> + <object class="GtkWindow"> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">False</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">E</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FE</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="vexpand">False</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">E</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FE</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">F</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">E</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FE</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_I</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">ES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">19</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_I</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">ES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">19</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">False</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_I</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEI</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_S</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FS</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">ES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FES</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">start</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_N</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">10</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEN</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">11</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_C</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">12</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">13</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">14</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEC</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">15</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">_B</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">16</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">17</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">EB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">False</property> + <property name="position">18</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">FEB</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">baseline</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">19</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + </object> + </child> + </object> +</interface> diff --git a/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected b/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected index 6e41177129..11a691763d 100644 --- a/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected +++ b/testsuite/tools/simplify-data-3to4/gtkfilechooserdialog.expected @@ -12,15 +12,13 @@ <property name="border-width">0</property> <child> <object class="GtkFileChooserWidget" id="widget"> + <property name="vexpand">1</property> <property name="orientation">vertical</property> <signal name="default-size-changed" handler="file_chooser_widget_default_size_changed" swapped="no"/> <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/> <signal name="response-requested" handler="file_chooser_widget_response_requested" swapped="no"/> <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> diff --git a/testsuite/tools/simplify-data-3to4/office-runner.expected b/testsuite/tools/simplify-data-3to4/office-runner.expected index adeca878bf..d6860d0fd7 100644 --- a/testsuite/tools/simplify-data-3to4/office-runner.expected +++ b/testsuite/tools/simplify-data-3to4/office-runner.expected @@ -144,10 +144,6 @@ <attribute name="scale" value="1.5"></attribute> </attributes> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> <child> <object class="GtkLabel" id="current_time_label"> @@ -157,10 +153,6 @@ <property name="use_markup">1</property> <property name="wrap">1</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> <child> <object class="GtkLabel" id="better_time_label"> @@ -170,10 +162,6 @@ <property name="use_markup">1</property> <property name="wrap">1</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> <layout> <property name="column">1</property> @@ -191,10 +179,6 @@ </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> <child> <object class="GtkButton" id="run_button"> @@ -211,10 +195,6 @@ </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> </child> </object> </property> |