Changeset f78fdf3 in subsurface


Ignore:
Timestamp:
May 27, 2017, 11:07:19 AM (4 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
0e4c996
Parents:
99515922
git-author:
Tomaz Canabrava <tcanabrava@…> (05/12/17 09:17:23)
git-committer:
Dirk Hohndel <dirk@…> (05/27/17 11:07:19)
Message:

QML UI: show the VendorList? on the Download from DC

Signed-off-by: Tomaz Canabrava <tcanabrava@…>
Signed-off-by: Dirk Hohndel <dirk@…>

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • mobile-widgets/qml/DownloadFromDiveComputer.qml

    r99515922 rf78fdf3  
    3636                GridLayout {
    3737                        columns: 2
    38                         Kirigami.Label { text: qsTr(" Vendor name: ") }  ComboBox { Layout.fillWidth: true }
     38                        Kirigami.Label { text: qsTr(" Vendor name: ") }
     39                        ComboBox {
     40                                Layout.fillWidth: true
     41                                model: vendorList
     42                        }
    3943                        Kirigami.Label { text: qsTr(" Dive Computer:") } ComboBox { Layout.fillWidth: true }
    4044                }
  • subsurface-mobile-helper.cpp

    r59ed9ea3 rf78fdf3  
    2222#include "qt-models/gpslistmodel.h"
    2323#include "mobile-widgets/qmlprofile.h"
     24#include "core/downloadfromdcthread.h"
    2425
    2526#include "mobile-widgets/qml/kirigami/src/kirigamiplugin.h"
     
    6869        ctxt->setContextProperty("diveModel", sortModel);
    6970        ctxt->setContextProperty("gpsModel", gpsSortModel);
     71        ctxt->setContextProperty("vendorList", vendorList);
     72
    7073        engine.load(QUrl(QStringLiteral("qrc:///qml/main.qml")));
    7174        qqWindowObject = engine.rootObjects().value(0);
Note: See TracChangeset for help on using the changeset viewer.