diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-08 12:07:58 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-09 15:17:04 +0200 |
| commit | 15ea661bec6e38f4b4b641ed79bd5591345fefbd (patch) | |
| tree | a9a8c17a99b7c0356d8ba3d77c1b5f582cdfc43f /include | |
| parent | 7ceee0f1ec0e349d0df4980d7fdedbd13c7917c5 (diff) | |
tdf#120377 weld cluster of animation pages and dialog
Change-Id: Ia5a9880c1e6d88141bd654a9cc761b289f27c249
Reviewed-on: https://gerrit.libreoffice.org/61542
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/colorbox.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/weld.hxx | 32 |
2 files changed, 30 insertions, 4 deletions
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 6b3847cbf2cf..67e26e652576 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -146,6 +146,8 @@ public: else hide(); } + void set_help_id(const OString& rHelpId) { m_xButton->set_help_id(rHelpId); } + weld::MenuButton& get_widget() { return *m_xButton; } }; #endif diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index eddb3baaa176..e49e3689f56d 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -477,6 +477,26 @@ protected: public: void connect_selected(const Link<const OString&, void>& rLink) { m_aSelectHdl = rLink; } + + virtual void insert_item(int pos, const OUString& rId, const OUString& rStr, + const OUString* pIconName, VirtualDevice* pImageSufface, bool bCheck) + = 0; + void append_item(const OUString& rId, const OUString& rStr) + { + insert_item(-1, rId, rStr, nullptr, nullptr, false); + } + void append_item_check(const OUString& rId, const OUString& rStr) + { + insert_item(-1, rId, rStr, nullptr, nullptr, true); + } + void append_item(const OUString& rId, const OUString& rStr, const OUString& rImage) + { + insert_item(-1, rId, rStr, &rImage, nullptr, false); + } + void append_item(const OUString& rId, const OUString& rStr, VirtualDevice& rImage) + { + insert_item(-1, rId, rStr, nullptr, &rImage, false); + } virtual void set_item_active(const OString& rIdent, bool bActive) = 0; virtual void set_item_label(const OString& rIdent, const OUString& rLabel) = 0; virtual void set_item_help_id(const OString& rIdent, const OString& rHelpId) = 0; @@ -1050,19 +1070,23 @@ public: virtual void show(const OString& rIdent, bool bShow) = 0; virtual void insert(int pos, const OUString& rId, const OUString& rStr, - const OUString* pIconName, VirtualDevice* pImageSufface) + const OUString* pIconName, VirtualDevice* pImageSufface, bool bCheck) = 0; void append(const OUString& rId, const OUString& rStr) { - insert(-1, rId, rStr, nullptr, nullptr); + insert(-1, rId, rStr, nullptr, nullptr, false); + } + void append_check(const OUString& rId, const OUString& rStr) + { + insert(-1, rId, rStr, nullptr, nullptr, true); } void append(const OUString& rId, const OUString& rStr, const OUString& rImage) { - insert(-1, rId, rStr, &rImage, nullptr); + insert(-1, rId, rStr, &rImage, nullptr, false); } void append(const OUString& rId, const OUString& rStr, VirtualDevice& rImage) { - insert(-1, rId, rStr, nullptr, &rImage); + insert(-1, rId, rStr, nullptr, &rImage, false); } virtual ~Menu() {} |