Merge branch 'develop' into features-3005
# Conflicts: # CellFrameDashboardGUI/DapServiceController.cpp # CellFrameDashboardGUI/DapServiceController.h # CellFrameDashboardGUI/qml.qrc # CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml # CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanel.qml # CellFrameDashboardService/DapServiceController.cpp # CellFrameDashboardService/DapServiceController.h # libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri # libdap-qt-ui-qml
Showing
- CellFrameDashboardGUI/DapServiceController.cpp 4 additions, 0 deletionsCellFrameDashboardGUI/DapServiceController.cpp
- CellFrameDashboardGUI/DapServiceController.h 8 additions, 0 deletionsCellFrameDashboardGUI/DapServiceController.h
- CellFrameDashboardGUI/qml.qrc 4 additions, 0 deletionsCellFrameDashboardGUI/qml.qrc
- CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml 0 additions, 1 deletion...FrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/DapAbstractScreenForm.ui.qml 0 additions, 1 deletionCellFrameDashboardGUI/screen/DapAbstractScreenForm.ui.qml
- CellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml 3 additions, 0 deletionsCellFrameDashboardGUI/screen/DapAbstractTabForm.ui.qml
- CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml 0 additions, 1 deletionCellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml 44 additions, 4 deletions...hboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml 14 additions, 0 deletions...UI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml 89 additions, 2 deletions...eDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml 53 additions, 11 deletions...ardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml 3 additions, 1 deletion...rameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml
- CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml 17 additions, 2 deletions...hboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml 6 additions, 3 deletions...UI/screen/desktop/Dashboard/DapDashboardScreenForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml 26 additions, 2 deletions...DashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml 9 additions, 4 deletions...rdGUI/screen/desktop/Dashboard/DapDashboardTabForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml 9 additions, 0 deletions...ktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanel.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml 145 additions, 0 deletions...shboard/RightPanel/DapNewPaymentDoneRightPanelForm.ui.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml 13 additions, 0 deletions...ktop/Dashboard/RightPanel/DapNewPaymentMainRightPanel.qml
- CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml 446 additions, 0 deletions...shboard/RightPanel/DapNewPaymentMainRightPanelForm.ui.qml
Loading
Please register or sign in to comment