summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Robert C. Helling <helling@atdotde.de>2014-06-03 09:35:19 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-06-03 07:23:37 -0700
commit2785d7bc3eaaf9a2015dc2d281d7bf6136edc2c4 (patch)
treebabf54a891bba884ff6c1d6ff014e779340943cf /qt-ui
parentb249370ffec79785b8dd7454e94300f1c793d39f (diff)
downloadsubsurface-2785d7bc3eaaf9a2015dc2d281d7bf6136edc2c4.tar.gz
Layout improvements to the dive plan
Changed to html. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/diveplanner.ui2
-rw-r--r--qt-ui/mainwindow.cpp2
-rw-r--r--qt-ui/mainwindow.ui3
3 files changed, 5 insertions, 2 deletions
diff --git a/qt-ui/diveplanner.ui b/qt-ui/diveplanner.ui
index fe3f46086..4e1071470 100644
--- a/qt-ui/diveplanner.ui
+++ b/qt-ui/diveplanner.ui
@@ -195,7 +195,7 @@
<string>In dive plan, show duration (relative time) of stops</string>
</property>
<property name="text">
- <string>display stop duration</string>
+ <string>display segment duration</string>
</property>
</widget>
</item>
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index af2fcf5c7..a49cdc460 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -416,7 +416,7 @@ void MainWindow::planCreated()
void MainWindow::setPlanNotes(const char *notes)
{
- ui.divePlanOutput->setText(notes);
+ ui.divePlanOutput->setHtml(notes);
}
void MainWindow::on_actionDivePlanner_triggered()
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index 1dd6db59f..2e7e7ad4b 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -548,6 +548,9 @@
<property name="styleSheet">
<string notr="true">font: 13pt &quot;Courier&quot;;</string>
</property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;