[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/window/printdlg.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 457fabbc358930b71884a97ba9ade4bd26310ce0
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 19 10:32:52 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed May 19 15:03:09 2021 +0200

    use toggle instead of click for print dialog CheckButtons
    
    Change-Id: If15c354bd54523b5c1cf93a93f8b39382190aa79
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115792
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index de96ea5d28df..4418a543c919 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -688,14 +688,14 @@ PrintDialog::PrintDialog(weld::Window* i_pWindow, const 
std::shared_ptr<PrinterC
     mxForwardBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
     mxFirstBtn->connect_clicked(LINK(this, PrintDialog, ClickHdl));
     mxLastBtn->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
-    mxPreviewBox->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
-    mxBorderCB->connect_clicked( LINK( this, PrintDialog, ClickHdl ) );
 
     // setup toggle hdl
     mxReverseOrderBox->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
     mxCollateBox->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
     mxSingleJobsBox->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
     mxBrochureBtn->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
+    mxPreviewBox->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
+    mxBorderCB->connect_toggled( LINK( this, PrintDialog, ToggleHdl ) );
 
     // setup select hdl
     mxPrinters->connect_changed( LINK( this, PrintDialog, SelectHdl ) );
@@ -1822,7 +1822,15 @@ PropertyValue* PrintDialog::getValueForWindow( 
weld::Widget* i_pWindow ) const
 
 IMPL_LINK(PrintDialog, ToggleHdl, weld::ToggleButton&, rButton, void)
 {
-    if (&rButton == mxSingleJobsBox.get())
+    if (&rButton == mxPreviewBox.get())
+    {
+        maUpdatePreviewIdle.Start();
+    }
+    else if( &rButton == mxBorderCB.get() )
+    {
+        updateNup();
+    }
+    else if (&rButton == mxSingleJobsBox.get())
     {
         maPController->setValue( "SinglePrintJobs",
                                  makeAny( isSingleJobs() ) );
@@ -1891,10 +1899,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
             pHelp->Start("vcl/ui/printdialog/PrintDialog", mxOKButton.get());
         }
     }
-    else if ( &rButton == mxPreviewBox.get() )
-    {
-        maUpdatePreviewIdle.Start();
-    }
     else if( &rButton == mxForwardBtn.get() )
     {
         previewForward();
@@ -1911,10 +1915,6 @@ IMPL_LINK(PrintDialog, ClickHdl, weld::Button&, rButton, 
void)
     {
         previewLast();
     }
-    else if( &rButton == mxBorderCB.get() )
-    {
-        updateNup();
-    }
     else
     {
         if( &rButton == mxSetupButton.get() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits