mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Planner: fix display of "overlapping dives" message

Browse source 
1) Add a missing <div>

2) More importantly: recognize html content via <div>-tags instead of
   <table>-tags.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-09-09 22:49:57 +02:00 • committed by Dirk Hohndel
parent ecbfea3568
commit 31f1af07c2
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/plannernotes.c
View file

@ -120,7 +120,7 @@ void add_plan_to_notes(struct diveplan *diveplan, struct dive *dive, bool show_d
}
if (diveplan->surface_interval < 0) {
put_format(&buf, "<div><b>%s (%s) %s<br>",
put_format(&buf, "<div><b>%s (%s) %s<br></div>",
translate("gettextFromC", "Subsurface"),
subsurface_canonical_version(),
translate("gettextFromC", "dive plan</b> (overlapping dives detected)"));

6
desktop-widgets/tab-widgets/maintab.cpp
View file

@ -433,7 +433,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.notes->setText(QString());
if (!clear) {
QString tmp(displayed_dive.notes);
if (tmp.indexOf("<table") != -1) {
if (tmp.indexOf("<div") != -1) {
tmp.replace(QString("\n"), QString("<br>"));
ui.notes->setHtml(tmp);
} else {
@ -1427,7 +1427,7 @@ void MainTab::on_notes_textChanged()
if (same_string(displayed_dive.notes, qPrintable(ui.notes->toPlainText())))
return;
free(displayed_dive.notes);
if (ui.notes->toHtml().indexOf("<table") != -1)
if (ui.notes->toHtml().indexOf("<div") != -1)
displayed_dive.notes = copy_qstring(ui.notes->toHtml());
else
displayed_dive.notes = copy_qstring(ui.notes->toPlainText());
@ -1512,7 +1512,7 @@ void MainTab::showAndTriggerEditSelective(struct dive_components what)
SHOW_SELECTIVE(suit);
if (what.notes) {
QString tmp(displayed_dive.notes);
if (tmp.contains("<table")) {
if (tmp.contains("<div")) {
tmp.replace(QString("\n"), QString("<br>"));
ui.notes->setHtml(tmp);
} else {