extensions/uiconfig/sbibliography/ui/mappingdialog.ui | 494 +++++++++--------- 1 file changed, 247 insertions(+), 247 deletions(-)
New commits: commit 73db9b474e98329781e2b1d1d42defe349a88459 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 13:05:08 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:16:33 2026 +0100 tdf#130857 Define widgets in Column Arrangement dialog in order Switch the order in which the widgets in the .ui file are defined so that the order better matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn <[email protected]> Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. The dialog can be triggered like this: * start Writer * "Tools" -> Bibliography Database" * "Data" -> "Column Arrangement" Change-Id: I7bcb4d78f5ae78a2edda8eccb10839e5a8fc5fdc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199159 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui index 242f465847f3..60bf499e17bf 100644 --- a/extensions/uiconfig/sbibliography/ui/mappingdialog.ui +++ b/extensions/uiconfig/sbibliography/ui/mappingdialog.ui @@ -108,75 +108,85 @@ </packing> </child> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkComboBoxText" id="identifierCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label3">_Author(s)</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">authorCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label7"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label4">_Publisher</property> + <property name="label" translatable="yes" context="mappingdialog|label7">_Type</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">publisherCombobox</property> + <property name="mnemonic-widget">authorityTypeCombobox</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkComboBoxText" id="authorityTypeCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label5">_Chapter</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">chapterCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel" id="label8"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label6">Editor</property> + <property name="label" translatable="yes" context="mappingdialog|label8">_Year</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">editorCombobox</property> + <property name="mnemonic-widget">yearCombobox</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="left-attach">4</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="authorCombobox"> + <object class="GtkComboBoxText" id="yearCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">5</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label3">_Author(s)</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">authorCombobox</property> + </object> + <packing> + <property name="left-attach">0</property> <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="publisherCombobox"> + <object class="GtkComboBoxText" id="authorCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> @@ -184,77 +194,77 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="chapterCombobox"> + <object class="GtkLabel" id="label9"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label9">Tit_le</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">titleCombobox</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="editorCombobox"> + <object class="GtkComboBoxText" id="titleCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="left-attach">3</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label7">_Type</property> + <property name="label" translatable="yes" context="mappingdialog|label4">_Publisher</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">authorityTypeCombobox</property> + <property name="mnemonic-widget">publisherCombobox</property> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkComboBoxText" id="publisherCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label8">_Year</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">yearCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">4</property> - <property name="top-attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label9">Tit_le</property> + <property name="label" translatable="yes" context="mappingdialog|label10">A_ddress</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">titleCombobox</property> + <property name="mnemonic-widget">addressCombobox</property> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="authorityTypeCombobox"> + <object class="GtkComboBoxText" id="addressCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> @@ -262,59 +272,59 @@ </object> <packing> <property name="left-attach">3</property> - <property name="top-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="yearCombobox"> + <object class="GtkLabel" id="label11"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label11">_ISBN</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">ISBNCombobox</property> </object> <packing> - <property name="left-attach">5</property> - <property name="top-attach">0</property> + <property name="left-attach">4</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="titleCombobox"> + <object class="GtkComboBoxText" id="ISBNCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">3</property> - <property name="top-attach">1</property> + <property name="left-attach">5</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label10">A_ddress</property> + <property name="label" translatable="yes" context="mappingdialog|label5">_Chapter</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">addressCombobox</property> + <property name="mnemonic-widget">chapterCombobox</property> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkComboBoxText" id="chapterCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label11">_ISBN</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">ISBNCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">4</property> - <property name="top-attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -332,7 +342,7 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="addressCombobox"> + <object class="GtkComboBoxText" id="pagesCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> @@ -340,31 +350,49 @@ </object> <packing> <property name="left-attach">3</property> - <property name="top-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="ISBNCombobox"> + <object class="GtkBox" id="box1"> + <property name="width-request">12</property> + <property name="height-request">12</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left-attach">5</property> - <property name="top-attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="pagesCombobox"> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label6">Editor</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">editorCombobox</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">5</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="editorCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">3</property> - <property name="top-attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> @@ -408,54 +436,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label15"> + <object class="GtkComboBoxText" id="bookTitleCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label15">Volume</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">volumeCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">1</property> <property name="top-attach">6</property> </packing> </child> <child> - <object class="GtkLabel" id="label16"> + <object class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label16">Publication t_ype</property> + <property name="label" translatable="yes" context="mappingdialog|label15">Volume</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">howPublishedCombobox</property> + <property name="mnemonic-widget">volumeCombobox</property> </object> <packing> - <property name="left-attach">4</property> + <property name="left-attach">2</property> <property name="top-attach">6</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="bookTitleCombobox"> + <object class="GtkComboBoxText" id="volumeCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> <property name="top-attach">6</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="volumeCombobox"> + <object class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label16">Publication t_ype</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">howPublishedCombobox</property> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">4</property> <property name="top-attach">6</property> </packing> </child> @@ -486,54 +514,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label18"> + <object class="GtkComboBoxText" id="organizationCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label18">Instit_ution</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">institutionCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">1</property> <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="label19"> + <object class="GtkLabel" id="label18"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label19">Uni_versity</property> + <property name="label" translatable="yes" context="mappingdialog|label18">Instit_ution</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">schoolCombobox</property> + <property name="mnemonic-widget">institutionCombobox</property> </object> <packing> - <property name="left-attach">4</property> + <property name="left-attach">2</property> <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="organizationCombobox"> + <object class="GtkComboBoxText" id="institutionCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="institutionCombobox"> + <object class="GtkLabel" id="label19"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label19">Uni_versity</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">schoolCombobox</property> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">4</property> <property name="top-attach">7</property> </packing> </child> @@ -563,6 +591,18 @@ <property name="top-attach">8</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="reportTypeCombobox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">8</property> + </packing> + </child> <child> <object class="GtkLabel" id="label21"> <property name="visible">True</property> @@ -578,27 +618,31 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="reportTypeCombobox"> + <object class="GtkComboBoxText" id="monthCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> <property name="top-attach">8</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="monthCombobox"> + <object class="GtkBox" id="box2"> + <property name="width-request">12</property> + <property name="height-request">12</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left-attach">3</property> - <property name="top-attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">9</property> </packing> </child> <child> @@ -616,54 +660,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label23"> + <object class="GtkComboBoxText" id="journalCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label23">Numb_er</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">numberCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">1</property> <property name="top-attach">10</property> </packing> </child> <child> - <object class="GtkLabel" id="label24"> + <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label24">Se_ries</property> + <property name="label" translatable="yes" context="mappingdialog|label23">Numb_er</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">seriesCombobox</property> + <property name="mnemonic-widget">numberCombobox</property> </object> <packing> - <property name="left-attach">4</property> + <property name="left-attach">2</property> <property name="top-attach">10</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="journalCombobox"> + <object class="GtkComboBoxText" id="numberCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> <property name="top-attach">10</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="numberCombobox"> + <object class="GtkLabel" id="label24"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label24">Se_ries</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">seriesCombobox</property> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">4</property> <property name="top-attach">10</property> </packing> </child> @@ -694,54 +738,54 @@ </packing> </child> <child> - <object class="GtkLabel" id="label26"> + <object class="GtkComboBoxText" id="annoteCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label26">_Note</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">noteCombobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">1</property> <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkLabel" id="label27"> + <object class="GtkLabel" id="label26"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label27">URL</property> + <property name="label" translatable="yes" context="mappingdialog|label26">_Note</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">URLCombobox</property> + <property name="mnemonic-widget">noteCombobox</property> </object> <packing> - <property name="left-attach">4</property> + <property name="left-attach">2</property> <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="annoteCombobox"> + <object class="GtkComboBoxText" id="noteCombobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">3</property> <property name="top-attach">11</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="noteCombobox"> + <object class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label27">URL</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">URLCombobox</property> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">4</property> <property name="top-attach">11</property> </packing> </child> @@ -758,84 +802,58 @@ </packing> </child> <child> - <object class="GtkLabel" id="label28"> + <object class="GtkBox" id="box3"> + <property name="width-request">12</property> + <property name="height-request">12</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label28">User-defined field _1</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">custom1Combobox</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">13</property> + <property name="top-attach">12</property> </packing> </child> <child> - <object class="GtkLabel" id="label29"> + <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label29">User-defined field _2</property> + <property name="label" translatable="yes" context="mappingdialog|label28">User-defined field _1</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">custom2Combobox</property> + <property name="mnemonic-widget">custom1Combobox</property> </object> <packing> - <property name="left-attach">2</property> + <property name="left-attach">0</property> <property name="top-attach">13</property> </packing> </child> <child> - <object class="GtkLabel" id="label30"> + <object class="GtkComboBoxText" id="custom1Combobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label30">User-defined field _3</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">custom3Combobox</property> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">4</property> + <property name="left-attach">1</property> <property name="top-attach">13</property> </packing> </child> <child> - <object class="GtkLabel" id="label31"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label31">User-defined field _4</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">custom4Combobox</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">14</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label32"> + <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes" context="mappingdialog|label32">User-defined field _5</property> + <property name="label" translatable="yes" context="mappingdialog|label29">User-defined field _2</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">custom5Combobox</property> + <property name="mnemonic-widget">custom2Combobox</property> </object> <packing> <property name="left-attach">2</property> - <property name="top-attach">14</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="custom1Combobox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - </object> - <packing> - <property name="left-attach">1</property> <property name="top-attach">13</property> </packing> </child> @@ -852,43 +870,47 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="custom3Combobox"> + <object class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label30">User-defined field _3</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">custom3Combobox</property> </object> <packing> - <property name="left-attach">5</property> + <property name="left-attach">4</property> <property name="top-attach">13</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="custom4Combobox"> + <object class="GtkComboBoxText" id="custom3Combobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">14</property> + <property name="left-attach">5</property> + <property name="top-attach">13</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="custom5Combobox"> + <object class="GtkLabel" id="label31"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="valign">center</property> - <property name="hexpand">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label31">User-defined field _4</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">custom4Combobox</property> </object> <packing> - <property name="left-attach">3</property> + <property name="left-attach">0</property> <property name="top-attach">14</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="identifierCombobox"> + <object class="GtkComboBoxText" id="custom4Combobox"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="valign">center</property> @@ -896,55 +918,33 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box3"> - <property name="width-request">12</property> - <property name="height-request">12</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">12</property> + <property name="top-attach">14</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> - <property name="width-request">12</property> - <property name="height-request">12</property> + <object class="GtkLabel" id="label32"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> + <property name="halign">end</property> + <property name="label" translatable="yes" context="mappingdialog|label32">User-defined field _5</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">custom5Combobox</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">9</property> + <property name="left-attach">2</property> + <property name="top-attach">14</property> </packing> </child> <child> - <object class="GtkBox" id="box1"> - <property name="width-request">12</property> - <property name="height-request">12</property> + <object class="GtkComboBoxText" id="custom5Combobox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> + <property name="valign">center</property> + <property name="hexpand">True</property> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> + <property name="left-attach">3</property> + <property name="top-attach">14</property> </packing> </child> <child>
