Escape HTML chars in camera/lens name in quick info box (fixes #6294)
This commit is contained in:
parent
4ab54c9fda
commit
b6449bfd5f
@ -1335,8 +1335,8 @@ void EditorPanel::info_toggled ()
|
|||||||
|
|
||||||
if (idata && idata->hasExif(selectedFrame)) {
|
if (idata && idata->hasExif(selectedFrame)) {
|
||||||
infoString = Glib::ustring::compose ("%1 + %2\n<span size=\"small\">f/</span><span size=\"large\">%3</span> <span size=\"large\">%4</span><span size=\"small\">s</span> <span size=\"small\">%5</span><span size=\"large\">%6</span> <span size=\"large\">%7</span><span size=\"small\">mm</span>",
|
infoString = Glib::ustring::compose ("%1 + %2\n<span size=\"small\">f/</span><span size=\"large\">%3</span> <span size=\"large\">%4</span><span size=\"small\">s</span> <span size=\"small\">%5</span><span size=\"large\">%6</span> <span size=\"large\">%7</span><span size=\"small\">mm</span>",
|
||||||
Glib::ustring (idata->getMake() + " " + idata->getModel()),
|
escapeHtmlChars (idata->getMake() + " " + idata->getModel()),
|
||||||
Glib::ustring (idata->getLens()),
|
escapeHtmlChars (idata->getLens()),
|
||||||
Glib::ustring (idata->apertureToString (idata->getFNumber(selectedFrame))),
|
Glib::ustring (idata->apertureToString (idata->getFNumber(selectedFrame))),
|
||||||
Glib::ustring (idata->shutterToString (idata->getShutterSpeed(selectedFrame))),
|
Glib::ustring (idata->shutterToString (idata->getShutterSpeed(selectedFrame))),
|
||||||
M ("QINFO_ISO"), idata->getISOSpeed(selectedFrame),
|
M ("QINFO_ISO"), idata->getISOSpeed(selectedFrame),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user