summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-31 21:14:44 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-05-31 21:14:44 -0700
commit6333f3aa35d12d7e9f1c02389df0f6129adb93b3 (patch)
tree948d1b98f7db0644a08ea27e4d9f3d4baf088315 /qt-ui
parente93bf1e55953a7f95b4a0a5fb2a07e83e2a8c4c4 (diff)
downloadsubsurface-6333f3aa35d12d7e9f1c02389df0f6129adb93b3.tar.gz
Planner: show the plan notes in the new widget
That was easy. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/diveplanner.cpp1
-rw-r--r--qt-ui/mainwindow.cpp5
-rw-r--r--qt-ui/mainwindow.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index c73487048..dd72ce9c5 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -842,6 +842,7 @@ void DivePlannerPointsModel::createTemporaryPlan()
#endif
if (plannerModel->recalcQ() && !diveplan_empty(&diveplan)) {
plan(&diveplan, &cache, &tempDive, stagingDive, isPlanner());
+ MainWindow::instance()->setPlanNotes(tempDive->notes);
addDecoToModel();
if (mode == ADD || mode == PLAN) {
// copy the samples and events, but don't overwrite the cylinders
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 910580e06..dad8e4706 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -415,6 +415,11 @@ void MainWindow::planCreated()
refreshDisplay();
}
+void MainWindow::setPlanNotes(const char *notes)
+{
+ ui.divePlanOutput->setText(notes);
+}
+
void MainWindow::on_actionDivePlanner_triggered()
{
if(!plannerStateClean())
diff --git a/qt-ui/mainwindow.h b/qt-ui/mainwindow.h
index 9501e97e6..57c205ba4 100644
--- a/qt-ui/mainwindow.h
+++ b/qt-ui/mainwindow.h
@@ -77,6 +77,7 @@ public:
ProfileWidget2 *graphics() const;
void setLoadedWithFiles(bool filesFromCommandLine);
bool filesFromCommandLine() const;
+ void setPlanNotes(const char *notes);
private
slots:
/* file menu action */