summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-09-08 11:17:45 +0100
committerAndras Timar <andras.timar@collabora.com>2020-09-19 21:10:52 +0200
commitb89fbdcba5226d8c640bfffa6b2eede3935635ce (patch)
treea0d85b262c93b96c2682690f6c2149362e7b67e7
parentc14802149fee73defbea3e2e64c09665900e8dc1 (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>
-rw-r--r--basic/source/runtime/methods.cxx3
-rw-r--r--include/vcl/vclenum.hxx3
-rw-r--r--vcl/source/window/layout.cxx9
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx3
4 files changed, 14 insertions, 4 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index e2ed754122c6..30ad9dc10188 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -4402,7 +4402,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)
{
@@ -4416,7 +4416,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 3ae12c0373f7..9d4091be23c9 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 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);
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 8f50dcb7b260..f1e3a731bf15 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5015,6 +5015,9 @@ static GtkMessageType VclToGtk(VclMessageType eType)
case VclMessageType::Error:
eRet = GTK_MESSAGE_ERROR;
break;
+ case VclMessageType::Other:
+ eRet = GTK_MESSAGE_OTHER;
+ break;
}
return eRet;
}