From bdd89f0e7ab179f74051ffec9f3ecebd8443af14 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Thu, 27 Jun 2013 15:33:44 +0300 Subject: [PATCH] Coordinate some mark_divelist_changed() calls 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 Signed-off-by: Dirk Hohndel --- 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 24806d520..c16af93cf 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 @@ -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 843724374..82550a3f4 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 43376f9ac..3f16b50e5 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(); }