basctl/inc/strings.hrc                     |    8 
 basctl/source/basicide/basicrenderable.cxx |   14 
 sc/inc/strings.hrc                         |    8 
 sc/source/ui/unoobj/docuno.cxx             |   16 
 sd/inc/DocumentRenderer.hrc                |   20 
 sd/source/ui/view/DocumentRenderer.cxx     |   24 
 sw/inc/strings.hrc                         |   10 
 sw/source/core/view/printdata.cxx          |   41 
 vcl/uiconfig/ui/printdialog.ui             | 1353 +++++++++++++++--------------
 9 files changed, 816 insertions(+), 678 deletions(-)

New commits:
commit 044fa501e95dcac8120767996dfb7ba8f25a703f
Author:     heiko tietze <tietze.he...@gmail.com>
AuthorDate: Tue Mar 5 15:08:53 2019 +0100
Commit:     Heiko Tietze <tietze.he...@gmail.com>
CommitDate: Thu Mar 14 16:03:23 2019 +0100

    Resolves tdf#122707 - Replace listbox for print range by radio buttons
    
    Some changes to the ui file (GtkGrid, alignment, radio buttons),
    setChoiceRadiosControlOpt() instead of *list
    Labels adjusted accordingly
    Patch partially reverts I62bd9affc9e065d7afcc60296a72eae4612b0ddd
    
    Change-Id: Ia06b8f2513d98fbdb1971477cf7b7127595d338c
    Reviewed-on: https://gerrit.libreoffice.org/68846
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <tietze.he...@gmail.com>

diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index 6e93d8649f83..6487c607694a 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -98,10 +98,10 @@
 #define RID_STR_DLGIMP_MISMATCH_TITLE       
NC_("RID_STR_DLGIMP_MISMATCH_TITLE", "Dialog Import - Language Mismatch")
 #define RID_STR_DLGIMP_MISMATCH_TEXT        
NC_("RID_STR_DLGIMP_MISMATCH_TEXT", "The dialog to be imported supports other 
languages than the target library.\n\nAdd these languages to the library to 
keep additional language resources provided by the dialog or omit them to stay 
with the current library languages.\n\nNote: For languages not supported by the 
dialog the resources of the dialog's default language will be used.\n ")
 #define RID_STR_PRINTDLG_PAGES              NC_("RID_STR_PRINTDLG_PAGES", 
"Pages:")
-#define RID_STR_PRINTDLG_PRINTALLPAGES      
NC_("RID_STR_PRINTDLG_PRINTALLPAGES", "Print all pages")
-#define RID_STR_PRINTDLG_PRINTPAGES         NC_("RID_STR_PRINTDLG_PRINTPAGES", 
"Print pages")
-#define RID_STR_PRINTDLG_PRINTEVENPAGES     
NC_("RID_STR_PRINTDLG_PRINTEVENPAGES", "Print even pages")
-#define RID_STR_PRINTDLG_PRINTODDPAGES      
NC_("RID_STR_PRINTDLG_PRINTODDPAGES", "Print odd pages")
+#define RID_STR_PRINTDLG_PRINTALLPAGES      
NC_("RID_STR_PRINTDLG_PRINTALLPAGES", "All ~Pages")
+#define RID_STR_PRINTDLG_PRINTPAGES         NC_("RID_STR_PRINTDLG_PRINTPAGES", 
"Pa~ges:")
+#define RID_STR_PRINTDLG_PRINTEVENPAGES     
NC_("RID_STR_PRINTDLG_PRINTEVENPAGES", "~Even pages")
+#define RID_STR_PRINTDLG_PRINTODDPAGES      
NC_("RID_STR_PRINTDLG_PRINTODDPAGES", "~Odd pages")
 #define RID_STR_CHOOSE                      NC_("RID_STR_CHOOSE", "Choose")
 #define RID_STR_RUN                         NC_("RID_STR_RUN", "Run")
 #define RID_STR_RECORD                      NC_("RID_STR_RECORD", "~Save")
