svg rendering for 5.12 too

HMI_MainMenu.qml

@@ -33,19 +33,25 @@ Item {
         width: parent.width
         height: parent.height - 2 * y
 
+        //border.color: "blue"
+        //border.width: 2
+
+
         GridLayout {
+            anchors.centerIn: parent
             anchors.fill: parent
             columnSpacing: 0
             rowSpacing: 0
 
+            columns: 3
             rows: 2
-            columns: 4
 
             Menu.MenuButton {
                 Layout.row: 0
                 Layout.column: 0
                 Layout.fillHeight: true
                 Layout.fillWidth: true
+                Layout.preferredWidth: parent.width / colums
                 //: ID:main_menu_hmi_settings Main Menu HMI Settings text
                 menuText:  qsTrId("main_menu_hmi_settings") + transLoad.emptyString //qsTr("HMI - Einstellungen") + transLoad.emptyString
                 menuQML: "/HMI_SettingsContainer.qml"
@@ -75,6 +81,7 @@ Item {
                 Layout.column: 1
                 Layout.fillHeight: true
                 Layout.fillWidth: true
+                Layout.preferredWidth: parent.width / colums
 
                 menuImage:  "/images/CamSettings.svg"
                 //: ID:main_menu_cam_settings Main Menu CAM Settings text
@@ -104,6 +111,7 @@ Item {
                 Layout.column: 2
                 Layout.fillHeight: true
                 Layout.fillWidth: true
+                Layout.preferredWidth: parent.width / colums
 
                 menuImage:  "/images/AdminSettings.svg"
                 //: ID:main_menu_admin_settings Main Menu Administrator Settings text

HMI_Settings.qml

@@ -312,6 +312,9 @@ Rectangle {
                     fillMode: Image.PreserveAspectFit
                     sourceSize.height: parent.height / 5
                     sourceSize.width: parent.height / 5
+                    height: sourceSize.height
+                    width:sourceSize.width
+
                 }
 
                 ListModel {
@@ -347,6 +350,8 @@ Rectangle {
                                 fillMode: Image.PreserveAspectFit
                                 sourceSize.height: parent.height - parent.height * 0.25
                                 sourceSize.width: parent.width
+                                height: sourceSize.height
+                                width:sourceSize.width
 
                                 source: flag
                                 smooth: true

Main.qml

@@ -26,6 +26,8 @@ Window {
             fillMode: Image.PreserveAspectFit
             sourceSize.width: parent.width
             sourceSize.height: parent.height
+            height: sourceSize.height
+            width:sourceSize.width
             visible: Globals.logoSplashVisible
             Component.onCompleted: {
                 splashTIMER.running = true;

Menu/MenuButton.qml

@@ -19,39 +19,66 @@ Button {
     width: parent.width
     height: parent.height
 
-    Image {
-        id: idIMG
+    background: Rectangle {
+        id: backrectBUTT
+        border.width: 0.0
+    }
+
+    Rectangle {
+        id: buttRECT
         anchors.centerIn: parent
+        //border.color: "red"
+        //border.width: 2
 
-        fillMode: Image.PreserveAspectFit
-        source: menuImage
-        sourceSize.height: parent.height - parent.width * (parent.imgBorder / 100.0)
-        sourceSize.width: parent.width - parent.width * (parent.imgBorder / 100.0)
-
-        Text {
-            id: menTXT
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 3
-            x: 2
-            width: parent.width - 2 * x
-            color: "white"
-            font.pixelSize: (parent.height * 0.21) / 2
-            wrapMode: Text.WordWrap
-            text: menuText
-        }
-    }
+        width: backrectBUTT.width  - backrectBUTT.width * (parent.imgBorder / 100.0)
+        height: backrectBUTT.height - backrectBUTT.height * (parent.imgBorder / 100.0)
 
-    HueSaturation {
-        id: idSaturation
-        anchors.fill: idIMG
-        source: idIMG
-        hue: 0.0
-        saturation: buttGreyed
-        lightness: 0.0
-    }
+        Image {
+            id: idIMG
+            anchors.centerIn: parent
+            anchors.fill: parent
+            source: menuImage
+            fillMode: Image.PreserveAspectFit
+            sourceSize: Qt.size(backrectBUTT.width ,
+                                backrectBUTT.height  )
 
-    background: Rectangle {
-        border.width: 0.0
+            width: backrectBUTT.width
+            height: backrectBUTT.height
+
+            onStatusChanged: {
+                if (status == Image.Ready) {
+                    console.log(menuImage + '---' + backrectBUTT.width + '  ' + backrectBUTT.height + '==' + paintedWidth + '  ' + paintedHeight);
+                }
+            }
+
+            Item {
+                anchors.centerIn: parent
+                width: idIMG.paintedWidth
+                height: idIMG.paintedHeight
+
+                Text {
+                    id: menTXT
+                    anchors.bottom: parent.bottom
+                    anchors.bottomMargin: 3
+                    x: 2
+                    width: parent.width - 2 * x
+                    color: "white"
+                    font.pixelSize: (parent.height * 0.21) / 2
+                    wrapMode: Text.WordWrap
+                    text: menuText
+
+                }
+            }
+        }
+
+        HueSaturation {
+            id: idSaturation
+            anchors.fill: idIMG
+            source: idIMG
+            hue: 0.0
+            saturation: buttGreyed
+            lightness: 0.0
+        }
     }
 
     onClicked: {

Menu/MenuHeader.qml

@@ -87,6 +87,8 @@ Item {
             source: buttUndoImage
             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+            height: sourceSize.height
+            width:sourceSize.width
         }
         background: Rectangle {
             radius: buttRadius
@@ -115,6 +117,8 @@ Item {
             source: buttHomeImage
             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+            height: sourceSize.height
+            width:sourceSize.width
         }
         background: Rectangle {
             radius: buttRadius
@@ -144,6 +148,8 @@ Item {
             source: buttLockImage
             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+            height: sourceSize.height
+            width:sourceSize.width
         }
         background: Rectangle {
             radius: buttRadius
@@ -179,6 +185,8 @@ Item {
             source: buttCamImage
             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+            height: sourceSize.height
+            width:sourceSize.width
             visible: parent.visible
         }
         background: Rectangle {
@@ -223,6 +231,8 @@ Item {
             source: buttCamImage
             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+            height: sourceSize.height
+            width:sourceSize.width
             visible: parent.visible
         }
         background: Rectangle {
@@ -259,6 +269,8 @@ Item {
         fillMode: Image.PreserveAspectFit
         sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
         sourceSize.width: parent.width/3.0 - parent.width/3.0 * (buttImgBorder / 100.0)
+        height: sourceSize.height
+        width:sourceSize.width
     }
 
     Text {

Start.qml

@@ -69,7 +69,7 @@ Rectangle {
         running: false
         repeat: false
         onTriggered: {
-            testWebsite.appName = "curl -m 3 -Is " + camURL;
+            testWebsite.appName = "curl --insecure -m 3 -Is " + camURL;
             if(menuAREA.z === 1) {
                 testWebsite.launchScript();
             } else {
@@ -121,7 +121,7 @@ Rectangle {
         urlchangeBUSY.visible = true;
         camURL = whichCamSet();
 
-        testWebsite.appName = "curl -m 3 -Is " + camURL;
+        testWebsite.appName = "curl --insecure -m 3 -Is " + camURL;
 
         testWebsite.launchScript();
         console.debug("CAMURL Component.onCompleted :" + camURL);
@@ -134,7 +134,7 @@ Rectangle {
                 console.debug("CAMURL onVisible changed :" + camURL);
                 camURL = whichCamSet();
 
-                testWebsite.appName = "curl -m 3 -Is " + camURL;
+                testWebsite.appName = "curl --insecure -m 3 -Is " + camURL;
 
                 testWebsite.launchScript();
                 console.debug("CAMURL onVisibleChanged :" + camURL);
@@ -261,6 +261,8 @@ Rectangle {
                             source: buttmenuArea
                             sourceSize.height: parent.height * 0.7 //- parent.height * (buttImgBorder / 100.0)
                             sourceSize.width: parent.width * 0.7 //- parent.width * (buttImgBorder / 100.0)
+                            height: sourceSize.height
+                            width:sourceSize.width
                             visible: parent.visible
                         }
                     }
@@ -275,7 +277,7 @@ Rectangle {
                         onPressAndHold: {
                             camURL = whichCamSet();
 
-                            testWebsite.appName = "curl -m 3 -Is " + camURL;
+                            testWebsite.appName = "curl --insecure -m 3 -Is " + camURL;
 
                             testWebsite.launchScript();
 
@@ -336,6 +338,8 @@ Rectangle {
                             source: buttCamImage
                             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
                             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+                            height: sourceSize.height
+                            width:sourceSize.width
                             visible: parent.visible
                         }
                         background: Rectangle {
@@ -387,6 +391,8 @@ Rectangle {
                             source: buttCamImage
                             sourceSize.height: parent.height - parent.height * (buttImgBorder / 100.0)
                             sourceSize.width: parent.width - parent.width * (buttImgBorder / 100.0)
+                            height: sourceSize.height
+                            width:sourceSize.width
                             visible: parent.visible
                         }
                         background: Rectangle {

images/AdminSettings.svg

@@ -9,9 +9,6 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24.99995mm"
-   height="24.99995mm"
-   viewBox="0 0 88.582501 88.582501"
    id="svg3595"
    version="1.1"
    inkscape:version="0.91 r13725"

main.cpp

@@ -180,12 +180,12 @@ int main(int argc, char *argv[])
     QSize availSize = app.primaryScreen()->availableSize();
 
     if(QSysInfo::currentCpuArchitecture() == "x86_64") {
-        item->setProperty("width", 640);
-        item->setProperty("height", 480);
+        //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", 800);
+        item->setProperty("height", 480);
         //        item->setProperty("width", 1280);
         //        item->setProperty("height", 800);
     } else {