tdf#94097: Move 'Print to file' option to the front page

Change-Id: I4acc09d0a46d82cfc9a63cbffe8e53a1b86f3acd
Reviewed-on: https://gerrit.libreoffice.org/21908Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

vcl/inc/printdlg.hxx

@@ -163,7 +163,6 @@ namespace vcl
         class OutputOptPage
         {
         public:
-            VclPtr<CheckBox>                    mpToFileBox;
             VclPtr<CheckBox>                    mpCollateSingleJobsBox;
             VclPtr<CheckBox>                    mpPapersizeFromSetup;
 

vcl/source/window/printdlg.cxx

@@ -484,7 +484,6 @@ PrintDialog::JobTabPage::JobTabPage( VclBuilder* pUIBuilder )
     , mnCollateUIMode( 0 )
 {
     pUIBuilder->get(mpPrinters, "printers");
-    mpPrinters->SetStyle(mpPrinters->GetStyle() | WB_SORT);
     pUIBuilder->get(mpStatusTxt, "status");
     pUIBuilder->get(mpLocationTxt, "location");
     pUIBuilder->get(mpCommentTxt, "comment");
@@ -535,7 +534,6 @@ void PrintDialog::JobTabPage::storeToSettings()
 
 PrintDialog::OutputOptPage::OutputOptPage( VclBuilder *pUIBuilder )
 {
-    pUIBuilder->get(mpToFileBox, "printtofile");
     pUIBuilder->get(mpCollateSingleJobsBox, "singleprintjob");
     pUIBuilder->get(mpPapersizeFromSetup, "papersizefromsetup");
 }
@@ -559,16 +557,19 @@ void PrintDialog::OutputOptPage::readFromSettings()
 void PrintDialog::OutputOptPage::storeToSettings()
 {
     SettingsConfigItem* pItem = SettingsConfigItem::get();
-    pItem->setValue( "PrintDialog",
-                     "ToFile",
-                     mpToFileBox->IsChecked() ? OUString("true")
-                                             : OUString("false") );
     pItem->setValue( "PrintDialog",
                      "CollateSingleJobs",
                      mpCollateSingleJobsBox->IsChecked() ? OUString("true") :
                                                 OUString("false") );
 }
 
+namespace {
+   bool lcl_ListBoxCompare( const OUString& rStr1, const OUString& rStr2 )
+   {
+       return ListBox::NaturalSortCompare( rStr1, rStr2 ) < 0;
+   }
+}
+
 PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterController>& i_rController )
     : ModalDialog(i_pParent, "PrintDialog", "vcl/ui/printdialog.ui")
     , mpCustomOptionsUIBuilder(nullptr)
@@ -607,8 +608,10 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
 
     Printer::updatePrinters();
 
+    maJobPage.mpPrinters->InsertEntry( maPrintToFileText );
     // fill printer listbox
-    const std::vector< OUString >& rQueues( Printer::GetPrinterQueues() );
+    std::vector< OUString > rQueues( Printer::GetPrinterQueues() );
+    std::sort( rQueues.begin(), rQueues.end(), lcl_ListBoxCompare );
     for( std::vector< OUString >::const_iterator it = rQueues.begin();
          it != rQueues.end(); ++it )
     {
@@ -676,7 +679,6 @@ PrintDialog::PrintDialog( vcl::Window* i_pParent, const std::shared_ptr<PrinterC
     maJobPage.mpCollateBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     maJobPage.mpSetupButton->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
     maNUpPage.mpBorderCB->SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
-    maOptionsPage.mpToFileBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     maOptionsPage.mpPapersizeFromSetup->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     maJobPage.mpReverseOrderBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
     maOptionsPage.mpCollateSingleJobsBox->SetToggleHdl( LINK( this, PrintDialog, ToggleHdl ) );
@@ -756,19 +758,12 @@ void PrintDialog::readFromSettings()
             break;
         }
     }
-    mpOKButton->SetText( maOptionsPage.mpToFileBox->IsChecked() ? maPrintToFileText : maPrintText );
 
     // persistent window state
     OUString aWinState( pItem->getValue( "PrintDialog",
                                               "WindowState" ) );
     if( !aWinState.isEmpty() )
         SetWindowState( OUStringToOString( aWinState, RTL_TEXTENCODING_UTF8 ) );
-
-    if( maOptionsPage.mpToFileBox->IsChecked() )
-    {
-        maPController->resetPrinterOptions( true );
-        preparePreview( true, true );
-    }
 }
 
 void PrintDialog::storeToSettings()
