Changeset 0e4c996 in subsurface


Ignore:
Timestamp:
May 27, 2017, 11:07:19 AM (5 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
54bb5cc
Parents:
f78fdf3
git-author:
Tomaz Canabrava <tcanabrava@…> (05/12/17 09:29:45)
git-committer:
Dirk Hohndel <dirk@…> (05/27/17 11:07:19)
Message:

QML UI: Fill the product list

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

Location:
mobile-widgets
Files:
3 edited

Legend:

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

    rf78fdf3 r0e4c996  
    3838                        Kirigami.Label { text: qsTr(" Vendor name: ") }
    3939                        ComboBox {
     40                                id: comboVendor
    4041                                Layout.fillWidth: true
    4142                                model: vendorList
    4243                        }
    43                         Kirigami.Label { text: qsTr(" Dive Computer:") } ComboBox { Layout.fillWidth: true }
     44                        Kirigami.Label { text: qsTr(" Dive Computer:") }
     45                        ComboBox {
     46                                id: comboProduct
     47                                Layout.fillWidth: true
     48                                model: manager.getDCListFromVendor(comboVendor.currentText)
     49                        }
    4450                }
    4551
  • mobile-widgets/qmlmanager.cpp

    r8525805 r0e4c996  
    2525#include "core/membuffer.h"
    2626#include "qt-models/tankinfomodel.h"
     27#include "core/downloadfromdcthread.h"
    2728
    2829QMLManager *QMLManager::m_instance = NULL;
     
    15141515        emit showPinChanged();
    15151516}
     1517
     1518QStringList QMLManager::getDCListFromVendor(const QString& vendor)
     1519{
     1520        return productList[vendor];
     1521}
  • mobile-widgets/qmlmanager.h

    r8525805 r0e4c996  
    114114        bool showPin() const;
    115115        void setShowPin(bool enable);
     116        Q_INVOKABLE QStringList getDCListFromVendor(const QString& vendor);
    116117
    117118public slots:
Note: See TracChangeset for help on using the changeset viewer.