Kaydet (Commit) 6686eaa0 authored tarafından Daniel's avatar Daniel Kaydeden (comit) Daniel Silva

Print dialog UI adjustments

Change-Id: Iecf66e31b66d65b9077da4870385ef8f9012f043
Reviewed-on: https://gerrit.libreoffice.org/58361
Tested-by: Jenkins
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 86c60a6a
...@@ -21,97 +21,73 @@ ...@@ -21,97 +21,73 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<property name="right_padding">7</property>
<child> <child>
<object class="GtkBox" id="box4"> <object class="GtkGrid">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="row_spacing">5</property>
<property name="spacing">3</property> <property name="column_spacing">6</property>
<child>
<object class="GtkBox" id="box7">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="label2"> <object class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes" context="impressprinteroptions|label2">Type:</property> <property name="label" translatable="yes" context="impressprinteroptions|label2">Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">impressdocument</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">0</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="impressdocument"> <object class="GtkLabel" id="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">1</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box5"> <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="label7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="impressprinteroptions|label7">Slides per page:</property> <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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">0</property>
<property name="fill">True</property> <property name="top_attach">2</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkComboBox" id="slidesperpage"> <object class="GtkComboBox" id="impressdocument">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">1</property>
<property name="fill">True</property> <property name="top_attach">0</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</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> <child>
<object class="GtkLabel" id="label1"> <object class="GtkComboBox" id="slidesperpage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="impressprinteroptions|label1">Order:</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">1</property>
<property name="fill">True</property> <property name="top_attach">1</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -120,16 +96,8 @@ ...@@ -120,16 +96,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="left_attach">1</property>
<property name="fill">True</property> <property name="top_attach">2</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> </packing>
</child> </child>
</object> </object>
......
...@@ -116,6 +116,8 @@ ...@@ -116,6 +116,8 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="margin_left">5</property>
<property name="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property> <property name="label" translatable="yes" context="printeroptions|formcontrols">Comments:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">writercomments</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
<property name="secondary">True</property> <property name="secondary">True</property>
...@@ -155,11 +155,10 @@ ...@@ -155,11 +155,10 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="margin_left">50</property> <property name="margin_right">10</property>
<property name="margin_right">135</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
...@@ -173,7 +172,7 @@ ...@@ -173,7 +172,7 @@
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
...@@ -187,7 +186,7 @@ ...@@ -187,7 +186,7 @@
<property name="use_stock">True</property> <property name="use_stock">True</property>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">3</property>
</packing> </packing>
...@@ -203,10 +202,7 @@ ...@@ -203,10 +202,7 @@
<object class="GtkBox" id="box0"> <object class="GtkBox" id="box0">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">5</property> <property name="spacing">6</property>
<property name="margin_right">5</property>
<property name="margin_top">5</property>
<property name="margin_bottom">5</property>
<child> <child>
<object class="GtkBox" id="box1"> <object class="GtkBox" id="box1">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -224,8 +220,8 @@ ...@@ -224,8 +220,8 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="vcllo-PrintPreviewWindow" id="preview"> <object class="vcllo-PrintPreviewWindow" id="preview">
<property name="width_request">463</property> <property name="width_request">500</property>
<property name="height_request">650</property> <property name="height_request">700</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
</object> </object>
...@@ -242,35 +238,17 @@ ...@@ -242,35 +238,17 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </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> <child>
<object class="GtkBox" id="box3"> <object class="GtkBox" id="box3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">25</property> <property name="spacing">30</property>
<child> <child>
<object class="GtkBox" id="box"> <object class="GtkBox" id="box14">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_right">10</property> <property name="margin_right">10</property>
<property name="spacing">3</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkButton" id="forward"> <object class="GtkButton" id="forward">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -327,7 +305,7 @@ ...@@ -327,7 +305,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">True</property>
<property name="pack_type">end</property> <property name="pack_type">end</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
...@@ -339,76 +317,23 @@ ...@@ -339,76 +317,23 @@
<property name="margin_left">10</property> <property name="margin_left">10</property>
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <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="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">True</property>
<property name="label" translatable="yes" context="printdialog|labelzoom">Zoom:</property> <property name="receives_default">False</property>
<property name="halign">center</property>
<property name="use_underline">True</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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </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> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -421,7 +346,7 @@ ...@@ -421,7 +346,7 @@
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property> <property name="pack_type">end</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -443,7 +368,6 @@ ...@@ -443,7 +368,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">10</property>
<child> <child>
<object class="GtkNotebook" id="tabcontrol"> <object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -452,8 +376,10 @@ ...@@ -452,8 +376,10 @@
<object class="GtkBox" id="box11"> <object class="GtkBox" id="box11">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">12</property>
<child> <child>
<object class="GtkFrame" id="frame1"> <object class="GtkFrame" id="frame1">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -461,7 +387,7 @@ ...@@ -461,7 +387,7 @@
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment"> <object class="GtkAlignment" id="alignment">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
...@@ -471,22 +397,7 @@ ...@@ -471,22 +397,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <property name="spacing">6</property>
<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>
<child> <child>
<object class="GtkComboBox" id="printersbox"> <object class="GtkComboBox" id="printersbox">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -495,13 +406,14 @@ ...@@ -495,13 +406,14 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="box6"> <object class="GtkBox" id="box6">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="labelstatus"> <object class="GtkLabel" id="labelstatus">
<property name="visible">True</property> <property name="visible">True</property>
...@@ -528,7 +440,7 @@ ...@@ -528,7 +440,7 @@
</child> </child>
<child> <child>
<object class="GtkButton" id="setup"> <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="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
...@@ -545,7 +457,7 @@ ...@@ -545,7 +457,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
...@@ -553,9 +465,15 @@ ...@@ -553,9 +465,15 @@
</object> </object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel"> <object class="GtkLabel" id="labelprinter">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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> </object>
</child> </child>
</object> </object>
...@@ -572,21 +490,15 @@ ...@@ -572,21 +490,15 @@
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment"> <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child>
<object class="GtkExpander" id="expander1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="expanded">True</property>
<child> <child>
<object class="GtkBox" id="box7"> <object class="GtkBox" id="box7">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
...@@ -598,6 +510,7 @@ ...@@ -598,6 +510,7 @@
<object class="GtkLabel" id="labelcopies"> <object class="GtkLabel" id="labelcopies">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">8</property> <property name="margin_left">8</property>
<property name="label" translatable="yes" context="printdialog|labelcopies">Number of Copies:</property> <property name="label" translatable="yes" context="printdialog|labelcopies">Number of Copies:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
...@@ -625,7 +538,6 @@ ...@@ -625,7 +538,6 @@
<object class="GtkBox" id="box9"> <object class="GtkBox" id="box9">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkCheckButton" id="collate"> <object class="GtkCheckButton" id="collate">
<property name="label" translatable="yes" context="printdialog|collate">Collate</property> <property name="label" translatable="yes" context="printdialog|collate">Collate</property>
...@@ -657,6 +569,7 @@ ...@@ -657,6 +569,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
...@@ -684,12 +597,15 @@ ...@@ -684,12 +597,15 @@
<property name="halign">start</property> <property name="halign">start</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">3</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="printrange"> <object class="GtkLabel" id="printrange">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">start</property>
<property name="margin_left">6</property>
<property name="label" translatable="yes" context="printdialog|labelpages">Pages:</property> <property name="label" translatable="yes" context="printdialog|labelpages">Pages:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagerange</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -711,9 +627,11 @@ ...@@ -711,9 +627,11 @@
<object class="GtkLabel" id="labelpapersides"> <object class="GtkLabel" id="labelpapersides">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</property> <property name="halign">start</property>
<property name="margin_left">6</property> <property name="margin_left">6</property>
<property name="label" translatable="yes" context="printdialog|labelpapersides">Paper Sides:</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> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -735,8 +653,11 @@ ...@@ -735,8 +653,11 @@
<child> <child>
<object class="GtkLabel" id="fromwhich"> <object class="GtkLabel" id="fromwhich">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">center</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="label" translatable="yes" context="printdialog|fromwhich">From which print:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">printextrabox</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -753,13 +674,6 @@ ...@@ -753,13 +674,6 @@
<property name="width">2</property> <property name="width">2</property>
</packing> </packing>
</child> </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child> <child>
<object class="GtkCheckButton" id="reverseorder"> <object class="GtkCheckButton" id="reverseorder">
<property name="label" translatable="yes" context="printdialog|reverseorder">Print in Reverse Order</property> <property name="label" translatable="yes" context="printdialog|reverseorder">Print in Reverse Order</property>
...@@ -770,35 +684,35 @@ ...@@ -770,35 +684,35 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">3</property>
</packing>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
</object> </object>
</child> </child>
</object>
</child>
<child type="label"> <child type="label">
<object class="GtkLabel" id="labelrangeandcopies"> <object class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="printdialog|labelrangeandcopies">Range and Copies</property> <property name="label" translatable="yes" context="printdialog|label2">Range and Copies</property>
<property name="mnemonic_widget">printpagesbox</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>
</object> </object>
</child> </child>
</object> </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> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
...@@ -812,28 +726,25 @@ ...@@ -812,28 +726,25 @@
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
<child> <child>
<object class="GtkAlignment"> <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="top_padding">6</property> <property name="top_padding">6</property>
<property name="left_padding">12</property> <property name="left_padding">12</property>
<child> <child>
<object class="GtkExpander" id="expander2"> <object class="GtkGrid" id="grid3">
<property name="visible">True</property> <property name="width_request">530</property>
<property name="can_focus">True</property>
<property name="expanded">True</property>
<child>
<object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">3</property> <property name="column_spacing">6</property>
<child> <child>
<object class="GtkLabel" id="labelorientation"> <object class="GtkLabel" id="labelorientation">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes" context="printdialog|labelorientation">Orientation:</property> <property name="label" translatable="yes" context="printdialog|labelorientation">Orientation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pageorientationbox</property> <property name="mnemonic_widget">pageorientationbox</property>
</object> </object>
<packing> <packing>
...@@ -845,7 +756,9 @@ ...@@ -845,7 +756,9 @@
<object class="GtkLabel" id="labelsize"> <object class="GtkLabel" id="labelsize">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="label" translatable="yes" context="printdialog|labelsize">Paper Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">papersizebox</property> <property name="mnemonic_widget">papersizebox</property>
</object> </object>
<packing> <packing>
...@@ -857,7 +770,10 @@ ...@@ -857,7 +770,10 @@
<object class="GtkLabel" id="labelorder"> <object class="GtkLabel" id="labelorder">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</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="label" translatable="yes" context="printdialog|labelorder">Order:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">orderbox</property> <property name="mnemonic_widget">orderbox</property>
</object> </object>
<packing> <packing>
...@@ -917,7 +833,10 @@ ...@@ -917,7 +833,10 @@
<child> <child>
<object class="GtkLabel" id="pagemargintxt1"> <object class="GtkLabel" id="pagemargintxt1">
<property name="can_focus">False</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|pagemargintxt1">Margin:</property> <property name="label" translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagemarginsb:0mm</property> <property name="mnemonic_widget">pagemarginsb:0mm</property>
</object> </object>
<packing> <packing>
...@@ -928,7 +847,10 @@ ...@@ -928,7 +847,10 @@
<child> <child>
<object class="GtkLabel" id="sheetmargintxt1"> <object class="GtkLabel" id="sheetmargintxt1">
<property name="can_focus">False</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|sheetmargintxt1">Distance:</property> <property name="label" translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sheetmarginsb:0mm</property> <property name="mnemonic_widget">sheetmarginsb:0mm</property>
</object> </object>
<packing> <packing>
...@@ -957,6 +879,8 @@ ...@@ -957,6 +879,8 @@
<child> <child>
<object class="GtkLabel" id="pagemargintxt2"> <object class="GtkLabel" id="pagemargintxt2">
<property name="can_focus">False</property> <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> <property name="label" translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
</object> </object>
<packing> <packing>
...@@ -968,6 +892,8 @@ ...@@ -968,6 +892,8 @@
<child> <child>
<object class="GtkLabel" id="sheetmargintxt2"> <object class="GtkLabel" id="sheetmargintxt2">
<property name="can_focus">False</property> <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> <property name="label" translatable="yes" context="printdialog|sheetmargintxt2">to sheet border</property>
</object> </object>
<packing> <packing>
...@@ -983,15 +909,14 @@ ...@@ -983,15 +909,14 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="active">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">pagespersheetbtn</property> <property name="group">pagespersheetbtn</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">7</property> <property name="top_attach">8</property>
<property name="width">4</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -1016,6 +941,7 @@ ...@@ -1016,6 +941,7 @@
<object class="GtkLabel" id="by"> <object class="GtkLabel" id="by">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="printdialog|by">by</property> <property name="label" translatable="yes" context="printdialog|by">by</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagecols</property> <property name="mnemonic_widget">pagecols</property>
</object> </object>
<packing> <packing>
...@@ -1030,12 +956,13 @@ ...@@ -1030,12 +956,13 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="margin_left">12</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
<property name="top_attach">8</property> <property name="top_attach">7</property>
<property name="width">4</property> <property name="width">4</property>
</packing> </packing>
</child> </child>
...@@ -1046,14 +973,18 @@ ...@@ -1046,14 +973,18 @@
<property name="spacing">3</property> <property name="spacing">3</property>
<child> <child>
<object class="GtkRadioButton" id="pagespersheetbtn"> <object class="GtkRadioButton" id="pagespersheetbtn">
<property name="label" translatable="yes" context="printdialog|pagespersheetbtn">Pages per sheet</property> <property name="label" translatable="yes" context="printdialog|pagespersheetbtn">Pages per sheet:</property>
<property name="visible">True</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="receives_default">False</property>
<property name="active">True</property> <property name="halign">start</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">brochure</property> <property name="group">brochure</property>
<accessibility>
<relation type="label-for" target="pagespersheetbox"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
...@@ -1081,7 +1012,10 @@ ...@@ -1081,7 +1012,10 @@
<child> <child>
<object class="GtkLabel" id="pagestxt"> <object class="GtkLabel" id="pagestxt">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="printdialog|pagespersheettxt">Pages</property> <property name="halign">start</property>
<property name="margin_left">12</property>
<property name="label" translatable="yes" context="printdialog|pagespersheettxt">Pages:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pagerows</property> <property name="mnemonic_widget">pagerows</property>
</object> </object>
<packing> <packing>
...@@ -1095,6 +1029,9 @@ ...@@ -1095,6 +1029,9 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="model">liststore1</property> <property name="model">liststore1</property>
<accessibility>
<relation type="labelled-by" target="pagespersheetbtn"/>
</accessibility>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
...@@ -1102,26 +1039,28 @@ ...@@ -1102,26 +1039,28 @@
<property name="width">3</property> <property name="width">3</property>
</packing> </packing>
</child> </child>
</object> <child>
</child> <object class="GtkComboBox" id="scriptdirection">
<child type="label">
<object class="GtkLabel" id="pagelayout">
<property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="printdialog|pagelayout">Page Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">8</property>
<property name="width">3</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child type="label"> <child type="label">
<object class="GtkLabel"> <object class="GtkLabel" id="label3">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="label" translatable="yes" context="printdialog|label3">Page Layout</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object> </object>
</child> </child>
</object> </object>
...@@ -1170,14 +1109,14 @@ ...@@ -1170,14 +1109,14 @@
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment