vcl/uiconfig/ui/printdialog.ui | 1721 ++++++++++++++++++++--------------------- 1 file changed, 858 insertions(+), 863 deletions(-)
New commits:
commit 26ada4335a5804735ae37cf9a89f8145e0931fd7
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Apr 23 13:40:29 2020 +0200
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Apr 23 20:13:44 2020 +0200
tdf#127782 - New Print dialog is too high
ScrollWindow behind the tab control
Change-Id: I5560f4368f94a45eeb1e3af3bf18df0f305ab3da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92758
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index f3935ecf24c8..d0ebb7abe103 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
<interface domain="vcl">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
@@ -66,7 +66,7 @@
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property>
- <child>
+ <child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox">
@@ -146,38 +146,30 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box0">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkBox" id="box13">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="orientation">vertical</property>
- <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box13">
+ <object class="GtkDrawingArea" id="preview">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkDrawingArea" id="preview">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_STRUCTURE_MASK |
GDK_SCROLL_MASK</property>
- <property name="tooltip_text" translatable="yes"
context="printdialog|printpreview">Print preview</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="events">GDK_STRUCTURE_MASK |
GDK_SCROLL_MASK</property>
+ <property name="tooltip_text" translatable="yes"
context="printdialog|printpreview">Print preview</property>
+ <property name="margin_right">6</property>
</object>
<packing>
<property name="expand">True</property>
@@ -185,103 +177,29 @@
<property name="position">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkBox" id="box14">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box14">
+ <object class="GtkButton" id="btnLast">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_right">10</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="btnLast">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes" context="printdialog|lastpage">Last page</property>
- <property name="image">imgLast</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="GtkButton" id="forward">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes" context="printdialog|forward">Next page</property>
- <property name="image">imgForward</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="totalnumpages">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="printdialog|totalnumpages">/ %n</property>
- </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="GtkEntry" id="pageedit-nospin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="width_chars">3</property>
- <property name="text"
translatable="no">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="backward">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes" context="printdialog|backward">Previous page</property>
- <property name="image">imgBack</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="btnFirst">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property name="tooltip_text"
translatable="yes" context="printdialog|firstpage">First page</property>
- <property name="image">imgFirst</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">5</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes"
context="printdialog|lastpage">Last page</property>
+ <property name="image">imgLast</property>
</object>
<packing>
<property name="expand">False</property>
@@ -291,49 +209,121 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box10">
+ <object class="GtkButton" id="forward">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes"
context="printdialog|forward">Next page</property>
+ <property name="image">imgForward</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="totalnumpages">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">10</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkCheckButton" id="previewbox">
- <property name="label" translatable="yes"
context="printdialog|previewbox">Pre_view</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="use_underline">True</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>
+ <property name="label" translatable="yes"
context="printdialog|totalnumpages">/ %n</property>
+ </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="GtkEntry" id="pageedit-nospin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="width_chars">3</property>
+ <property name="text">1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="backward">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes"
context="printdialog|backward">Previous page</property>
+ <property name="image">imgBack</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="btnFirst">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes"
context="printdialog|firstpage">First page</property>
+ <property name="image">imgFirst</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkCheckButton" id="previewbox">
+ <property name="label" translatable="yes"
context="printdialog|previewbox">Pre_view</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="use_underline">True</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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
@@ -344,65 +334,52 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkNotebook" id="tabcontrol">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">True</property>
+ <property name="margin_left">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkNotebook" id="tabcontrol">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="scrollable">True</property>
- <property name="enable_popup">True</property>
+ <property name="shadow_type">in</property>
+ <property name="min_content_width">500</property>
+ <property name="max_content_height">450</property>
<child>
- <object class="GtkBox" id="box11">
+ <object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frPrinterName">
+ <object class="GtkBox" id="box11">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="alignment">
+ <object class="GtkFrame" id="frPrinterName">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkAlignment" id="alignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBoxText"
id="printersbox">
- <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">0</property>
- </packing>
- </child>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkBox" id="box5">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel"
id="labelstatus">
+ <object class="GtkComboBoxText"
id="printersbox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|labelstatus">Status:</property>
- <accessibility>
- <relation type="label-for"
target="status"/>
- </accessibility>
</object>
<packing>
<property
name="expand">False</property>
@@ -411,13 +388,55 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="status">
+ <object class="GtkBox" id="box6">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|status">Default Printer</property>
- <accessibility>
- <relation type="labelled-by"
target="labelstatus"/>
- </accessibility>
+ <property
name="spacing">6</property>
+ <child>
+ <object class="GtkLabel"
id="labelstatus">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="printdialog|labelstatus">Status:</property>
+ <accessibility>
+ <relation type="label-for"
target="status"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="status">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes" context="printdialog|status">Default Printer</property>
+ <accessibility>
+ <relation type="labelled-by"
target="labelstatus"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="setup">
+ <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>
+ <property
name="halign">end</property>
+ </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>
</object>
<packing>
<property
name="expand">False</property>
@@ -425,227 +444,82 @@
<property
name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkButton" id="setup">
- <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>
- <property
name="halign">end</property>
- </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>
</object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel" id="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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="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>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frPrintRange">
- <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="alPrintRange">
+ <object class="GtkFrame" id="frPrintRange">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkAlignment"
id="alPrintRange">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="rangegrid">
+ <object class="GtkGrid">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="row_spacing">2</property>
- <property
name="column_spacing">6</property>
- <child>
- <object class="GtkRadioButton"
id="rbAllPages">
- <property name="label"
translatable="yes" context="printdialog|rbAllPages">_All pages</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_bottom">2</property>
- <property
name="use_underline">True</property>
- <property
name="active">True</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="rbRangePages">
- <property name="label"
translatable="yes" context="printdialog|rbPageRange">_Pages:</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_top">2</property>
- <property
name="margin_bottom">2</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">rbAllPages</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="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property
name="activates_default">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>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="rbEvenPages">
- <property name="label"
translatable="yes" context="printdialog|rmEvenPages">_Even pages</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_top">2</property>
- <property
name="margin_bottom">2</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">rbAllPages</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">2</property>
- <property name="width">2</property>
- </packing>
- </child>
+ <property
name="row_spacing">6</property>
<child>
- <object class="GtkRadioButton"
id="rbOddPages">
- <property name="label"
translatable="yes" context="printdialog|rbOddPages">_Odd pages</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_top">2</property>
- <property
name="margin_bottom">2</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">rbAllPages</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">3</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton"
id="rbRangeSelection">
- <property name="label"
translatable="yes" context="printdialog|rbRangeSelection">_Selection</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="halign">start</property>
- <property
name="margin_top">2</property>
- <property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
- <property
name="group">rbAllPages</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander"
id="exRangeExpander">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <child>
- <object class="GtkGrid"
id="gdCopiesExtra">
+ <object class="GtkGrid"
id="rangegrid">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="row_spacing">2</property>
<property
name="column_spacing">6</property>
<child>
- <object class="GtkLabel"
id="fromwhich">
- <property
name="can_focus">False</property>
+ <object class="GtkRadioButton"
id="rbAllPages">
+ <property name="label"
translatable="yes" context="printdialog|rbAllPages">_All pages</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="label"
translatable="yes" context="printdialog|fromwhich">_From which print:</property>
+ <property
name="margin_bottom">2</property>
<property
name="use_underline">True</property>
- <property
name="mnemonic_widget">printextrabox</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
</object>
<packing>
<property
name="left_attach">0</property>
<property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="printextrabox">
- <property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
<property
name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="labelpapersides">
+ <object class="GtkRadioButton"
id="rbRangePages">
+ <property name="label"
translatable="yes" context="printdialog|rbPageRange">_Pages:</property>
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
<property
name="halign">start</property>
- <property name="label"
translatable="yes" context="printdialog|labelpapersides">Paper
_sides:</property>
+ <property
name="margin_top">2</property>
+ <property
name="margin_bottom">2</property>
<property
name="use_underline">True</property>
- <property
name="mnemonic_widget">sidesbox</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">rbAllPages</property>
</object>
<packing>
<property
name="left_attach">0</property>
@@ -653,290 +527,327 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="sidesbox">
+ <object class="GtkEntry"
id="pagerange">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
+ <property
name="can_focus">True</property>
<property
name="hexpand">True</property>
- <items>
- <item translatable="yes"
context="printdialog|liststore4">Print on one side (simplex)</item>
- <item translatable="yes"
context="printdialog|liststore4">Print on both sides (duplex long edge)</item>
- <item translatable="yes"
context="printdialog|liststore4">Print on both sides (duplex short edge)</item>
- </items>
+ <property
name="activates_default">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="labelcopies">
+ <object class="GtkRadioButton"
id="rbEvenPages">
+ <property name="label"
translatable="yes" context="printdialog|rmEvenPages">_Even pages</property>
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
<property
name="halign">start</property>
- <property name="label"
translatable="yes" context="printdialog|labelcopies">_Number of
copies:</property>
+ <property
name="margin_top">2</property>
+ <property
name="margin_bottom">2</property>
<property
name="use_underline">True</property>
- <property
name="mnemonic_widget">copycount</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">rbAllPages</property>
</object>
<packing>
<property
name="left_attach">0</property>
<property
name="top_attach">2</property>
+ <property
name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="copycount">
+ <object class="GtkRadioButton"
id="rbOddPages">
+ <property name="label"
translatable="yes" context="printdialog|rbOddPages">_Odd pages</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <property
name="valign">center</property>
- <property
name="hexpand">True</property>
- <property
name="activates_default">True</property>
- <property
name="text">1</property>
- <property
name="adjustment">adjustment2</property>
- <property
name="value">1</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_top">2</property>
+ <property
name="margin_bottom">2</property>
+ <property
name="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">rbAllPages</property>
</object>
<packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">2</property>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">3</property>
+ <property
name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="rbRangeSelection">
+ <property name="label"
translatable="yes" context="printdialog|rbRangeSelection">_Selection</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_top">2</property>
+ <property
name="use_underline">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">rbAllPages</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">4</property>
+ <property
name="width">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander"
id="exRangeExpander">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
<child>
- <object class="GtkBox" id="box9">
+ <object class="GtkGrid"
id="gdCopiesExtra">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="halign">end</property>
- <property
name="spacing">4</property>
+ <property
name="row_spacing">2</property>
+ <property
name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel"
id="fromwhich">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</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">0</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkComboBoxText" id="printextrabox">
+ <property
name="can_focus">False</property>
+ <property
name="hexpand">True</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="labelpapersides">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkComboBoxText" id="sidesbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="printdialog|liststore4">Print on one side (simplex)</item>
+ <item translatable="yes"
context="printdialog|liststore4">Print on both sides (duplex long edge)</item>
+ <item translatable="yes"
context="printdialog|liststore4">Print on both sides (duplex short edge)</item>
+ </items>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ </packing>
+ </child>
<child>
- <object
class="GtkCheckButton" id="collate">
- <property name="label"
translatable="yes" context="printdialog|collate">_Collate</property>
+ <object class="GtkLabel"
id="labelcopies">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</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="left_attach">0</property>
+ <property
name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkSpinButton" id="copycount">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="valign">center</property>
+ <property
name="hexpand">True</property>
+ <property
name="activates_default">True</property>
+ <property
name="text">1</property>
+ <property
name="adjustment">adjustment2</property>
+ <property
name="value">1</property>
+ </object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="cbPrintOrder">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes" context="printdialog|cbPrintOrder">Order:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">reverseorder</property>
+ </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">4</property>
+ <property
name="width">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">0</property>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkImage"
id="collateimage">
+ <object class="GtkBox"
id="box9">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="stock">gtk-missing-image</property>
+ <property
name="halign">start</property>
+ <property
name="spacing">4</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">1</property>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">3</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
- <packing>
- <property
name="left_attach">2</property>
- <property
name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel"
id="cbPrintOrder">
+ <child type="label">
+ <object class="GtkLabel"
id="lbRangeExpander">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property name="label"
translatable="yes" context="printdialog|cbPrintOrder">Order:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">reverseorder</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">3</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="label"
translatable="yes" context="printdialog|rangeexpander">_more</property>
<property
name="use_underline">True</property>
- <property
name="draw_indicator">True</property>
</object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">3</property>
- <property
name="width">2</property>
- </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel"
id="lbRangeExpander">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes" context="printdialog|rangeexpander">_more</property>
- <property
name="use_underline">True</property>
- </object>
+ <packing>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
- </packing>
</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>
+ <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 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>
- <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">
+ <object class="GtkFrame" id="layoutframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkGrid" id="pagegrid">
+ <object class="GtkGrid">
<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="GtkComboBoxText"
id="pageorientationbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- <property
name="active">0</property>
- <items>
- <item translatable="yes"
context="printdialog|liststore3">Automatic</item>
- <item translatable="yes"
context="printdialog|liststore3">Portrait</item>
- <item translatable="yes"
context="printdialog|liststore3">Landscape</item>
- </items>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="papersizebox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander"
id="exLayoutExpander">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
<child>
- <object class="GtkGrid"
id="expandpagegrid">
+ <object class="GtkGrid"
id="pagegrid">
<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="GtkBox"
id="box12">
+ <object class="GtkLabel"
id="labelorientation">
<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="halign">start</property>
- <property
name="use_underline">True</property>
- <property
name="active">True</property>
- <property
name="draw_indicator">True</property>
- <accessibility>
- <relation
type="label-for" target="pagespersheetbox"/>
- </accessibility>
- </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>
+ <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>
@@ -944,351 +855,435 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText"
id="pagespersheetbox">
+ <object class="GtkComboBoxText"
id="pageorientationbox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="hexpand">True</property>
<property
name="active">0</property>
<items>
- <item id="1"
context="printdialog|liststore1">1</item>
- <item id="2"
context="printdialog|liststore1">2</item>
- <item id="4"
context="printdialog|liststore1">4</item>
- <item id="6"
context="printdialog|liststore1">6</item>
- <item id="9"
context="printdialog|liststore1">9</item>
- <item id="16"
context="printdialog|liststore1">16</item>
- <item id="65535"
translatable="yes" context="printdialog|liststore1">Custom</item>
+ <item translatable="yes"
context="printdialog|liststore3">Automatic</item>
+ <item translatable="yes"
context="printdialog|liststore3">Portrait</item>
+ <item translatable="yes"
context="printdialog|liststore3">Landscape</item>
</items>
- <accessibility>
- <relation type="labelled-by"
target="pagespersheetbtn"/>
- </accessibility>
</object>
<packing>
<property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- <property
name="width">3</property>
+ <property
name="top_attach">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="pagestxt">
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property name="label"
translatable="yes" context="printdialog|pagespersheettxt">Pages:</property>
- <property
name="use_underline">True</property>
- <property
name="mnemonic_widget">pagerows</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="pagerows">
- <property
name="can_focus">True</property>
- <property
name="activates_default">True</property>
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