diff --git a/basctl/source/basicide/basicrenderable.cxx 
b/basctl/source/basicide/basicrenderable.cxx
index 7913c8a10d75..ee0116d368bf 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -42,6 +42,7 @@ Renderable::Renderable (BaseWindow* pWin)
     vcl::PrinterOptionsHelper::UIControlOptions aPrintRangeOpt;
     aPrintRangeOpt.maGroupHint = "PrintRange" ;
     aPrintRangeOpt.mbInternalOnly = true;
+
     m_aUIProperties[0].Value = setSubgroupControlOpt("printrange",
         IDEResId( RID_STR_PRINTDLG_PAGES ), OUString(), aPrintRangeOpt);
 
@@ -51,10 +52,17 @@ Renderable::Renderable (BaseWindow* pWin)
                                       IDEResId(RID_STR_PRINTDLG_PRINTPAGES),
                                       
IDEResId(RID_STR_PRINTDLG_PRINTEVENPAGES),
                                       
IDEResId(RID_STR_PRINTDLG_PRINTODDPAGES)};
-    const Sequence<OUString> 
aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:ListBox"};
-    m_aUIProperties[1].Value = setChoiceListControlOpt( "printpagesbox", 
OUString(),
+    const Sequence<OUString> 
aHelpIds{".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0",
+                                      
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1",
+                                      
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2",
+                                      
".HelpID:vcl:PrintDialog:PrintContent:RadioButton:3"};
+    const Sequence<OUString> aWidgetIds{"rbAllPages",
+                                        "rbRangePages",
+                                        "rbEvenPages",
+                                        "rbOddPages"};
+    m_aUIProperties[1].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
                                                    aHelpIds, aPrintContentName,
-                                                   aChoices, 0 );
+                                                   aChoices, 0);
 
     // create a an Edit dependent on "Pages" selected
     vcl::PrinterOptionsHelper::UIControlOptions 
aPageRangeOpt(aPrintContentName, 1, true);
diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index f3fb5a6726e6..f85aa46263f2 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -108,10 +108,10 @@
 #define SCSTR_PRINTOPT_SELECTEDSHEETS               
NC_("SCSTR_PRINTOPT_SELECTEDSHEETS", "Print Selected Sheets")
 #define SCSTR_PRINTOPT_SELECTEDCELLS                
NC_("SCSTR_PRINTOPT_SELECTEDCELLS", "Print Selected Cells")
 #define SCSTR_PRINTOPT_FROMWHICH                    
NC_("SCSTR_PRINTOPT_FROMWHICH", "From which:")
-#define SCSTR_PRINTOPT_PRINTALLPAGES                
NC_("SCSTR_PRINTOPT_PRINTALLPAGES", "Print all pages")
-#define SCSTR_PRINTOPT_PRINTPAGES                   
NC_("SCSTR_PRINTOPT_PRINTPAGES", "Print pages")
-#define SCSTR_PRINTOPT_PRINTEVENPAGES               
NC_("SCSTR_PRINTOPT_PRINTEVENPAGES", "Print even pages")
-#define SCSTR_PRINTOPT_PRINTODDPAGES                
NC_("SCSTR_PRINTOPT_PRINTODDPAGES", "Print odd pages")
+#define SCSTR_PRINTOPT_PRINTALLPAGES                
NC_("SCSTR_PRINTOPT_PRINTALLPAGES", "All ~Pages")
+#define SCSTR_PRINTOPT_PRINTPAGES                   
NC_("SCSTR_PRINTOPT_PRINTPAGES", "Pa~ges:")
+#define SCSTR_PRINTOPT_PRINTEVENPAGES               
NC_("SCSTR_PRINTOPT_PRINTEVENPAGES", "~Even pages")
+#define SCSTR_PRINTOPT_PRINTODDPAGES                
NC_("SCSTR_PRINTOPT_PRINTODDPAGES", "~Odd pages")
 #define SCSTR_PRINTOPT_PRODNAME                     
NC_("SCSTR_PRINTOPT_PRODNAME", "%PRODUCTNAME %s")
 #define SCSTR_DDEDOC_NOT_LOADED                     
NC_("SCSTR_DDEDOC_NOT_LOADED", "The following DDE source could not be updated 
possibly because the source document was not open. Please launch the source 
document and try again." )
 #define SCSTR_EXTDOC_NOT_LOADED                     
NC_("SCSTR_EXTDOC_NOT_LOADED", "The following external file could not be 
loaded. Data linked from this file did not get updated." )
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 5487a4629a27..51595c5eca95 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -288,7 +288,7 @@ ScPrintUIOptions::ScPrintUIOptions()
         ScResId( SCSTR_PRINTOPT_SELECTEDCELLS )};
     uno::Sequence< OUString > aHelpIds{
         ".HelpID:vcl:PrintDialog:PrintContent:ListBox"};
-    m_aUIProperties[nIdx++].Value = setChoiceListControlOpt( "printpagesbox", 
OUString(),
+    m_aUIProperties[nIdx++].Value = setChoiceListControlOpt( "printextrabox", 
OUString(),
                                                     aHelpIds, "PrintContent",
                                                     aChoices, nContent );
 
@@ -301,13 +301,21 @@ ScPrintUIOptions::ScPrintUIOptions()
     // create a choice for the range to print
     OUString aPrintRangeName( "PrintRange" );
     aChoices.realloc( 4 );
-    aHelpIds.realloc( 1 );
+    aHelpIds.realloc( 4 );
+    uno::Sequence< OUString > aWidgetIds( 4 );
     aChoices[0] = ScResId( SCSTR_PRINTOPT_PRINTALLPAGES );
+    aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:0";
+    aWidgetIds[0] = "rbAllPages";
     aChoices[1] = ScResId( SCSTR_PRINTOPT_PRINTPAGES );
+    aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:1";
+    aWidgetIds[1] = "rbRangePages";
     aChoices[2] = ScResId( SCSTR_PRINTOPT_PRINTEVENPAGES );
+    aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:2";
+    aWidgetIds[2] = "rbEvenPages";
     aChoices[3] = ScResId( SCSTR_PRINTOPT_PRINTODDPAGES );
-    aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintRange:ListBox";
-    m_aUIProperties[nIdx++].Value = setChoiceListControlOpt( "printextrabox", 
OUString(),
+    aHelpIds[3] = ".HelpID:vcl:PrintDialog:PrintRange:RadioButton:3";
+    aWidgetIds[3] = "rbOddPages";
+    m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
                                                     aHelpIds,
                                                     aPrintRangeName,
                                                     aChoices,
diff --git a/sd/inc/DocumentRenderer.hrc b/sd/inc/DocumentRenderer.hrc
index c47c6fd82797..1a86bfd31e7f 100644
--- a/sd/inc/DocumentRenderer.hrc
+++ b/sd/inc/DocumentRenderer.hrc
@@ -79,20 +79,20 @@ const char* STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST[] =
 
 const char* STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE[] =
 {
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print all slides"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print slides"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print even slides"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print odd slides"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print selection")
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "All ~Slides"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "S~lides:"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Even slides"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Odd slides"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Selection")
 };
 
 const char* STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE[] =
 {
-    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Print all pages"),
-    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Print pages"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print even pages"),
-    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "Print odd pages"),
-    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "Print selection")
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "All ~Pages"),
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~Pages:"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Even pages"),
+    NC_("STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE", "~Odd pages"),
+    NC_("STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE", "~Selection")
 };
 
 #endif
diff --git a/sd/source/ui/view/DocumentRenderer.cxx 
b/sd/source/ui/view/DocumentRenderer.cxx
index 149e328e7022..3750db72e59d 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -597,7 +597,7 @@ namespace {
                     nPrintRange = 1;
                 }
             }
