Skip to content
Snippets Groups Projects
Commit 040d5ecb authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2961' into 'develop'

[+] Added a console tab.

See merge request !82
parents cfbb96aa 43c84e2c
No related branches found
No related tags found
1 merge request!82[+] Added a console tab.
Pipeline #1690 passed with stage
in 14 minutes and 56 seconds
Showing
with 78 additions and 1 deletion
...@@ -110,5 +110,13 @@ ...@@ -110,5 +110,13 @@
<file>screen/desktop/Settings/DapSettingsScreenForm.ui.qml</file> <file>screen/desktop/Settings/DapSettingsScreenForm.ui.qml</file>
<file>screen/desktop/Settings/DapSettingsRightPanel.qml</file> <file>screen/desktop/Settings/DapSettingsRightPanel.qml</file>
<file>screen/desktop/Settings/DapSettingsRightPanelForm.ui.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> </qresource>
</RCC> </RCC>
...@@ -12,6 +12,8 @@ DapMainApplicationWindowForm ...@@ -12,6 +12,8 @@ DapMainApplicationWindowForm
readonly property string settingsScreen: "qrc:/screen/" + device + "/Settings/DapSettingsTab.qml" readonly property string settingsScreen: "qrc:/screen/" + device + "/Settings/DapSettingsTab.qml"
///@detalis Path to the logs tab. ///@detalis Path to the logs tab.
readonly property string logsScreen: "qrc:/screen/" + device + "/Logs/DapLogsTab.qml" 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 ...@@ -44,6 +46,13 @@ DapMainApplicationWindowForm
hoverIcon: "qrc:/res/icons/icon_history_hover.png" 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 ({ append ({
name: qsTr("Settings"), name: qsTr("Settings"),
page: settingsScreen, page: settingsScreen,
......
import QtQuick 2.4
DapConsoleRightPanelForm
{
}
import QtQuick 2.4
import "../../"
DapAbstractRightPanel
{
}
import QtQuick 2.4
DapConsoleScreenForm
{
}
import QtQuick 2.4
import QtQuick.Controls 2.0
import "../../"
DapAbstractScreen
{
}
import QtQuick 2.4
DapConsoleTabForm
{
}
import QtQuick 2.4
import "qrc:/"
import "../../"
DapAbstractTab
{
id: consoleTab
dapTopPanel: DapConsoleTopPanel { }
dapScreen: DapConsoleScreen { }
dapRightPanel: DapConsoleRightPanel { }
}
import QtQuick 2.4
DapConsoleTopPanelForm
{
}
import QtQuick 2.4
import "../../"
DapAbstractTopPanelForm
{
}
...@@ -4,7 +4,7 @@ import "../../" ...@@ -4,7 +4,7 @@ import "../../"
DapAbstractTab DapAbstractTab
{ {
id: historyTab id: settingsTab
dapTopPanel: DapSettingsTopPanel { } dapTopPanel: DapSettingsTopPanel { }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment