Skip to content
Snippets Groups Projects
Commit d03d4073 authored by Andrey Daragan's avatar Andrey Daragan
Browse files

[+] Changed code.

parent f9f0d28f
No related branches found
No related tags found
1 merge request!11Cellframe clone
...@@ -84,15 +84,4 @@ void DapServiceController::findEmittedSignal(const QVariant &aValue) ...@@ -84,15 +84,4 @@ void DapServiceController::findEmittedSignal(const QVariant &aValue)
} }
} }
/// Method that implements the singleton pattern for the qml layer.
/// @param engine QML application.
/// @param scriptEngine The QJSEngine class provides an environment for evaluating JavaScript code.
QObject *DapServiceController::singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
return &getInstance();
}
...@@ -74,7 +74,7 @@ signals: ...@@ -74,7 +74,7 @@ signals:
/// @param version Version /// @param version Version
void versionChanged(const QString &version); void versionChanged(const QString &version);
void addWalletResponded(); void addWalletResponded(bool);
private slots: private slots:
/// Register command. /// Register command.
...@@ -82,12 +82,6 @@ private slots: ...@@ -82,12 +82,6 @@ private slots:
/// Find the emitted signal. /// Find the emitted signal.
/// @param aValue Transmitted parameter. /// @param aValue Transmitted parameter.
void findEmittedSignal(const QVariant& aValue); void findEmittedSignal(const QVariant& aValue);
public slots:
/// Method that implements the singleton pattern for the qml layer.
/// @param engine QML application.
/// @param scriptEngine The QJSEngine class provides an environment for evaluating JavaScript code.
static QObject *singletonProvider(QQmlEngine *engine, QJSEngine *scriptEngine);
}; };
#endif // DAPSERVICECONTROLLER_H #endif // DAPSERVICECONTROLLER_H
...@@ -2,6 +2,16 @@ import QtQuick 2.4 ...@@ -2,6 +2,16 @@ import QtQuick 2.4
DapDashboardTopPanelForm DapDashboardTopPanelForm
{ {
ListModel
{
id: modelWallets
}
function updateModel(name)
{
modelWallets.append({ "name" : name })
}
dapAddWalletButton.onClicked: dapAddWalletButton.onClicked:
{ {
dapServiceController.requestToService("ADD", 5); dapServiceController.requestToService("ADD", 5);
......
...@@ -37,26 +37,7 @@ DapAbstractTopPanel ...@@ -37,26 +37,7 @@ DapAbstractTopPanel
{ {
id: comboboxWallet id: comboboxWallet
model: ListModel model: modelWallets
{
id: сonversionList
ListElement
{
text: "all wallets"
}
ListElement
{
text: "Money for children"
}
ListElement
{
text: "Money for education"
}
ListElement
{
text: "Money for medicine"
}
}
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png" indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png" indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt sidePaddingNormal: 0 * pt
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment