From 516527e1bd4af1591abf212deb75bc26cbfa132b Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Mon, 2 Oct 2017 17:51:20 +0200 Subject: [PATCH] [Divesite] Hook location information interface for country Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- desktop-widgets/locationinformation.cpp | 16 ++++++++++++++++ desktop-widgets/locationinformation.h | 1 + 2 files changed, 17 insertions(+) diff --git a/desktop-widgets/locationinformation.cpp b/desktop-widgets/locationinformation.cpp index e32222bf4..3c347b774 100644 --- a/desktop-widgets/locationinformation.cpp +++ b/desktop-widgets/locationinformation.cpp @@ -93,6 +93,10 @@ void LocationInformationWidget::updateLabels() ui.diveSiteName->setText(displayed_dive_site.name); else ui.diveSiteName->clear(); + if (displayed_dive_site.country) + ui.diveSiteCountry->setText(displayed_dive_site.country); + else + ui.diveSiteCountry->clear(); if (displayed_dive_site.description) ui.diveSiteDescription->setText(displayed_dive_site.description); else @@ -147,6 +151,11 @@ void LocationInformationWidget::acceptChanges() free(currentDs->description); currentDs->description = copy_string(uiString); } + uiString = ui.diveSiteCountry->text().toUtf8().data(); + if (!same_string(uiString, currentDs->country)) { + free(currentDs->country); + currentDs->country = copy_string(uiString); + } uiString = ui.diveSiteNotes->document()->toPlainText().toUtf8().data(); if (!same_string(uiString, currentDs->notes)) { free(currentDs->notes); @@ -243,6 +252,12 @@ void LocationInformationWidget::on_diveSiteCoordinates_textChanged(const QString free((void *)coords); } +void LocationInformationWidget::on_diveSiteCountry_textChanged(const QString& text) +{ + if (!same_string(qPrintable(text), displayed_dive_site.country)) + markChangedWidget(ui.diveSiteCountry); +} + void LocationInformationWidget::on_diveSiteDescription_textChanged(const QString &text) { if (!same_string(qPrintable(text), displayed_dive_site.description)) @@ -266,6 +281,7 @@ void LocationInformationWidget::resetPallete() QPalette p; ui.diveSiteCoordinates->setPalette(p); ui.diveSiteDescription->setPalette(p); + ui.diveSiteCountry->setPalette(p); ui.diveSiteName->setPalette(p); ui.diveSiteNotes->setPalette(p); } diff --git a/desktop-widgets/locationinformation.h b/desktop-widgets/locationinformation.h index 9b245fe6e..f5c11820b 100644 --- a/desktop-widgets/locationinformation.h +++ b/desktop-widgets/locationinformation.h @@ -24,6 +24,7 @@ public slots: void enableEdition(); void resetState(); void resetPallete(); + void on_diveSiteCountry_textChanged(const QString& text); void on_diveSiteCoordinates_textChanged(const QString& text); void on_diveSiteDescription_textChanged(const QString& text); void on_diveSiteName_textChanged(const QString& text);