-
+/*
             OUString aPrintRangeName( "PrintContent" );
             aHelpIds.realloc( 1 );
             aHelpIds[0] = ".HelpID:vcl:PrintDialog:PageContentType:ListBox";
@@ -606,7 +606,27 @@ namespace {
                                 mbImpress ? CreateChoice( 
STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, 
SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE ) ) :
                                             CreateChoice( 
STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, 
SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE ) ),
                                 nPrintRange ) );
-
+*/
+            OUString aPrintRangeName( "PrintContent" );
+            aHelpIds.realloc( 5 );
+            aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" 
;
+            aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" 
;
+            aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2" 
;
+            aHelpIds[3] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:3" 
;
+            aHelpIds[4] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:4" 
;
+            aWidgetIds.realloc( 5 );
+            aWidgetIds[0] = "rbAllPages";
+            aWidgetIds[1] = "rbRangePages";
+            aWidgetIds[2] = "rbEvenPages";
+            aWidgetIds[3] = "rbOddPages";
+            aWidgetIds[4] = "rbRangeSelection";
+
+            AddDialogControl( 
vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, OUString(),
+                                aHelpIds, aPrintRangeName,
+                                mbImpress ? 
CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, 
SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE)) :
+                                            
CreateChoice(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, 
SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE)),
+                                nPrintRange )
+                            );
             // create a an Edit dependent on "Pages" selected
             vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( 
aPrintRangeName, 1, true );
             
AddDialogControl(vcl::PrinterOptionsHelper::setEditControlOpt("pagerange", "",
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index fe4ab39acd33..1a3e7bcabb83 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -603,11 +603,11 @@
 #define STR_PRINTOPTUI_BROCHURE                 NC_("STR_PRINTOPTUI_BROCHURE", 
"Broch~ure")
 #define STR_PRINTOPTUI_LEFT_SCRIPT              
NC_("STR_PRINTOPTUI_LEFT_SCRIPT", "Left-to-right script")
 #define STR_PRINTOPTUI_RIGHT_SCRIPT             
NC_("STR_PRINTOPTUI_RIGHT_SCRIPT", "Right-to-left script")
-#define STR_PRINTOPTUI_PRINTALLPAGES            
NC_("STR_PRINTOPTUI_PRINTALLPAGES", "Print all pages")
-#define STR_PRINTOPTUI_PRINTPAGES               
NC_("STR_PRINTOPTUI_PRINTPAGES", "Print pages")
-#define STR_PRINTOPTUI_PRINTEVENPAGES           
NC_("STR_PRINTOPTUI_PRINTEVENPAGES", "Print even pages")
-#define STR_PRINTOPTUI_PRINTODDPAGES            
NC_("STR_PRINTOPTUI_PRINTODDPAGES", "Print odd pages")
-#define STR_PRINTOPTUI_PRINTSELECTION           
NC_("STR_PRINTOPTUI_PRINTSELECTION", "Print selection")
+#define STR_PRINTOPTUI_PRINTALLPAGES            
NC_("STR_PRINTOPTUI_PRINTALLPAGES", "All ~Pages")
+#define STR_PRINTOPTUI_PRINTPAGES               
NC_("STR_PRINTOPTUI_PRINTPAGES", "Pa~ges:")
+#define STR_PRINTOPTUI_PRINTEVENPAGES           
NC_("STR_PRINTOPTUI_PRINTEVENPAGES", "~Even pages")
+#define STR_PRINTOPTUI_PRINTODDPAGES            
NC_("STR_PRINTOPTUI_PRINTODDPAGES", "~Odd pages")
+#define STR_PRINTOPTUI_PRINTSELECTION           
NC_("STR_PRINTOPTUI_PRINTSELECTION", "~Selection")
 #define STR_PRINTOPTUI_PLACE_MARGINS            
NC_("STR_PRINTOPTUI_PLACE_MARGINS", "Place in margins")
 
 #define STR_FORMULA_CALC                        NC_("STR_FORMULA_CALC", 
"Functions")
diff --git a/sw/source/core/view/printdata.cxx 
b/sw/source/core/view/printdata.cxx
index 4accad10eec9..44f34d1e2a5f 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -275,27 +275,34 @@ SwPrintUIOptions::SwPrintUIOptions(
 
     // create a choice for the content to create
     const OUString aPrintRangeName( "PrintContent" );
-    uno::Sequence< OUString > aChoices( 4 );
-    uno::Sequence< OUString > aHelpIds( 1 );
-
-    aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:ListBox";
-
+    uno::Sequence< OUString > aChoices( 5 );
+    uno::Sequence< sal_Bool > aChoicesDisabled( 5 );
+    uno::Sequence< OUString > aHelpIds( 5 );
+    uno::Sequence< OUString > aWidgetIds( 5 );
     aChoices[0] = SwResId( STR_PRINTOPTUI_PRINTALLPAGES );
+    aChoicesDisabled[0] = false;
+    aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0";
+    aWidgetIds[0] = "rbAllPages";
     aChoices[1] = SwResId( STR_PRINTOPTUI_PRINTPAGES );
+    aChoicesDisabled[1] = false;
+    aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1";
+    aWidgetIds[1] = "rbRangePages";
     aChoices[2] = SwResId( STR_PRINTOPTUI_PRINTEVENPAGES );
+    aChoicesDisabled[2] = false; //better disable for 1 page only
+    aHelpIds[2] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:2";
+    aWidgetIds[2] = "rbEvenPages";
     aChoices[3] = SwResId( STR_PRINTOPTUI_PRINTODDPAGES );
-    if ( bHasSelection )
-    {
-        aChoices.realloc( 5 );
-        aChoices[4] = SwResId( STR_PRINTOPTUI_PRINTSELECTION );
-    }
-
-    m_aUIProperties[ nIdx++ ].Value = setChoiceListControlOpt( "printpagesbox",
-                                                        OUString(),
-                                                        aHelpIds,
-                                                        aPrintRangeName,
-                                                        aChoices,
-                                                        0 /* always default to 
'All pages' */ );
+    aChoicesDisabled[3] = false; //better disable for 1 page only
+    aHelpIds[3] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:3";
+    aWidgetIds[3] = "rbOddPages";
+    aChoices[4] = SwResId( STR_PRINTOPTUI_PRINTSELECTION );
+    aChoicesDisabled[4] = !bHasSelection;
+    aHelpIds[4] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:4";
+    aWidgetIds[4] = "rbRangeSelection";
+    m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, 
OUString(),
+                                                        aHelpIds, 
aPrintRangeName,
+                                                        aChoices, 0 /* always 
default to 'All pages' */,
+                                                        aChoicesDisabled);
 
     // show an Edit dependent on "Pages" selected
     vcl::PrinterOptionsHelper::UIControlOptions aPageRangeOpt( 
aPrintRangeName, 1, true );
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index 8ede860fa291..063d961e8bca 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -172,6 +172,7 @@
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_default">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -381,715 +382,809 @@
                     <property name="scrollable">True</property>
                     <property name="enable_popup">True</property>
                     <child>
