Merge branch 'master' into inversemousearea

examples/touch/content/IconPage.qml

@@ -0,0 +1,68 @@
+/****************************************************************************************
+**
+** Copyright (C) 2017 Eetu Kahelin
+** All rights reserved.
+**
+** You may use this file under the terms of BSD license as follows:
+**
+** Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are met:
+**     * Redistributions of source code must retain the above copyright
+**       notice, this list of conditions and the following disclaimer.
+**     * Redistributions in binary form must reproduce the above copyright
+**       notice, this list of conditions and the following disclaimer in the
+**       documentation and/or other materials provided with the distribution.
+**     * Neither the name of the author nor the
+**       names of its contributors may be used to endorse or promote products
+**       derived from this software without specific prior written permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+** WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR
+** ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**
+****************************************************************************************/
+
+import QtQuick 2.6
+import QtQuick.Controls 1.0 //needed for the Stack attached property
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+
+Page {
+    id: root
+
+    headerTools: HeaderToolsLayout { showBackButton: true; title: "Icon example" }
+    allowedOrientations: Qt.PortraitOrientation | Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation | Qt.InvertedPortraitOrientation
+
+    Column {
+        spacing: Theme.itemSpacingMedium
+        anchors.centerIn: parent
+        //fontawesome
+        IconButton {
+            source: "image://theme/compass"
+        }
+        //fontawesome
+        IconButton {
+            width: height
+            height: Theme.itemHeightExtraLarge
+            source: "image://theme/bell"
+            enabled:false
+        }
+        //fontawesome
+        IconButton {
+            source: "image://theme/address-book?" + Theme.fillColor
+        }
+        //glacier
+        IconButton {
+            width: height
+            height: Theme.itemHeightExtraLarge
+            source: "image://theme/icon-m-framework-close-thumbnail"
+        }
+    }
+}

examples/touch/main.qml

@@ -116,6 +116,10 @@ ApplicationWindow {
             title: "Query Dialog"
             page: "content/QueryDialogPage.qml"
         }
+        ListElement {
+            title: "Icons"
+            page: "content/IconPage.qml"
+        }
     }
 
 

examples/touch/touch.pro

@@ -24,29 +24,15 @@ qml.files += \
     content/ButtonRowPage.qml \
     content/QueryDialogPage.qml \
     content/ListViewPage.qml \
-    content/SelectRollerPage.qml
+    content/SelectRollerPage.qml \
+    content/IconPage.qml
 
 qml.path = /usr/share/glacier-components/content
 
 images.files = images/*.png
 images.path = /usr/share/glacier-components/images
 
-OTHER_FILES += \
-    main.qml \
-    content/AndroidDelegate.qml \
-    content/ButtonPage.qml \
-    content/ProgressBarPage.qml \
-    content/SliderPage.qml \
-    content/TabBarPage.qml \
-    content/TextInputPage.qml \
-    content/LiveCoding.qml \
-    content/SpinnerPage.qml \
-    content/LabelPage.qml \
-    content/CheckboxPage.qml \
-    content/ButtonRowPage.qml \
-    content/QueryDialogPage.qml \
-    content/ListViewPage.qml \
-    content/SelectRollerPage.qml
+OTHER_FILES += $$qml.files
 
 
 desktop.path = /usr/share/applications