Merge branch 'develop' into bugs-2893
# Conflicts: # CellFrameDashboardGUI/qml.qrc # CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml # libdap-qt-ui-qml
No related branches found
No related tags found
Showing
- CellFrameDashboardGUI/main.qml 23 additions, 2 deletionsCellFrameDashboardGUI/main.qml
- CellFrameDashboardGUI/qml.qrc 25 additions, 0 deletionsCellFrameDashboardGUI/qml.qrc
- CellFrameDashboardGUI/res/icons/icon_export.png 0 additions, 0 deletionsCellFrameDashboardGUI/res/icons/icon_export.png
- CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml 1 addition, 22 deletions...FrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml 30 additions, 0 deletionsCellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml 6 additions, 0 deletions...hboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml 7 additions, 0 deletions...UI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml 6 additions, 0 deletions...eDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml 8 additions, 0 deletions...ardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml 6 additions, 0 deletions...rameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml 14 additions, 0 deletions...hboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanel.qml 6 additions, 0 deletions...ashboardGUI/screen/desktop/Console/DapConsoleTopPanel.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanelForm.ui.qml 7 additions, 0 deletions...dGUI/screen/desktop/Console/DapConsoleTopPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml 7 additions, 7 deletions...DashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml 1 addition, 7 deletions.../screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml 8 additions, 3 deletions...p/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml 12 additions, 22 deletions...ard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml 0 additions, 19 deletions...shboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanel.qml 6 additions, 0 deletions...ameDashboardGUI/screen/desktop/Logs/DapLogsRightPanel.qml
- CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanelForm.ui.qml 9 additions, 0 deletions...boardGUI/screen/desktop/Logs/DapLogsRightPanelForm.ui.qml
Loading
Please register or sign in to comment