-                      <object class="GtkBox" id="box11">
+                      <object class="GtkScrolledWindow">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin_left">6</property>
-                        <property name="margin_right">6</property>
-                        <property name="margin_top">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">12</property>
+                        <property name="can_focus">True</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
+                        <property name="shadow_type">in</property>
+                        <property name="min_content_width">1076</property>
+                        <property name="min_content_height">600</property>
                         <child>
-                          <object class="GtkFrame" id="frame1">
+                          <object class="GtkViewport">
                             <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="alignment">
+                              <object class="GtkBox" id="box11">
                                 <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="margin_left">6</property>
+                                <property name="margin_right">6</property>
+                                <property name="margin_top">6</property>
+                                <property name="margin_bottom">6</property>
+                                <property 
name="orientation">vertical</property>
+                                <property name="spacing">12</property>
                                 <child>
-                                  <object class="GtkBox" id="box5">
+                                  <object class="GtkFrame" id="frPrinterName">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property 
name="orientation">vertical</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkComboBox" 
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="margin_left">6</property>
+                                    <property name="margin_right">6</property>
+                                    <property name="label_xalign">0</property>
+                                    <property 
name="shadow_type">none</property>
                                     <child>
-                                      <object class="GtkBox" id="box6">
+                                      <object class="GtkAlignment" 
id="alignment">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property name="spacing">6</property>
-                                        <child>
-                                          <object class="GtkLabel" 
id="labelstatus">
-                                            <property 
name="visible">True</property>
-                                            <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>
+                                        <property 
name="top_padding">6</property>
+                                        <property 
name="left_padding">12</property>
                                         <child>
