summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
authorGravatar Tomaz Canabrava <tomaz.canabrava@intel.com>2015-10-01 18:11:03 -0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-10-01 18:01:34 -0400
commit6979ebfdae328799a5c3f8dabc82c15299d56943 (patch)
tree453cd3decde4c64392734f05aa736870201bd83d /qt-ui
parentd25e456fccabac55d3102f82524c26cb4d7bdc7c (diff)
downloadsubsurface-6979ebfdae328799a5c3f8dabc82c15299d56943.tar.gz
Make dive trip location edit work again.
:D Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/maintab.cpp4
-rw-r--r--qt-ui/maintab.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index 33c5055bd..8ec339e03 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -548,6 +548,7 @@ void MainTab::updateDiveInfo(bool clear)
ui.editDiveSiteButton->hide();
// rename the remaining fields and fill data from selected trip
ui.LocationLabel->setText(tr("Trip location"));
+ ui.diveTripLocation->setText(currentTrip->location);
ui.locationTags->clear();
//TODO: Fix this.
//ui.location->setText(currentTrip->location);
@@ -1154,6 +1155,7 @@ void MainTab::resetPallete()
ui.dateEdit->setPalette(p);
ui.timeEdit->setPalette(p);
ui.tagWidget->setPalette(p);
+ ui.diveTripLocation->setPalette(p);
}
#define EDIT_TEXT2(what, text) \
@@ -1507,7 +1509,7 @@ void MainTab::on_location_diveSiteSelected()
updateDisplayedDiveSite();
}
-void MainTab::on_diveTripLocation_textChanged(const QString& text)
+void MainTab::on_diveTripLocation_textEdited(const QString& text)
{
if (currentTrip) {
free(displayedTrip.location);
diff --git a/qt-ui/maintab.h b/qt-ui/maintab.h
index b4bd33865..9cd14034e 100644
--- a/qt-ui/maintab.h
+++ b/qt-ui/maintab.h
@@ -72,7 +72,7 @@ slots:
void on_divemaster_textChanged();
void on_buddy_textChanged();
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_airtemp_textChanged(const QString &text);
void divetype_Changed(int);