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

Make dive trip location edit work again.

Browse source 
:D

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-10-01 18:11:03 -03:00 • committed by Dirk Hohndel
parent d25e456fcc
commit 6979ebfdae
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qt-ui/maintab.cpp
View file

@ -548,6 +548,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.editDiveSiteButton->hide(); ui.editDiveSiteButton->hide();
// rename the remaining fields and fill data from selected trip // rename the remaining fields and fill data from selected trip
ui.LocationLabel->setText(tr("Trip location")); ui.LocationLabel->setText(tr("Trip location"));
ui.diveTripLocation->setText(currentTrip->location);
ui.locationTags->clear(); ui.locationTags->clear();
//TODO: Fix this. //TODO: Fix this.
//ui.location->setText(currentTrip->location); //ui.location->setText(currentTrip->location);
@ -1154,6 +1155,7 @@ void MainTab::resetPallete()
ui.dateEdit->setPalette(p); ui.dateEdit->setPalette(p);
ui.timeEdit->setPalette(p); ui.timeEdit->setPalette(p);
ui.tagWidget->setPalette(p); ui.tagWidget->setPalette(p);
ui.diveTripLocation->setPalette(p);
} }
#define EDIT_TEXT2(what, text) \ #define EDIT_TEXT2(what, text) \
@ -1507,7 +1509,7 @@ void MainTab::on_location_diveSiteSelected()
updateDisplayedDiveSite(); updateDisplayedDiveSite();
} }
void MainTab::on_diveTripLocation_textChanged(const QString& text) void MainTab::on_diveTripLocation_textEdited(const QString& text)
{ {
if (currentTrip) { if (currentTrip) {
free(displayedTrip.location); free(displayedTrip.location);

2
qt-ui/maintab.h
View file

@ -72,7 +72,7 @@ slots:
void on_divemaster_textChanged(); void on_divemaster_textChanged();
void on_buddy_textChanged(); void on_buddy_textChanged();
void on_suit_textChanged(const QString &text); void on_suit_textChanged(const QString &text);
void on_diveTripLocation_textChanged(const QString& text); void on_diveTripLocation_textEdited(const QString& text);
void on_notes_textChanged(); void on_notes_textChanged();
void on_airtemp_textChanged(const QString &text); void on_airtemp_textChanged(const QString &text);
void divetype_Changed(int); void divetype_Changed(int);