-                                          <object class="GtkLabel" id="status">
+                                          <object class="GtkBox" id="box5">
                                             <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>
+                                            <property 
name="orientation">vertical</property>
+                                            <property 
name="spacing">6</property>
+                                            <child>
+                                              <object class="GtkComboBox" 
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>
+                                            <child>
+                                              <object class="GtkBox" id="box6">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="spacing">6</property>
+                                                <child>
+                                                  <object class="GtkLabel" 
id="labelstatus">
+                                                    <property 
name="visible">True</property>
+                                                    <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>
+                                                <property 
name="fill">True</property>
+                                                <property 
name="position">1</property>
+                                              </packing>
+                                            </child>
                                           </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">True</property>
-                                            <property 
name="pack_type">end</property>
-                                            <property 
name="position">2</property>
-                                          </packing>
                                         </child>
                                       </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="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>
-                              </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>
-                          <object class="GtkFrame" id="frame2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="top_padding">6</property>
-                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkBox" id="box7">
+                                  <object class="GtkFrame" id="frPrintRange">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property 
name="orientation">vertical</property>
-                                    <property name="spacing">6</property>
+                                    <property name="margin_left">6</property>
+                                    <property name="margin_right">6</property>
+                                    <property name="label_xalign">0</property>
+                                    <property 
name="shadow_type">none</property>
                                     <child>
-                                      <object class="GtkBox" id="box8">
+                                      <object class="GtkAlignment" 
id="alPrintRange">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property name="spacing">6</property>
-                                        <child>
-                                          <object class="GtkLabel" 
id="labelcopies">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="halign">start</property>
-                                            <property 
name="margin_left">8</property>
-                                            <property name="label" 
translatable="yes" context="printdialog|labelcopies">Number of 
copies:</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">copycount</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">True</property>
-                                            <property 
name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSpinButton" 
id="copycount">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">True</property>
-                                            <property 
name="valign">center</property>
-                                            <property 
name="adjustment">adjustment2</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">True</property>
-                                            <property 
name="position">1</property>
-                                          </packing>
-                                        </child>
+                                        <property 
name="top_padding">6</property>
+                                        <property 
name="left_padding">12</property>
                                         <child>
-                                          <object class="GtkBox" id="box9">
+                                          <object class="GtkGrid" id="grid1">
                                             <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="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="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="active">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">False</property>
+                                                <property 
name="hexpand">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="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="active">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>
+                                              </packing>
+                                            </child>
+                                            <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="active">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>
+                                              </packing>
+                                            </child>
+                                            <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">6</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkComboBox" 
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">6</property>
+                                                <property 
name="width">2</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">7</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkComboBox" 
id="sidesbox">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="hexpand">True</property>
+                                                <property 
name="model">liststore4</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">1</property>
+                                                <property 
name="top_attach">7</property>
+                                                <property 
name="width">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <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">8</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="adjustment">adjustment2</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">1</property>
+                                                <property 
name="top_attach">8</property>
+                                              </packing>
+                                            </child>
                                             <child>
-                                              <object class="GtkCheckButton" 
id="collate">
-                                                <property name="label" 
translatable="yes" context="printdialog|collate">Collate</property>
+                                              <object class="GtkCheckButton" 
id="reverseorder">
+                                                <property name="label" 
translatable="yes" context="printdialog|reverseorder">Print in _reverse 
order</property>
                                                 <property 
name="visible">True</property>
                                                 <property 
name="can_focus">True</property>
                                                 <property 
name="receives_default">False</property>
+                                                <property 
name="halign">start</property>
                                                 <property 
name="use_underline">True</property>
                                                 <property 
name="draw_indicator">True</property>
                                               </object>
                                               <packing>
