sd/uiconfig/simpress/ui/impressprinteroptions.ui | 142 +--
sw/uiconfig/swriter/ui/printeroptions.ui | 2
vcl/uiconfig/ui/printdialog.ui | 1005 ++++++++++-------------
3 files changed, 529 insertions(+), 620 deletions(-)
New commits:
commit 889953bd3af4d1fa584d086815f3bb9fcad6db2d
Author: Daniel <danielfaleirosi...@gmail.com>
AuthorDate: Tue Jul 31 09:49:07 2018 -0300
Commit: Katarina Behrens <katarina.behr...@cib.de>
CommitDate: Tue Aug 14 17:05:18 2018 +0200
Print dialog UI adjustments
Change-Id: Iecf66e31b66d65b9077da4870385ef8f9012f043
Reviewed-on: https://gerrit.libreoffice.org/58361
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <katarina.behr...@cib.de>
diff --git a/sd/uiconfig/simpress/ui/impressprinteroptions.ui
b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
index e09238699de7..44ea2df97feb 100644
--- a/sd/uiconfig/simpress/ui/impressprinteroptions.ui
+++ b/sd/uiconfig/simpress/ui/impressprinteroptions.ui
@@ -21,115 +21,83 @@
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
+ <property name="right_padding">7</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">6</property>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="impressprinteroptions|label2">Type:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="impressdocument">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="impressprinteroptions|label2">Type:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">impressdocument</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="impressprinteroptions|label7">Slides per page:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="slidesperpage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="impressprinteroptions|label7">Slides per page:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">slidesperpage</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="impressprinteroptions|label1">Order:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="slidesperpageorder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="impressprinteroptions|label1">Order:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">slidesperpageorder</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="impressdocument">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="slidesperpage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="slidesperpageorder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/printeroptions.ui
b/sw/uiconfig/swriter/ui/printeroptions.ui
index 88bb58a22eb4..6b6fcc4cb586 100644
--- a/sw/uiconfig/swriter/ui/printeroptions.ui
+++ b/sw/uiconfig/swriter/ui/printeroptions.ui
@@ -121,6 +121,8 @@
<property name="can_focus">False</property>
<property name="margin_left">5</property>
<property name="label" translatable="yes"
context="printeroptions|formcontrols">Comments:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">writercomments</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f3ec99e83817..951c2e3ac189 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -106,10 +106,10 @@
</object>
<object class="GtkListStore" id="liststore4">
<columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
</columns>
- <data>
+ <data>
<row>
<col id="0" translatable="yes" context="printdialog|liststore4">Print
only in one side</col>
</row>
@@ -143,7 +143,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
<property name="secondary">True</property>
@@ -155,11 +155,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="margin_left">50</property>
- <property name="margin_right">135</property>
+ <property name="margin_right">10</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -173,7 +172,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
@@ -187,7 +186,7 @@
<property name="use_stock">True</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
@@ -203,10 +202,7 @@
<object class="GtkBox" id="box0">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
@@ -224,8 +220,8 @@
<property name="orientation">vertical</property>
<child>
<object class="vcllo-PrintPreviewWindow"
id="preview">
- <property name="width_request">463</property>
- <property name="height_request">650</property>
+ <property name="width_request">500</property>
+ <property name="height_request">700</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -243,34 +239,16 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="previewbox">
- <property name="label" translatable="yes"
context="printdialog|previewbox">Preview</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">center</property>
- <property name="active">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">25</property>
+ <property name="spacing">30</property>
<child>
- <object class="GtkBox" id="box">
+ <object class="GtkBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_right">10</property>
- <property name="spacing">3</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkButton" id="forward">
<property name="visible">True</property>
@@ -327,7 +305,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -339,76 +317,23 @@
<property name="margin_left">10</property>
<property name="spacing">3</property>
<child>
- <object class="GtkLabel" id="labelzoom">
+ <object class="GtkCheckButton" id="previewbox">
+ <property name="label" translatable="yes"
context="printdialog|previewbox">Preview</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="printdialog|labelzoom">Zoom:</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="halign">center</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">zoomscale</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="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="minus">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="zoomscale">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property
name="adjustment">adjustment1</property>
- <property name="round_digits">1</property>
- <property name="digits">0</property>
- <property name="draw_value">False</property>
- <property name="has_origin">False</property>
- <property name="value_pos">bottom</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="plus">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelzoomvalue">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="printdialog|labelzoomvalue">100%</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -421,7 +346,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -443,7 +368,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">10</property>
<child>
<object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
@@ -452,8 +376,10 @@
<object class="GtkBox" id="box11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="margin_top">6</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
@@ -461,7 +387,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
@@ -471,22 +397,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property
name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="labelprint">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property name="label"
translatable="yes" context="printdialog|labelprint">Printer</property>
- <attributes>
- <attribute name="weight"
value="bold"/>
- </attributes>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="spacing">6</property>
<child>
<object class="GtkComboBox"
id="printersbox">
<property
name="visible">True</property>
@@ -495,13 +406,14 @@
<packing>
<property
name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box6">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
<object class="GtkLabel"
id="labelstatus">
<property
name="visible">True</property>
@@ -528,7 +440,7 @@
</child>
<child>
<object class="GtkButton" id="setup">
- <property name="label"
translatable="yes" context="printdialog|setup">Printer Settings</property>
+ <property name="label"
translatable="yes" context="printdialog|setup">Properties...</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
@@ -545,7 +457,7 @@
<packing>
<property
name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -553,9 +465,15 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="labelprinter">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="printdialog|labelprinter">Printer</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">printersbox</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
</child>
</object>
@@ -572,104 +490,43 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkExpander" id="expander1">
+ <object class="GtkBox" id="box7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box7">
+ <object class="GtkBox" id="box8">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="margin_top">6</property>
- <property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box8">
+ <object class="GtkLabel"
id="labelcopies">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="spacing">6</property>
- <child>
- <object class="GtkLabel"
id="labelcopies">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="margin_left">8</property>
- <property name="label"
translatable="yes" context="printdialog|labelcopies">Number of
Copies:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">copycount</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="copycount">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="adjustment">adjustment2</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box9">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="spacing">5</property>
- <child>
- <object
class="GtkCheckButton" id="collate">
- <property name="label"
translatable="yes" context="printdialog|collate">Collate</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="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="GtkImage"
id="collateimage">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
- </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">2</property>
- </packing>
- </child>
+ <property
name="halign">start</property>
+ <property
name="margin_left">8</property>
+ <property name="label"
translatable="yes" context="printdialog|labelcopies">Number of
Copies:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">copycount</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="fill">False</property>
+ <property
name="fill">True</property>
<property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="printpagesbox">
- <property
name="can_focus">False</property>
+ <object class="GtkSpinButton"
id="copycount">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="adjustment">adjustment2</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -678,163 +535,77 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkBox" id="box9">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="orientation">vertical</property>
- <property
name="row_spacing">6</property>
- <property
name="column_spacing">3</property>
- <child>
- <object class="GtkLabel"
id="printrange">
- <property
name="can_focus">False</property>
- <property
name="halign">center</property>
- <property name="label"
translatable="yes" context="printdialog|labelpages">Pages:</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
<child>
- <object class="GtkEntry"
id="pagerange">
- <property
name="can_focus">True</property>
- <property
name="placeholder_text" translatable="yes"
context="printdialog|pagerange">e.g.: 1, 3-5, 7, 9</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">1</property>
- <property
name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="labelpapersides">
+ <object class="GtkCheckButton"
id="collate">
+ <property name="label"
translatable="yes" context="printdialog|collate">Collate</property>
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">center</property>
- <property
name="margin_left">6</property>
- <property name="label"
translatable="yes" context="printdialog|labelpapersides">Paper Sides:</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
- <property
name="left_attach">0</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="GtkComboBox"
id="sidesbox">
+ <object class="GtkImage"
id="collateimage">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="model">liststore4</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">2</property>
- <property
name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="fromwhich">
- <property
name="can_focus">False</property>
- <property
name="halign">center</property>
- <property name="label"
translatable="yes" context="printdialog|fromwhich">From which print:</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox"
id="printextrabox">
- <property
name="can_focus">False</property>
+ <property
name="stock">gtk-missing-image</property>
</object>
<packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- <property
name="width">2</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="pack_type">end</property>
<property
name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton"
id="reverseorder">
- <property name="label"
translatable="yes" context="printdialog|reverseorder">Print in Reverse
Order</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="halign">start</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
- </child>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel"
id="labelrangeandcopies">
- <property
name="visible">True</property>
+ <child>
+ <object class="GtkComboBox"
id="printpagesbox">
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|labelrangeandcopies">Range and
Copies</property>
- <attributes>
- <attribute name="weight"
value="bold"/>
- </attributes>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="layoutframe">
- <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">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkExpander" id="expander2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="expanded">True</property>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid1">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="margin_top">6</property>
+ <property
name="halign">start</property>
+ <property
name="orientation">vertical</property>
<property
name="row_spacing">6</property>
- <property
name="column_spacing">3</property>
+ <property
name="column_spacing">6</property>
<child>
- <object class="GtkLabel"
id="labelorientation">
- <property
name="visible">True</property>
+ <object class="GtkLabel"
id="printrange">
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes"
context="printdialog|labelorientation">Orientation:</property>
- <property
name="mnemonic_widget">pageorientationbox</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">6</property>
+ <property name="label"
translatable="yes" context="printdialog|labelpages">Pages:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">pagerange</property>
</object>
<packing>
<property
name="left_attach">0</property>
@@ -842,286 +613,454 @@
</packing>
</child>
<child>
- <object class="GtkLabel"
id="labelsize">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|labelsize">Paper Size:</property>
- <property
name="mnemonic_widget">papersizebox</property>
+ <object class="GtkEntry"
id="pagerange">
+ <property
name="can_focus">True</property>
+ <property name="placeholder_text"
translatable="yes" context="printdialog|pagerange">e.g.: 1, 3-5, 7, 9</property>
</object>
<packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="labelorder">
+ <object class="GtkLabel"
id="labelpapersides">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|labelorder">Order:</property>
- <property
name="mnemonic_widget">orderbox</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">6</property>
+ <property name="label"
translatable="yes" context="printdialog|labelpapersides">Paper Sides:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">sidesbox</property>
</object>
<packing>
<property
name="left_attach">0</property>
- <property
name="top_attach">6</property>
+ <property
name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="orderbox">
+ <object class="GtkComboBox"
id="sidesbox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- <property
name="model">liststore2</property>
+ <property
name="model">liststore4</property>
</object>
<packing>
<property
name="left_attach">1</property>
- <property
name="top_attach">6</property>
- <property name="width">3</property>
- </packing>
- </child>
- <child>
- <object
class="vcllo-ShowNupOrderWindow" id="orderpreview">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">center</property>
- <property
name="valign">start</property>
- </object>
- <packing>
- <property
name="left_attach">4</property>
<property
name="top_attach">2</property>
- <property
name="height">7</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="pageorientationbox">
- <property
name="visible">True</property>
+ <object class="GtkLabel"
id="fromwhich">
<property
name="can_focus">False</property>
- <property
name="model">liststore3</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">6</property>
+ <property name="label"
translatable="yes" context="printdialog|fromwhich">From which print:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">printextrabox</property>
</object>
<packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">1</property>
- <property name="width">4</property>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="papersizebox">
- <property
name="visible">True</property>
+ <object class="GtkComboBox"
id="printextrabox">
<property
name="can_focus">False</property>
</object>
<packing>
<property
name="left_attach">1</property>
<property
name="top_attach">0</property>
- <property name="width">4</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="pagemargintxt1">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
- <property
name="mnemonic_widget">pagemarginsb:0mm</property>
+ <object class="GtkCheckButton"
id="reverseorder">
+ <property name="label"
translatable="yes" context="printdialog|reverseorder">Print in Reverse
Order</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
<property
name="left_attach">0</property>
- <property
name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="sheetmargintxt1">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
- <property
name="mnemonic_widget">sheetmarginsb:0mm</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="sheetmarginsb:0mm">
- <property
name="can_focus">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="pagemarginsb:0mm">
- <property
name="can_focus">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="pagemargintxt2">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
- </object>
- <packing>
- <property
name="left_attach">2</property>
- <property
name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="sheetmargintxt2">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|sheetmargintxt2">to sheet
border</property>
- </object>
- <packing>
- <property
name="left_attach">2</property>
- <property
name="top_attach">5</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="brochure">
- <property name="label"
translatable="yes" context="printdialog|brochure">Brochure</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="halign">start</property>
- <property
name="active">True</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">pagespersheetbtn</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">7</property>
- <property name="width">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="pagerows">
- <property
name="can_focus">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="pagecols">
- <property
name="can_focus">True</property>
- </object>
- <packing>
- <property
name="left_attach">3</property>
- <property
name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="by">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|by">by</property>
- <property
name="mnemonic_widget">pagecols</property>
- </object>
- <packing>
- <property
name="left_attach">2</property>
<property
name="top_attach">3</property>
+ <property name="width">3</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
context="printdialog|label2">Range and Copies</property>
+ <property
name="mnemonic_widget">printpagesbox</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="layoutframe">
+ <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="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property
name="width_request">530</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property
name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel"
id="labelorientation">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes"
context="printdialog|labelorientation">Orientation:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">pageorientationbox</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelsize">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes" context="printdialog|labelsize">Paper Size:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">papersizebox</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelorder">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">12</property>
+ <property name="label"
translatable="yes" context="printdialog|labelorder">Order:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">orderbox</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="orderbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="hexpand">True</property>
+ <property
name="model">liststore2</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">6</property>
+ <property name="width">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="vcllo-ShowNupOrderWindow"
id="orderpreview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">center</property>
+ <property
name="valign">start</property>
+ </object>
+ <packing>
+ <property
name="left_attach">4</property>
+ <property
name="top_attach">2</property>
+ <property name="height">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="pageorientationbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="model">liststore3</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox"
id="papersizebox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="pagemargintxt1">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">12</property>
+ <property name="label"
translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">pagemarginsb:0mm</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="sheetmargintxt1">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">12</property>
+ <property name="label"
translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">sheetmarginsb:0mm</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="sheetmarginsb:0mm">
+ <property
name="can_focus">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="pagemarginsb:0mm">
+ <property
name="can_focus">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="pagemargintxt2">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">6</property>
+ <property name="label"
translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="sheetmargintxt2">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">6</property>
+ <property name="label"
translatable="yes" context="printdialog|sheetmargintxt2">to sheet
border</property>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="brochure">
+ <property name="label"
translatable="yes" context="printdialog|brochure">Brochure</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="use_underline">True</property>
+ <property name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">pagespersheetbtn</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="pagerows">
+ <property
name="can_focus">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="pagecols">
+ <property
name="can_focus">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">3</property>
+ <property
name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="by">
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="printdialog|by">by</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">pagecols</property>
+ </object>
+ <packing>
+ <property
name="left_attach">2</property>
+ <property
name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="bordercb">
+ <property name="label"
translatable="yes" context="printdialog|bordercb">Draw a border around each
page</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">12</property>
+ <property
name="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">7</property>
+ <property name="width">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box12">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="spacing">3</property>
<child>
- <object class="GtkCheckButton"
id="bordercb">
- <property name="label"
translatable="yes" context="printdialog|bordercb">Draw a border around each
page</property>
+ <object class="GtkRadioButton"
id="pagespersheetbtn">
+ <property name="label"
translatable="yes" context="printdialog|pagespersheetbtn">Pages per
sheet:</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="halign">start</property>
<property
name="use_underline">True</property>
+ <property
name="active">True</property>
<property
name="draw_indicator">True</property>
+ <property
name="group">brochure</property>
+ <accessibility>
+ <relation type="label-for"
target="pagespersheetbox"/>
+ </accessibility>
</object>
<packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">8</property>
- <property name="width">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box12">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="spacing">3</property>
- <child>
- <object class="GtkRadioButton"
id="pagespersheetbtn">
- <property name="label"
translatable="yes" context="printdialog|pagespersheetbtn">Pages per
sheet</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="active">True</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">brochure</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="pagespersheettxt">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="pagestxt">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|pagespersheettxt">Pages</property>
- <property
name="mnemonic_widget">pagerows</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">3</property>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="pagespersheetbox">
+ <object class="GtkLabel"
id="pagespersheettxt">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- <property
name="model">liststore1</property>
</object>
<packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">2</property>
- <property name="width">3</property>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">2</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="pagelayout">
+ <child>
+ <object class="GtkLabel" id="pagestxt">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">12</property>
+ <property name="label"
translatable="yes" context="printdialog|pagespersheettxt">Pages:</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
