diff options
| author |  Grace Karanja <gracie.karanja89@gmail.com> | 2015-06-11 09:56:18 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-06-20 14:28:49 -0700 |
| commit | e4e6e896c1a0b8634e2adbc5ac0e5163ab5007d4 (patch) | |
| tree | c18f28f710cf20e4589eaf73dd23e4620beac2e4 /qt-mobile | |
| parent | ee9452ae8ace9e5ec6b6c99ebb01ec3748e1bfaa (diff) | |
| download | subsurface-e4e6e896c1a0b8634e2adbc5ac0e5163ab5007d4.tar.gz | |
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 <gracie.karanja89@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
| -rw-r--r-- | qt-mobile/main.qml | 2 | ||||
| -rw-r--r-- | 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: '<b>Notes:</b><br/>' + 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 <QUrl> -#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; |