@@ -778,9 +773,14 @@ void PrintDialog::storeToSettings()
 
     // store last selected printer
     SettingsConfigItem* pItem = SettingsConfigItem::get();
+    pItem->setValue( "PrintDialog",
+                     "ToFile",
+                      isPrintToFile() ? OUString("true")
+                                             : OUString("false") );
     pItem->setValue( "PrintDialog",
                      "LastPrinter",
-                     maJobPage.mpPrinters->GetSelectEntry() );
+                      isPrintToFile() ? Printer::GetDefaultPrinterName()
+                                      : maJobPage.mpPrinters->GetSelectEntry() );
 
     pItem->setValue( "PrintDialog",
                      "LastPage",
@@ -794,7 +794,7 @@ void PrintDialog::storeToSettings()
 
 bool PrintDialog::isPrintToFile()
 {
-    return maOptionsPage.mpToFileBox->IsChecked();
+    return ( maJobPage.mpPrinters->GetSelectEntryPos() == 0 );
 }
 
 bool PrintDialog::isCollate()
@@ -1521,13 +1521,26 @@ IMPL_LINK_TYPED( PrintDialog, SelectHdl, ListBox&, rBox, void )
 {
     if(  &rBox == maJobPage.mpPrinters )
     {
-        OUString aNewPrinter( rBox.GetSelectEntry() );
-        // set new printer
-        maPController->setPrinter( VclPtrInstance<Printer>( aNewPrinter ) );
-        maPController->resetPrinterOptions( maOptionsPage.mpToFileBox->IsChecked() );
-        // update text fields
-        updatePrinterText();
-        preparePreview();
+
+        if ( rBox.GetSelectEntryPos() != 0)
+        {
+            OUString aNewPrinter( rBox.GetSelectEntry() );
+            // set new printer
+            maPController->setPrinter( VclPtrInstance<Printer>( aNewPrinter ) );
+            maPController->resetPrinterOptions( false  );
+            // update text fields
+            mpOKButton->SetText( maPrintText );
+            updatePrinterText();
+            preparePreview();
+        }
+        else // print to file
+        {
+            // use the default printer or FIXME: the last used one?
+            maPController->setPrinter( VclPtrInstance<Printer>( Printer::GetDefaultPrinterName() ) );
+            mpOKButton->SetText( maPrintToFileText );
+            maPController->resetPrinterOptions( true );
+            preparePreview( true, true );
+        }
     }
     else if( &rBox == maNUpPage.mpNupOrientationBox || &rBox == maNUpPage.mpNupOrderBox )
     {
@@ -1575,12 +1588,6 @@ IMPL_LINK_TYPED( PrintDialog, ClickHdl, Button*, pButton, void )
     {
         previewBackward();
     }
-    else if( pButton == maOptionsPage.mpToFileBox )
-    {
-        mpOKButton->SetText( maOptionsPage.mpToFileBox->IsChecked() ? maPrintToFileText : maPrintText );
-        maPController->resetPrinterOptions( maOptionsPage.mpToFileBox->IsChecked() );
-        preparePreview( true, true );
-    }
     else if( pButton == maOptionsPage.mpPapersizeFromSetup )
     {
         bool bChecked = maOptionsPage.mpPapersizeFromSetup->IsChecked();

vcl/uiconfig/ui/printdialog.ui

@@ -1511,22 +1511,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="row_spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="printtofile">
-                                <property name="label" translatable="yes">Print to file</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="xalign">0</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">0</property>
-                                <property name="top_attach">0</property>
-                                <property name="width">1</property>
-                                <property name="height">1</property>
-                              </packing>
-                            </child>
                             <child>
                               <object class="GtkCheckButton" id="singleprintjob">
                                 <property name="label" translatable="yes">Create single print jobs for collated output</property>
@@ -1538,7 +1522,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">1</property>
+                                <property name="top_attach">0</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
@@ -1553,7 +1537,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">2</property>
+                                <property name="top_attach">1</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>
@@ -1570,7 +1554,7 @@
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
-                                <property name="top_attach">3</property>
+                                <property name="top_attach">2</property>
                                 <property name="width">1</property>
                                 <property name="height">1</property>
                               </packing>