Use Qt Quick Controls 2 & Qt Labs Platform

.gitignore

@@ -2,7 +2,6 @@
 build/
 bin/
 lib/
-qml/
 Makefile*
 *.o
 *.qm
@@ -31,6 +30,9 @@ moc_predefs.h
 .qmake.stash
 translations/phony_target.app
 
+# Mac stuff
+*.DS_Store
+
 # IDE files
 *.pro.user*
 *.qbs.user*

src/tiledquick/fonts/LICENSE.txt

@@ -0,0 +1,12 @@
+Font license info
+
+
+## Font Awesome
+
+   Copyright (C) 2016 by Dave Gandy
+
+   Author:    Dave Gandy
+   License:   SIL ()
+   Homepage:  http://fortawesome.github.com/Font-Awesome/
+
+

src/tiledquick/fonts/README.txt

@@ -0,0 +1,6 @@
+This webfont is generated by http://fontello.com open source project.
+
+
+To recreate fontawesome.ttf, drag and drop fontello-config.json onto the home page of fontello.com. For more information, read this:
+
+https://github.com/fontello/fontello/wiki/How-to-save-and-load-projects#simple-import

src/tiledquick/fonts/fontello-config.json

@@ -0,0 +1,22 @@
+{
+  "name": "fontawesome",
+  "css_prefix_text": "icon-",
+  "css_use_suffix": false,
+  "hinting": true,
+  "units_per_em": 1000,
+  "ascent": 850,
+  "glyphs": [
+    {
+      "uid": "c95735c17a10af81448c7fed98a04546",
+      "css": "folder-open",
+      "code": 59392,
+      "src": "fontawesome"
+    },
+    {
+      "uid": "f4445feb55521283572ee88bc304f928",
+      "css": "floppy",
+      "code": 59393,
+      "src": "fontawesome"
+    }
+  ]
+}

src/tiledquick/fonts/fonts.qrc

@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/fonts">
+        <file>fontawesome.ttf</file>
+    </qresource>
+</RCC>

src/tiledquick/qml/FontAwesome.qml

@@ -0,0 +1,7 @@
+pragma Singleton
+import QtQml 2.3
+
+QtObject {
+    readonly property string open: "\uE800"
+    readonly property string save: "\uE801"
+}

src/tiledquick/main.qml → src/tiledquick/qml/main.qml

@@ -1,37 +1,39 @@
-import QtQuick 2.4
-import QtQuick.Controls 1.3
-import QtQuick.Dialogs 1.2
-import QtQuick.Layouts 1.1
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
 import org.mapeditor.Tiled 1.0 as Tiled
 import Qt.labs.settings 1.0
+import Qt.labs.platform 1.0 as Platform
+
+// For access to FontAwesome Singleton
+import "."
 
 ApplicationWindow {
     id: window
-
-    visible: true
-
     width: 1024
     height: 720
-
     minimumWidth: 480
     minimumHeight: 320
-
     title: qsTr("Tiled Quick")
+    visible: true
+
+    FontLoader {
+        source: "fonts/fontawesome.ttf"
+    }
 
-    FileDialog {
+    Platform.FileDialog {
         id: fileDialog
         nameFilters: [ "TMX files (*.tmx)", "All files (*)" ]
         onAccepted: {
-            mapLoader.source = fileDialog.fileUrl
+            mapLoader.source = fileDialog.file
             settings.mapsFolder = fileDialog.folder
         }
     }
 
-    MessageDialog {
+    Platform.MessageDialog {
         id: aboutBox
         title: "About Tiled Quick"
         text: "This is an experimental Qt Quick version of Tiled,\na generic 2D map editor"
-        icon: StandardIcon.Information
     }
 
     Settings {
@@ -49,29 +51,34 @@ ApplicationWindow {
         id: openAction
         text: qsTr("Open...")
         shortcut: StandardKey.Open
-        iconName: "document-open"
         onTriggered: {
             fileDialog.folder = settings.mapsFolder
             fileDialog.open()
         }
     }
 
+    Action {
+        id: exitAction
+        text: qsTr("Exit")
+        shortcut: StandardKey.Quit
+        onTriggered: Qt.quit()
+    }
+
     menuBar: MenuBar {
         Menu {
             title: qsTr("File")
             MenuItem {
                 action: openAction
                 text: qsTr("Open...")
-                shortcut: StandardKey.Open
                 onTriggered: {
                     fileDialog.open()
                 }
             }
             MenuSeparator {}
             MenuItem {
                 text: qsTr("Exit")
-                shortcut: StandardKey.Quit
-                onTriggered: Qt.quit();
+                action: exitAction
+                onTriggered: Qt.quit()
             }
         }
         Menu {
@@ -83,11 +90,13 @@ ApplicationWindow {
         }
     }
 
-    toolBar: ToolBar {
+    header: ToolBar {
         RowLayout {
             anchors.fill: parent
             ToolButton {
                 action: openAction
+                font.family: "FontAwesome"
+                text: FontAwesome.open
             }
         }
     }
@@ -164,7 +173,7 @@ ApplicationWindow {
         }
     }
 
-    statusBar: StatusBar {
+    footer: Pane {
         RowLayout {
             Label {
                 text: {

src/tiledquick/qml.qrc → src/tiledquick/qml/qml.qrc

@@ -1,6 +1,9 @@
 <RCC>
     <qresource prefix="/">
-        <file>DragArea.qml</file>
         <file>main.qml</file>
+        <file>qtquickcontrols2.conf</file>
+        <file>DragArea.qml</file>
+        <file>FontAwesome.qml</file>
+        <file>qmldir</file>
     </qresource>
 </RCC>

src/tiledquick/qml/qmldir

@@ -0,0 +1 @@
+singleton FontAwesome 1.0 FontAwesome.qml

src/tiledquick/qml/qtquickcontrols2.conf

@@ -0,0 +1,2 @@
+[Controls]
+Style=Material

src/tiledquick/tiledquick.pro

@@ -14,7 +14,8 @@ macx {
 
 SOURCES += main.cpp
 RESOURCES += \
-    qml.qrc
+    qml/qml.qrc \
+    fonts/fonts.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =

src/tiledquick/tiledquick.qbs

@@ -16,8 +16,10 @@ QtGuiApplication {
     cpp.cxxLanguageVersion: "c++11"
 
     files: [
+        "fonts/fonts.qrc",
         "main.cpp",
-        "qml.qrc",
+        "qml/qml.qrc",
+        "qml/qtquickcontrols2.conf",
     ]
 
     Properties {