qt57 variante

ButtHMI.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.0
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import "qrc:/Globals"
 
 

Globals/Globals.qml

@@ -7,6 +7,7 @@ Item {
     property color customer_color_base: "#FF559F98" // Basisfarbe Kundenabhängig
     property string baseDir: "/opt/GfA-Browser"
     property string logoSplash: "/images/Logo_Gfa.svg"
+    property bool logoSplashVisible:false
     property string logoMenu: "/images/Logo_Gfa_.svg"
 
     property string cam1Name: "---"

HMI_DateTimeSettings.qml

@@ -106,9 +106,6 @@ Item {
         }
     }
 
-
-
-
     function yearNumSet(){
         yearModel.clear();
         defaultYEARIDX = 0;
@@ -124,13 +121,11 @@ Item {
         defaultYEARIDX = year;
     }
 
-
     function hourNumSet() {
         hourModel.clear();
         defaultHOURIDX = 0;
         var i = 0;
         for ( i = 0; i < 24; i++){
-
             hourModel.append( {index: i,
                                  hour: i.toString(),
                              } );
@@ -143,7 +138,6 @@ Item {
         defaultMINIDX = 0;
         var i = 0;
         for ( i = 0; i < 60; i++){
-
             minModel.append( {index: i,
                                 min: i.toString(),
                             } );
@@ -156,7 +150,6 @@ Item {
         defaultSECIDX = 0;
         var i = 0;
         for ( i = 0; i < 60; i++){
-
             secModel.append( {index: i,
                                 sec: i.toString(),
                             } );

HMI_MainMenu.qml

@@ -2,7 +2,8 @@ import QtQuick 2.5
 import QtWebEngine 1.2
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 import QtQuick.Layouts 1.1

HMI_Settings.qml

@@ -2,7 +2,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import QtQml 2.2
 import ApplicationLauncher 1.0

HMI_UpdatePopup.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.5
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
 import ApplicationLauncher 1.0

Main.qml

@@ -2,7 +2,8 @@ import QtQuick 2.5
 import QtWebEngine 1.2
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import ApplicationLauncher 1.0
 
 import "qrc:/Globals"
@@ -25,6 +26,7 @@ Window {
             fillMode: Image.PreserveAspectFit
             sourceSize.width: parent.width
             sourceSize.height: parent.height
+            visible: Globals.logoSplashVisible
             Component.onCompleted: {
                 splashTIMER.running = true;
             }
@@ -79,6 +81,8 @@ Window {
                 duration: 50
             }
         }
+
+        onBusyChanged: enabled = !busy
     }
 
     onWidthChanged: {

Menu/MenuButton.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 import ApplicationLauncher 1.0

Menu/MenuHeader.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 import ApplicationLauncher 1.0

Menu/MenuStatus.qml

@@ -1,6 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 import "qrc:/Globals"
@@ -30,10 +31,15 @@ Item {
         id: versHMI
         text: Globals.versionINFO + " : " +  Globals.getActUserRoleText(Globals.actUserRole) //+
               //" IN: " + Globals.in1Status + Globals.in2Status + Globals.in3Status + Globals.in4Status
-        anchors.verticalCenter: parent.verticalCenter
-        font.pointSize: 10
-        anchors.left: parent.left
+        font.pixelSize: 22
+        anchors.left:  parent.left
+        anchors.top: parent.top
+        anchors.topMargin: (parent.height - font.pixelSize) / 2
+
         anchors.leftMargin: 5
+        width: parent.width * 0.25
+        scale: paintedWidth > width ? (width / paintedWidth):1
+        transformOrigin: Item.Left
     }
 
     Text {
@@ -43,6 +49,9 @@ Item {
         color: "white"
         text : ""
         font.pixelSize: 22
+        width: parent.width * 0.6
+        scale: paintedWidth > width ? (width / paintedWidth):1
+        transformOrigin: Item.Left
 
         Timer {
             interval: 500

PWD.qml

@@ -1,5 +1,6 @@
 import QtQuick 2.5
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 
 import "qrc:/Globals"
@@ -113,8 +114,13 @@ Rectangle {
                     border.width: 3
 
                     Label {
-                        anchors.centerIn: parent
                         font.pixelSize: roleFontSize
+                        width: parent.width - parent.border.width * 2
+                        x: parent.border.width
+                        y: parent.border.width * 2 // (parent.heigh ) - font.pixelSize
+                        scale: paintedWidth > width ? (width / paintedWidth):1
+
+                        transformOrigin: Item.Left
                         text: Globals.getActUserRoleText(parent.userRole)
                     }
 

Start.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.5
 import QtWebEngine 1.2
 import QtQuick.Window 2.1
-import QtQuick.Controls 1.4
-import Qt.labs.controls 1.0
+//import Qt.labs.controls 1.0
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import ApplicationLauncher 1.0
 

main.cpp

@@ -180,8 +180,12 @@ int main(int argc, char *argv[])
     QSize availSize = app.primaryScreen()->availableSize();
 
     if(QSysInfo::currentCpuArchitecture() == "x86_64") {
-        item->setProperty("width", 800);
+        item->setProperty("width", 640);
         item->setProperty("height", 480);
+        //item->setProperty("width", 480);
+        //item->setProperty("height", 272);
+        //item->setProperty("width", 800);
+        //item->setProperty("height", 480);
         //        item->setProperty("width", 1280);
         //        item->setProperty("height", 800);
     } else {
@@ -211,6 +215,8 @@ int main(int argc, char *argv[])
         glob->setProperty("logoSplash", "file://" + baseDir + "/Logo_Splash.svg");
     }
 
+    glob->setProperty("logoSplashVisible", "true"); // visible true after checking customer logo
+
     if(!QFile(baseDir + "/Logo_Menu.svg").exists()) {
         if(!QFile(baseDir + "/Logo_Menu.png").exists()) {
             if(!QFile(baseDir + "/Logo_Menu.jpg").exists()) {