mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 08:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make sure we do not fall back to edit mode on accept

Browse source 
On Ubuntu 14.04 the edit mode does not exit successfully when applying
the changes. It instead jumps back to edit mode (even though hiding the
option to apply/discard changes again). So let's just have a flag to
prevent faulty behavior.

Fixes #786

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-01-04 20:06:33 +02:00 • committed by Dirk Hohndel
parent f7b3c8b496
commit fdd152af71
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
qt-ui/maintab.cpp
View file

@ -701,6 +701,8 @@ void MainTab::acceptChanges()
int i, addedId = -1; int i, addedId = -1;
struct dive *d; struct dive *d;
bool do_replot = false; bool do_replot = false;
acceptingEdit = true;
tabBar()->setTabIcon(0, QIcon()); // Notes tabBar()->setTabIcon(0, QIcon()); // Notes
tabBar()->setTabIcon(1, QIcon()); // Equipment tabBar()->setTabIcon(1, QIcon()); // Equipment
ui.dateEdit->setEnabled(true); ui.dateEdit->setEnabled(true);
@ -870,6 +872,7 @@ void MainTab::acceptChanges()
cylindersModel->changed = false; cylindersModel->changed = false;
weightModel->changed = false; weightModel->changed = false;
MainWindow::instance()->setEnabledToolbar(true); MainWindow::instance()->setEnabledToolbar(true);
acceptingEdit = false;
} }
void MainTab::resetPallete() void MainTab::resetPallete()
@ -960,7 +963,7 @@ void MainTab::markChangedWidget(QWidget *w)
void MainTab::on_buddy_textChanged() void MainTab::on_buddy_textChanged()
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
QStringList text_list = ui.buddy->toPlainText().split(",", QString::SkipEmptyParts); QStringList text_list = ui.buddy->toPlainText().split(",", QString::SkipEmptyParts);
for (int i = 0; i < text_list.size(); i++) for (int i = 0; i < text_list.size(); i++)
@ -973,7 +976,7 @@ void MainTab::on_buddy_textChanged()
void MainTab::on_divemaster_textChanged() void MainTab::on_divemaster_textChanged()
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
QStringList text_list = ui.divemaster->toPlainText().split(",", QString::SkipEmptyParts); QStringList text_list = ui.divemaster->toPlainText().split(",", QString::SkipEmptyParts);
for (int i = 0; i < text_list.size(); i++) for (int i = 0; i < text_list.size(); i++)
@ -986,7 +989,7 @@ void MainTab::on_divemaster_textChanged()
void MainTab::on_airtemp_textChanged(const QString &text) void MainTab::on_airtemp_textChanged(const QString &text)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
displayed_dive.airtemp.mkelvin = parseTemperatureToMkelvin(text); displayed_dive.airtemp.mkelvin = parseTemperatureToMkelvin(text);
markChangedWidget(ui.airtemp); markChangedWidget(ui.airtemp);
@ -995,7 +998,7 @@ void MainTab::on_airtemp_textChanged(const QString &text)
void MainTab::on_watertemp_textChanged(const QString &text) void MainTab::on_watertemp_textChanged(const QString &text)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
displayed_dive.watertemp.mkelvin = parseTemperatureToMkelvin(text); displayed_dive.watertemp.mkelvin = parseTemperatureToMkelvin(text);
markChangedWidget(ui.watertemp); markChangedWidget(ui.watertemp);
@ -1032,7 +1035,7 @@ void MainTab::validate_temp_field(QLineEdit *tempField, const QString &text)
void MainTab::on_dateEdit_dateChanged(const QDate &date) void MainTab::on_dateEdit_dateChanged(const QDate &date)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
markChangedWidget(ui.dateEdit); markChangedWidget(ui.dateEdit);
QDateTime dateTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when)); QDateTime dateTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when));
@ -1044,7 +1047,7 @@ void MainTab::on_dateEdit_dateChanged(const QDate &date)
void MainTab::on_timeEdit_timeChanged(const QTime &time) void MainTab::on_timeEdit_timeChanged(const QTime &time)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
markChangedWidget(ui.timeEdit); markChangedWidget(ui.timeEdit);
QDateTime dateTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when)); QDateTime dateTime = QDateTime::fromTime_t(displayed_dive.when - gettimezoneoffset(displayed_dive.when));
@ -1074,14 +1077,14 @@ void MainTab::saveTags()
void MainTab::on_tagWidget_textChanged() void MainTab::on_tagWidget_textChanged()
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
markChangedWidget(ui.tagWidget); markChangedWidget(ui.tagWidget);
} }
void MainTab::on_location_textChanged(const QString &text) void MainTab::on_location_textChanged(const QString &text)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
if (currentTrip) { if (currentTrip) {
free(displayedTrip.location); free(displayedTrip.location);
@ -1119,7 +1122,7 @@ void MainTab::on_location_editingFinished()
void MainTab::on_suit_textChanged(const QString &text) void MainTab::on_suit_textChanged(const QString &text)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
free(displayed_dive.suit); free(displayed_dive.suit);
displayed_dive.suit = strdup(text.toUtf8().data()); displayed_dive.suit = strdup(text.toUtf8().data());
@ -1128,7 +1131,7 @@ void MainTab::on_suit_textChanged(const QString &text)
void MainTab::on_notes_textChanged() void MainTab::on_notes_textChanged()
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
if (currentTrip) { if (currentTrip) {
free(displayedTrip.notes); free(displayedTrip.notes);
@ -1145,7 +1148,7 @@ void MainTab::on_notes_textChanged()
void MainTab::on_coordinates_textChanged(const QString &text) void MainTab::on_coordinates_textChanged(const QString &text)
{ {
if (editMode == IGNORE) if (editMode == IGNORE || acceptingEdit == true)
return; return;
bool gpsChanged = false; bool gpsChanged = false;
bool parsed = false; bool parsed = false;
@ -1162,6 +1165,8 @@ void MainTab::on_coordinates_textChanged(const QString &text)
void MainTab::on_rating_valueChanged(int value) void MainTab::on_rating_valueChanged(int value)
{ {
if (acceptingEdit == true)
return;
if (displayed_dive.rating != value) { if (displayed_dive.rating != value) {
displayed_dive.rating = value; displayed_dive.rating = value;
modified = true; modified = true;
@ -1171,6 +1176,8 @@ void MainTab::on_rating_valueChanged(int value)
void MainTab::on_visibility_valueChanged(int value) void MainTab::on_visibility_valueChanged(int value)
{ {
if (acceptingEdit == true)
return;
if (displayed_dive.visibility != value) { if (displayed_dive.visibility != value) {
displayed_dive.visibility = value; displayed_dive.visibility = value;
modified = true; modified = true;

1
qt-ui/maintab.h
View file

@ -112,6 +112,7 @@ private:
void markChangedWidget(QWidget *w); void markChangedWidget(QWidget *w);
dive_trip_t *currentTrip; dive_trip_t *currentTrip;
dive_trip_t displayedTrip; dive_trip_t displayedTrip;
bool acceptingEdit;
}; };
#endif // MAINTAB_H #endif // MAINTAB_H