diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc index 5757d3f3d691dce776d78a455fd636e7fc688a4e..f9c79da04e13827ae605d6f06a8f83e98bea412f 100755 --- a/CellFrameDashboardGUI/qml.qrc +++ b/CellFrameDashboardGUI/qml.qrc @@ -93,5 +93,13 @@ <file>res/icons/close_icon_hover.png</file> <file>res/icons/close_icon.png</file> <file>res/icons/ic_arrow_drop_down_dark.png</file> + <file>screen/desktop/Settings/DapSettingsTab.qml</file> + <file>screen/desktop/Settings/DapSettingsTabForm.ui.qml</file> + <file>screen/desktop/Settings/DapSettingsTopPanel.qml</file> + <file>screen/desktop/Settings/DapSettingsTopPanelForm.ui.qml</file> + <file>screen/desktop/Settings/DapSettingsScreen.qml</file> + <file>screen/desktop/Settings/DapSettingsScreenForm.ui.qml</file> + <file>screen/desktop/Settings/DapSettingsRightPanel.qml</file> + <file>screen/desktop/Settings/DapSettingsRightPanelForm.ui.qml</file> </qresource> </RCC> diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml index 2c50163c74049c23df380a60d9b71b6a08c6d5ab..8ab8085d8cf51fd7a55ecda397135486d3d260ff 100644 --- a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml +++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml @@ -8,6 +8,9 @@ DapMainApplicationWindowForm readonly property string exchangeScreen: "qrc:/screen/" + device + "/Exchange/DapExchangeTab.qml" ///@detalis Path to the history tab. readonly property string historyScreen: "qrc:/screen/" + device + "/History/DapHistoryTab.qml" + ///@detalis Path to the settings tab. + readonly property string settingsScreen: "qrc:/screen/" + device + "/Settings/DapSettingsTab.qml" + // Menu bar tab model ListModel @@ -36,6 +39,13 @@ DapMainApplicationWindowForm normalIcon: "qrc:/res/icons/icon_history.png", hoverIcon: "qrc:/res/icons/icon_history_hover.png" }) + + append ({ + name: qsTr("Settings"), + page: settingsScreen, + normalIcon: "qrc:/res/icons/icon_settings.png", + hoverIcon: "qrc:/res/icons/icon_settings_hover.png" + }) } } diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanel.qml new file mode 100644 index 0000000000000000000000000000000000000000..c9efe68c53d54235073804aff1de0d10c8efcdba --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanel.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapSettingsRightPanelForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanelForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..23443fadc96246dafdb7d6e342c971bd7b62b0bd --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsRightPanelForm.ui.qml @@ -0,0 +1,7 @@ +import QtQuick 2.4 +import "../../" + +DapAbstractRightPanel +{ + visible: false +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreen.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreen.qml new file mode 100644 index 0000000000000000000000000000000000000000..12dcfa012d2e5e7b74e9bd3d45618e0ab7e92715 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreen.qml @@ -0,0 +1,102 @@ +import QtQuick 2.4 +import QtQuick.Controls 2.0 + +DapSettingsScreenForm +{ + ///@detalis Settings item model. + VisualItemModel + { + id: modelSettings + + // Network settings section + Rectangle + { + id: itemNetwork + height: networkHeader.height + contentNetwork.height + width: dapListViewSettings.width + + // Header + Rectangle + { + id: networkHeader + color: "#DFE1E6" + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + height: 30 * pt + Text + { + anchors.fill: parent + anchors.leftMargin: 18 * pt + verticalAlignment: Qt.AlignVCenter + text:"Network" + font.family: "Roboto" + font.pixelSize: 12 * pt + color: "#5F5F63" + } + } + + // Content + Rectangle + { + id: contentNetwork + anchors.top: networkHeader.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + height: 60 * pt + ComboBox + { + width: 150 + anchors.left: parent.left + anchors.top: parent.top + anchors.bottom: parent.bottom + anchors.leftMargin: 18 * pt + anchors.topMargin: 10 * pt + anchors.bottomMargin: 10 * pt + model: + ListModel + { + ListElement + { + text: "one" + } + ListElement + { + text: "two" + } + } + } + } + } + + // VPN settings section + Rectangle + { + id: itemVPN + height: vpnHeader.height + textH.height + width: dapListViewSettings.width + color: "blue" + // Header + Rectangle + { + id: vpnHeader + color: "#DFE1E6" + anchors.top: parent.top + anchors.left: parent.left + anchors.right: parent.right + height: 30 * pt + Text + { + anchors.fill: parent + anchors.leftMargin: 18 * pt + verticalAlignment: Qt.AlignVCenter + text: "VPN" + font.family: "Roboto" + font.pixelSize: 12 * pt + color: "#5F5F63" + } + } + } + } +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreenForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..1bd62f84abdc9368bef991f33a95512202ed1745 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsScreenForm.ui.qml @@ -0,0 +1,15 @@ +import QtQuick 2.4 +import QtQuick.Controls 2.0 +import "../../" + +DapAbstractScreen +{ + ///@detalis Listview to display settings items. + property alias dapListViewSettings: listViewSettings + ListView + { + id: listViewSettings + anchors.fill: parent + model: modelSettings + } +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTab.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTab.qml new file mode 100644 index 0000000000000000000000000000000000000000..68e3b3517f617141b02be14e761dddef95417b70 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTab.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapSettingsTabForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..0a75a802fbb9b1f4d4fca91af0c3a8fc591efd19 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml @@ -0,0 +1,14 @@ +import QtQuick 2.4 +import "qrc:/" +import "../../" + +DapAbstractTab +{ + id: historyTab + + dapTopPanel: DapSettingsTopPanel { } + + dapScreen: DapSettingsScreen { } + + dapRightPanel: DapSettingsRightPanel { } +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanel.qml new file mode 100644 index 0000000000000000000000000000000000000000..2ea8c942ea053b2b1ae889b3429f30efac516ed8 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanel.qml @@ -0,0 +1,6 @@ +import QtQuick 2.4 + +DapSettingsTopPanelForm +{ + +} diff --git a/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanelForm.ui.qml new file mode 100644 index 0000000000000000000000000000000000000000..893e3fab82ffd610d27655715f432e90ac0f8088 --- /dev/null +++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTopPanelForm.ui.qml @@ -0,0 +1,7 @@ +import QtQuick 2.4 +import "../../" + +DapAbstractTopPanelForm +{ + +}