diff --git a/ libdap-qt-ui-chain-wallet.pri b/ libdap-qt-ui-chain-wallet.pri deleted file mode 100644 index c34e5b37a49fff56e1e7ec6a33d65171926ed224..0000000000000000000000000000000000000000 --- a/ libdap-qt-ui-chain-wallet.pri +++ /dev/null @@ -1,82 +0,0 @@ -QT += core qml - -INCLUDEPATH += $$PWD $$PWD/../ - - -include (DapRPCProtocol/DapRPCProtocol.pri) - -win32{ - QMAKE_CXXFLAGS += -mno-ms-bitfields -} - -DISTFILES += - -HEADERS += \ - $$PWD/DapChainConvertor.h \ - $$PWD/DapHalper.h \ - $$PWD/DapHistoryType.h \ - $$PWD/DapLogMessage.h \ - $$PWD/DapNodeType.h \ - $$PWD/DapSettings.h \ - $$PWD/DapSystemTrayIcon.h \ - $$PWD/DapWallet.h \ - $$PWD/DapWalletHistoryEvent.h \ - $$PWD/DapWalletToken.h \ - $$PWD/Handlers/DapAbstractCommand.h \ - $$PWD/Handlers/DapActivateClientCommand.h \ - $$PWD/Handlers/DapAddWalletCommand.h \ - $$PWD/Handlers/DapCreateTransactionCommand.h \ - $$PWD/Handlers/DapExportLogCommand.h \ - $$PWD/Handlers/DapGetHistoryExecutedCmdCommand.h \ - $$PWD/Handlers/DapGetListNetworksCommand.h \ - $$PWD/Handlers/DapGetListWalletsCommand.h \ - $$PWD/Handlers/DapGetWalletAddressesCommand.h \ - $$PWD/Handlers/DapGetWalletHistoryCommand.h \ - $$PWD/Handlers/DapGetWalletTokenInfoCommand.h \ - $$PWD/Handlers/DapMempoolProcessCommand.h \ - $$PWD/Handlers/DapQuitApplicationCommand.h \ - $$PWD/Handlers/DapRunCmdCommand.h \ - $$PWD/Handlers/DapSaveHistoryExecutedCmdCommand.h \ - $$PWD/Handlers/DapUpdateLogsCommand.h \ - $$PWD/Models/DapWalletModel.h \ - $$PWD/ServiceClient/DapServiceClient.h \ - $$PWD/ServiceClient/DapServiceClientNativeAbstract.h \ - $$PWD/ServiceClient/DapServiceClientNativeLinux.h \ - $$PWD/ServiceClient/DapServiceClientNativeMacOS.h \ - $$PWD/ServiceClient/DapServiceClientNativeWin.h - -SOURCES += \ - $$PWD/DapChainConvertor.cpp \ - $$PWD/DapHalper.cpp \ - $$PWD/DapHistoryType.cpp \ - $$PWD/DapLogMessage.cpp \ - $$PWD/DapSettings.cpp \ - $$PWD/DapSystemTrayIcon.cpp \ - $$PWD/DapWallet.cpp \ - $$PWD/DapWalletHistoryEvent.cpp \ - $$PWD/DapWalletToken.cpp \ - $$PWD/Handlers/DapAbstractCommand.cpp \ - $$PWD/Handlers/DapActivateClientCommand.cpp \ - $$PWD/Handlers/DapAddWalletCommand.cpp \ - $$PWD/Handlers/DapCreateTransactionCommand.cpp \ - $$PWD/Handlers/DapExportLogCommand.cpp \ - $$PWD/Handlers/DapGetHistoryExecutedCmdCommand.cpp \ - $$PWD/Handlers/DapGetListNetworksCommand.cpp \ - $$PWD/Handlers/DapGetListWalletsCommand.cpp \ - $$PWD/Handlers/DapGetWalletAddressesCommand.cpp \ - $$PWD/Handlers/DapGetWalletHistoryCommand.cpp \ - $$PWD/Handlers/DapGetWalletTokenInfoCommand.cpp \ - $$PWD/Handlers/DapMempoolProcessCommand.cpp \ - $$PWD/Handlers/DapQuitApplicationCommand.cpp \ - $$PWD/Handlers/DapRunCmdCommand.cpp \ - $$PWD/Handlers/DapSaveHistoryExecutedCmdCommand.cpp \ - $$PWD/Handlers/DapUpdateLogsCommand.cpp \ - $$PWD/Models/DapWalletModel.cpp \ - $$PWD/ServiceClient/DapServiceClient.cpp \ - $$PWD/ServiceClient/DapServiceClientNativeAbstract.cpp \ - $$PWD/ServiceClient/DapServiceClientNativeLinux.cpp \ - $$PWD/ServiceClient/DapServiceClientNativeMacOS.cpp \ - $$PWD/ServiceClient/DapServiceClientNativeWin.cpp - - - diff --git a/DapRPCProtocol/DapRPCProtocol.pri b/dapRPCProtocol/DapRPCProtocol.pri similarity index 100% rename from DapRPCProtocol/DapRPCProtocol.pri rename to dapRPCProtocol/DapRPCProtocol.pri diff --git a/DapRPCProtocol/DapRpcAbstractServer.cpp b/dapRPCProtocol/DapRpcAbstractServer.cpp similarity index 100% rename from DapRPCProtocol/DapRpcAbstractServer.cpp rename to dapRPCProtocol/DapRpcAbstractServer.cpp diff --git a/DapRPCProtocol/DapRpcAbstractServer.h b/dapRPCProtocol/DapRpcAbstractServer.h similarity index 100% rename from DapRPCProtocol/DapRpcAbstractServer.h rename to dapRPCProtocol/DapRpcAbstractServer.h diff --git a/DapRPCProtocol/DapRpcLocalServer.cpp b/dapRPCProtocol/DapRpcLocalServer.cpp similarity index 100% rename from DapRPCProtocol/DapRpcLocalServer.cpp rename to dapRPCProtocol/DapRpcLocalServer.cpp diff --git a/DapRPCProtocol/DapRpcLocalServer.h b/dapRPCProtocol/DapRpcLocalServer.h similarity index 100% rename from DapRPCProtocol/DapRpcLocalServer.h rename to dapRPCProtocol/DapRpcLocalServer.h diff --git a/DapRPCProtocol/DapRpcMessage.cpp b/dapRPCProtocol/DapRpcMessage.cpp similarity index 100% rename from DapRPCProtocol/DapRpcMessage.cpp rename to dapRPCProtocol/DapRpcMessage.cpp diff --git a/DapRPCProtocol/DapRpcMessage.h b/dapRPCProtocol/DapRpcMessage.h similarity index 100% rename from DapRPCProtocol/DapRpcMessage.h rename to dapRPCProtocol/DapRpcMessage.h diff --git a/DapRPCProtocol/DapRpcService.cpp b/dapRPCProtocol/DapRpcService.cpp similarity index 100% rename from DapRPCProtocol/DapRpcService.cpp rename to dapRPCProtocol/DapRpcService.cpp diff --git a/DapRPCProtocol/DapRpcService.h b/dapRPCProtocol/DapRpcService.h similarity index 100% rename from DapRPCProtocol/DapRpcService.h rename to dapRPCProtocol/DapRpcService.h diff --git a/DapRPCProtocol/DapRpcServiceProvider.cpp b/dapRPCProtocol/DapRpcServiceProvider.cpp similarity index 100% rename from DapRPCProtocol/DapRpcServiceProvider.cpp rename to dapRPCProtocol/DapRpcServiceProvider.cpp diff --git a/DapRPCProtocol/DapRpcServiceProvider.h b/dapRPCProtocol/DapRpcServiceProvider.h similarity index 100% rename from DapRPCProtocol/DapRpcServiceProvider.h rename to dapRPCProtocol/DapRpcServiceProvider.h diff --git a/DapRPCProtocol/DapRpcServiceReply.cpp b/dapRPCProtocol/DapRpcServiceReply.cpp similarity index 100% rename from DapRPCProtocol/DapRpcServiceReply.cpp rename to dapRPCProtocol/DapRpcServiceReply.cpp diff --git a/DapRPCProtocol/DapRpcServiceReply.h b/dapRPCProtocol/DapRpcServiceReply.h similarity index 100% rename from DapRPCProtocol/DapRpcServiceReply.h rename to dapRPCProtocol/DapRpcServiceReply.h diff --git a/DapRPCProtocol/DapRpcServiceRequest.cpp b/dapRPCProtocol/DapRpcServiceRequest.cpp similarity index 100% rename from DapRPCProtocol/DapRpcServiceRequest.cpp rename to dapRPCProtocol/DapRpcServiceRequest.cpp diff --git a/DapRPCProtocol/DapRpcServiceRequest.h b/dapRPCProtocol/DapRpcServiceRequest.h similarity index 100% rename from DapRPCProtocol/DapRpcServiceRequest.h rename to dapRPCProtocol/DapRpcServiceRequest.h diff --git a/DapRPCProtocol/DapRpcSocket.cpp b/dapRPCProtocol/DapRpcSocket.cpp similarity index 100% rename from DapRPCProtocol/DapRpcSocket.cpp rename to dapRPCProtocol/DapRpcSocket.cpp diff --git a/DapRPCProtocol/DapRpcSocket.h b/dapRPCProtocol/DapRpcSocket.h similarity index 100% rename from DapRPCProtocol/DapRpcSocket.h rename to dapRPCProtocol/DapRpcSocket.h diff --git a/DapRPCProtocol/DapRpcTCPServer.cpp b/dapRPCProtocol/DapRpcTCPServer.cpp similarity index 100% rename from DapRPCProtocol/DapRpcTCPServer.cpp rename to dapRPCProtocol/DapRpcTCPServer.cpp diff --git a/DapRPCProtocol/DapRpcTCPServer.h b/dapRPCProtocol/DapRpcTCPServer.h similarity index 100% rename from DapRPCProtocol/DapRpcTCPServer.h rename to dapRPCProtocol/DapRpcTCPServer.h diff --git a/Handlers/DapAbstractCommand.cpp b/handlers/DapAbstractCommand.cpp similarity index 100% rename from Handlers/DapAbstractCommand.cpp rename to handlers/DapAbstractCommand.cpp diff --git a/Handlers/DapAbstractCommand.h b/handlers/DapAbstractCommand.h similarity index 100% rename from Handlers/DapAbstractCommand.h rename to handlers/DapAbstractCommand.h diff --git a/Handlers/DapActivateClientCommand.cpp b/handlers/DapActivateClientCommand.cpp similarity index 100% rename from Handlers/DapActivateClientCommand.cpp rename to handlers/DapActivateClientCommand.cpp diff --git a/Handlers/DapActivateClientCommand.h b/handlers/DapActivateClientCommand.h similarity index 100% rename from Handlers/DapActivateClientCommand.h rename to handlers/DapActivateClientCommand.h diff --git a/Handlers/DapAddWalletCommand.cpp b/handlers/DapAddWalletCommand.cpp similarity index 93% rename from Handlers/DapAddWalletCommand.cpp rename to handlers/DapAddWalletCommand.cpp index 514c596b9d7a9194cc0feae19c536b6fc3378bf0..0570ed61330ca8ef27b7ac0d7a97740f84b0e51c 100644 --- a/Handlers/DapAddWalletCommand.cpp +++ b/handlers/DapAddWalletCommand.cpp @@ -30,8 +30,8 @@ QVariant DapAddWalletCommand::respondToClient(const QVariant &arg1, const QVaria QJsonArray result; process.start(QString("%1 wallet new -w %2 -sign %3 -net %4 -restore %5").arg(CLI_PATH).arg(arg1.toString()).arg(arg2.toString()).arg(arg3.toString()).arg(arg4.toString())); process.waitForFinished(-1); - QString res = QString::fromLatin1(process.readAll()); - if(res.contains("already exists")) + QString resources = QString::fromLatin1(process.readAll()); + if(resources.contains("already exists")) { result.append(QJsonValue(false)); result.append(QJsonValue("Wallet already exists")); diff --git a/Handlers/DapAddWalletCommand.h b/handlers/DapAddWalletCommand.h similarity index 100% rename from Handlers/DapAddWalletCommand.h rename to handlers/DapAddWalletCommand.h diff --git a/Handlers/DapCreateTransactionCommand.cpp b/handlers/DapCreateTransactionCommand.cpp similarity index 100% rename from Handlers/DapCreateTransactionCommand.cpp rename to handlers/DapCreateTransactionCommand.cpp diff --git a/Handlers/DapCreateTransactionCommand.h b/handlers/DapCreateTransactionCommand.h similarity index 100% rename from Handlers/DapCreateTransactionCommand.h rename to handlers/DapCreateTransactionCommand.h diff --git a/Handlers/DapExportLogCommand.cpp b/handlers/DapExportLogCommand.cpp similarity index 100% rename from Handlers/DapExportLogCommand.cpp rename to handlers/DapExportLogCommand.cpp diff --git a/Handlers/DapExportLogCommand.h b/handlers/DapExportLogCommand.h similarity index 100% rename from Handlers/DapExportLogCommand.h rename to handlers/DapExportLogCommand.h diff --git a/Handlers/DapGetHistoryExecutedCmdCommand.cpp b/handlers/DapGetHistoryExecutedCmdCommand.cpp similarity index 100% rename from Handlers/DapGetHistoryExecutedCmdCommand.cpp rename to handlers/DapGetHistoryExecutedCmdCommand.cpp diff --git a/Handlers/DapGetHistoryExecutedCmdCommand.h b/handlers/DapGetHistoryExecutedCmdCommand.h similarity index 100% rename from Handlers/DapGetHistoryExecutedCmdCommand.h rename to handlers/DapGetHistoryExecutedCmdCommand.h diff --git a/Handlers/DapGetListNetworksCommand.cpp b/handlers/DapGetListNetworksCommand.cpp similarity index 100% rename from Handlers/DapGetListNetworksCommand.cpp rename to handlers/DapGetListNetworksCommand.cpp diff --git a/Handlers/DapGetListNetworksCommand.h b/handlers/DapGetListNetworksCommand.h similarity index 100% rename from Handlers/DapGetListNetworksCommand.h rename to handlers/DapGetListNetworksCommand.h diff --git a/Handlers/DapGetListWalletsCommand.cpp b/handlers/DapGetListWalletsCommand.cpp similarity index 97% rename from Handlers/DapGetListWalletsCommand.cpp rename to handlers/DapGetListWalletsCommand.cpp index e6d396425914a155f629c6e91b1cd6df730221de..82c11e9606ac1e8ebc157d18353c749512c445b8 100644 --- a/Handlers/DapGetListWalletsCommand.cpp +++ b/handlers/DapGetListWalletsCommand.cpp @@ -113,9 +113,9 @@ QVariant DapGetListWalletsCommand::respondToClient(const QVariant &arg1, const Q QProcess process; process.start(QString("%1 wallet list").arg(m_sCliPath)); process.waitForFinished(-1); - QString res = QString::fromLatin1(process.readAll()); + QString resources = QString::fromLatin1(process.readAll()); QRegularExpression rx("wallet:\\s(.+)\\s", QRegularExpression::MultilineOption); - QRegularExpressionMatchIterator itr = rx.globalMatch(res); + QRegularExpressionMatchIterator itr = rx.globalMatch(resources); while (itr.hasNext()) { QRegularExpressionMatch match = itr.next(); @@ -179,7 +179,6 @@ QVariant DapGetListWalletsCommand::respondToClient(const QVariant &arg1, const Q /// @return Service reply. QVariant DapGetListWalletsCommand::replyFromService() { - QObject * s = sender(); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); emit serviceResponded(reply->response().toJsonValue().toVariant().toByteArray()); diff --git a/Handlers/DapGetListWalletsCommand.h b/handlers/DapGetListWalletsCommand.h similarity index 100% rename from Handlers/DapGetListWalletsCommand.h rename to handlers/DapGetListWalletsCommand.h diff --git a/Handlers/DapGetWalletAddressesCommand.cpp b/handlers/DapGetWalletAddressesCommand.cpp similarity index 100% rename from Handlers/DapGetWalletAddressesCommand.cpp rename to handlers/DapGetWalletAddressesCommand.cpp diff --git a/Handlers/DapGetWalletAddressesCommand.h b/handlers/DapGetWalletAddressesCommand.h similarity index 100% rename from Handlers/DapGetWalletAddressesCommand.h rename to handlers/DapGetWalletAddressesCommand.h diff --git a/Handlers/DapGetWalletHistoryCommand.cpp b/handlers/DapGetWalletHistoryCommand.cpp similarity index 100% rename from Handlers/DapGetWalletHistoryCommand.cpp rename to handlers/DapGetWalletHistoryCommand.cpp diff --git a/Handlers/DapGetWalletHistoryCommand.h b/handlers/DapGetWalletHistoryCommand.h similarity index 100% rename from Handlers/DapGetWalletHistoryCommand.h rename to handlers/DapGetWalletHistoryCommand.h diff --git a/Handlers/DapGetWalletTokenInfoCommand.cpp b/handlers/DapGetWalletTokenInfoCommand.cpp similarity index 100% rename from Handlers/DapGetWalletTokenInfoCommand.cpp rename to handlers/DapGetWalletTokenInfoCommand.cpp diff --git a/Handlers/DapGetWalletTokenInfoCommand.h b/handlers/DapGetWalletTokenInfoCommand.h similarity index 100% rename from Handlers/DapGetWalletTokenInfoCommand.h rename to handlers/DapGetWalletTokenInfoCommand.h diff --git a/Handlers/DapMempoolProcessCommand.cpp b/handlers/DapMempoolProcessCommand.cpp similarity index 100% rename from Handlers/DapMempoolProcessCommand.cpp rename to handlers/DapMempoolProcessCommand.cpp diff --git a/Handlers/DapMempoolProcessCommand.h b/handlers/DapMempoolProcessCommand.h similarity index 100% rename from Handlers/DapMempoolProcessCommand.h rename to handlers/DapMempoolProcessCommand.h diff --git a/Handlers/DapQuitApplicationCommand.cpp b/handlers/DapQuitApplicationCommand.cpp similarity index 100% rename from Handlers/DapQuitApplicationCommand.cpp rename to handlers/DapQuitApplicationCommand.cpp diff --git a/Handlers/DapQuitApplicationCommand.h b/handlers/DapQuitApplicationCommand.h similarity index 100% rename from Handlers/DapQuitApplicationCommand.h rename to handlers/DapQuitApplicationCommand.h diff --git a/Handlers/DapRunCmdCommand.cpp b/handlers/DapRunCmdCommand.cpp similarity index 100% rename from Handlers/DapRunCmdCommand.cpp rename to handlers/DapRunCmdCommand.cpp diff --git a/Handlers/DapRunCmdCommand.h b/handlers/DapRunCmdCommand.h similarity index 100% rename from Handlers/DapRunCmdCommand.h rename to handlers/DapRunCmdCommand.h diff --git a/Handlers/DapSaveHistoryExecutedCmdCommand.cpp b/handlers/DapSaveHistoryExecutedCmdCommand.cpp similarity index 100% rename from Handlers/DapSaveHistoryExecutedCmdCommand.cpp rename to handlers/DapSaveHistoryExecutedCmdCommand.cpp diff --git a/Handlers/DapSaveHistoryExecutedCmdCommand.h b/handlers/DapSaveHistoryExecutedCmdCommand.h similarity index 100% rename from Handlers/DapSaveHistoryExecutedCmdCommand.h rename to handlers/DapSaveHistoryExecutedCmdCommand.h diff --git a/Handlers/DapUpdateLogsCommand.cpp b/handlers/DapUpdateLogsCommand.cpp similarity index 100% rename from Handlers/DapUpdateLogsCommand.cpp rename to handlers/DapUpdateLogsCommand.cpp diff --git a/Handlers/DapUpdateLogsCommand.h b/handlers/DapUpdateLogsCommand.h similarity index 100% rename from Handlers/DapUpdateLogsCommand.h rename to handlers/DapUpdateLogsCommand.h diff --git a/libdap-qt-ui-chain-wallet.pri b/libdap-qt-ui-chain-wallet.pri new file mode 100644 index 0000000000000000000000000000000000000000..47ae284e733f5454f44db28a65cb73f48a47afd2 --- /dev/null +++ b/libdap-qt-ui-chain-wallet.pri @@ -0,0 +1,85 @@ +QT += core qml + +INCLUDEPATH += $$PWD $$PWD/../ + + +include (dapRPCProtocol/DapRPCProtocol.pri) + +win32{ + QMAKE_CXXFLAGS += -mno-ms-bitfields +} + +DISTFILES += + +HEADERS += \ + $$PWD/DapChainConvertor.h \ + $$PWD/DapHalper.h \ + $$PWD/DapHistoryType.h \ + $$PWD/DapLogMessage.h \ + $$PWD/DapNodeType.h \ + $$PWD/DapSettings.h \ + $$PWD/DapSystemTrayIcon.h \ + $$PWD/DapWallet.h \ + $$PWD/DapWalletHistoryEvent.h \ + $$PWD/DapWalletToken.h \ + $$PWD/handlers/DapAbstractCommand.h \ + $$PWD/handlers/DapActivateClientCommand.h \ + $$PWD/handlers/DapAddWalletCommand.h \ + $$PWD/handlers/DapCreateTransactionCommand.h \ + $$PWD/handlers/DapExportLogCommand.h \ + $$PWD/handlers/DapGetHistoryExecutedCmdCommand.h \ + $$PWD/handlers/DapGetListNetworksCommand.h \ + $$PWD/handlers/DapGetListWalletsCommand.h \ + $$PWD/handlers/DapGetWalletAddressesCommand.h \ + $$PWD/handlers/DapGetWalletHistoryCommand.h \ + $$PWD/handlers/DapGetWalletTokenInfoCommand.h \ + $$PWD/handlers/DapMempoolProcessCommand.h \ + $$PWD/handlers/DapQuitApplicationCommand.h \ + $$PWD/handlers/DapRunCmdCommand.h \ + $$PWD/handlers/DapSaveHistoryExecutedCmdCommand.h \ + $$PWD/handlers/DapUpdateLogsCommand.h \ + $$PWD/models/DapWalletModel.h \ + $$PWD/serviceClient/DapServiceClient.h \ + $$PWD/serviceClient/DapServiceClientNativeAbstract.h \ + $$PWD/serviceClient/DapServiceClientNativeLinux.h \ + $$PWD/serviceClient/DapServiceClientNativeMacOS.h \ + $$PWD/serviceClient/DapServiceClientNativeWin.h + +SOURCES += \ + $$PWD/DapChainConvertor.cpp \ + $$PWD/DapHalper.cpp \ + $$PWD/DapHistoryType.cpp \ + $$PWD/DapLogMessage.cpp \ + $$PWD/DapSettings.cpp \ + $$PWD/DapSystemTrayIcon.cpp \ + $$PWD/DapWallet.cpp \ + $$PWD/DapWalletHistoryEvent.cpp \ + $$PWD/DapWalletToken.cpp \ + $$PWD/handlers/DapAbstractCommand.cpp \ + $$PWD/handlers/DapActivateClientCommand.cpp \ + $$PWD/handlers/DapAddWalletCommand.cpp \ + $$PWD/handlers/DapCreateTransactionCommand.cpp \ + $$PWD/handlers/DapExportLogCommand.cpp \ + $$PWD/handlers/DapGetHistoryExecutedCmdCommand.cpp \ + $$PWD/handlers/DapGetListNetworksCommand.cpp \ + $$PWD/handlers/DapGetListWalletsCommand.cpp \ + $$PWD/handlers/DapGetWalletAddressesCommand.cpp \ + $$PWD/handlers/DapGetWalletHistoryCommand.cpp \ + $$PWD/handlers/DapGetWalletTokenInfoCommand.cpp \ + $$PWD/handlers/DapMempoolProcessCommand.cpp \ + $$PWD/handlers/DapQuitApplicationCommand.cpp \ + $$PWD/handlers/DapRunCmdCommand.cpp \ + $$PWD/handlers/DapSaveHistoryExecutedCmdCommand.cpp \ + $$PWD/handlers/DapUpdateLogsCommand.cpp \ + $$PWD/models/DapWalletModel.cpp \ + $$PWD/serviceClient/DapServiceClient.cpp \ + $$PWD/serviceClient/DapServiceClientNativeAbstract.cpp \ + $$PWD/serviceClient/DapServiceClientNativeLinux.cpp \ + $$PWD/serviceClient/DapServiceClientNativeMacOS.cpp \ + $$PWD/serviceClient/DapServiceClientNativeWin.cpp + +RESOURCES += \ + $$PWD/libdap-qt-ui-chain-wallet.qrc + + + diff --git a/libdap-qt-ui-chain-wallet.qrc b/libdap-qt-ui-chain-wallet.qrc new file mode 100644 index 0000000000000000000000000000000000000000..5aee0596244e02842a31830ff8a07702e11e6b91 --- /dev/null +++ b/libdap-qt-ui-chain-wallet.qrc @@ -0,0 +1,18 @@ +<RCC> + <qresource prefix="/"> + <file>resources/QML/DapFontRoboto.qml</file> + <file>resources/fonts/LICENSE.txt</file> + <file>resources/fonts/roboto_black_italic.ttf</file> + <file>resources/fonts/roboto_black.ttf</file> + <file>resources/fonts/roboto_bold_italic.ttf</file> + <file>resources/fonts/roboto_bold.ttf</file> + <file>resources/fonts/roboto_italic.ttf</file> + <file>resources/fonts/roboto_light_italic.ttf</file> + <file>resources/fonts/roboto_light.ttf</file> + <file>resources/fonts/roboto_medium_italic.ttf</file> + <file>resources/fonts/roboto_medium.ttf</file> + <file>resources/fonts/roboto_regular.ttf</file> + <file>resources/fonts/roboto_thin_italic.ttf</file> + <file>resources/fonts/roboto_thin.ttf</file> + </qresource> +</RCC> diff --git a/Models/DapWalletModel.cpp b/models/DapWalletModel.cpp similarity index 100% rename from Models/DapWalletModel.cpp rename to models/DapWalletModel.cpp diff --git a/Models/DapWalletModel.h b/models/DapWalletModel.h similarity index 100% rename from Models/DapWalletModel.h rename to models/DapWalletModel.h diff --git a/resources/QML/DapFontRoboto.qml b/resources/QML/DapFontRoboto.qml new file mode 100644 index 0000000000000000000000000000000000000000..a9f787f9a635a98cecf75bacf16dea9a30c55d0e --- /dev/null +++ b/resources/QML/DapFontRoboto.qml @@ -0,0 +1,219 @@ +import QtQuick 2.0 +import "qrc:/" + +Item +{ + ///@details dapMainFontTheme ID of item with all project fonts + property alias dapMainFontTheme: dapFontsObjects + + //Add Font Loader + DapFont + { + id: dapFonts + dapFontPath: "qrc:/resources/fonts/" + dapFontNames: ["roboto_black.ttf", + "roboto_light.ttf", + "roboto_medium.ttf", + "roboto_regular.ttf", + "roboto_thin.ttf"] + } + //Create fonts + QtObject + { + + id: dapFontsObjects + + ///@details dapFontRobotoBlack14 Font of Roboto font family (black, 14pt) + property font dapFontRobotoBlack14: Qt.font({ + family: dapFonts.dapProjectFonts[0].name, + bold: false, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoBlackCustom Font of Roboto font family (black, without parameters) + property font dapFontRobotoBlackCustom: Qt.font({ family: dapFonts.dapProjectFonts[0].name }) + + ///@details dapFontRobotoBlackItalic14 Font of Roboto font family (black-italic, 14pt) + property font dapFontRobotoBlackItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[0].name, + bold: false, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoBlackItalicCustom Font of Roboto font family (black-italic, without parameters) + property font dapFontRobotoBlackItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[0].name, + italic: true + }) + + ///@details dapFontRobotoBold14 Font of Roboto font family (bold, 14pt) + property font dapFontRobotoBold14: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: true, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoBoldCustom Font of Roboto font family (bold, without parameters) + property font dapFontRobotoBoldCustom: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: true + }) + + ///@detalis dapFontRobotoBoldItalic14 Font of Roboto font family (bold-italic, 14pt) + property font dapFontRobotoBoldItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: true, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoBoldItalicCustom Font of Roboto font family (bold-italic, without parameters) + property font dapFontRobotoBoldItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: true, + italic: true + }) + + ///@details dapFontRobotoLight14 Font of Roboto font family (light, 14pt) + property font dapFontRobotoLight14: Qt.font({ + family: dapFonts.dapProjectFonts[1].name, + bold: false, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoLightCustom Font of Roboto font family (light, without parameters) + property font dapFontRobotoLightCustom: Qt.font({ family: dapFonts.dapProjectFonts[1].name }) + + ///@details dapFontRobotoLightItalic14 Font of Roboto font family (light-italic, 14pt) + property font dapFontRobotoLightItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[1].name, + bold: false, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoLightItalicCustom Font of Roboto font family (light-italic, without parameters) + property font dapFontRobotoLightItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[1].name, + italic: true + }) + ///@details dapFontRobotoMedium14 Font of Roboto font family (medium, 14pt) + property font dapFontRobotoMedium14: Qt.font({ + family: dapFonts.dapProjectFonts[2].name, + bold: false, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoMediumCustom Font of Roboto font family (medium, without parameters) + property font dapFontRobotoMediumCustom: Qt.font({ family: dapFonts.dapProjectFonts[2].name }) + + ///@details dapFontRobotoMediumItalic14 Font of Roboto font family (medium-italic, 14pt) + property font dapFontRobotoMediumItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[2].name, + bold: false, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoMediumItalicCustom Font of Roboto font family (medium-italic, without parameters) + property font dapFontRobotoMediumItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[2].name, + italic: true + }) + + ///@details dapFontRobotoItalic14 Font of Roboto font family (italic, 14pt) + property font dapFontRobotoItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoItalicCustom Font of Roboto font family (italic, without parameters) + property font dapFontRobotoItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + italic: true + }) + + ///@details dapFontRobotoRegular14 Font of Roboto font family (regular, 14pt) + property font dapFontRobotoRegular14: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoRegular12 Font of Roboto font family (regular, 12pt) + property font dapFontRobotoRegular12: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 12 + }) + + ///@details dapFontRobotoRegular16 Font of Roboto font family (regular, 16pt) + property font dapFontRobotoRegular16: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 16 + }) + + ///@details dapFontRobotoRegular18 Font of Roboto font family (regular, 18pt) + property font dapFontRobotoRegular18: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 18 + }) + + ///@details dapFontRobotoRegularCustom Font of Roboto font family (regular, without parameters) + property font dapFontRobotoRegularCustom: Qt.font({ family: dapFonts.dapProjectFonts[3].name }) + + ///@details dapFontRobotoThin14 Font of Roboto font family (thin, 14pt) + property font dapFontRobotoThin14: Qt.font({ + family: dapFonts.dapProjectFonts[4].name, + bold: false, + italic: false, + pixelSize: 14 + }) + + ///@details dapFontRobotoThinCustom Font of Roboto font family (thin, without parameters) + property font dapFontRobotoThinCustom: Qt.font({ family: dapFonts.dapProjectFonts[4].name }) + + ///@details dapFontRobotoThinItalic14 Font of Roboto font family (thin-italic, 14pt) + property font dapFontRobotoThinItalic14: Qt.font({ + family: dapFonts.dapProjectFonts[4].name, + bold: false, + italic: true, + pixelSize: 14 + }) + + ///@details dapFontRobotoThinItalicCustom Font of Roboto font family (thin-italic, without parameters) + property font dapFontRobotoThinItalicCustom: Qt.font({ + family: dapFonts.dapProjectFonts[4].name, + italic: true + }) + + ///@details dapFontRobotoRegular11 Font of Roboto font family (regular, 11pt) + property font dapFontRobotoRegular11: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 11 + }) + + ///@details dapFontRobotoRegular10 Font of Roboto font family (regular, 10pt) + property font dapFontRobotoRegular10: Qt.font({ + family: dapFonts.dapProjectFonts[3].name, + bold: false, + italic: false, + pixelSize: 10 + }) + } +} diff --git a/resources/fonts/LICENSE.txt b/resources/fonts/LICENSE.txt new file mode 100644 index 0000000000000000000000000000000000000000..d645695673349e3947e8e5ae42332d0ac3164cd7 --- /dev/null +++ b/resources/fonts/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/resources/fonts/roboto_black.ttf b/resources/fonts/roboto_black.ttf new file mode 100644 index 0000000000000000000000000000000000000000..51c71bbe2d565247a020319ff9b324e8c8e05353 Binary files /dev/null and b/resources/fonts/roboto_black.ttf differ diff --git a/resources/fonts/roboto_black_italic.ttf b/resources/fonts/roboto_black_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ca20ca399981d14c441b9ea2f3decc1c88e69da4 Binary files /dev/null and b/resources/fonts/roboto_black_italic.ttf differ diff --git a/resources/fonts/roboto_bold.ttf b/resources/fonts/roboto_bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e612852d259930d0dcc632318ac0f15ae312422b Binary files /dev/null and b/resources/fonts/roboto_bold.ttf differ diff --git a/resources/fonts/roboto_bold_italic.ttf b/resources/fonts/roboto_bold_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..677bc045e565c7b74c3ce0f8ad55df305bb28a29 Binary files /dev/null and b/resources/fonts/roboto_bold_italic.ttf differ diff --git a/resources/fonts/roboto_italic.ttf b/resources/fonts/roboto_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..5fd05c3b645a8fdcdeffae18bffc19369514a76a Binary files /dev/null and b/resources/fonts/roboto_italic.ttf differ diff --git a/resources/fonts/roboto_light.ttf b/resources/fonts/roboto_light.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4f1fb5805f432036d390a353c43191f06b0ad6e0 Binary files /dev/null and b/resources/fonts/roboto_light.ttf differ diff --git a/resources/fonts/roboto_light_italic.ttf b/resources/fonts/roboto_light_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..eec0ae9be8f8f74279afe5253de5286c04fc2fad Binary files /dev/null and b/resources/fonts/roboto_light_italic.ttf differ diff --git a/resources/fonts/roboto_medium.ttf b/resources/fonts/roboto_medium.ttf new file mode 100644 index 0000000000000000000000000000000000000000..86d1c52ed5ee125fdfa6ed63a58f5c02f08dd246 Binary files /dev/null and b/resources/fonts/roboto_medium.ttf differ diff --git a/resources/fonts/roboto_medium_italic.ttf b/resources/fonts/roboto_medium_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..66aa174f058481c39bcd60bdb464a1b3f78e4dcc Binary files /dev/null and b/resources/fonts/roboto_medium_italic.ttf differ diff --git a/resources/fonts/roboto_regular.ttf b/resources/fonts/roboto_regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..cb8ffcf1ad2c163bbf95ce6ff829b537d8bebd18 Binary files /dev/null and b/resources/fonts/roboto_regular.ttf differ diff --git a/resources/fonts/roboto_thin.ttf b/resources/fonts/roboto_thin.ttf new file mode 100644 index 0000000000000000000000000000000000000000..a85eb7c29505713608ec9fd8489944977914be21 Binary files /dev/null and b/resources/fonts/roboto_thin.ttf differ diff --git a/resources/fonts/roboto_thin_italic.ttf b/resources/fonts/roboto_thin_italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ac77951b80fc3ad37533dcae49c9e8085c42f1fb Binary files /dev/null and b/resources/fonts/roboto_thin_italic.ttf differ diff --git a/ServiceClient/DapServiceClient.cpp b/serviceClient/DapServiceClient.cpp similarity index 100% rename from ServiceClient/DapServiceClient.cpp rename to serviceClient/DapServiceClient.cpp diff --git a/ServiceClient/DapServiceClient.h b/serviceClient/DapServiceClient.h similarity index 100% rename from ServiceClient/DapServiceClient.h rename to serviceClient/DapServiceClient.h diff --git a/ServiceClient/DapServiceClientNativeAbstract.cpp b/serviceClient/DapServiceClientNativeAbstract.cpp similarity index 100% rename from ServiceClient/DapServiceClientNativeAbstract.cpp rename to serviceClient/DapServiceClientNativeAbstract.cpp diff --git a/ServiceClient/DapServiceClientNativeAbstract.h b/serviceClient/DapServiceClientNativeAbstract.h similarity index 100% rename from ServiceClient/DapServiceClientNativeAbstract.h rename to serviceClient/DapServiceClientNativeAbstract.h diff --git a/ServiceClient/DapServiceClientNativeLinux.cpp b/serviceClient/DapServiceClientNativeLinux.cpp similarity index 100% rename from ServiceClient/DapServiceClientNativeLinux.cpp rename to serviceClient/DapServiceClientNativeLinux.cpp diff --git a/ServiceClient/DapServiceClientNativeLinux.h b/serviceClient/DapServiceClientNativeLinux.h similarity index 100% rename from ServiceClient/DapServiceClientNativeLinux.h rename to serviceClient/DapServiceClientNativeLinux.h diff --git a/ServiceClient/DapServiceClientNativeMacOS.cpp b/serviceClient/DapServiceClientNativeMacOS.cpp similarity index 100% rename from ServiceClient/DapServiceClientNativeMacOS.cpp rename to serviceClient/DapServiceClientNativeMacOS.cpp diff --git a/ServiceClient/DapServiceClientNativeMacOS.h b/serviceClient/DapServiceClientNativeMacOS.h similarity index 100% rename from ServiceClient/DapServiceClientNativeMacOS.h rename to serviceClient/DapServiceClientNativeMacOS.h diff --git a/ServiceClient/DapServiceClientNativeWin.cpp b/serviceClient/DapServiceClientNativeWin.cpp similarity index 100% rename from ServiceClient/DapServiceClientNativeWin.cpp rename to serviceClient/DapServiceClientNativeWin.cpp diff --git a/ServiceClient/DapServiceClientNativeWin.h b/serviceClient/DapServiceClientNativeWin.h similarity index 100% rename from ServiceClient/DapServiceClientNativeWin.h rename to serviceClient/DapServiceClientNativeWin.h