diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 16:33:35 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-22 22:07:38 +0100 |
commit | 6a4c464b49dbfa2801818ead1b50bc9580824d00 (patch) | |
tree | 3d6381b6b13576bc536670992b36784436486e95 /svx/source/dialog/linkwarn.cxx | |
parent | f7733528e88a6619f82b54b59e92a9bca72c0a89 (diff) |
weld native message dialogs
just the straight-forward MessageDialog cases first
a) remove border_width from message dialog .ui so as to take
the default border width
b) retain 12 as default message dialog border for vcl widget case
c) remove layour_style from message dialog button boxes so as to
take the default mode (a no-op for vcl widget case)
d) use gtk response ids (vcl builder will converts to vcl ones)
Change-Id: I7de281093a1b64f92f71ca11e7cbba42bb658154
Reviewed-on: https://gerrit.libreoffice.org/50143
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/dialog/linkwarn.cxx')
-rw-r--r-- | svx/source/dialog/linkwarn.cxx | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 26879f23f7fe..23a4f0d2102f 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -18,43 +18,36 @@ */ #include <osl/file.hxx> +#include <vcl/svapp.hxx> #include <svx/linkwarn.hxx> #include <svtools/miscopt.hxx> -SvxLinkWarningDialog::SvxLinkWarningDialog( vcl::Window* pParent, const OUString& _rFileName ) - : MessageDialog(pParent, "LinkWarnDialog" , "svx/ui/linkwarndialog.ui") +SvxLinkWarningDialog::SvxLinkWarningDialog(weld::Widget* pParent, const OUString& _rFileName) + : m_xBuilder(Application::CreateBuilder(pParent, "svx/ui/linkwarndialog.ui")) + , m_xDialog(m_xBuilder->weld_message_dialog("LinkWarnDialog")) + , m_xWarningOnBox(m_xBuilder->weld_check_button("ask")) { - get(m_pWarningOnBox, "ask"); - // replace filename - OUString sInfoText = get_primary_text(); + OUString sInfoText = m_xDialog->get_primary_text(); OUString aPath; if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( _rFileName, aPath ) ) aPath = _rFileName; sInfoText = sInfoText.replaceAll("%FILENAME", aPath); - set_primary_text( sInfoText ); + m_xDialog->set_primary_text(sInfoText); // load state of "warning on" checkbox from misc options SvtMiscOptions aMiscOpt; - m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() ); - if( aMiscOpt.IsShowLinkWarningDialogReadOnly() ) - m_pWarningOnBox->Disable(); + m_xWarningOnBox->set_active(aMiscOpt.ShowLinkWarningDialog()); + m_xWarningOnBox->set_sensitive(!aMiscOpt.IsShowLinkWarningDialogReadOnly()); } SvxLinkWarningDialog::~SvxLinkWarningDialog() { - disposeOnce(); -} - -void SvxLinkWarningDialog::dispose() -{ // save value of "warning off" checkbox, if necessary SvtMiscOptions aMiscOpt; - bool bChecked = m_pWarningOnBox->IsChecked(); - if ( aMiscOpt.ShowLinkWarningDialog() != bChecked ) - aMiscOpt.SetShowLinkWarningDialog( bChecked ); - m_pWarningOnBox.clear(); - MessageDialog::dispose(); + bool bChecked = m_xWarningOnBox->get_active(); + if (aMiscOpt.ShowLinkWarningDialog() != bChecked) + aMiscOpt.SetShowLinkWarningDialog(bChecked); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |