From e4e6e896c1a0b8634e2adbc5ac0e5163ab5007d4 Mon Sep 17 00:00:00 2001 From: Grace Karanja Date: Thu, 11 Jun 2015 09:56:18 +0300 Subject: [PATCH] Fix bug where dives are shown twice On the QML page, dives are repeated. Adding process_dives to QMLManager after calling parse_file solves this. Signed-off-by: Grace Karanja Signed-off-by: Dirk Hohndel --- qt-mobile/main.qml | 2 +- qt-mobile/qmlmanager.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml index 8518f84df..7084619a3 100644 --- a/qt-mobile/main.qml +++ b/qt-mobile/main.qml @@ -107,7 +107,7 @@ ApplicationWindow { contentHeight: detailsView.height clip: true Row { - Text { text: 'Notes: ' + notes; wrapMode: Text.WordWrap; width: details.width } + Text { text: 'Notes:
' + notes; wrapMode: Text.WordWrap; width: details.width } } } } diff --git a/qt-mobile/qmlmanager.cpp b/qt-mobile/qmlmanager.cpp index 0f8ccbe61..eeeada3e0 100644 --- a/qt-mobile/qmlmanager.cpp +++ b/qt-mobile/qmlmanager.cpp @@ -1,7 +1,8 @@ #include "qmlmanager.h" #include -#include "../qt-models/divelistmodel.h" +#include "qt-models/divelistmodel.h" +#include "divelist.h" QMLManager::QMLManager() { @@ -21,7 +22,6 @@ void QMLManager::setFilename(const QString &f) { m_fileName = f; loadFile(); - emit filenameChanged(); } void QMLManager::loadFile() @@ -30,7 +30,7 @@ void QMLManager::loadFile() QString strippedFileName = url.toLocalFile(); parse_file(strippedFileName.toUtf8().data()); - + process_dives(false, false); int i; struct dive *d;