[PATCH 2/3] Coordinate some mark_divelist_changed() calls

Lubomir I. Ivanov neolit123 at gmail.com
Thu Jun 27 05:33:44 PDT 2013


From: "Lubomir I. Ivanov" <neolit123 at gmail.com>

1) Make a call mark_divelist_changed(TRUE) when the user adds new
cylinder or weight entries.

2) Call mark_divelist_changed(FALSE) in
MainWindow::on_actionClose_triggered() so that each time after
a file is closed or a new one is created it does not ask immediately
the user for a save confirmation for the blank file/divelist.

3) Call mark_divelist_changed(TRUE) once a dive's geo location
has changed in GlobeGPS::changeDiveGeoPosition().

Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
 qt-ui/globe.cpp      | 2 ++
 qt-ui/maintab.cpp    | 2 ++
 qt-ui/mainwindow.cpp | 1 +
 3 files changed, 5 insertions(+)

diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 24806d5..c16af93 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -3,6 +3,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "../dive.h"
+#include "../divelist.h"
 #include "../helpers.h"
 
 #include <QDebug>
@@ -203,6 +204,7 @@ void GlobeGPS::changeDiveGeoPosition(qreal lon, qreal lat, GeoDataCoordinates::U
 	reload();
 	editingDiveCoords = 0;
 	messageWidget->animatedHide();
+	mark_divelist_changed(TRUE);
 }
 
 void GlobeGPS::mousePressEvent(QMouseEvent* event)
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 8437243..82550a3 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -324,11 +324,13 @@ void MainTab::updateDiveInfo(int dive)
 void MainTab::addCylinder_clicked()
 {
 	cylindersModel->add();
+	mark_divelist_changed(TRUE);
 }
 
 void MainTab::addWeight_clicked()
 {
 	weightModel->add();
+	mark_divelist_changed(TRUE);
 }
 
 void MainTab::reload()
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 43376f9..3f16b50 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -166,6 +166,7 @@ void MainWindow::on_actionClose_triggered()
 	ui->ListWidget->reload(DiveTripModel::TREE);
 	ui->globe->reload();
 	setTitle(MWTF_DEFAULT);
+	mark_divelist_changed(FALSE);
 
 	clear_events();
 }
-- 
1.7.11.msysgit.0



More information about the subsurface mailing list