ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Introduce EntryMessageType::Info

Browse Source 
Used as pure information for successful font replacement

Change-Id: I4cd92561b58eacce960430007987935a26a657bf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211148
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Tested-by: Jenkins
This commit is contained in:
Heiko Tietze
2026-09-19 08:58:21 +02:00
committed by Heiko Tietze
parent e301b83029
commit c8679f314a
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/vcl/weld/EntryMessageType.hxx
+1
View File
@@ -14,6 +14,7 @@ namespace weld
enum class EntryMessageType
{
Normal,
Info,
Warning,
Error,
};
vcl/qt5/QtInstanceEntry.cxx
+4
View File
@@ -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);
vcl/source/app/salvtables.cxx
+7 -2
View File
@@ -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;
}
}
vcl/unx/gtk3/gtkinst.cxx
+4
View File
@@ -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;
}
}
}