From 165e57d6c9b980f22e57fb1c4c70d9a8c4aaf1c8 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 14 May 2018 11:37:47 +0100 Subject: weld FmInputRecordNoDialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I87f3dc3a576e30fe50871c14a67a5b777c21d3ba Reviewed-on: https://gerrit.libreoffice.org/54308 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/dialogs/cuitbxform.cxx | 28 ++----------- cui/source/factory/dlgfact.cxx | 15 ++++--- cui/source/factory/dlgfact.hxx | 11 ++++- cui/source/inc/cuitbxform.hxx | 17 +++----- cui/uiconfig/ui/recordnumberdialog.ui | 77 ++++++++++++++++++++--------------- 5 files changed, 73 insertions(+), 75 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx index eaccdc120a04..eb0a768149d5 100644 --- a/cui/source/dialogs/cuitbxform.cxx +++ b/cui/source/dialogs/cuitbxform.cxx @@ -17,37 +17,17 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -FmInputRecordNoDialog::FmInputRecordNoDialog(vcl::Window * pParent) - : ModalDialog( pParent, "RecordNumberDialog", "cui/ui/recordnumberdialog.ui") +FmInputRecordNoDialog::FmInputRecordNoDialog(weld::Window * pParent) + : GenericDialogController(pParent, "cui/ui/recordnumberdialog.ui", "RecordNumberDialog") + , m_xRecordNo(m_xBuilder->weld_spin_button("entry")) { - get(m_pRecordNo, "entry-nospin"); - - m_pRecordNo->SetMin(1); - m_pRecordNo->SetMax(0x7FFFFFFF); - m_pRecordNo->SetStrictFormat(true); - m_pRecordNo->SetDecimalDigits(0); + m_xRecordNo->set_range(1, 0x7FFFFFFF); } FmInputRecordNoDialog::~FmInputRecordNoDialog() { - disposeOnce(); -} - -void FmInputRecordNoDialog::dispose() -{ - m_pRecordNo.clear(); - ModalDialog::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index a22a64c1f933..0bf6ea154642 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -124,7 +124,11 @@ short AbstractSvxSearchSimilarityDialog_Impl::Execute() IMPL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl); -IMPL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl); + +short AbstractFmInputRecordNoDialog_Impl::Execute() +{ + return m_xDlg->run(); +} short AbstractSvxNewDictionaryDialog_Impl::Execute() { @@ -630,12 +634,12 @@ TransliterationFlags AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFla void AbstractFmInputRecordNoDialog_Impl::SetValue(long nNew) { - pDlg->SetValue(nNew); + m_xDlg->SetValue(nNew); } long AbstractFmInputRecordNoDialog_Impl::GetValue() const { - return pDlg->GetValue(); + return m_xDlg->GetValue(); } ::Reference< css::linguistic2::XDictionary > AbstractSvxNewDictionaryDialog_Impl::GetNewDictionary() @@ -1169,10 +1173,9 @@ VclPtr AbstractDialogFactory_Impl::CreateSvxJSe return VclPtr::Create( pDlg ); } -VclPtr AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog( ) +VclPtr AbstractDialogFactory_Impl::CreateFmInputRecordNoDialog(weld::Window* pParent) { - VclPtrInstance pDlg( nullptr ); - return VclPtr::Create( pDlg ); + return VclPtr::Create(new FmInputRecordNoDialog(pParent)); } VclPtr AbstractDialogFactory_Impl::CreateSvxNewDictionaryDialog(weld::Window* pParent) diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index b1239c049e00..e5be4de5f999 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -314,7 +314,14 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog class FmInputRecordNoDialog; class AbstractFmInputRecordNoDialog_Impl :public AbstractFmInputRecordNoDialog { - DECL_ABSTDLG_BASE(AbstractFmInputRecordNoDialog_Impl,FmInputRecordNoDialog) +protected: + std::unique_ptr m_xDlg; +public: + explicit AbstractFmInputRecordNoDialog_Impl(FmInputRecordNoDialog* p) + : m_xDlg(p) + { + } + virtual short Execute() override; virtual void SetValue(long nNew) override ; virtual long GetValue() const override ; }; @@ -682,7 +689,7 @@ public: virtual VclPtr CreateSvxJSearchOptionsDialog( vcl::Window* pParent, const SfxItemSet& rOptionsSet, TransliterationFlags nInitialFlags) override; - virtual VclPtr CreateFmInputRecordNoDialog() override; + virtual VclPtr CreateFmInputRecordNoDialog(weld::Window* pParent) override; virtual VclPtr CreateSvxNewDictionaryDialog(weld::Window* pParent) override; virtual VclPtr CreateSvxEditDictionaryDialog(vcl::Window* pParent, const OUString& rName) override; virtual VclPtr CreateSvxNameDialog(weld::Window* pParent, diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 5eefc5712b61..96d41c09002b 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -19,24 +19,19 @@ #ifndef INCLUDED_CUI_SOURCE_INC_CUITBXFORM_HXX #define INCLUDED_CUI_SOURCE_INC_CUITBXFORM_HXX -#include -#include -#include -#include +#include - -class FmInputRecordNoDialog : public ModalDialog +class FmInputRecordNoDialog : public weld::GenericDialogController { public: - VclPtr m_pRecordNo; + std::unique_ptr m_xRecordNo; public: - FmInputRecordNoDialog(vcl::Window * pParent); + FmInputRecordNoDialog(weld::Window* pParent); virtual ~FmInputRecordNoDialog() override; - virtual void dispose() override; - void SetValue(long dNew) { m_pRecordNo->SetValue(dNew); } - long GetValue() const { return static_cast(m_pRecordNo->GetValue()); } + void SetValue(int dNew) { m_xRecordNo->set_value(dNew); } + int GetValue() const { return m_xRecordNo->get_value(); } }; #endif diff --git a/cui/uiconfig/ui/recordnumberdialog.ui b/cui/uiconfig/ui/recordnumberdialog.ui index d191d09fb263..fbad4ea3895e 100644 --- a/cui/uiconfig/ui/recordnumberdialog.ui +++ b/cui/uiconfig/ui/recordnumberdialog.ui @@ -1,45 +1,61 @@ + - + + + 100 + 1 + 10 + False 6 Record Number + True + 0 + 0 dialog + + + False vertical 12 - - - True + + False - start - True - 12 + end - + + gtk-ok True - False - go to record - True - entry-nospin + True + True + True + True + True False True + end 0 - + + gtk-cancel True True + True + True False True + end 1 @@ -47,42 +63,40 @@ False True - 0 + end + 1 - - + + + True False - end + start + True + 12 - - gtk-ok + True - True - True - True - True - True + False + go to record + True + entry False True - end 0 - - gtk-cancel + True True - True - True + adjustment1 False True - end 1 @@ -90,8 +104,7 @@ False True - end - 1 + 0 -- cgit