summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-20 15:36:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-05-21 10:49:40 +0200
commitd16ceda55b145cb31882bbf504924aa9103278aa (patch)
treeb75d59c682b6083660d01e33f1a9e673c6f30731 /extensions
parente8578423e9390a07419066d6c350c34fa254095d (diff)
use toggle instead of click for RadioButton
Change-Id: Ic246c68749f79cc1b25fed08a66fd8a0d57495f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115884 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx12
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx8
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx2
4 files changed, 12 insertions, 12 deletions
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 6e923b00aff6..29efaf4f4fe7 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -115,14 +115,14 @@ namespace abp
m_aAllTypes.push_back( ButtonItem( m_xMacab.get(), AST_MACAB, bHaveMacab ) );
m_aAllTypes.push_back( ButtonItem( m_xOther.get(), AST_OTHER, true ) );
- Link<weld::Button&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
+ Link<weld::ToggleButton&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected );
for (auto const& elem : m_aAllTypes)
{
if (!elem.m_bVisible)
elem.m_pItem->hide();
else
{
- elem.m_pItem->connect_clicked( aTypeSelectionHandler );
+ elem.m_pItem->connect_toggled( aTypeSelectionHandler );
elem.m_pItem->show();
}
}
@@ -205,22 +205,20 @@ namespace abp
return true;
}
-
bool TypeSelectionPage::canAdvance() const
{
return AddressBookSourcePage::canAdvance()
&& (AST_INVALID != getSelectedType());
}
-
- IMPL_LINK_NOARG( TypeSelectionPage, OnTypeSelected, weld::Button&, void )
+ IMPL_LINK(TypeSelectionPage, OnTypeSelected, weld::ToggleButton&, rButton, void)
{
+ if (!rButton.get_active())
+ return;
getDialog()->typeSelectionChanged( getSelectedType() );
updateDialogTravelUI();
}
-
} // namespace abp
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index 9caaeb8e1c4e..b3878a6bf711 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -71,7 +71,7 @@ namespace abp
// OImportPage overridables
virtual bool canAdvance() const override;
- DECL_LINK( OnTypeSelected, weld::Button&, void );
+ DECL_LINK( OnTypeSelected, weld::ToggleButton&, void );
void selectType( AddressSourceType _eType );
};
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 883f1a78536c..3aede04224e4 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -362,13 +362,15 @@ namespace dbp
m_pNo = &_rNoButton;
m_pList = &_rSelection;
- m_pYes->connect_clicked(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
- m_pNo->connect_clicked(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
+ m_pYes->connect_toggled(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
+ m_pNo->connect_toggled(LINK(this, OMaybeListSelectionPage, OnRadioSelected));
implEnableWindows();
}
- IMPL_LINK_NOARG( OMaybeListSelectionPage, OnRadioSelected, weld::Button&, void )
+ IMPL_LINK(OMaybeListSelectionPage, OnRadioSelected, weld::ToggleButton&, rButton, void)
{
+ if (!rButton.get_active())
+ return;
implEnableWindows();
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index ebb2331c5bd8..6aaac6854eab 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -70,7 +70,7 @@ namespace dbp
virtual ~OMaybeListSelectionPage() override;
protected:
- DECL_LINK( OnRadioSelected, weld::Button&, void );
+ DECL_LINK( OnRadioSelected, weld::ToggleButton&, void );
// BuilderPage overridables
void Activate() override;