<3
From 17906400364c08221a22afe3f3c62b133285b91b Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <[email protected]>
Date: Mon, 5 Oct 2015 18:01:28 -0300
Subject: [PATCH] Do not incorrectly use the UUID as the dive name

for some reason sometimes activating the dive via tab
or enter gave us the wrong column, so simply select the
right one.

Signed-off-by: Tomaz Canabrava <[email protected]>
---
 qt-ui/locationinformation.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/qt-ui/locationinformation.cpp b/qt-ui/locationinformation.cpp
index 4c11326..5807266 100644
--- a/qt-ui/locationinformation.cpp
+++ b/qt-ui/locationinformation.cpp
@@ -447,11 +447,15 @@ void DiveLocationLineEdit::focusOutEvent(QFocusEvent *ev)
 
 void DiveLocationLineEdit::itemActivated(const QModelIndex &index)
 {
+	QModelIndex idx = index;
+	if (index.column() == DiveLocationModel::UUID)
+		idx = index.model()->index(index.row(), DiveLocationModel::NAME);
+
 	QModelIndex uuidIndex = index.model()->index(index.row(), DiveLocationModel::UUID);
 	uint32_t uuid = uuidIndex.data().toInt();
 	currType = uuid == 1 ? NEW_DIVE_SITE : EXISTING_DIVE_SITE;
 	currUuid = uuid;
-	setText(index.data().toString());
+	setText(idx.data().toString());
 	if (currUuid == NEW_DIVE_SITE)
 		qDebug() << "Setting a New dive site";
 	else
-- 
2.6.0

_______________________________________________
subsurface mailing list
[email protected]
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface

Reply via email to