diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 10:29:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 15:32:38 +0200 |
commit | e292aa04980d0eac776619c9d37812ebff0a333c (patch) | |
tree | 8fe3d6734d72803085c5862301ad4c23bbca45b1 /sd | |
parent | f180554caf7d6088d3fc0da805f5c195f8972e6b (diff) |
use toggle instead of click for CheckButton
Change-Id: I6a80946481ee6fc40b2ee207a64287d1a5f96110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115864
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/dlg/custsdlg.cxx | 7 | ||||
-rw-r--r-- | sd/source/ui/dlg/headerfooterdlg.cxx | 16 | ||||
-rw-r--r-- | sd/source/ui/dlg/paragr.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/inc/custsdlg.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/sidebar/SlideBackground.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/sidebar/SlideBackground.hxx | 4 |
6 files changed, 25 insertions, 19 deletions
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx index dc0ad6b7f287..7fee1ae5030e 100644 --- a/sd/source/ui/dlg/custsdlg.cxx +++ b/sd/source/ui/dlg/custsdlg.cxx @@ -55,7 +55,7 @@ SdCustomShowDlg::SdCustomShowDlg(weld::Window* pWindow, SdDrawDocument& rDrawDoc m_xBtnEdit->connect_clicked( aLink ); m_xBtnRemove->connect_clicked( aLink ); m_xBtnCopy->connect_clicked( aLink ); - m_xCbxUseCustomShow->connect_clicked( aLink ); + m_xCbxUseCustomShow->connect_toggled(LINK(this, SdCustomShowDlg, ToggleButtonHdl)); m_xLbCustomShows->connect_changed( LINK( this, SdCustomShowDlg, SelectListBoxHdl ) ); m_xBtnStartShow->connect_clicked( LINK( this, SdCustomShowDlg, StartShowHdl ) ); // for test @@ -100,6 +100,11 @@ void SdCustomShowDlg::CheckState() pCustomShowList->Seek( nPos ); } +IMPL_LINK( SdCustomShowDlg, ToggleButtonHdl, weld::ToggleButton&, r, void ) +{ + SelectHdl(&r); +} + IMPL_LINK( SdCustomShowDlg, ClickButtonHdl, weld::Button&, r, void ) { SelectHdl(&r); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 30b243c7fc5b..bd073ba9207f 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -146,7 +146,7 @@ private: std::unique_ptr<weld::CustomWeld> mxCTPreviewWin; - DECL_LINK( UpdateOnClickHdl, weld::Button&, void ); + DECL_LINK( UpdateOnToggleHdl, weld::ToggleButton&, void ); DECL_LINK( LanguageChangeHdl, weld::ComboBox&, void ); void FillFormatList(sal_Int32 nSelectedPos); @@ -395,12 +395,12 @@ HeaderFooterTabPage::HeaderFooterTabPage(weld::Container* pParent, SdDrawDocumen mxHeaderBox->set_visible( mbHandoutMode ); mxCBNotOnTitle->set_visible( !mbHandoutMode ); - mxCBDateTime->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); - mxRBDateTimeFixed->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); - mxRBDateTimeAutomatic->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); - mxCBFooter->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); - mxCBHeader->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); - mxCBSlideNumber->connect_clicked( LINK( this, HeaderFooterTabPage, UpdateOnClickHdl ) ); + mxCBDateTime->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); + mxRBDateTimeFixed->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); + mxRBDateTimeAutomatic->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); + mxCBFooter->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); + mxCBHeader->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); + mxCBSlideNumber->connect_toggled( LINK( this, HeaderFooterTabPage, UpdateOnToggleHdl ) ); mxCBDateTimeLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false, false ); mxCBDateTimeLanguage->connect_changed( LINK( this, HeaderFooterTabPage, LanguageChangeHdl ) ); @@ -510,7 +510,7 @@ void HeaderFooterTabPage::update() mxCTPreview->update( aSettings ); } -IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnClickHdl, weld::Button&, void) +IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnToggleHdl, weld::ToggleButton&, void) { update(); } diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index e9fd852cb40f..423e191f9928 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -47,7 +47,7 @@ private: std::unique_ptr<weld::CheckButton> m_xNewStartNumberCB; std::unique_ptr<weld::SpinButton> m_xNewStartNF; - DECL_LINK( ImplNewStartHdl, weld::Button&, void ); + DECL_LINK( ImplNewStartHdl, weld::ToggleButton&, void ); }; } @@ -59,8 +59,8 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(weld::Container* pPage, weld::Dialo , m_xNewStartNumberCB(m_xBuilder->weld_check_button("checkbuttonCB_NUMBER_NEW_START")) , m_xNewStartNF(m_xBuilder->weld_spin_button("spinbuttonNF_NEW_START")) { - m_xNewStartCB->connect_clicked(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); - m_xNewStartNumberCB->connect_clicked(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); + m_xNewStartCB->connect_toggled(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); + m_xNewStartNumberCB->connect_toggled(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl)); } std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * rAttrSet) @@ -132,7 +132,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet ) mbModified = false; } -IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, weld::Button&, void) +IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, weld::ToggleButton&, void) { bool bEnable = m_xNewStartCB->get_active(); m_xNewStartNumberCB->set_sensitive(bEnable); diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx index 60fa9253195c..ed28cd21fb4e 100644 --- a/sd/source/ui/inc/custsdlg.hxx +++ b/sd/source/ui/inc/custsdlg.hxx @@ -45,6 +45,7 @@ private: void CheckState(); DECL_LINK( ClickButtonHdl, weld::Button&, void ); + DECL_LINK( ToggleButtonHdl, weld::ToggleButton&, void ); DECL_LINK( SelectListBoxHdl, weld::TreeView&, void ); DECL_LINK( StartShowHdl, weld::Button&, void ); void SelectHdl(void const *); diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index eaee1c1d4802..033304ac0bc8 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -255,8 +255,8 @@ void SlideBackground::Initialize() mxFillStyle->set_active(static_cast< sal_Int32 >(NONE)); - mxDspMasterBackground->connect_clicked(LINK(this, SlideBackground, DspBackground)); - mxDspMasterObjects->connect_clicked(LINK(this,SlideBackground, DspObjects)); + mxDspMasterBackground->connect_toggled(LINK(this, SlideBackground, DspBackground)); + mxDspMasterObjects->connect_toggled(LINK(this, SlideBackground, DspObjects)); //margins mxMarginSelectBox->connect_changed(LINK(this, SlideBackground, ModifyMarginHdl)); @@ -1205,14 +1205,14 @@ IMPL_LINK_NOARG(SlideBackground, CloseMasterHdl, weld::Button&, void) GetBindings()->GetDispatcher()->Execute( SID_CLOSE_MASTER_VIEW, SfxCallMode::RECORD ); } -IMPL_LINK_NOARG(SlideBackground, DspBackground, weld::Button&, void) +IMPL_LINK_NOARG(SlideBackground, DspBackground, weld::ToggleButton&, void) { bool IsChecked = mxDspMasterBackground->get_active(); const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_BACKGROUND, IsChecked); GetBindings()->GetDispatcher()->ExecuteList(SID_DISPLAY_MASTER_BACKGROUND, SfxCallMode::RECORD, { &aBoolItem }); } -IMPL_LINK_NOARG(SlideBackground, DspObjects, weld::Button&, void) +IMPL_LINK_NOARG(SlideBackground, DspObjects, weld::ToggleButton&, void) { bool IsChecked = mxDspMasterObjects->get_active(); const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_OBJECTS,IsChecked); diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 23735aebd0b2..0b28fdc60756 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -144,8 +144,8 @@ private: DECL_LINK(PaperSizeModifyHdl, weld::ComboBox&, void); DECL_LINK(FillColorHdl, ColorListBox&, void); DECL_LINK(AssignMasterPage, weld::ComboBox&, void); - DECL_LINK(DspBackground, weld::Button&, void); - DECL_LINK(DspObjects, weld::Button&, void); + DECL_LINK(DspBackground, weld::ToggleButton&, void); + DECL_LINK(DspObjects, weld::ToggleButton&, void); DECL_LINK(CloseMasterHdl, weld::Button&, void); DECL_LINK(EditMasterHdl, weld::Button&, void); DECL_LINK(SelectBgHdl, weld::Button&, void); |