diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index e70bb2d2aedbab22629c67d0bf3fadc26aaa5ce0..f513694c9d3c02118b05446e8e7e30c29bbeb5e1 100755 --- a/CellFrameDashboardGUI/qml.qrc +++ b/CellFrameDashboardGUI/qml.qrc @@ -110,5 +110,13 @@ <file>screen/desktop/Settings/DapSettingsScreenForm.ui.qml</file> <file>screen/desktop/Settings/DapSettingsRightPanel.qml</file> <file>screen/desktop/Settings/DapSettingsRightPanelForm.ui.qml</file> + <file>screen/desktop/Console/DapConsoleTab.qml</file> + <file>screen/desktop/Console/DapConsoleTabForm.ui.qml</file> + <file>screen/desktop/Console/DapConsoleRightPanel.qml</file> + <file>screen/desktop/Console/DapConsoleRightPanelForm.ui.qml</file> + <file>screen/desktop/Console/DapConsoleScreen.qml</file> + <file>screen/desktop/Console/DapConsoleScreenForm.ui.qml</file> + <file>screen/desktop/Console/DapConsoleTopPanel.qml</file> + <file>screen/desktop/Console/DapConsoleTopPanelForm.ui.qml</file> </qresource> </RCC> diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml index 44893c95f2db92d1e17bada98835184f22fb74a1..f7debc1002e65b20757409a9283a0349304d5a68 100644 --- a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml +++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml @@ -12,6 +12,8 @@ DapMainApplicationWindowForm readonly property string settingsScreen: "qrc:/screen/" + device + "/Settings/DapSettingsTab.qml" ///@detalis Path to the logs tab. readonly property string logsScreen: "qrc:/screen/" + device + "/Logs/DapLogsTab.qml" + ///@detalis Path to the console tab. + readonly property string consoleScreen: "qrc:/screen/" + device + "/Console/DapConsoleTab.qml" @@ -44,6 +46,13 @@ DapMainApplicationWindowForm hoverIcon: "qrc:/res/icons/icon_history_hover.png" }) + append ({ + name: qsTr("Console"), + page: consoleScreen, + normalIcon: "qrc:/res/icons/icon_console.png", + hoverIcon: "qrc:/res/icons/icon_console_hover.png" + }) + append ({ name: qsTr("Settings"), page: settingsScreen, diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml new file mode 100644 index 0000000000000000000000000000000000000000..43be3b47d8b4b053c395c6d643d103f45f2856f9 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanel.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapConsoleRightPanelForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..df6d80022e97df58aea22e1dbee409d03fa65f12 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleRightPanelForm.ui.qml @@ -0,0 +1,7 @@ +import QtQuick 2.4 +import "../../" + +DapAbstractRightPanel +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml new file mode 100644 index 0000000000000000000000000000000000000000..88ffd82143d76e868a8ed38c5a7650f32879165a --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreen.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapConsoleScreenForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..9566f1d43bcda2543906a05bfc0eb78e13dd9ec9 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleScreenForm.ui.qml @@ -0,0 +1,8 @@ +import QtQuick 2.4 +import QtQuick.Controls 2.0 +import "../../" + +DapAbstractScreen +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml new file mode 100644 index 0000000000000000000000000000000000000000..f50b551a97ff7f2ef96fb0255aca79abd7a7a0b1 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTab.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapConsoleTabForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..4576be55a74972450548bff0658f9f908dac14f7 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTabForm.ui.qml @@ -0,0 +1,14 @@ +import QtQuick 2.4 +import "qrc:/" +import "../../" + +DapAbstractTab +{ + id: consoleTab + + dapTopPanel: DapConsoleTopPanel { } + + dapScreen: DapConsoleScreen { } + + dapRightPanel: DapConsoleRightPanel { } +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanel.qml new file mode 100644 index 0000000000000000000000000000000000000000..787a411b17024265affed66b5b8dcb1250870df7 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanel.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapConsoleTopPanelForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanelForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..893e3fab82ffd610d27655715f432e90ac0f8088 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Console/DapConsoleTopPanelForm.ui.qml @@ -0,0 +1,7 @@ +import QtQuick 2.4 +import "../../" + +DapAbstractTopPanelForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml index 0a75a802fbb9b1f4d4fca91af0c3a8fc591efd19..d9e9dac188d56e2ef2633da01e6800955d85d948 100644 --- a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml @@ -4,7 +4,7 @@ import "../../" DapAbstractTab { - id: historyTab + id: settingsTab dapTopPanel: DapSettingsTopPanel { }