[-] DapMainApplicationWindowForm;

CellFrameDashboardGUI/qml.qrc

@@ -16,7 +16,6 @@
         <file>main.qml</file>
         <file>resources/icons/cellframe-logo-dashboard.png</file>
         <file>screen/DapMainApplicationWindow.qml</file>
-        <file>screen/DapMainApplicationWindowForm.ui.qml</file>
         <file>screen/DapAbstractTopPanel.qml</file>
         <file>screen/DapAbstractTopPanelForm.ui.qml</file>
         <file>screen/DapAbstractTab.qml</file>

CellFrameDashboardGUI/screen/DapMainApplicationWindow.qml

@@ -3,8 +3,9 @@ import "qrc:/resources/QML"
 import "qrc:/screen/desktop/Certificates"
 
 
-DapMainApplicationWindowForm 
-{
+
+
+Item {
     id: dapMainWindow
     ///@detalis Path to the dashboard tab.
     readonly property string dashboardScreen: "qrc:/screen/" + device + "/Dashboard/DapDashboardTab.qml"
@@ -31,6 +32,102 @@ DapMainApplicationWindowForm
 
 
 
+
+        ///@detalis Logo icon.
+//        property alias dapIconLogotype: iconLogotype
+//        ///@detalis Logo frame.
+//        property alias dapFrameLogotype: frameLogotype
+//        ///@detalis Menu bar.
+//        property alias dapMenuTabWidget: menuTabWidget
+
+//        property alias dapScreenLoader: stackViewTabs
+
+
+
+
+
+        // The horizontal location of the virtual menu column and tab view loader
+        Row
+        {
+            id: rowMainWindow
+
+            anchors.fill: parent
+
+            // Virtual logo column frame and menu bar
+            Column
+            {
+                id: columnMenuTab
+                height: rowMainWindow.height
+                // Logotype widget
+                Item
+                {
+                    id: logotype
+                    data: dapLogotype
+                    width: columnMenuTab.width
+                    height: 60 * pt
+                    Rectangle
+                    {
+                        id: frameLogotype
+                        anchors.fill: parent
+                        color: "#070023"
+                        height: 60 * pt
+                        Image
+                        {
+                            id: iconLogotype
+                            anchors.verticalCenter: parent.verticalCenter
+                            width: 111 * pt
+                            height: 24 * pt
+                            anchors.left: parent.left
+                            anchors.leftMargin: 24 * pt
+                            source: "qrc:/resources/icons/cellframe-logo-dashboard.png"
+                        }
+                    }
+                }
+                // Menu bar widget
+                Item
+                {
+                    id: menuWidget
+                    data: DapAbstractMenuTabWidget
+                    {
+                        onPathScreenChanged:
+                        {
+                            stackViewTabs.setSource(Qt.resolvedUrl(this.pathScreen))
+                        }
+                        id: menuTabWidget
+                        anchors.fill: parent
+                        dapFrameMenuTab.width: 180 * pt
+                        heightItemMenu: 60 * pt
+                        normalColorItemMenu: "transparent"
+                        selectColorItemMenu: "#D51F5D"
+                        widthIconItemMenu: 18 * pt
+                        heightIconItemMenu: 18 * pt
+                        dapMenuWidget.model: modelMenuTab
+                    }
+
+                    width: menuTabWidget.width
+                    height: columnMenuTab.height - logotype.height
+                }
+            }
+
+            // Screen downloader widget
+            Item
+            {
+                id: screens
+                data: dabScreensWidget
+                height: rowMainWindow.height
+                width: rowMainWindow.width - columnMenuTab.width
+                Loader
+                {
+                    id: stackViewTabs
+                    anchors.fill: parent
+                    clip: true
+                    source: dashboardScreen
+                }
+            }
+        }
+
+
+
     property var dapWallets: []
 
     signal modelWalletsUpdated()
@@ -110,14 +207,7 @@ DapMainApplicationWindowForm
                 hoverIcon: "qrc:/resources/icons/icon_logs_hover.png"
              })
         }
-    }
-
-    dapScreenLoader.source: dashboardScreen
-    
-    dapMenuTabWidget.onPathScreenChanged:
-    {
-        dapScreenLoader.setSource(Qt.resolvedUrl(dapMenuTabWidget.pathScreen))
-    }
+    }  
 
     Component.onCompleted:
     {

CellFrameDashboardGUI/screen/DapMainApplicationWindowForm.ui.qml

-import QtQuick 2.4
-import QtQuick.Controls 2.0
-import "qrc:/widgets"
-
-DapMainWindow
-{
-    anchors.fill: parent
-
-    ///@detalis Logo icon.
-    property alias dapIconLogotype: iconLogotype
-    ///@detalis Logo frame.
-    property alias dapFrameLogotype: frameLogotype
-    ///@detalis Menu bar.
-    property alias dapMenuTabWidget: menuTabWidget
-
-    property alias dapScreenLoader: stackViewTabs
-
-    dapLogotype:
-        // Logotype
-        Rectangle
-        {
-            id: frameLogotype
-            anchors.fill: parent
-            color: "#070023"
-            height: 60 * pt
-            Image 
-            {
-                id: iconLogotype
-                anchors.verticalCenter: parent.verticalCenter
-                width: 111 * pt
-                height: 24 * pt
-                anchors.left: parent.left
-                anchors.leftMargin: 24 * pt
-                source: "qrc:/resources/icons/cellframe-logo-dashboard.png"
-            }
-        }
-
-    dapMenuWidget:
-        // Menu bar
-        DapAbstractMenuTabWidget
-        {
-            id: menuTabWidget
-            anchors.fill: parent
-            dapFrameMenuTab.width: 180 * pt
-            heightItemMenu: 60 * pt
-            normalColorItemMenu: "transparent"
-            selectColorItemMenu: "#D51F5D"
-            widthIconItemMenu: 18 * pt
-            heightIconItemMenu: 18 * pt
-            dapMenuWidget.model: modelMenuTab
-        }
-
-    dabScreensWidget:
-        // Sceen loader
-        Loader
-        {
-            id: stackViewTabs
-            anchors.fill: parent
-            clip: true
-        }
-}
-
-/*##^##
-Designer {
-    D{i:0;autoSize:true;height:480;width:640}
-}
-##^##*/

CellFrameDashboardService/CellFrameDashboardService.pro

@@ -74,3 +74,6 @@ unix: !mac : !android {
 
 RESOURCES += \
     $$PWD/CellFrameDashboardService.qrc
+
+DISTFILES += \
+    classdiagram.qmodel

dap-ui-sdk @ 2c62121a

-Subproject commit d371339f97ccb140c9f9509f3ac147eca56acd1b
+Subproject commit 2c62121ae0a291c1023059337c77b5dc2d572c59