diff --git a/include/vcl/weld/EntryMessageType.hxx b/include/vcl/weld/EntryMessageType.hxx index f2b153c94869..d04ac9137472 100644 --- a/include/vcl/weld/EntryMessageType.hxx +++ b/include/vcl/weld/EntryMessageType.hxx @@ -14,6 +14,7 @@ namespace weld enum class EntryMessageType { Normal, + Info, Warning, Error, }; diff --git a/vcl/qt5/QtInstanceEntry.cxx b/vcl/qt5/QtInstanceEntry.cxx index c9ddf591ec5e..2891b42b66c1 100644 --- a/vcl/qt5/QtInstanceEntry.cxx +++ b/vcl/qt5/QtInstanceEntry.cxx @@ -143,6 +143,10 @@ void QtInstanceEntry::setMessageType(QLineEdit& rLineEdit, weld::EntryMessageTyp case weld::EntryMessageType::Normal: // don't do anything special return; + case weld::EntryMessageType::Info: + rLineEdit.addAction(QIcon::fromTheme("dialog-information"), + QLineEdit::TrailingPosition); + return; case weld::EntryMessageType::Warning: rLineEdit.addAction(QIcon::fromTheme("dialog-warning"), QLineEdit::TrailingPosition); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index 4c3517775592..6bf73e7b2ffb 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -3217,19 +3217,24 @@ void set_message_type(Edit* pEntry, weld::EntryMessageType eType) pEntry->SetControlForeground(); pEntry->SetControlBackground(); break; + case weld::EntryMessageType::Info: + pEntry->SetForceControlBackground(true); + pEntry->SetControlForeground(COL_BLACK); + pEntry->SetControlBackground(0xb4c7dc); // light blue 3 + break; case weld::EntryMessageType::Warning: // tdf#114603: enable setting the background to a different color; // relevant for GTK; see also #i75179# pEntry->SetForceControlBackground(true); pEntry->SetControlForeground(COL_BLACK); - pEntry->SetControlBackground(0xffff38); // "light yellow 1" + pEntry->SetControlBackground(0xffffa6); // "light yellow 3" break; case weld::EntryMessageType::Error: // tdf#114603: enable setting the background to a different color; // relevant for GTK; see also #i75179# pEntry->SetForceControlBackground(true); pEntry->SetControlForeground(COL_BLACK); // contrast of 5.87 to the red background - pEntry->SetControlBackground(0xff3838); // "light red 1" + pEntry->SetControlBackground(0xffa6a6); // "light red 3" break; } } diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index e31dc40ac10f..265abac878ec 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -12802,6 +12802,7 @@ namespace switch (eType) { case weld::EntryMessageType::Normal: + case weld::EntryMessageType::Info: break; case weld::EntryMessageType::Warning: #if GTK_CHECK_VERSION(4, 0, 0) @@ -12834,6 +12835,9 @@ namespace case weld::EntryMessageType::Error: gtk_entry_set_icon_from_icon_name(pEntry, GTK_ENTRY_ICON_SECONDARY, "dialog-error"); break; + case weld::EntryMessageType::Info: + gtk_entry_set_icon_from_icon_name(pEntry, GTK_ENTRY_ICON_SECONDARY, "dialog-information"); + break; } } }