cui/source/inc/cuitabarea.hxx | 2 +-
cui/source/inc/cuitabline.hxx | 4 ++--
cui/source/tabpages/tpbitmap.cxx | 4 ++--
cui/source/tabpages/tpline.cxx | 8 ++++----
sd/source/ui/dlg/custsdlg.cxx | 7 ++++++-
sd/source/ui/dlg/headerfooterdlg.cxx | 16 ++++++++--------
sd/source/ui/dlg/paragr.cxx | 8 ++++----
sd/source/ui/inc/custsdlg.hxx | 1 +
sd/source/ui/sidebar/SlideBackground.cxx | 8 ++++----
sd/source/ui/sidebar/SlideBackground.hxx | 4 ++--
sw/source/ui/config/optpage.cxx | 10 +++++-----
sw/source/ui/envelp/envlop1.cxx | 4 ++--
sw/source/uibase/inc/envlop.hxx | 2 +-
sw/source/uibase/inc/optpage.hxx | 2 +-
14 files changed, 43 insertions(+), 37 deletions(-)
New commits:
commit e292aa04980d0eac776619c9d37812ebff0a333c
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 20 10:29:41 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 20 15:32:38 2021 +0200
use toggle instead of click for CheckButton
Change-Id: I6a80946481ee6fc40b2ee207a64287d1a5f96110
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115864
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index aa660c6d791d..5498e19c8689 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -527,7 +527,7 @@ private:
std::unique_ptr<weld::CustomWeld> m_xBitmapLBWin;
DECL_LINK( ModifyBitmapHdl, ValueSet*, void );
- DECL_LINK( ClickScaleHdl, weld::Button&, void );
+ DECL_LINK( ClickScaleHdl, weld::ToggleButton&, void );
DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void );
DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void );
DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void );
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 2839927c1bc8..6e193acedc4a 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -176,12 +176,12 @@ private:
DECL_LINK(ClickInvisibleHdl_Impl, weld::ComboBox&, void);
void ClickInvisibleHdl_Impl();
- DECL_LINK(ChangeStartClickHdl_Impl, weld::Button&, void);
+ DECL_LINK(ChangeStartClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ChangeStartListBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ChangeStartModifyHdl_Impl, weld::MetricSpinButton&, void);
DECL_LINK(ChangeEndListBoxHdl_Impl, weld::ComboBox&, void);
DECL_LINK(ChangeEndModifyHdl_Impl, weld::MetricSpinButton&, void);
- DECL_LINK(ChangeEndClickHdl_Impl, weld::Button&, void);
+ DECL_LINK(ChangeEndClickHdl_Impl, weld::ToggleButton&, void);
DECL_LINK(ChangePreviewListBoxHdl_Impl, ColorListBox&, void);
DECL_LINK(ChangePreviewModifyHdl_Impl, weld::MetricSpinButton&, void);
void ChangePreviewHdl_Impl(const weld::MetricSpinButton*);
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index f0a239775d13..73dc80cb975d 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -106,7 +106,7 @@ SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage,
weld::DialogControlle
Link<weld::MetricSpinButton&, void> aLink1( LINK(this, SvxBitmapTabPage,
ModifyBitmapSizeHdl) );
m_xBitmapWidth->connect_value_changed( aLink1 );
m_xBitmapHeight->connect_value_changed( aLink1 );
- m_xTsbScale->connect_clicked(LINK(this, SvxBitmapTabPage, ClickScaleHdl));
+ m_xTsbScale->connect_toggled(LINK(this, SvxBitmapTabPage, ClickScaleHdl));
m_xPositionLB->connect_changed( LINK( this, SvxBitmapTabPage,
ModifyBitmapPositionHdl ) );
Link<weld::MetricSpinButton&, void> aLink( LINK( this, SvxBitmapTabPage,
ModifyPositionOffsetHdl ) );
m_xPositionOffX->connect_value_changed(aLink);
@@ -596,7 +596,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl,
weld::MetricSpinButton&,
m_aCtlBitmapPreview.Invalidate();
}
-IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::Button&, void )
+IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::ToggleButton&, void )
{
if (m_xTsbScale->get_state() == TRISTATE_TRUE)
{
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 1edf9a56d0bf..9b0e90886ca5 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -174,8 +174,8 @@ SvxLineTabPage::SvxLineTabPage(weld::Container* pPage,
weld::DialogController* p
m_xLbEndStyle->connect_changed(LINK(this, SvxLineTabPage,
ChangeEndListBoxHdl_Impl));
m_xMtrStartWidth->connect_value_changed(LINK(this, SvxLineTabPage,
ChangeStartModifyHdl_Impl));
m_xMtrEndWidth->connect_value_changed(LINK( this, SvxLineTabPage,
ChangeEndModifyHdl_Impl));
- m_xTsbCenterStart->connect_clicked(LINK(this, SvxLineTabPage,
ChangeStartClickHdl_Impl));
- m_xTsbCenterEnd->connect_clicked(LINK(this, SvxLineTabPage,
ChangeEndClickHdl_Impl));
+ m_xTsbCenterStart->connect_toggled(LINK(this, SvxLineTabPage,
ChangeStartClickHdl_Impl));
+ m_xTsbCenterEnd->connect_toggled(LINK(this, SvxLineTabPage,
ChangeEndClickHdl_Impl));
Link<weld::ComboBox&,void> aEdgeStyle = LINK(this, SvxLineTabPage,
ChangeEdgeStyleHdl_Impl);
m_xLBEdgeStyle->connect_changed(aEdgeStyle);
@@ -1255,7 +1255,7 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(const
weld::MetricSpinButton* pCntrl)
m_xBoxEnd->set_sensitive(bHasLineEnd && bHasLineStyle);
}
-IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartClickHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartClickHdl_Impl, weld::ToggleButton&,
void)
{
if (m_xCbxSynchronize->get_active())
m_xTsbCenterEnd->set_state(m_xTsbCenterStart->get_state());
@@ -1336,7 +1336,7 @@ void SvxLineTabPage::ClickInvisibleHdl_Impl()
ChangePreviewHdl_Impl( nullptr );
}
-IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndClickHdl_Impl, weld::Button&, void)
+IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndClickHdl_Impl, weld::ToggleButton&,
void)
{
if (m_xCbxSynchronize->get_active())
m_xTsbCenterStart->set_state(m_xTsbCenterEnd->get_state());
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);
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 9bd987be67e5..5db1c92b304c 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1028,10 +1028,10 @@
SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage, weld::Dialo
, m_xFixPropRB(m_xBuilder->weld_radio_button("fixprop"))
, m_xVarRB(m_xBuilder->weld_radio_button("var"))
{
- Link<weld::Button&,void> aLnk(LINK(this, SwTableOptionsTabPage,
CheckBoxHdl));
- m_xNumFormattingCB->connect_clicked(aLnk);
- m_xNumFormatFormattingCB->connect_clicked(aLnk);
- m_xHeaderCB->connect_clicked(aLnk);
+ Link<weld::ToggleButton&,void> aLnk(LINK(this, SwTableOptionsTabPage,
CheckBoxHdl));
+ m_xNumFormattingCB->connect_toggled(aLnk);
+ m_xNumFormatFormattingCB->connect_toggled(aLnk);
+ m_xHeaderCB->connect_toggled(aLnk);
}
SwTableOptionsTabPage::~SwTableOptionsTabPage()
@@ -1195,7 +1195,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
CheckBoxHdl(*m_xHeaderCB);
}
-IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::ToggleButton&, void)
{
m_xNumFormatFormattingCB->set_sensitive(m_xNumFormattingCB->get_active());
m_xNumAlignmentCB->set_sensitive(m_xNumFormattingCB->get_active());
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index d01848470f1d..121a523479c5 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -214,7 +214,7 @@ void SwEnvPage::Init(SwEnvDlg* pDialog)
m_xDatabaseLB->connect_changed(LINK(this, SwEnvPage, DatabaseHdl));
m_xTableLB->connect_changed(LINK(this, SwEnvPage, DatabaseHdl));
m_xInsertBT->connect_clicked(LINK(this, SwEnvPage, FieldHdl));
- m_xSenderBox->connect_clicked(LINK(this, SwEnvPage, SenderHdl));
+ m_xSenderBox->connect_toggled(LINK(this, SwEnvPage, SenderHdl));
SwDBData aData = m_pSh->GetDBData();
m_sActDBName = aData.sDataSource + OUStringChar(DB_DELIM) + aData.sCommand;
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, weld::Button&, void)
m_xAddrEdit->select_region(nStartPos, nEndPos);
}
-IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::Button&, void)
+IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::ToggleButton&, void)
{
const bool bEnable = m_xSenderBox->get_active();
GetParentSwEnvDlg()->aEnvItem.m_bSend = bEnable;
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index a851aa3880e1..ed23fb6b0f6a 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -98,7 +98,7 @@ class SwEnvPage : public SfxTabPage
DECL_LINK(DatabaseHdl, weld::ComboBox&, void);
DECL_LINK(FieldHdl, weld::Button&, void);
- DECL_LINK(SenderHdl, weld::Button&, void);
+ DECL_LINK(SenderHdl, weld::ToggleButton&, void);
void InitDatabaseBox();
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index eebacf51ef53..ead7dbc40675 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -205,7 +205,7 @@ class SwTableOptionsTabPage : public SfxTabPage
std::unique_ptr<weld::RadioButton> m_xFixPropRB;
std::unique_ptr<weld::RadioButton> m_xVarRB;
- DECL_LINK(CheckBoxHdl, weld::Button&, void);
+ DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
public:
SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController*
pController, const SfxItemSet& rSet);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
