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

Show dive_site info on the labels

Browse source 
Correctly show the dive_site information on the labels.
still crashes on accept / reject.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-07-25 13:03:14 -03:00 • committed by Dirk Hohndel
parent f4c31f110f
commit 7c770f0790
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/locationinformation.cpp
View file

@ -28,7 +28,7 @@ LocationInformationWidget::LocationInformationWidget(QWidget *parent) : QGroupBo
connect(this, SIGNAL(stopFilterDiveSite()), MultiFilterSortModel::instance(), SLOT(stopFilterDiveSite())); connect(this, SIGNAL(stopFilterDiveSite()), MultiFilterSortModel::instance(), SLOT(stopFilterDiveSite()));
} }
void LocationInformationWidget::setCurrentDiveSiteByUuid(uint32_t uuid) void LocationInformationWidget::updateLabels()
{ {
if (displayed_dive_site.name) if (displayed_dive_site.name)
ui.diveSiteName->setText(displayed_dive_site.name); ui.diveSiteName->setText(displayed_dive_site.name);
@ -48,7 +48,7 @@ void LocationInformationWidget::setCurrentDiveSiteByUuid(uint32_t uuid)
ui.diveSiteCoordinates->clear(); ui.diveSiteCoordinates->clear();
emit startFilterDiveSite(displayed_dive_site.uuid); emit startFilterDiveSite(displayed_dive_site.uuid);
emit startEditDiveSite(uuid); emit startEditDiveSite(displayed_dive_site.uuid);
} }
void LocationInformationWidget::updateGpsCoordinates() void LocationInformationWidget::updateGpsCoordinates()
@ -100,6 +100,7 @@ void LocationInformationWidget::rejectChanges()
void LocationInformationWidget::showEvent(QShowEvent *ev) void LocationInformationWidget::showEvent(QShowEvent *ev)
{ {
if (displayed_dive_site.uuid) if (displayed_dive_site.uuid)
updateLabels();
emit startFilterDiveSite(displayed_dive_site.uuid); emit startFilterDiveSite(displayed_dive_site.uuid);
QGroupBox::showEvent(ev); QGroupBox::showEvent(ev);
} }

2
qt-ui/locationinformation.h
View file

@ -25,7 +25,7 @@ public slots:
void on_diveSiteName_textChanged(const QString& text); void on_diveSiteName_textChanged(const QString& text);
void on_diveSiteNotes_textChanged(); void on_diveSiteNotes_textChanged();
private slots: private slots:
void setCurrentDiveSiteByUuid(uint32_t uuid); void updateLabels();
signals: signals:
void startEditDiveSite(uint32_t uuid); void startEditDiveSite(uint32_t uuid);
void endEditDiveSite(); void endEditDiveSite();