mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site rewrite: better member name

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-06-26 15:12:37 -03:00 • committed by Dirk Hohndel
parent 9d51326e48
commit 73eceacaed
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
qt-ui/locationinformation.cpp
View file

@ -229,7 +229,7 @@ void LocationInformationWidget::resetPallete()
SimpleDiveSiteEditDialog::SimpleDiveSiteEditDialog(QWidget *parent) : SimpleDiveSiteEditDialog::SimpleDiveSiteEditDialog(QWidget *parent) :
QDialog(parent, Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::Popup), QDialog(parent, Qt::FramelessWindowHint | Qt::WindowSystemMenuHint | Qt::Popup),
ui(new Ui::SimpleDiveSiteEditDialog()), changed(false) ui(new Ui::SimpleDiveSiteEditDialog()), changed_dive_site(false)
{ {
ui->setupUi(this); ui->setupUi(this);
} }
@ -263,7 +263,7 @@ void SimpleDiveSiteEditDialog::showEvent(QShowEvent *ev)
ui->diveSiteCoordinates->setText(QString(gps_text)); ui->diveSiteCoordinates->setText(QString(gps_text));
free( (void*) gps_text); free( (void*) gps_text);
changed = false; changed_dive_site = false;
} }
void SimpleDiveSiteEditDialog::on_diveSiteName_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteName_editingFinished()
@ -272,7 +272,7 @@ void SimpleDiveSiteEditDialog::on_diveSiteName_editingFinished()
return; return;
free(displayed_dive_site.name); free(displayed_dive_site.name);
displayed_dive_site.name = copy_string(qPrintable(ui->diveSiteName->text())); displayed_dive_site.name = copy_string(qPrintable(ui->diveSiteName->text()));
changed = true; changed_dive_site = true;
} }
void SimpleDiveSiteEditDialog::on_diveSiteCoordinates_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteCoordinates_editingFinished()
@ -289,7 +289,7 @@ void SimpleDiveSiteEditDialog::on_diveSiteCoordinates_editingFinished()
displayed_dive_site.latitude.udeg = uLat; displayed_dive_site.latitude.udeg = uLat;
displayed_dive_site.longitude.udeg = uLon; displayed_dive_site.longitude.udeg = uLon;
changed = true; changed_dive_site = true;
} }
void SimpleDiveSiteEditDialog::on_diveSiteDescription_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteDescription_editingFinished()
@ -298,7 +298,7 @@ void SimpleDiveSiteEditDialog::on_diveSiteDescription_editingFinished()
return; return;
free(displayed_dive_site.description); free(displayed_dive_site.description);
displayed_dive_site.description = copy_string(qPrintable(ui->diveSiteDescription->text())); displayed_dive_site.description = copy_string(qPrintable(ui->diveSiteDescription->text()));
changed = true; changed_dive_site = true;
} }
void SimpleDiveSiteEditDialog::on_diveSiteNotes_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteNotes_editingFinished()
@ -307,5 +307,5 @@ void SimpleDiveSiteEditDialog::on_diveSiteNotes_editingFinished()
return; return;
free(displayed_dive_site.notes); free(displayed_dive_site.notes);
displayed_dive_site.notes = copy_string(qPrintable(ui->diveSiteNotes->text())); displayed_dive_site.notes = copy_string(qPrintable(ui->diveSiteNotes->text()));
changed = true; changed_dive_site = true;
} }

2
qt-ui/locationinformation.h
View file

@ -51,7 +51,7 @@ Q_OBJECT
public: public:
SimpleDiveSiteEditDialog(QWidget *parent); SimpleDiveSiteEditDialog(QWidget *parent);
virtual ~SimpleDiveSiteEditDialog(); virtual ~SimpleDiveSiteEditDialog();
bool changed; bool changed_dive_site;
public slots: public slots:
void on_diveSiteName_editingFinished(); void on_diveSiteName_editingFinished();
void on_diveSiteCoordinates_editingFinished(); void on_diveSiteCoordinates_editingFinished();

5
qt-ui/maintab.cpp
View file

@ -241,7 +241,10 @@ void MainTab::setCurrentLocationIndex()
void MainTab::showDiveSiteSimpleEdit() void MainTab::showDiveSiteSimpleEdit()
{ {
SimpleDiveSiteEditDialog dlg(this); SimpleDiveSiteEditDialog dlg(this);
int reason = dlg.exec(); dlg.exec();
if (dlg.changed_dive_site) {
qDebug() << "Changed the dive site, paint something yellow.";
}
} }
void MainTab::enableGeoLookupEdition() void MainTab::enableGeoLookupEdition()