-                                                <property 
name="expand">False</property>
-                                                <property 
name="fill">True</property>
-                                                <property 
name="position">0</property>
+                                                <property 
name="left_attach">1</property>
+                                                <property 
name="top_attach">9</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">end</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">2</property>
+                                                <property 
name="top_attach">8</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">9</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkSeparator">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">0</property>
+                                                <property 
name="top_attach">5</property>
+                                                <property 
name="width">3</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="draw_indicator">True</property>
+                                                <property 
name="group">rbAllPages</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">0</property>
+                                                <property 
name="top_attach">4</property>
                                               </packing>
                                             </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
                                           </object>
-                                          <packing>
-                                            <property 
name="expand">False</property>
-                                            <property 
name="fill">True</property>
-                                            <property 
name="pack_type">end</property>
-                                            <property 
name="position">2</property>
-                                          </packing>
                                         </child>
                                       </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" 
id="printpagesbox">
-                                        <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>
-                                    <child>
-                                      <object class="GtkGrid" id="grid1">
+                                    <child type="label">
+                                      <object class="GtkLabel" id="label2">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="orientation">vertical</property>
-                                        <property 
name="row_spacing">6</property>
-                                        <property 
name="column_spacing">6</property>
-                                        <child>
-                                          <object class="GtkLabel" 
id="printrange">
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="halign">start</property>
-                                            <property 
name="margin_left">6</property>
-                                            <property name="label" 
translatable="yes" context="printdialog|labelpages">Pages:</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">pagerange</property>
-                                            <accessibility>
-                                              <relation type="label-for" 
target="pagerange"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" 
id="pagerange">
-                                            <property 
name="can_focus">True</property>
-                                            <property name="placeholder_text" 
translatable="yes" context="printdialog|pagerange">e.g.: 1, 3-5, 7, 9</property>
-                                            <accessibility>
-                                              <relation type="labelled-by" 
target="printrange"/>
-                                            </accessibility>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">1</property>
-                                            <property name="width">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" 
id="labelpapersides">
-                                            <property 
name="visible">True</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|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">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" 
id="sidesbox">
-                                            <property 
name="visible">True</property>
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="model">liststore4</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">2</property>
-                                            <property name="width">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" 
id="fromwhich">
-                                            <property 
name="can_focus">False</property>
-                                            <property 
name="halign">start</property>
-                                            <property 
name="margin_left">6</property>
-                                            <property name="label" 
translatable="yes" context="printdialog|fromwhich">From which print:</property>
-                                            <property 
name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">printextrabox</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">0</property>
-                                            <property 
name="top_attach">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkComboBox" 
id="printextrabox">
-                                            <property 
name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property 
name="left_attach">1</property>
-                                            <property 
name="top_attach">0</property>
-                                            <property name="width">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="left_attach">0</property>
-                                            <property 
name="top_attach">3</property>
-                                            <property name="width">3</property>
-                                          </packing>
-                                        </child>
+                                        <property name="label" 
translatable="yes" context="printdialog|label2">Range and Copies</property>
+                                        <property 
name="mnemonic_widget">grid1</property>
+                                        <attributes>
+                                          <attribute name="weight" 
value="bold"/>
+                                        </attributes>
                                       </object>
-                                      <packing>
-                                        <property 
name="expand">False</property>
-                                        <property name="fill">True</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="label2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes" 
context="printdialog|label2">Range and Copies</property>
-                                <property 
name="mnemonic_widget">printpagesbox</property>
-                                <attributes>
-                                  <attribute name="weight" value="bold"/>
-                                </attributes>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="layoutframe">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="top_padding">6</property>
-                                <property name="left_padding">12</property>
                                 <child>
-                                  <object class="GtkGrid" id="grid3">
-                                    <property 
name="width_request">530</property>
+                                  <object class="GtkFrame" id="layoutframe">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="row_spacing">6</property>
-                                    <property 
name="column_spacing">6</property>
+                                    <property name="margin_left">6</property>
+                                    <property name="margin_right">6</property>
+                                    <property name="label_xalign">0</property>
+                                    <property 
name="shadow_type">none</property>
                                     <child>
-                                      <object class="GtkLabel" 
id="labelorientation">
+                                      <object class="GtkAlignment" 
id="alignment3">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property name="label" 
translatable="yes" 
context="printdialog|labelorientation">Orientation:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">pageorientationbox</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="labelsize">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|labelsize">Paper size:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">papersizebox</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="labelorder">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|labelorder">Order:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">orderbox</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">6</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" 
id="orderbox">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="hexpand">True</property>
-                                        <property 
name="model">liststore2</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">6</property>
-                                        <property name="width">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="vcllo-ShowNupOrderWindow" 
id="orderpreview">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">center</property>
-                                        <property 
name="valign">start</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">4</property>
-                                        <property 
name="top_attach">2</property>
-                                        <property name="height">7</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" 
id="pageorientationbox">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="model">liststore3</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">1</property>
-                                        <property name="width">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" 
id="papersizebox">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">0</property>
-                                        <property name="width">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" 
id="pagemargintxt1">
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="margin_left">12</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|pagemargintxt1">Margin:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">pagemarginsb:0mm</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" 
id="sheetmargintxt1">
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="margin_left">12</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|sheetmargintxt1">Distance:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">sheetmarginsb:0mm</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">5</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" 
id="sheetmarginsb:0mm">
-                                        <property 
name="can_focus">True</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" 
id="pagemarginsb:0mm">
-                                        <property 
name="can_focus">True</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">5</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" 
id="pagemargintxt2">
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="margin_left">6</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|pagemargintxt2">between pages</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">2</property>
-                                        <property 
name="top_attach">4</property>
-                                        <property name="width">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" 
id="sheetmargintxt2">
-                                        <property 
name="can_focus">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="margin_left">6</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|sheetmargintxt2">to sheet 
border</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">2</property>
-                                        <property 
name="top_attach">5</property>
-                                        <property name="width">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" 
id="brochure">
-                                        <property name="label" 
translatable="yes" context="printdialog|brochure">Brochure</property>
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property 
name="draw_indicator">True</property>
-                                        <property 
name="group">pagespersheetbtn</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">8</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" 
id="pagerows">
-                                        <property 
name="can_focus">True</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkSpinButton" 
id="pagecols">
-                                        <property 
name="can_focus">True</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">3</property>
-                                        <property 
name="top_attach">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="by">
-                                        <property 
name="can_focus">False</property>
-                                        <property name="label" 
translatable="yes" context="printdialog|by">by</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">pagecols</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">2</property>
-                                        <property 
name="top_attach">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" 
id="bordercb">
-                                        <property name="label" 
translatable="yes" context="printdialog|bordercb">Draw a border around each 
page</property>
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="halign">start</property>
-                                        <property 
name="margin_left">12</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">7</property>
-                                        <property name="width">4</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkBox" id="box12">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
-                                        <property name="spacing">3</property>
+                                        <property 
name="top_padding">6</property>
+                                        <property 
name="left_padding">12</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>
-                                            <property 
name="group">brochure</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">
+                                          <object class="GtkGrid" id="grid3">
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">False</property>
+                                            <property 
name="row_spacing">6</property>
+                                            <property 
name="column_spacing">6</property>
+                                            <child>
+                                              <object class="GtkLabel" 
id="labelorientation">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="halign">start</property>
+                                                <property name="label" 
translatable="yes" 
context="printdialog|labelorientation">Orientation:</property>
+                                                <property 
name="use_underline">True</property>
+                                                <property 
name="mnemonic_widget">pageorientationbox</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">0</property>
+                                                <property 
name="top_attach">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" 
id="labelsize">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="halign">start</property>
+                                                <property name="label" 
translatable="yes" context="printdialog|labelsize">Paper size:</property>
+                                                <property 
name="use_underline">True</property>
+                                                <property 
name="mnemonic_widget">papersizebox</property>
+                                              </object>
+                                              <packing>
+                                                <property 
name="left_attach">0</property>
+                                                <property 
name="top_attach">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkLabel" 
id="labelorder">
+                                                <property 
name="visible">True</property>
+                                                <property 
name="can_focus">False</property>
+                                                <property 
name="halign">start</property>
+                                                <property name="label" 
translatable="yes" context="printdialog|labelorder">Order:</property>

... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to