More use of Controls2

src/DetailsTextArea.qml

@@ -0,0 +1,79 @@
+/**
+ ** This file is part of the Baugeschichte.at project.
+ **
+ ** The MIT License (MIT)
+ **
+ ** Copyright (c) 2016 Guenter Schwann
+ **
+ ** Permission is hereby granted, free of charge, to any person obtaining a copy
+ ** of this software and associated documentation files (the "Software"), to deal
+ ** in the Software without restriction, including without limitation the rights
+ ** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ ** copies of the Software, and to permit persons to whom the Software is
+ ** furnished to do so, subject to the following conditions:
+ **
+ ** The above copyright notice and this permission notice shall be included in all
+ ** copies or substantial portions of the Software.
+ **
+ ** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ ** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ ** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ ** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ ** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ ** OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ ** SOFTWARE.
+ **/
+
+import QtQuick 2.4
+import QtQuick.Controls 2.0
+import "./"
+
+Item {
+    id: root
+
+    Rectangle {
+        id: textBackground
+        anchors.fill: root
+        color: "white"
+    }
+
+    Flickable {
+        id: textArea
+        anchors.fill: parent
+
+        contentWidth: textItem.paintedWidth
+        contentHeight: textItem.paintedHeight
+        clip: true
+
+        flickableDirection: Flickable.VerticalFlick
+        ScrollBar.vertical: ScrollBar {}
+
+        Item {
+            width: textArea.width
+            height: textArea.height
+
+            Text {
+                id: textItem
+                anchors.fill: parent
+                anchors.margins: Theme.smallMargin
+
+                wrapMode: TextEdit.WordWrap
+                textFormat: TextEdit.RichText
+                font.pixelSize: Theme.smallFontSize
+
+                text: (detailText.length > 0) ? detailText : qsTr("Kein Text")
+
+                onLinkActivated: {
+                    if (link.substr(0, 11) === "internal://") {
+                        var newBuilding = link.substring(11, link.length);
+                        console.debug("Open internal link: "+newBuilding);
+                        appCore.selectAndCenterHouse(newBuilding);
+                    } else {
+                        console.debug("Open external link: "+link);
+                        appCore.openExternalLink(link);
+                    }
+                }
+            }
+        }
+    }
+}

src/DetailsView.qml

@@ -39,7 +39,8 @@
 ****************************************************************************/
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4
+import QtQuick.Controls 1.4 as Controls1
+import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.1
 import "./"
 
@@ -113,7 +114,7 @@ BaseView {
         border.color: "#8E8E8E"
     }
 
-    SplitView {
+    Controls1.SplitView {
         id: splitView
         anchors {
             top: parent.top
@@ -215,34 +216,13 @@ BaseView {
                         wrapMode: Text.Wrap
                     }
 
-                    TextArea {
-                        anchors { top: titleText.bottom;
-                            bottom: parent.bottom; left: parent.left;
-                            right: parent.right
-                        }
-                        textMargin:Theme.smallMargin
-                        readOnly: true
-                        verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
-                        horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                        wrapMode: TextEdit.WordWrap
-                        text: (detailText.length > 0) ? detailText : qsTr("Kein Text")
-                        textFormat: TextEdit.RichText
-                        font.pixelSize: Theme.smallFontSize
-
-                        onLinkActivated: {
-                            if (link.substr(0, 11) === "internal://") {
-                                var newBuilding = link.substring(11, link.length);
-                                console.debug("Open internal link: "+newBuilding);
-                                appCore.selectAndCenterHouse(newBuilding);
-                            } else {
-                                console.debug("Open external link: "+link);
-                                appCore.openExternalLink(link);
-                            }
-                        }
+                    DetailsTextArea {
+                        anchors.top: titleText.bottom
+                        anchors.bottom: parent.bottom
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        anchors.margins: 1
                     }
-
-                    Keys.onLeftPressed: console.log("onLeft Details")
-                    Keys.onRightPressed: console.log("onLeft Details")
                 }
             }
         }

src/MapComponent.qml

@@ -25,7 +25,7 @@
  **/
 
 import QtQuick 2.4
-import QtQuick.Controls 1.4 as Controls1
+import QtQuick.Controls 2.0
 import QtQuick.Window 2.2
 import QtLocation 5.5
 import QtPositioning 5.5
@@ -270,18 +270,33 @@ BaseView {
         }
     }
 
-    Controls1.Slider {
+    Slider {
         id: zoomSlider
-        minimumValue: map.minimumZoomLevel
-        maximumValue: map.maximumZoomLevel
+        from: map.minimumZoomLevel
+        to: map.maximumZoomLevel
         anchors.margins: 10
         anchors.bottom: scaleItem.top
         anchors.top: parent.top
         anchors.right: parent.right
         orientation: Qt.Vertical
-        value: map.zoomLevel
-        onValueChanged: {
-            map.zoomLevel = value
+        onPositionChanged: {
+            map.zoomLevel = position2value(position);
+        }
+        function position2value(pos) {
+            return from + (to - from) * pos
+        }
+
+        Connections{
+            target: map
+            onZoomLevelChanged: {
+                if (!zoomSlider.pressed) {
+                    zoomSlider.value = map.zoomLevel;
+                }
+            }
+        }
+
+        Component.onCompleted: {
+            zoomSlider.value = map.zoomLevel;
         }
     }
 

src/main.cpp

@@ -32,6 +32,9 @@ int main(int argc, char* argv[])
 {
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true);
 
+    // style for Controls2
+    qputenv("QT_QUICK_CONTROLS_STYLE", "Material");
+
     QGuiApplication app(argc, argv);
     app.setApplicationDisplayName(QStringLiteral("Baugeschichte.at"));
 

src/main.qml

@@ -27,6 +27,7 @@
 import QtQuick 2.5
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 1.4 as Controls1
+import QtQuick.Controls.Material 2.0
 import QtPositioning 5.5
 import QtLocation 5.5
 import Qt.labs.settings 1.0
@@ -40,6 +41,8 @@ Item {
 
     visible: true
 
+    Material.accent: Material.LightBlue
+
     readonly property bool loading: (uiStack.currentItem && uiStack.currentItem.loading) ||
                                     markerLoader.loading ||
                                     categoryLoader.isLoading || routeLoader.loading

src/qml.qrc

@@ -53,5 +53,6 @@
         <file>qmldir</file>
         <file>ShutDownDialog.qml</file>
         <file>LoadIndicator.qml</file>
+        <file>DetailsTextArea.qml</file>
     </qresource>
 </RCC>