diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-17 14:50:39 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-05-19 10:11:17 +0200 |
| commit | 98c696e0b8ac10fb43616db625d57278f4dbb851 (patch) | |
| tree | c6a806711fd835e183f786b164a153473bd588fb /include | |
| parent | a872552854cc632f6c968bad9f858500e16c2d41 (diff) | |
jsdialog: use for message dialogs on mobile
Change-Id: Ib172dc264d7f55fef08dc474f7e6f4d1b3108085
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94431
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/jsdialog/jsdialogbuilder.hxx | 14 | ||||
| -rw-r--r-- | include/vcl/salvtables.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/include/vcl/jsdialog/jsdialogbuilder.hxx b/include/vcl/jsdialog/jsdialogbuilder.hxx index 8befb2b0f79b..660be3ea75d3 100644 --- a/include/vcl/jsdialog/jsdialogbuilder.hxx +++ b/include/vcl/jsdialog/jsdialogbuilder.hxx @@ -52,6 +52,10 @@ public: virtual std::unique_ptr<weld::Notebook> weld_notebook(const OString& id, bool bTakeOwnership = false) override; + static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, + VclMessageType eMessageType, + VclButtonsType eButtonType, + const OUString& rPrimaryMessage); static weld::Widget* FindWeldWidgetsMap(vcl::LOKWindowId nWindowId, const OString& rWidget); }; @@ -146,4 +150,14 @@ public: virtual void append_page(const OString& rIdent, const OUString& rLabel) override; }; +class VCL_DLLPUBLIC JSMessageDialog : public SalInstanceMessageDialog, public JSDialogSender +{ +public: + JSMessageDialog(::MessageDialog* pDialog, SalInstanceBuilder* pBuilder, bool bTakeOwnership); + + virtual void set_primary_text(const OUString& rText) override; + + virtual void set_secondary_text(const OUString& rText) override; +}; + #endif diff --git a/include/vcl/salvtables.hxx b/include/vcl/salvtables.hxx index 0fb282d385c7..dad0e71d5137 100644 --- a/include/vcl/salvtables.hxx +++ b/include/vcl/salvtables.hxx @@ -733,7 +733,7 @@ public: class SalInstanceMessageDialog : public SalInstanceDialog, public virtual weld::MessageDialog { -private: +protected: VclPtr<::MessageDialog> m_xMessageDialog; public: diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index f8be58bb6629..0707a4668e14 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1381,7 +1381,8 @@ public: static weld::Builder* CreateInterimBuilder(weld::Widget* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, - VclButtonsType eButtonType, const OUString& rPrimaryMessage); + VclButtonsType eButtonType, const OUString& rPrimaryMessage, + bool bMobile = false); static weld::Window* GetFrameWeld(const css::uno::Reference<css::awt::XWindow>& rWindow); private: |