diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-08 11:17:45 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-09-19 21:10:52 +0200 |
| commit | b89fbdcba5226d8c640bfffa6b2eede3935635ce (patch) | |
| tree | a0d85b262c93b96c2682690f6c2149362e7b67e7 /vcl/source/window/layout.cxx | |
| parent | c14802149fee73defbea3e2e64c09665900e8dc1 (diff) | |
tdf#134477 add VclMessageType::Other to indicate image-less generic InfoBox
Change-Id: I76e86bf4d82b33771ea2900517712be57ae7f03d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102130
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl/source/window/layout.cxx')
| -rw-r--r-- | vcl/source/window/layout.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index b6c1b6ee65eb..52197b51992d 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2071,11 +2071,13 @@ void MessageDialog::create_message_area() case VclMessageType::Error: m_pImage->SetImage(GetStandardErrorBoxImage()); break; + case VclMessageType::Other: + break; } m_pImage->set_grid_left_attach(0); m_pImage->set_grid_top_attach(0); m_pImage->set_valign(VclAlign::Start); - m_pImage->Show(); + m_pImage->Show(m_eMessageType != VclMessageType::Other); WinBits nWinStyle = WB_CLIPCHILDREN | WB_LEFT | WB_VCENTER | WB_NOLABEL | WB_NOTABSTOP; @@ -2227,6 +2229,9 @@ MessageDialog::MessageDialog(vcl::Window* pParent, case VclMessageType::Error: SetText(GetStandardErrorBoxText()); break; + case VclMessageType::Other: + SetText(Application::GetDisplayName()); + break; } } @@ -2296,6 +2301,8 @@ bool MessageDialog::set_property(const OString &rKey, const OUString &rValue) eMode = VclMessageType::Question; else if (rValue == "error") eMode = VclMessageType::Error; + else if (rValue == "other") + eMode = VclMessageType::Other; else { SAL_WARN("vcl.layout", "unknown message type mode" << rValue); |