diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-09-08 11:17:45 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-09-08 15:16:41 +0200 |
| commit | 50761e3c3da45772473f3329d5a7519b34fb1106 (patch) | |
| tree | 0e780003a9f5ef34bfdc1bd6de92ed23edcfb7f4 | |
| parent | 0603b571230db1a1c6ff9f75f990675883e16717 (diff) | |
tdf#134477 add VclMessageType::Other to indicate image-less generic InfoBox
Change-Id: I76e86bf4d82b33771ea2900517712be57ae7f03d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102232
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | basic/source/runtime/methods.cxx | 3 | ||||
| -rw-r--r-- | include/vcl/vclenum.hxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 9 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkinst.cxx | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 91c279d477b4..78dcbf5097d6 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4380,7 +4380,7 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) vcl::Window* pParentWin = Application::GetDefDialogParent(); weld::Widget* pParent = pParentWin ? pParentWin->GetFrameWeld() : nullptr; - VclMessageType eType = VclMessageType::Info; + VclMessageType eType = VclMessageType::Other; switch (nDialogType) { @@ -4394,7 +4394,6 @@ void SbRtl_MsgBox(StarBASIC *, SbxArray & rPar, bool) eType = VclMessageType::Warning; break; case 64: - default: eType = VclMessageType::Info; break; } diff --git a/include/vcl/vclenum.hxx b/include/vcl/vclenum.hxx index 59f0cb3c9f39..3e8fb266610b 100644 --- a/include/vcl/vclenum.hxx +++ b/include/vcl/vclenum.hxx @@ -258,7 +258,8 @@ enum class VclMessageType Info, Warning, Question, - Error + Error, + Other }; enum class VclSizeGroupMode diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d6b9247b73ed..917723b0c297 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2221,11 +2221,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; @@ -2376,6 +2378,9 @@ MessageDialog::MessageDialog(vcl::Window* pParent, case VclMessageType::Error: SetText(GetStandardErrorBoxText()); break; + case VclMessageType::Other: + SetText(Application::GetDisplayName()); + break; } } @@ -2445,6 +2450,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); diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 8a15f98530d7..5e7f09c22a76 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -5597,6 +5597,9 @@ static GtkMessageType VclToGtk(VclMessageType eType) case VclMessageType::Error: eRet = GTK_MESSAGE_ERROR; break; + case VclMessageType::Other: + eRet = GTK_MESSAGE_OTHER; + break; } return eRet; } |