diff --git a/CellFrameDashboardGUI/main.qml b/CellFrameDashboardGUI/main.qml
index ae336dc30f0f00133c56d3afcb9d6c63eac29057..79e95443077a75d51ffc9ca2aa0990b60409ff50 100755
--- a/CellFrameDashboardGUI/main.qml
+++ b/CellFrameDashboardGUI/main.qml
@@ -1,5 +1,6 @@
import QtQuick 2.0
import QtQuick.Controls 2.0
+import QtGraphicalEffects 1.0
import "screen"
ApplicationWindow
@@ -8,16 +9,36 @@ ApplicationWindow
visible: true
width: 1280
height: 800
-
+ //Main window
DapMainApplicationWindow
{
+ id:mainWindow
property alias device: dapDevice.device
anchors.fill: parent
Device
{
- id: dapDevice
+ id: dapDevice
}
}
+
+ ///The image with the effect fast blur
+ Image
+ {
+ id: screenShotMainWindow
+ anchors.fill: parent
+ smooth: true
+ visible: false
+ }
+ // Fast bluer application
+ FastBlur
+ {
+ id: fastBlurMainWindow
+ anchors.fill: screenShotMainWindow
+ source: screenShotMainWindow
+ radius: 50
+ visible: false
+ }
+
}
diff --git a/CellFrameDashboardGUI/qml.qrc b/CellFrameDashboardGUI/qml.qrc
index 5757d3f3d691dce776d78a455fd636e7fc688a4e..f513694c9d3c02118b05446e8e7e30c29bbeb5e1 100755
--- a/CellFrameDashboardGUI/qml.qrc
+++ b/CellFrameDashboardGUI/qml.qrc
@@ -80,6 +80,15 @@
<file>res/icons/new-wallet_icon_dark.png</file>
<file>res/icons/ic_arrow_drop_down.png</file>
<file>res/icons/ic_arrow_drop_up.png</file>
+ <file>screen/desktop/Logs/DapLogsTab.qml</file>
+ <file>screen/desktop/Logs/DapLogsTabForm.ui.qml</file>
+ <file>screen/desktop/Logs/DapLogsTopPanel.qml</file>
+ <file>screen/desktop/Logs/DapLogsTopPanelForm.ui.qml</file>
+ <file>screen/desktop/Logs/DapLogsScreen.qml</file>
+ <file>screen/desktop/Logs/DapLogsScreenForm.ui.qml</file>
+ <file>screen/desktop/Logs/DapLogsRightPanel.qml</file>
+ <file>screen/desktop/Logs/DapLogsRightPanelForm.ui.qml</file>
+ <file>res/icons/icon_export.png</file>
<file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapTransactionHistoryRightPanelForm.ui.qml</file>
<file>screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml</file>
@@ -93,5 +102,21 @@
<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>
+ <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/res/icons/icon_export.png b/CellFrameDashboardGUI/res/icons/icon_export.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ca310503c17c32b1765499a1829ffab8386f8c
Binary files /dev/null and b/CellFrameDashboardGUI/res/icons/icon_export.png differ
diff --git a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
index 9a7afb42822943a5ec310240f6409e4019e49b13..53180347dcc88a781baa4feddc422ddb9d56a9cd 100644
--- a/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/DapAbstractRightPanelForm.ui.qml
@@ -20,30 +20,9 @@ DapRightPanel
normalImageButton: "qrc:/res/icons/close_icon.png"
hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
}
-
+
dapHeader.height: 36 * pt
dapFrame.width: 400 * pt
dapFrame.height: parent.height
color: "#F8F7FA"
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
index 2c50163c74049c23df380a60d9b71b6a08c6d5ab..f7debc1002e65b20757409a9283a0349304d5a68 100644
--- a/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
+++ b/CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml
@@ -8,6 +8,15 @@ 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"
+ ///@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"
+
+
+
// Menu bar tab model
ListModel
@@ -36,6 +45,27 @@ DapMainApplicationWindowForm
normalIcon: "qrc:/res/icons/icon_history.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 ({
+ name: qsTr("Settings"),
+ page: settingsScreen,
+ normalIcon: "qrc:/res/icons/icon_settings.png",
+ hoverIcon: "qrc:/res/icons/icon_settings_hover.png"
+ })
+
+ append ({
+ name: qsTr("Logs"),
+ page: logsScreen,
+ normalIcon: "qrc:/res/icons/icon_logs.png",
+ hoverIcon: "qrc:/res/icons/icon_logs_hover.png"
+ })
}
}
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/Dashboard/DapDashboardTab.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
index d70054d5f022951b609ee9d0c7655ecd56a6fca2..1e874c2250bc3324bbb77d88bf7f8f638b8f3727 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTab.qml
@@ -2,18 +2,18 @@ import QtQuick 2.4
DapDashboardTabForm
{
- ///@detalis Path to the right pane of transaction history.
+ ///@detalis Path to the right panel of transaction history.
readonly property string transactionHistoryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapTransactionHistoryRightPanel.qml"
- ///@detalis Path to the right pane of name wallet.
+ ///@detalis Path to the right panel of transaction history.
readonly property string inputNameWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapInputNewWalletNameRightPanel.qml"
- ///@detalis Path to the right pane of revory wallet.
+ ///@detalis Path to the right panel of transaction history.
readonly property string recoveryWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapRecoveryWalletRightPanel.qml"
- ///@detalis Path to the right pane of done wallet.
+ ///@detalis Path to the right panel of transaction history.
readonly property string doneWallet: "qrc:/screen/" + device + "/Dashboard/RightPanel/DapDoneWalletRightPanel.qml"
- dapDashboardRightPanel.source: Qt.resolvedUrl(transactionHistoryWallet)
-
- dapDashboardTopPanel.dapAddWalletButton.onClicked:
+ dapDashboardRightPanel.source: Qt.resolvedUrl(inputNameWallet)
+
+ dapDashboardTopPanel.dapAddWalletButton.onClicked:
{
if(dapDashboardRightPanel.source != Qt.resolvedUrl(inputNameWallet))
dapDashboardRightPanel.setSource(Qt.resolvedUrl(inputNameWallet))
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
index f5470ff6c1a6aeaa14ecb52894de4aa6ed093fd3..7d5179e63a45ccd1cb36d7f6d0e8abf4e1893bad 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/DapDashboardTopPanelForm.ui.qml
@@ -36,13 +36,11 @@ DapAbstractTopPanel
DapComboBox
{
id: comboboxWallet
-
model: modelWallets
indicatorImageNormal: "qrc:/res/icons/ic_arrow_drop_down.png"
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
sidePaddingActive: 16 * pt
- topIndentActive: 10 * pt
normalColorText: "#070023"
hilightColorText: "#FFFFFF"
normalColorTopText: "#FFFFFF"
@@ -58,15 +56,12 @@ DapAbstractTopPanel
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF"
hilightTopColor: normalColor
- topIndentNormal: 12 * pt
- bottomIndentNormal: 14 * pt
- bottomIndentActive: bottomIndentNormal
paddingTopItemDelegate: 8 * pt
- paddingBottomItemDelegate: paddingTopItemDelegate
heightListElement: 32 * pt
intervalListElement: 10 * pt
indicatorWidth: 24 * pt
indicatorHeight: indicatorWidth
+ indicatorLeftInterval: 8 * pt
colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB"
fontComboBox.pixelSize: 14 * pt
@@ -122,7 +117,6 @@ DapAbstractTopPanel
colorButtonTextHover: "#FFFFFF"
indentTextRight: 20 * pt
fontButton.pixelSize: 14 * pt
- existenceImage: true
borderColorButton: "#000000"
borderWidthButton: 0
fontButton.family: "Roboto"
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
index fbb39e6fd4a6b01bbce6a923114c2f867bde735d..0cb2560afb9a71a5f42bc59ebf409b583c8599fa 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapDoneWalletRightPanelForm.ui.qml
@@ -4,6 +4,12 @@ import "../../../"
DapAbstractRightPanel
{
+ dapButtonClose.height: 16 * pt
+ dapButtonClose.width: 16 * pt
+ dapButtonClose.heightImageButton: 16 * pt
+ dapButtonClose.widthImageButton: 16 * pt
+ dapButtonClose.normalImageButton: "qrc:/res/icons/close_icon.png"
+ dapButtonClose.hoverImageButton: "qrc:/res/icons/close_icon_hover.png"
dapHeaderData:
Row
{
@@ -12,8 +18,8 @@ DapAbstractRightPanel
anchors.rightMargin: 16 * pt
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
-
- Item
+
+ Item
{
id: itemButtonClose
data: dapButtonClose
@@ -73,7 +79,6 @@ DapAbstractRightPanel
anchors.bottomMargin: 24 * pt
checkable: true
textButton: qsTr("Done")
- existenceImage: false
horizontalAligmentText: Text.AlignHCenter
indentTextRight: 0
fontButton.pixelSize: 18 * pt
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
index c8f5e821fd53b758442909dbb979087e82b9be6f..c691075db67f66d0af656a1723faeff2f26415af 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapInputNewWalletNameRightPanelForm.ui.qml
@@ -16,16 +16,16 @@ DapAbstractRightPanel
anchors.topMargin: 12 * pt
anchors.bottomMargin: 12 * pt
spacing: 12 * pt
-
- Item
+
+ Item
{
id: itemButtonClose
data: dapButtonClose
height: dapButtonClose.height
width: dapButtonClose.width
}
-
- Text
+
+ Text
{
id: textHeader
text: qsTr("New wallet")
@@ -33,8 +33,8 @@ DapAbstractRightPanel
color: "#3E3853"
}
}
-
- dapContentItemData:
+
+ dapContentItemData:
Rectangle
{
anchors.fill: parent
@@ -50,7 +50,7 @@ DapAbstractRightPanel
anchors.bottomMargin: 8 * pt
color: "#757184"
height: 30 * pt
- Text
+ Text
{
id: textNameWallet
color: "#ffffff"
@@ -66,7 +66,7 @@ DapAbstractRightPanel
}
}
- Rectangle
+ Rectangle
{
id: frameInputNameWallet
height: 68 * pt
@@ -103,8 +103,8 @@ DapAbstractRightPanel
}
}
}
-
- Rectangle
+
+ Rectangle
{
id: frameChooseSignatureType
anchors.top: frameInputNameWallet.bottom
@@ -112,7 +112,7 @@ DapAbstractRightPanel
anchors.left: parent.left
color: "#757184"
height: 30 * pt
- Text
+ Text
{
id: textChooseSignatureType
color: "#ffffff"
@@ -171,7 +171,6 @@ DapAbstractRightPanel
indicatorImageActive: "qrc:/res/icons/ic_arrow_drop_up.png"
sidePaddingNormal: 0 * pt
sidePaddingActive: 0 * pt
- topIndentActive: 10 * pt
normalColorText: "#070023"
hilightColorText: "#transparent"
normalColorTopText: "#070023"
@@ -187,15 +186,12 @@ DapAbstractRightPanel
x: popup.visible ? sidePaddingActive * (-1) : sidePaddingNormal
normalColor: "#FFFFFF"
hilightTopColor: normalColor
- topIndentNormal: 12 * pt
- bottomIndentNormal: 14 * pt
- bottomIndentActive: bottomIndentNormal
paddingTopItemDelegate: 8 * pt
- paddingBottomItemDelegate: paddingTopItemDelegate
heightListElement: 32 * pt
intervalListElement: 10 * pt
indicatorWidth: 20 * pt
indicatorHeight: indicatorWidth
+ indicatorLeftInterval: 8 * pt
colorTopNormalDropShadow: "#00000000"
colorDropShadow: "#40ABABAB"
fontComboBox.pixelSize: 16 * pt
@@ -307,7 +303,6 @@ DapAbstractRightPanel
anchors.top: frameChooseRecoveryMethod.bottom
anchors.topMargin: 64 * pt
textButton: qsTr("Next")
- existenceImage: false
colorBackgroundHover: "#D51F5D"
colorBackgroundNormal: "#070023"
colorButtonTextNormal: "#FFFFFF"
@@ -329,8 +324,3 @@ DapAbstractRightPanel
}
}
}
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
index 28d6b3b0e3444225927b887249b1b9a1dabf3100..41f1353848fdf764df1ea029a26d282dff7dead9 100644
--- a/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
+++ b/CellFrameDashboardGUI/screen/desktop/Dashboard/RightPanel/DapRecoveryWalletRightPanelForm.ui.qml
@@ -301,22 +301,3 @@ DapAbstractRightPanel
}
}
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/*##^## Designer {
- D{i:0;autoSize:true;height:480;width:640}
-}
- ##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanel.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..5321fc765d0c50b73dc315434050734935edde17
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanel.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapLogsRightPanelForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..765d2f13240609980946f68d0bf920165fe72042
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsRightPanelForm.ui.qml
@@ -0,0 +1,9 @@
+import QtQuick 2.4
+import "../../"
+
+DapAbstractRightPanel
+{
+ width: 0
+ height: 0
+ visible: false
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreen.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreen.qml
new file mode 100644
index 0000000000000000000000000000000000000000..fae13ac185f02594702d13b802e9422489780c9a
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreen.qml
@@ -0,0 +1,271 @@
+import QtQuick.Window 2.2
+import QtQuick.Controls 2.1
+import QtQuick 2.0
+import QtGraphicalEffects 1.0
+
+DapLogsScreenForm
+{
+ ///@detalis firstMarginList First indent in the delegate to the first word.
+ property int firstMarginList: 16 * pt
+ ///@detalis secondMarginList Second indent between the first and second word.
+ property int secondMarginList: 18 * pt
+ ///@detalis thirdMarginList Third indent between the second and third word and the following.
+ property int thirdMarginList: 40 * pt
+ ///@detalis fifthMarginList Fifth indent between the second and third word and the following.
+ property int fifthMarginList: 20 * pt
+ ///@detalis fontSizeList Font size delegate.
+ property int fontSizeList: 16 * pt
+ ///@detalis fontSizeHeader Font size header.
+ property int fontSizeHeader: 12 * pt
+ ///@detalis fontFamily Font family.
+ property string fontFamily: "Roboto"
+ ///@detalis Font color.
+ property string fontColor: "#070023"
+
+ ///In this block, the properties are only auxiliary for internal use.
+ QtObject
+ {
+ id: privateDate
+ //Day
+ property int day: 86400
+ //Current time
+ property var today
+ property var todayDay
+ property var todayMonth
+ property var todayYear
+ property var stringTime
+ }
+
+ //Creates a list model for the example
+ Component.onCompleted: {
+ dapLogsListViewIndex = -1;
+ privateDate.today = new Date();
+ privateDate.todayDay = privateDate.today.getDate();
+ privateDate.todayMonth = privateDate.today.getMonth();
+ privateDate.todayYear = privateDate.today.getFullYear();
+ var timeString = new Date();
+ var day = new Date(86400);
+ var count = 1000
+ for (var i = 0; i < count; i++)
+ {
+ var momentTime = timeString/1000 - (day/6) * i;
+ var momentDay = getDay(momentTime);
+ dapLogsModel.append({"type":"DBG"+i, "info":"Add problems"+i, "file":"dup_chein"+i, "time":getTime(momentTime),
+ "date":getDay(momentTime)});
+ }
+ }
+
+ ListModel
+ {
+ id:dapLogsModel
+ }
+ //The Component Header
+ Component
+ {
+ id:delegateLogsHeader
+ Rectangle
+ {
+ height: 30 * pt
+ width: dapLogsListView.width
+ color: "#908D9D"
+
+ Text
+ {
+ anchors.fill: parent
+ anchors.topMargin: 8 * pt
+ anchors.bottomMargin: 8 * pt
+ anchors.leftMargin: firstMarginList
+ color: "#FFFFFF"
+ font.pixelSize: fontSizeHeader
+ font.family: fontFamily
+ text: section
+ }
+ }
+ }
+
+
+ //The component delegate
+ Component
+ {
+ id:delegateLogs
+
+ //Frame delegate
+ Rectangle
+ {
+ height: 60 * pt
+ width: dapLogsListView.width
+
+ color:
+ {
+ if(dapLogsListViewIndex === index)
+ {
+ return "#FAE5ED";
+ }
+ else
+ {
+ return "#FFFFFF";
+ }
+ }
+
+ //Event container
+ Rectangle
+ {
+ anchors.fill: parent
+ anchors.topMargin: 20 * pt
+ anchors.bottomMargin: 20 * pt
+ anchors.leftMargin: firstMarginList
+ anchors.rightMargin: fifthMarginList
+ color: parent.color
+
+ //Frame type log
+ Rectangle
+ {
+ id:frameTypeLog
+ anchors.left: parent.left
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ width: 43 * pt
+ color: parent.color
+ Text
+ {
+ id: typeLog
+ anchors.fill: parent
+ font.pixelSize: fontSizeList
+ font.family: fontFamily
+ color: fontColor
+ text: type
+ }
+ }
+
+ // Frame text log
+ Rectangle
+ {
+ id:frameTextLog
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.left: frameTypeLog.right
+ anchors.leftMargin: secondMarginList
+ anchors.right: frameFileLog.left
+ anchors.rightMargin: thirdMarginList
+ color: parent.color
+ Text
+ {
+ id: textLog
+ anchors.fill: parent
+ font.pixelSize: fontSizeList
+ font.family: fontFamily
+ color: fontColor
+ text: info
+ }
+ }
+
+ //Frame file log
+ Rectangle
+ {
+ id: frameFileLog
+ anchors.right: frameTimeLog.left
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.rightMargin: thirdMarginList
+ width: 326 * pt
+ color: parent.color
+ Text
+ {
+ id: fileLog
+ anchors.fill: parent
+ font.pixelSize: 14 * pt
+ font.family: fontFamily
+ color: fontColor
+ text: file
+ }
+ }
+
+ //Frame time log
+ Rectangle
+ {
+ id: frameTimeLog
+ anchors.top: parent.top
+ anchors.bottom: parent.bottom
+ anchors.right: parent.right
+ width: 62 * pt
+ color: parent.color
+ Text
+ {
+ id: timeLog
+ anchors.fill: parent
+ font.pixelSize: fontSizeList
+ font.family: fontFamily
+ color: fontColor
+ text: time
+ }
+ }
+ }
+
+ //Underline bar
+ Rectangle
+ {
+ anchors.bottom: parent.bottom
+ color: "#E3E2E6"
+ width: parent.width
+ height: 1 * pt
+ }
+
+ MouseArea
+ {
+ anchors.fill: parent
+ onClicked:
+ {
+ dapLogsListViewIndex = index;
+ }
+ }
+ }
+ }
+
+ //This function converts the string representation of time to the Date format
+ function parceTime(thisTime)
+ {
+ var aDate = thisTime.split('-');
+ var aDay = aDate[0].split('/');
+ var aTime = aDate[1].split(':');
+ privateDate.stringTime = new Date(20+aDay[2], aDay[0] - 1, aDay[1], aTime[0], aTime[1], aTime[2]);
+ }
+
+ //Returns the time in the correct form for the delegate
+ function getTime(thisTime)
+ {
+ var tmpTime = new Date(thisTime * 1000)
+ var thisHour = tmpTime.getHours();
+ var thisMinute = tmpTime.getMinutes();
+ var thisSecond = tmpTime.getSeconds();
+ if(thisMinute<10) thisMinute = '0' + thisMinute;
+ if(thisSecond<10) thisSecond = '0' + thisSecond;
+ return thisHour + ':' + thisMinute + ':' + thisSecond;
+ }
+
+ //Returns the time in the correct form for the header
+ function getDay(thisTime)
+ {
+ var monthArray = ["January", "February", "March", "April", "May", "June", "July", "August", "September",
+ "October", "November", "December"];
+ var tmpDate = new Date(thisTime*1000);
+ var thisMonth = tmpDate.getMonth();
+ var thisDay = tmpDate.getDate();
+ var thisYear = tmpDate.getFullYear();
+
+ if(thisYear === privateDate.todayYear)
+ {
+ if(thisMonth === privateDate.todayMonth)
+ {
+ switch(thisDay){
+ case(privateDate.todayDay): return"Today";
+ case(privateDate.todayDay-1): return"Yesterday";
+ default: return monthArray[thisMonth] + ', ' + thisDay;
+ }
+ }
+ else
+ return monthArray[thisMonth] + ', ' + thisDay;
+ }
+ else
+ return monthArray[thisMonth] + ', ' + thisDay + ', ' + thisYear;
+ }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..2a499ecf359067f3eb06987cbe484f8505f368ff
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsScreenForm.ui.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import "../../"
+
+DapAbstractScreen
+{
+
+ id: logsBoard
+ ///@detalis dapLogsListView Indicates an active item.
+ property alias dapLogsListViewIndex: dapLogsList.currentIndex
+ ///@detalis dapLogsListView Log list widget.
+ property alias dapLogsListView: dapLogsList
+
+ ListView
+ {
+ id: dapLogsList
+ anchors.fill: parent
+ anchors.topMargin: 24 * pt
+ anchors.leftMargin: 24 * pt
+ anchors.rightMargin: 24 * pt
+ clip: true
+ model: dapLogsModel
+ delegate: delegateLogs
+ section.property: "date"
+ section.criteria: ViewSection.FullString
+ section.delegate: delegateLogsHeader
+ }
+}
+
+/*##^##
+Designer {
+ D{i:0;autoSize:true;height:480;width:640}
+}
+##^##*/
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTab.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTab.qml
new file mode 100644
index 0000000000000000000000000000000000000000..8996c3b440e744a9fad1926386decf431d983ae3
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTab.qml
@@ -0,0 +1,6 @@
+import QtQuick 2.4
+
+DapLogsTabForm
+{
+
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTabForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTabForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..c9167d8121110203ea1ac39d109d789ebb8830e4
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTabForm.ui.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.4
+import "qrc:/"
+import "../../"
+
+DapAbstractTab
+{
+ id: logsTab
+
+ dapTopPanel: DapLogsTopPanel { }
+
+ dapScreen: DapLogsScreen { }
+
+ dapRightPanel: DapLogsRightPanel { }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanel.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanel.qml
new file mode 100644
index 0000000000000000000000000000000000000000..684fa7762bb5bafde4b236c627caeb7d7aa650af
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanel.qml
@@ -0,0 +1,54 @@
+import QtQuick 2.4
+import QtQuick.Dialogs 1.2
+import Qt.labs.platform 1.0
+import QtGraphicalEffects 1.0
+import "../../"
+
+DapLogsTopPanelForm
+{
+ ///Loader for the Save window.
+ Loader
+ {
+ id:saveWindow
+ }
+
+ ///Component for the Save dialog box.
+ Component
+ {
+ id:saveFile
+ FileDialog
+ {
+ id: saveDialog
+ title: "Save the file"
+ fileMode: FileDialog.SaveFile
+
+ onFileChanged:
+ {
+ setPropertyDefaultWindow();
+ }
+
+ onRejected:
+ {
+ setPropertyDefaultWindow();
+ }
+ Component.onCompleted: visible = true;
+ }
+ }
+
+ ///Creating a screenshot of a window
+ function grub()
+ {
+ var x = mainWindow.grabToImage(function(result){screenShotMainWindow.source = result.url;},
+ Qt.size(mainWindow.width, mainWindow.height));
+ fastBlurMainWindow.source = screenShotMainWindow
+ fastBlurMainWindow.visible = true
+ }
+
+ ///Default window settings
+ function setPropertyDefaultWindow()
+ {
+ fastBlurMainWindow.visible = false;
+ saveWindow.sourceComponent = undefined;
+ buttonNormalColor = "#070023";
+ }
+}
diff --git a/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml
new file mode 100644
index 0000000000000000000000000000000000000000..4488c106b25027e1b1aad0c393321abb11d68e0a
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Logs/DapLogsTopPanelForm.ui.qml
@@ -0,0 +1,54 @@
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import "../../"
+import "qrc:/widgets"
+
+DapAbstractTopPanel
+{
+ id:topLogsPanel
+
+ property alias buttonNormalColor: exportLogButton.colorBackgroundNormal
+
+ //Export log button
+ DapButton
+ {
+ id: exportLogButton
+ textButton: "Export log"
+ anchors.right: parent.right
+ anchors.rightMargin: 24 * pt
+ anchors.verticalCenter: parent.verticalCenter
+ normalImageButton: "qrc:/res/icons/icon_export.png"
+ hoverImageButton: "qrc:/res/icons/icon_export.png"
+ height: 36 * pt
+ width: 120 * pt
+ widthImageButton: 28 * pt
+ heightImageButton: 28 * pt
+ indentImageLeftButton: 10 * pt
+ colorBackgroundNormal:"#070023"
+ colorBackgroundHover: "#D2145D"
+ colorButtonTextNormal: "#FFFFFF"
+ colorButtonTextHover: "#FFFFFF"
+ indentTextRight: 10 * pt
+ borderColorButton: "#000000"
+ borderWidthButton: 0
+ fontButton.family: "Roboto"
+ fontButton.pixelSize: 14 * pt
+ fontButton.weight: Font.Normal
+ horizontalAligmentText:Qt.AlignRight
+ colorTextButton: "#FFFFFF"
+ }
+
+ ///Handler for clicking the button exportLogButton
+ Connections
+ {
+ target: exportLogButton
+ onClicked:
+ {
+ grub();
+ exportLogButton.colorBackgroundNormal = "#D2145D"
+ saveWindow.sourceComponent = saveFile;
+ }
+ }
+
+}
+
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..60f961bc4483e144d6247e96e7f3c9836c657c88
--- /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
+ 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..d9e9dac188d56e2ef2633da01e6800955d85d948
--- /dev/null
+++ b/CellFrameDashboardGUI/screen/desktop/Settings/DapSettingsTabForm.ui.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.4
+import "qrc:/"
+import "../../"
+
+DapAbstractTab
+{
+ id: settingsTab
+
+ 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
+{
+
+}
diff --git a/libdap-qt-ui-qml b/libdap-qt-ui-qml
index d35f048eecc506f97b02cedef64f2ba9f00e90c8..049c20a0daf0097184e2cc60a4c9811d620d87e5 160000
--- a/libdap-qt-ui-qml
+++ b/libdap-qt-ui-qml
@@ -1 +1 @@
-Subproject commit d35f048eecc506f97b02cedef64f2ba9f00e90c8
+Subproject commit 049c20a0daf0097184e2cc60a4c9811d620d87e5