diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 09:51:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-05-17 14:29:09 +0200 |
| commit | 45112bfd091b8a14729f1010d2662c9064ba03e6 (patch) | |
| tree | 6a196e3f63957248c16d4cd6b03b3dc3c6bafc32 /uui/source/nameclashdlg.hxx | |
| parent | 27c9370b5fd00b851582e4163907656286e8c581 (diff) | |
weld NameClashDialog
Change-Id: I4c68bc92fa90ca4a9723f2664549f34b50213bfb
Reviewed-on: https://gerrit.libreoffice.org/54471
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/nameclashdlg.hxx')
| -rw-r--r-- | uui/source/nameclashdlg.hxx | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx index 9b357b3803e6..39d9af835f58 100644 --- a/uui/source/nameclashdlg.hxx +++ b/uui/source/nameclashdlg.hxx @@ -20,36 +20,31 @@ #ifndef INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX #define INCLUDED_UUI_SOURCE_NAMECLASHDLG_HXX -#include <vcl/button.hxx> -#include <vcl/dialog.hxx> -#include <vcl/fixed.hxx> -#include <vcl/edit.hxx> - +#include <vcl/weld.hxx> enum NameClashResolveDialogResult { ABORT, RENAME, OVERWRITE }; -class NameClashDialog : public ModalDialog +class NameClashDialog : public weld::GenericDialogController { - VclPtr<FixedText> m_pFTMessage; - VclPtr<Edit> m_pEDNewName; - VclPtr<PushButton> m_pBtnOverwrite; - VclPtr<PushButton> m_pBtnRename; - VclPtr<CancelButton> m_pBtnCancel; + OUString m_aSameName; + OUString m_aNewName; - OUString maSameName; - OUString maNewName; + std::unique_ptr<weld::Label> m_xFTMessage; + std::unique_ptr<weld::Entry> m_xEDNewName; + std::unique_ptr<weld::Button> m_xBtnOverwrite; + std::unique_ptr<weld::Button> m_xBtnRename; + std::unique_ptr<weld::Button> m_xBtnCancel; - DECL_LINK( ButtonHdl_Impl, Button *, void ); + DECL_LINK(ButtonHdl_Impl, weld::Button&, void); public: - NameClashDialog( vcl::Window* pParent, const std::locale& rLocale, - OUString const & rTargetFolderURL, - OUString const & rClashingName, - OUString const & rProposedNewName, - bool bAllowOverwrite ); + NameClashDialog(weld::Window* pParent, const std::locale& rLocale, + OUString const & rTargetFolderURL, + OUString const & rClashingName, + OUString const & rProposedNewName, + bool bAllowOverwrite); virtual ~NameClashDialog() override; - virtual void dispose() override; - const OUString& getNewName() const { return maNewName; } + const OUString& getNewName() const { return m_aNewName; } }; #endif // UUI_COOKIEDG_HXX |