vcl/qa/cppunit/builder/demo.ui | 2411 +++++++++++++++++++---------------------- vcl/uiconfig/ui/printdialog.ui | 1432 ++++++++++++------------ 2 files changed, 1866 insertions(+), 1977 deletions(-)
New commits: commit 36f45dc64ed60dde8ab074052f9192d15e7e507b Author: Caolán McNamara <[email protected]> AuthorDate: Tue Dec 22 13:11:09 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 22 21:07:08 2020 +0100 drop deprecated GtkAlignment, move left/top-padding into child margin-start/top for vcl Change-Id: I8ed97064bb65b00fac3b024a88677b5abe71d4f7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108201 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui index ad0f6a41ff18..17e0886a61bc 100644 --- a/vcl/qa/cppunit/builder/demo.ui +++ b/vcl/qa/cppunit/builder/demo.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.38.1 --> <interface domain="vcl"> <requires lib="gtk+" version="3.20"/> <object class="GtkListStore" id="liststore1"> @@ -9,10 +9,10 @@ </columns> <data> <row> - <col id="0" translatable="no">[None]</col> + <col id="0">[None]</col> </row> <row> - <col id="0" translatable="no">Normal</col> + <col id="0">Normal</col> </row> </data> </object> @@ -23,63 +23,60 @@ </columns> <data> <row> - <col id="0" translatable="no">1</col> + <col id="0">1</col> </row> <row> - <col id="0" translatable="no">2</col> + <col id="0">2</col> </row> <row> - <col id="0" translatable="no">3</col> + <col id="0">3</col> </row> <row> - <col id="0" translatable="no">4</col> + <col id="0">4</col> </row> <row> - <col id="0" translatable="no">5</col> + <col id="0">5</col> </row> <row> - <col id="0" translatable="no">6</col> + <col id="0">6</col> </row> <row> - <col id="0" translatable="no">7</col> + <col id="0">7</col> </row> <row> - <col id="0" translatable="no">8</col> + <col id="0">8</col> </row> <row> - <col id="0" translatable="no">9</col> + <col id="0">9</col> </row> <row> - <col id="0" translatable="no">10</col> + <col id="0">10</col> </row> <row> - <col id="0" translatable="no">1 - 10</col> + <col id="0">1 - 10</col> </row> </data> </object> <object class="GtkDialog" id="dialog1"> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="border-width">5</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> </object> <packing> <property name="expand">False</property> @@ -91,9 +88,9 @@ <object class="GtkButton" id="ok"> <property name="label">gtk-ok</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> </object> <packing> <property name="expand">False</property> @@ -105,60 +102,60 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <object class="GtkBox" id="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">4</property> - <property name="column_spacing">2</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">4</property> + <property name="column-spacing">2</property> + <property name="row-homogeneous">True</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkLabel" id="labelfoo"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">cell 1.1</property> + <property name="can-focus">False</property> + <property name="label">cell 1.1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">cell 3.3</property> + <property name="can-focus">False</property> + <property name="label">cell 3.3</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">A label that spans three rows</property> + <property name="can-focus">False</property> + <property name="label">A label that spans three rows</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> <property name="width">3</property> </packing> </child> @@ -184,11 +181,11 @@ <child> <object class="GtkBox" id="box5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkSpinButton" id="spinbutton1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="numeric">True</property> </object> <packing> @@ -200,7 +197,7 @@ <child> <object class="GtkComboBox" id="combobox1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">True</property> @@ -218,14 +215,14 @@ <child> <object class="GtkBox" id="box4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="button4"> - <property name="label" translatable="no">EXPAND</property> + <property name="label">EXPAND</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="no">A tooltip example</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text">A tooltip example</property> </object> <packing> <property name="expand">True</property> @@ -235,10 +232,10 @@ </child> <child> <object class="GtkButton" id="button5"> - <property name="label" translatable="no">FILL</property> + <property name="label">FILL</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> </object> <packing> <property name="expand">False</property> @@ -256,13 +253,13 @@ <child> <object class="GtkBox" id="box3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="button3"> - <property name="label" translatable="no">button</property> + <property name="label">button</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> </object> <packing> <property name="expand">False</property> @@ -272,14 +269,14 @@ </child> <child> <object class="GtkRadioButton" id="radiobutton1"> - <property name="label" translatable="no">radiobutton</property> + <property name="label">radiobutton</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="xalign">0</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -289,13 +286,13 @@ </child> <child> <object class="GtkCheckButton" id="checkbutton1"> - <property name="label" translatable="no">checkbutton</property> + <property name="label">checkbutton</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -313,81 +310,75 @@ <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="homogeneous">True</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">left</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">right</property> - <property name="xalign">1</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="text" translatable="no">an edit control</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="can-focus">False</property> + <property name="label">left</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">right</property> + <property name="xalign">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry1"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="text">an edit control</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> <child type="label"> <object class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Frame Label</property> + <property name="can-focus">False</property> + <property name="label">Frame Label</property> </object> </child> </object> @@ -402,393 +393,375 @@ <child type="tab"> <object class="GtkLabel" id="Tab1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">page 1</property> + <property name="can-focus">False</property> + <property name="label">page 1</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="box6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">10</property> <child> <object class="GtkFrame" id="frame2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment2"> + <!-- n-columns=4 n-rows=5 --> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="column-spacing">5</property> + <property name="row-homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> - <object class="GtkGrid" id="grid2"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">5</property> - <property name="row_homogeneous">True</property> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">_Number of title pages</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">NF_PAGE_COUNT</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Place title pages at</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">pages</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> + <property name="can-focus">False</property> + <property name="label">_Number of title pages</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">NF_PAGE_COUNT</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Place title pages at</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">pages</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="NF_PAGE_COUNT"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="numeric">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="NF_PAGE_START"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="numeric">True</property> + <accessibility> + <relation type="labelled-by" target="RB_PAGE_START"/> + </accessibility> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">4</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES"> + <property name="label">Converting existing pages to title pages</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">RB_INSERT_NEW_PAGES</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="width">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES"> + <property name="label">Insert new title pages</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">RB_USE_EXISTING_PAGES</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + <property name="width">4</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_DOCUMENT_START"> + <property name="label">Document Start</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">RB_PAGE_START</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + <property name="width">3</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="RB_PAGE_START"> + <property name="label">Page</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">RB_DOCUMENT_START</property> + <accessibility> + <relation type="label-for" target="NF_PAGE_START"/> + </accessibility> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Make Title Pages</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox" id="box7"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkCheckButton" id="CB_RESTART_NUMBERING"> + <property name="label">Reset Page Numbering after title pages</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box8"> + <property name="visible">True</property> + <property name="can-focus">False</property> <child> - <object class="GtkSpinButton" id="NF_PAGE_COUNT"> + <object class="GtkLabel" id="FT_PAGE_COUNT"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="numeric">True</property> + <property name="can-focus">False</property> + <property name="label">Page number</property> + <accessibility> + <relation type="label-for" target="NF_RESTART_NUMBERING"/> + </accessibility> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkSpinButton" id="NF_PAGE_START"> + <object class="GtkSpinButton" id="NF_RESTART_NUMBERING"> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="numeric">True</property> <accessibility> - <relation type="labelled-by" target="RB_PAGE_START"/> + <relation type="labelled-by" target="FT_PAGE_COUNT"/> </accessibility> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_USE_EXISTING_PAGES"> - <property name="label" translatable="no">Converting existing pages to title pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">RB_INSERT_NEW_PAGES</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">4</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="RB_INSERT_NEW_PAGES"> - <property name="label" translatable="no">Insert new title pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">RB_USE_EXISTING_PAGES</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - <property name="width">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER"> + <property name="label">Set Page Number for first title page</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box9"> + <property name="visible">True</property> + <property name="can-focus">False</property> <child> - <object class="GtkRadioButton" id="RB_DOCUMENT_START"> - <property name="label" translatable="no">Document Start</property> + <object class="GtkLabel" id="FT_PAGE_PAGES"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">RB_PAGE_START</property> + <property name="can-focus">False</property> + <property name="label">Page number</property> + <accessibility> + <relation type="label-for" target="NF_SET_PAGE_NUMBER"/> + </accessibility> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">3</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioButton" id="RB_PAGE_START"> - <property name="label" translatable="no">Page</property> + <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">RB_DOCUMENT_START</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="numeric">True</property> <accessibility> - <relation type="label-for" target="NF_PAGE_START"/> + <relation type="labelled-by" target="FT_PAGE_PAGES"/> </accessibility> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> </child> </object> </child> <child type="label"> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel" id="label12"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Make Title Pages</property> + <property name="can-focus">False</property> + <property name="label">Page Numbering</property> </object> </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="frame4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment3"> + <object class="GtkBox" id="box10"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> <child> - <object class="GtkBox" id="box7"> + <object class="GtkComboBox" id="LB_PAGE_PROPERTIES"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkCheckButton" id="CB_RESTART_NUMBERING"> - <property name="label" translatable="no">Reset Page Numbering after title pages</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box8"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="FT_PAGE_COUNT"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Page number</property> - <accessibility> - <relation type="label-for" target="NF_RESTART_NUMBERING"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_RESTART_NUMBERING"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="numeric">True</property> - <accessibility> - <relation type="labelled-by" target="FT_PAGE_COUNT"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="CB_SET_PAGE_NUMBER"> - <property name="label" translatable="no">Set Page Number for first title page</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="FT_PAGE_PAGES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Page number</property> - <accessibility> - <relation type="label-for" target="NF_SET_PAGE_NUMBER"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="NF_SET_PAGE_NUMBER"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="numeric">True</property> - <accessibility> - <relation type="labelled-by" target="FT_PAGE_PAGES"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> + <property name="can-focus">False</property> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Page Numbering</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> - <child> - <object class="GtkAlignment" id="alignment4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> <child> - <object class="GtkBox" id="box10"> + <object class="GtkButton" id="PB_PAGE_PROPERTIES"> + <property name="label">Edit...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkComboBox" id="LB_PAGE_PROPERTIES"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="PB_PAGE_PROPERTIES"> - <property name="label" translatable="no">Edit...</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> + <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> </object> </child> <child type="label"> <object class="GtkLabel" id="label13"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Edit Page Properties</property> + <property name="can-focus">False</property> + <property name="label">Edit Page Properties</property> </object> </child> </object> @@ -806,40 +779,133 @@ <child type="tab"> <object class="GtkLabel" id="Tab2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">page 2</property> + <property name="can-focus">False</property> + <property name="label">page 2</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkFrame" id="frame5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment5"> + <object class="GtkBox" id="box11"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box11"> + <object class="GtkRadioButton" id="2"> + <property name="label">Line break</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="3"> + <property name="label">Column break</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="1"> + <property name="label">Page break</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">2</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="4"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Style</property> + <property name="mnemonic-widget">5</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="5"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="model">liststore1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="7"> + <property name="label">Change page number</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <accessibility> + <relation type="label-for" target="8"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box12"> + <property name="visible">True</property> + <property name="can-focus">False</property> <child> - <object class="GtkRadioButton" id="2"> - <property name="label" translatable="no">Line break</property> + <object class="GtkSpinButton" id="8"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <accessibility> + <relation type="labelled-by" target="7"/> + </accessibility> </object> <packing> <property name="expand">False</property> @@ -848,94 +914,141 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="3"> - <property name="label" translatable="no">Column break</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">2</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="6"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Type</property> + </object> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="Tab3"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">page 3</property> + </object> + <packing> + <property name="position">2</property> + <property name="tab-fill">False</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box13"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkFrame" id="frame6"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child> + <object class="GtkBox" id="box14"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkRadioButton" id="1"> - <property name="label" translatable="no">Page break</property> + <object class="GtkRadioButton" id="15"> + <property name="label">Optimal</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">2</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="4"> + <object class="GtkRadioButton" id="16"> + <property name="label">Fit width and height</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Style</property> - <property name="mnemonic_widget">5</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">15</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkComboBox" id="5"> + <object class="GtkRadioButton" id="17"> + <property name="label">Fit width</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">15</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> <child> - <object class="GtkCheckButton" id="7"> - <property name="label" translatable="no">Change page number</property> + <object class="GtkRadioButton" id="18"> + <property name="label">100%</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <accessibility> - <relation type="label-for" target="8"/> - </accessibility> + <property name="draw-indicator">True</property> + <property name="group">15</property> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="box12"> + <object class="GtkBox" id="box15"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> - <object class="GtkSpinButton" id="8"> + <object class="GtkRadioButton" id="19"> + <property name="label">Variable</property> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <property name="group">15</property> <accessibility> - <relation type="labelled-by" target="7"/> + <relation type="label-for" target="20"/> </accessibility> </object> <packing> @@ -945,220 +1058,105 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkSpinButton" id="20"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <accessibility> + <relation type="labelled-by" target="19"/> + </accessibility> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">4</property> </packing> </child> </object> </child> + <child type="label"> + <object class="GtkLabel" id="14"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Zoom Factor</property> + </object> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - <child type="label"> - <object class="GtkLabel" id="6"> + <child> + <object class="GtkFrame" id="frame7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Type</property> - </object> - </child> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - <child type="tab"> - <object class="GtkLabel" id="Tab3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">page 3</property> - </object> - <packing> - <property name="position">2</property> - <property name="tab_fill">False</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box13"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkFrame" id="frame6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <object class="GtkAlignment" id="alignment6"> + <object class="GtkBox" id="box16"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="box14"> + <object class="GtkRadioButton" id="22"> + <property name="label">Automatic</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkRadioButton" id="15"> - <property name="label" translatable="no">Optimal</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="16"> - <property name="label" translatable="no">Fit width and height</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">15</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="17"> - <property name="label" translatable="no">Fit width</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">15</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="18"> - <property name="label" translatable="no">100%</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">15</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkBox" id="box15"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkRadioButton" id="19"> - <property name="label" translatable="no">Variable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">15</property> - <accessibility> - <relation type="label-for" target="20"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="20"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <accessibility> - <relation type="labelled-by" target="19"/> - </accessibility> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - </child> - <child type="label"> - <object class="GtkLabel" id="14"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="no">Zoom Factor</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="frame7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
