use toggle instead of click for CheckButton

Change-Id: I7196581a8b7c307d531f6995e1c24db746afdb26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 25 insertions, 17 deletions

diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 802b0d853b52..609918899e0b 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -61,9 +61,9 @@ namespace abp
 
         m_xName->connect_changed( LINK(this, FinalPage, OnEntryNameModified) );
         m_xLocation->connect_changed( LINK(this, FinalPage, OnComboNameModified) );
-        m_xRegisterName->connect_clicked( LINK( this, FinalPage, OnRegister ) );
+        m_xRegisterName->connect_toggled( LINK( this, FinalPage, OnRegister ) );
         m_xRegisterName->set_active(true);
-        m_xEmbed->connect_clicked( LINK( this, FinalPage, OnEmbed ) );
+        m_xEmbed->connect_toggled( LINK( this, FinalPage, OnEmbed ) );
         m_xEmbed->set_active(true);
     }
 
@@ -204,7 +204,7 @@ namespace abp
         implCheckName();
     }
 
-    IMPL_LINK_NOARG(FinalPage, OnRegister, weld::Button&, void)
+    IMPL_LINK_NOARG(FinalPage, OnRegister, weld::ToggleButton&, void)
     {
         bool bEnable = m_xRegisterName->get_active();
         m_xNameLabel->set_sensitive(bEnable);
@@ -212,7 +212,7 @@ namespace abp
         implCheckName();
     }
 
-    IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::Button&, void)
+    IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::ToggleButton&, void)
     {
         bool bEmbed = m_xEmbed->get_active();
         m_xLocationLabel->set_sensitive(!bEmbed);
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index 400d4d8ad5e6..229509cb97fb 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -62,8 +62,8 @@ namespace abp
 
         DECL_LINK(OnEntryNameModified, weld::Entry&, void);
         DECL_LINK(OnComboNameModified, weld::ComboBox&, void);
-        DECL_LINK(OnRegister, weld::Button&, void);
-        DECL_LINK(OnEmbed, weld::Button&, void);
+        DECL_LINK(OnRegister, weld::ToggleButton&, void);
+        DECL_LINK(OnEmbed, weld::ToggleButton&, void);
 
         bool isValidName() const;
         void implCheckName();
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 197da88d94fd..06a508d6f860 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -250,7 +250,7 @@ SaneDlg::SaneDlg(weld::Window* pParent, Sane& rSane, bool bScanEnabled)
     mxDeviceBox->connect_changed( LINK( this, SaneDlg, SelectHdl ) );
     mxOptionBox->connect_changed( LINK( this, SaneDlg, OptionsBoxSelectHdl ) );
     mxCancelButton->connect_clicked( LINK( this, SaneDlg, ClickBtnHdl ) );
-    mxBoolCheckBox->connect_clicked( LINK( this, SaneDlg, ClickBtnHdl ) );
+    mxBoolCheckBox->connect_toggled( LINK( this, SaneDlg, ToggleBtnHdl ) );
     mxStringEdit->connect_changed( LINK( this, SaneDlg, ModifyHdl ) );
     mxNumericEdit->connect_changed( LINK( this, SaneDlg, ModifyHdl ) );
     mxVectorBox->connect_changed( LINK( this, SaneDlg, ModifyHdl ) );
@@ -261,7 +261,7 @@ SaneDlg::SaneDlg(weld::Window* pParent, Sane& rSane, bool bScanEnabled)
     mxRightField->connect_value_changed( LINK( this, SaneDlg, MetricValueModifyHdl) );
     mxTopField->connect_value_changed( LINK( this, SaneDlg, MetricValueModifyHdl) );
     mxBottomField->connect_value_changed( LINK( this, SaneDlg, MetricValueModifyHdl) );
-    mxAdvancedBox->connect_clicked( LINK( this, SaneDlg, ClickBtnHdl ) );
+    mxAdvancedBox->connect_toggled( LINK( this, SaneDlg, ToggleBtnHdl ) );
 
     maOldLink = mrSane.SetReloadOptionsHdl( LINK( this, SaneDlg, ReloadSaneOptionsHdl ) );
 }
@@ -568,11 +568,6 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, weld::Button&, rButton, void )
         }
         else if( &rButton == mxPreviewButton.get() )
             AcquirePreview();
-        else if( &rButton == mxBoolCheckBox.get() )
-        {
-            mrSane.SetOptionValue( mnCurrentOption,
-                                   mxBoolCheckBox->get_active() );
-        }
         else if( &rButton == mxButtonOption.get() )
         {
 
@@ -605,10 +600,6 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, weld::Button&, rButton, void )
                     break;
             }
         }
-        else if( &rButton == mxAdvancedBox.get() )
-        {
-            ReloadSaneOptionsHdl( mrSane );
-        }
     }
     if (&rButton == mxScanButton.get())
     {
@@ -626,6 +617,22 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, weld::Button&, rButton, void )
     }
 }
 
+IMPL_LINK( SaneDlg, ToggleBtnHdl, weld::ToggleButton&, rButton, void )
+{
+    if( mrSane.IsOpen() )
+    {
+        if( &rButton == mxBoolCheckBox.get() )
+        {
+            mrSane.SetOptionValue( mnCurrentOption,
+                                   mxBoolCheckBox->get_active() );
+        }
+        else if( &rButton == mxAdvancedBox.get() )
+        {
+            ReloadSaneOptionsHdl( mrSane );
+        }
+    }
+}
+
 IMPL_LINK( SaneDlg, SelectHdl, weld::ComboBox&, rListBox, void )
 {
     if( &rListBox == mxDeviceBox.get() && Sane::IsSane() && Sane::CountDevices() )
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index ad87667bf13a..f467cdd1f6f8 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -75,6 +75,7 @@ private:
     std::unique_ptr<weld::CustomWeld> mxPreviewWnd;
 
     DECL_LINK( ClickBtnHdl, weld::Button&, void );
+    DECL_LINK( ToggleBtnHdl, weld::ToggleButton&, void );
     DECL_LINK( SelectHdl, weld::ComboBox&, void );
     DECL_LINK( ModifyHdl, weld::Entry&, void );
     DECL_LINK( MetricValueModifyHdl, weld::MetricSpinButton&, void );