diff --git a/CellFrameDashboardGUI/DapServiceController.h b/CellFrameDashboardGUI/DapServiceController.h index 9e40b9068f5f2acc3b2cb0d69fe67f58058ef286..4943d9cb4aa02d46541e42fccd4d7e144424cce8 100755 --- a/CellFrameDashboardGUI/DapServiceController.h +++ b/CellFrameDashboardGUI/DapServiceController.h @@ -80,7 +80,7 @@ public: Q_INVOKABLE void executeCommand(const QString& command); void getWalletInfo(const QString& asWalletName); - + /// Request about new netowrk list void getNetworkList(); signals: diff --git a/CellFrameDashboardGUI/DapSettingsNetworkModel.cpp b/CellFrameDashboardGUI/DapSettingsNetworkModel.cpp index e3aa141193950ee0648470967025ad0f2a5abc4e..e6567a038718a95644e9f8c72238c9c2bf725fa7 100644 --- a/CellFrameDashboardGUI/DapSettingsNetworkModel.cpp +++ b/CellFrameDashboardGUI/DapSettingsNetworkModel.cpp @@ -3,7 +3,7 @@ DapSettingsNetworkModel::DapSettingsNetworkModel(QObject *parent) : QAbstractListModel(parent), m_CurrentIndex(-1) { - m_NetworkList = QStringList() << "First" << "Second" << "Third" << "Forth"; + } DapSettingsNetworkModel& DapSettingsNetworkModel::getInstance() diff --git a/CellFrameDashboardGUI/DapSettingsNetworkModel.h b/CellFrameDashboardGUI/DapSettingsNetworkModel.h index 05ce86cde6b4e64f9c3221114b2482d8112d6423..216d012900777673f5863c34a6653d170e9c4036 100644 --- a/CellFrameDashboardGUI/DapSettingsNetworkModel.h +++ b/CellFrameDashboardGUI/DapSettingsNetworkModel.h @@ -9,9 +9,8 @@ class DapSettingsNetworkModel : public QAbstractListModel { Q_OBJECT -// Q_PROPERTY(QString CurrentNetwork READ getCurrentNetwork WRITE setCurrentNetwork NOTIFY currentNetworkChanged) - public: + /// Enumeration display role enum DisplayRole { DisplayName = Qt::UserRole }; @@ -23,20 +22,34 @@ private: public: explicit DapSettingsNetworkModel(QObject *parent = nullptr); + /// Get instance of this object + /// @return instance static DapSettingsNetworkModel &getInstance(); + /// Overload methods int rowCount(const QModelIndex& parent) const; QVariant data(const QModelIndex& index, int role) const; QHash<int, QByteArray> roleNames() const; + /// Get current network which was selected + /// @return name of current network Q_INVOKABLE QString getCurrentNetwork() const; + /// Get current index which was selected + /// @return index of current network Q_INVOKABLE int getCurrentIndex() const; public slots: + /// Set new network list + /// @param List of network void setNetworkList(const QStringList& aNetworkList); + /// Set current network which was selected in combobox + /// @param name of network + /// @param index of network void setCurrentNetwork(QString CurrentNetwork, int CurrentIndex); signals: + /// Signal about changing current network + /// @param name of network which was selected void currentNetworkChanged(QString currentNetwork); }; diff --git a/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml b/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml index d1f6abc94427bb3d534e7151c05b45b650fb62d7..f7897fe4e805a44e761276f288f82fb2f4cf7e2e 100644 --- a/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml +++ b/CellFrameDashboardGUI/DapUiQmlScreenSettings.qml @@ -31,24 +31,6 @@ DapUiQmlScreenSettingsForm { section.property: "name" section.criteria: ViewSection.FullString - section.delegate: Component { - - Rectangle { - width: parent.width - height: 30 * pt - color: "#DFE1E6" - - Text { - anchors.fill: parent - anchors.leftMargin: 18 * pt - verticalAlignment: Qt.AlignVCenter - text: section - font.family: "Roboto" - font.pixelSize: 12 * pt - color: "#5F5F63" - } - } - - } + section.delegate: DapUiQmlScreenSettingsSection {} } } diff --git a/CellFrameDashboardGUI/DapUiQmlScreenSettingsSection.qml b/CellFrameDashboardGUI/DapUiQmlScreenSettingsSection.qml new file mode 100644 index 0000000000000000000000000000000000000000..51d10f3f663f3837b9c9e5ffba1b2df6651d98cb --- /dev/null +++ b/CellFrameDashboardGUI/DapUiQmlScreenSettingsSection.qml @@ -0,0 +1,21 @@ +import QtQuick 2.0 + +Component { + + Rectangle { + width: parent.width + height: 30 * pt + color: "#DFE1E6" + + Text { + anchors.fill: parent + anchors.leftMargin: 18 * pt + verticalAlignment: Qt.AlignVCenter + text: section + font.family: "Roboto" + font.pixelSize: 12 * pt + color: "#5F5F63" + } + } + +} diff --git a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml index ee4a5373e47730891e5f5ecd52dff3816ca4dc70..30286e2c369761260bcb845cba90c05cf553666f 100644 --- a/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml +++ b/CellFrameDashboardGUI/DapUiQmlWidgetSettingsNetwork.qml @@ -17,7 +17,6 @@ DapUiQmlWidgetSettingsNetworkForm { currentIndex: dapSettingsNetworkModel.getCurrentIndex() onCurrentTextChanged: { - console.debug(currentText); if(dapSettingsNetworkModel.getCurrentIndex() !== currentIndex) { dapSettingsNetworkModel.setCurrentNetwork(currentText, currentIndex); } diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index 182598de8f2f040180e2ebc30a923fe1385e494a..5f7955c323df1b6fb80dfcad029cdae2d96427c7 100755 --- a/CellFrameDashboardGUI/qml.qrc +++ b/CellFrameDashboardGUI/qml.qrc @@ -62,5 +62,6 @@ <file>DapUiQmlWidgetSettingsNetworkForm.ui.qml</file> <file>DapUiQmlScreenSettings.qml</file> <file>DapUiQmlScreenSettingsForm.ui.qml</file> + <file>DapUiQmlScreenSettingsSection.qml</file> </qresource> </RCC> diff --git a/CellFrameDashboardService/DapChainDashboardService.h b/CellFrameDashboardService/DapChainDashboardService.h index 0baa9630c862fe4162ce9157ad3623453102a60d..b7ae8b64c437a380ab16d6a648de76362f1566af 100755 --- a/CellFrameDashboardService/DapChainDashboardService.h +++ b/CellFrameDashboardService/DapChainDashboardService.h @@ -105,9 +105,11 @@ public slots: /// Get history /// @return QList data history QVariant getHistory() const; - + /// Get network list + /// @return Network list QStringList getNetworkList() const; - + /// Change current network + /// @param name of network whcih was selected void changeCurrentNetwork(const QString& aNetwork); private slots: diff --git a/CellFrameDashboardService/DapChainNetworkHandler.h b/CellFrameDashboardService/DapChainNetworkHandler.h index 5cbdde508f60775cbe47936be8c350818c96adde..515cd2298f0789ad760cb122870ab6aa67a6b9cc 100644 --- a/CellFrameDashboardService/DapChainNetworkHandler.h +++ b/CellFrameDashboardService/DapChainNetworkHandler.h @@ -17,6 +17,8 @@ private: public: explicit DapChainNetworkHandler(QObject *parent = nullptr); + /// Get network list + /// @return Network list QStringList getNetworkList(); };