Merge branch 'master' into develop (626a7932) · Commits · DapCash / DapCash Wallet

Commit 626a7932 authored 5 years ago by littletux89@gmail.com

Browse files

Merge branch 'master' into develop

parents b32c87c2 0a489113

No related branches found

No related tags found

1 merge request!11Cellframe clone

Hide whitespace changes

Inline Side-by-side

Showing

CellFrameDashboardGUI/CellFrameDashboardGUI.pro 2 additions, 2 deletions

CellFrameDashboardGUI/CellFrameDashboardGUI.pro
CellFrameDashboardGUI/DapServiceController.cpp 56 additions, 1 deletion

CellFrameDashboardGUI/DapServiceController.cpp
CellFrameDashboardGUI/DapServiceController.h 39 additions, 0 deletions

CellFrameDashboardGUI/DapServiceController.h
CellFrameDashboardGUI/main.cpp 8 additions, 2 deletions

CellFrameDashboardGUI/main.cpp
CellFrameDashboardGUI/qml.qrc 3 additions, 2 deletions

CellFrameDashboardGUI/qml.qrc
CellFrameDashboardGUI/res/icons/ic_cellframe.png 0 additions, 0 deletions

CellFrameDashboardGUI/res/icons/ic_cellframe.png
CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml 74 additions, 0 deletions

CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml 215 additions, 0 deletions

...hboardGUI/screen/desktop/Dashboard/DapDashboardScreen.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml 9 additions, 272 deletions

...UI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml 56 additions, 4 deletions

...DashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml 2 additions, 2 deletions

...rdGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml 10 additions, 19 deletions

...oardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml 8 additions, 54 deletions

.../screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml 8 additions, 0 deletions

.../desktop/Dashboard/RightPanel/DapDoneWalletRightPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml 5 additions, 0 deletions

...p/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml 31 additions, 0 deletions

.../Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml 36 additions, 23 deletions

...ard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml 9 additions, 1 deletion

...ktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml 3 additions, 0 deletions

...shboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml
CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml 10 additions, 2 deletions

...ktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml

with 584 additions and 384 deletions

Please register or to comment