From 96b4bf352b1dc43637080719c91eef61fef74bf8 Mon Sep 17 00:00:00 2001 From: Heiko Tietze Date: Thu, 9 Jan 2020 11:17:25 +0100 Subject: Resolves tdf#127782 - New Print dialog is too high Expander added Change-Id: Iea41f9cf335b75210de0acf5688fddd5e3dd3dbb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86478 Tested-by: Jenkins Reviewed-by: Heiko Tietze --- vcl/uiconfig/ui/printdialog.ui | 911 ++++++++++++++++++++++------------------- 1 file changed, 486 insertions(+), 425 deletions(-) (limited to 'vcl') diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 215e7d82f686..fc98a18a89a9 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -502,7 +502,7 @@ 0 0 - 3 + 2 @@ -534,7 +534,6 @@ 1 1 - 2 @@ -553,7 +552,7 @@ 0 2 - 3 + 2 @@ -572,191 +571,207 @@ 0 3 - 3 - - - - - False - start - _From which print: - True - printextrabox - - - 0 - 6 - - - - - False - True - - - 1 - 6 2 - - True - False - start - Paper _sides: - True - sidesbox - - - 0 - 7 - - - - - True - False - True - - Print on one side (simplex) - Print on both sides (duplex long edge) - Print on both sides (duplex short edge) - - - - 1 - 7 - 2 - - - - - True - False - start - _Number of copies: - True - copycount - - - 0 - 8 - - - - - True - True - center - True - True - 1 - adjustment2 - 1 - - - 1 - 8 - - - - - Print in _reverse order - True + + _Selection True False start + 2 True True + rbAllPages - 1 - 9 + 0 + 4 2 - + True - False - end - 4 + True + True + True - - _Collate + True - True - False - True - True + False + 2 + 6 + + + False + start + _From which print: + True + printextrabox + + + 0 + 0 + + + + + False + True + + + 1 + 0 + 2 + + + + + True + False + start + Paper _sides: + True + sidesbox + + + 0 + 1 + + + + + True + False + True + + Print on one side (simplex) + Print on both sides (duplex long edge) + Print on both sides (duplex short edge) + + + + 1 + 1 + 2 + + + + + True + False + start + _Number of copies: + True + copycount + + + 0 + 2 + + + + + True + True + center + True + True + 1 + adjustment2 + 1 + + + 1 + 2 + + + + + True + False + end + 4 + + + _Collate + True + True + False + True + True + + + False + True + 0 + + + + + True + False + gtk-missing-image + + + False + True + 1 + + + + + 2 + 2 + + + + + True + False + start + _Order: + True + reverseorder + + + 0 + 3 + + + + + Print in _reverse order + True + True + False + start + True + True + + + 1 + 3 + 2 + + - - False - True - 0 - - - + + True False - gtk-missing-image + _more + True - - False - True - 1 - - - 2 - 8 - - - - - True - False - start - _Order: - True - reverseorder - - - 0 - 9 - - - - - True - False - 3 - 3 - 0 5 - 3 - - - - - _Selection - True - False - start - 2 - True - True - rbAllPages - - - 0 - 4 - 3 + 2 @@ -827,56 +842,11 @@ 0 - - - True - False - start - Order: - True - orderbox - - - 0 - 6 - - - - - True - False - True - - Left to right, then down - Top to bottom, then right - Top to bottom, then left - Right to left, then down - - - - 1 - 6 - 3 - - - - - True - False - Collation preview - center - start - - - 4 - 2 - 7 - - True False + True 0 Automatic @@ -887,252 +857,343 @@ 1 1 - 4 True False + True 1 0 - 4 - - False - start - Margin: - True - pagemarginsb - - - 0 - 4 - - - - - True - True - 0 - adjustment5 - - - 1 - 4 - - - - - False - start - Distance: - True - sheetmarginsb - - - 0 - 5 - - - - - True - True - 0 - adjustment6 - - - 1 - 5 - - - - - False - start - between pages - - - 2 - 4 - 2 - - - - - False - start - to sheet border - - - 2 - 5 - 2 - - - - - Brochure + True True - False - start - True - True - pagespersheetbtn - - - 0 - 8 - - - - - True - True - 1 - adjustment3 - 1 - - - 1 - 3 - - - - - True - True - 1 - adjustment4 - 1 - - - 3 - 3 - - - - - False - by - True - pagecols - - - 2 - 3 - - - - - Draw a border around each page - True - True - False - start - True - True - - - 0 - 7 - 4 - - - - - True - False - 3 + True + True - - Pages per sheet: + True - True - False - start - True - True - True - - - + False + 6 + 6 + + + True + False + 3 + + + Pages per sheet: + True + True + False + start + True + True + True + + + + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + 0 + 0 + + + + + True + False + True + 0 + + 1 + 2 + 4 + 6 + 9 + 16 + Custom + + + + + + + 1 + 0 + 3 + + + + + False + start + Pages: + True + pagerows + + + 0 + 1 + + + + + True + True + 1 + adjustment3 + 1 + + + 1 + 1 + + + + + False + by + True + pagecols + + + 2 + 1 + + + + + True + True + 1 + adjustment4 + 1 + + + 3 + 1 + + + + + False + start + Margin: + True + pagemarginsb + + + 0 + 2 + + + + + True + True + 0 + adjustment5 + + + 1 + 2 + + + + + False + start + between pages + + + 2 + 2 + 2 + + + + + False + start + Distance: + True + sheetmarginsb + + + 0 + 3 + + + + + True + True + 0 + adjustment6 + + + 1 + 3 + + + + + False + start + to sheet border + + + 2 + 3 + 2 + + + + + True + False + start + Order: + True + orderbox + + + 0 + 4 + + + + + True + False + True + + Left to right, then down + Top to bottom, then right + Top to bottom, then left + Right to left, then down + + + + 1 + 4 + 3 + + + + + Draw a border around each page + True + True + False + start + True + True + + + 0 + 5 + 4 + + + + + Brochure + True + True + False + start + True + True + pagespersheetbtn + + + 0 + 6 + + + + + False + + + 1 + 6 + 3 + + + + + True + False + Collation preview + center + start + + + 4 + 4 + + + + + + + + + + + + + + + + + + + + - - False - True - 0 - - - + + True False + m_ore + True - - False - True - 1 - 0 2 - - - - - False - start - Pages: - True - pagerows - - - 0 - 3 - - - - - True - False - True - 0 - - 1 - 2 - 4 - 6 - 9 - 16 - Custom - - - - - - - 1 - 2 - 3 - - - - - False - - - 1 - 8 - 3 + 2 -- cgit