Merge pull request #41 from neochapay/theming

Theming
nemomobile · Jun 9, 2017 · 3858cd5 · 3858cd5
2 parents d20c032 + 7197e40
commit 3858cd5
Show file tree

Hide file tree

Showing 105 changed files with 802 additions and 4,166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,9 +3,13 @@
 .directory
 *.o
 *.so
+*.qmlc
 moc_*
 qrc_*
-examples/touch/touch_nemo
+.qmake.stash
+*.spec.*
+documentation.list
+examples/touch/glacier-components
 Makefile
 installroot/
 RPMS/
diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/touch/content/AndroidDelegate.qml
@@ -83,7 +83,7 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: 20
         anchors.verticalCenter: parent.verticalCenter
-        source: "../images/navigation_next_item.png"
+        source: "/usr/share/glacier-components/images/navigation_next_item.png"
     }
 
     MouseArea {

diff --git a/examples/touch/content/ButtonPage.qml b/examples/touch/content/ButtonPage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+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
@@ -54,11 +54,11 @@ Page {
         anchors.centerIn: parent
 
         Button {
-            property bool isGlacier: Theme.name == "Glacier"
+            property bool isGlacier: true
             anchors.margins: 20
             text: isGlacier ? "Set Ugly Theme" : "Set Nice Theme"
-            onClicked: isGlacier ? Theme.loadFromFile("ugly.json")
-                                 : Theme.loadFromFile("glacier.json")
+            onClicked: isGlacier ? Theme.loadTheme("ugly")
+                                 : Theme.loadTheme("glacier")
         }
 
         Button {

diff --git a/examples/touch/content/ButtonRowPage.qml b/examples/touch/content/ButtonRowPage.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/CheckboxPage.qml b/examples/touch/content/CheckboxPage.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/LabelPage.qml b/examples/touch/content/LabelPage.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/ListViewPage.qml b/examples/touch/content/ListViewPage.qml
@@ -1,4 +1,4 @@
-import QtQuick 2.1
+import QtQuick 2.6
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Nemo 1.0
 import QtQuick.Controls.Styles.Nemo 1.0

diff --git a/examples/touch/content/LiveCoding.qml b/examples/touch/content/LiveCoding.qml
@@ -17,7 +17,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-import QtQuick 2.1
+import QtQuick 2.6
 import QtQuick.Controls 1.0 //needed for the Stack attached property
 import QtQuick.Controls.Nemo 1.0
 import QtQuick.Layouts 1.0

diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/touch/content/ProgressBarPage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/QueryDialogPage.qml b/examples/touch/content/QueryDialogPage.qml
@@ -29,7 +29,7 @@
 **
 ****************************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/SelectRollerPage.qml b/examples/touch/content/SelectRollerPage.qml
@@ -1,80 +1,75 @@
-import QtQuick 2.1
+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: "Roller"
-    }
-
+    headerTools: HeaderToolsLayout { showBackButton: true; title: "Label" }
     allowedOrientations: Qt.PortraitOrientation | Qt.LandscapeOrientation | Qt.InvertedLandscapeOrientation | Qt.InvertedPortraitOrientation
 
-
-    ListModel {
-        id: animalsModel
-        ListElement { name: "Ant";}
-        ListElement { name: "Flea"; }
-        ListElement { name: "Parrot"; }
-        ListElement { name: "Guinea pig";}
-        ListElement { name: "Rat";}
-        ListElement { name: "Butterfly";}
-        ListElement { name: "Dog";}
-        ListElement { name: "Cat";}
-        ListElement { name: "Pony";}
-        ListElement { name: "Koala";}
-        ListElement { name: "Horse";}
-        ListElement { name: "Tiger";}
-        ListElement { name: "Giraffe";}
-        ListElement { name: "Elephant";}
-        ListElement { name: "Whale";}
-    }
-
-
-    GlacierRoller {
-        id: simpleRoller
+    Column {
+        spacing: 40
         width: parent.width
         anchors{
             top: parent.top
             topMargin: 40
         }
 
-        clip: true
-        model: animalsModel
-        label: qsTr("Choose your favorite animal")
-        delegate: GlacierRollerItem{
-            Text{
-                height: simpleRoller.itemHeight
-                text: name
-                color: "white"
-                font.pixelSize: 32
-                font.bold: (simpleRoller.activated && simpleRoller.currentIndex === index)
-            }
+        ListModel {
+            id: animalsModel
+            ListElement { name: "Ant";}
+            ListElement { name: "Flea"; }
+            ListElement { name: "Parrot"; }
+            ListElement { name: "Guinea pig";}
+            ListElement { name: "Rat";}
+            ListElement { name: "Butterfly";}
+            ListElement { name: "Dog";}
+            ListElement { name: "Cat";}
+            ListElement { name: "Pony";}
+            ListElement { name: "Koala";}
+            ListElement { name: "Horse";}
+            ListElement { name: "Tiger";}
+            ListElement { name: "Giraffe";}
+            ListElement { name: "Elephant";}
+            ListElement { name: "Whale";}
         }
-    }
 
-    GlacierRoller {
-        id: simpleRoller2
-        width: parent.width
-        anchors{
-            top: simpleRoller.bottom
-            topMargin: 40
+        GlacierRoller {
+            id: simpleRoller
+            width: parent.width
+
+            clip: true
+            model: animalsModel
+            label: qsTr("Choose your favorite animal")
+            delegate: GlacierRollerItem{
+                Text{
+                    height: simpleRoller.itemHeight
+                    text: name
+                    color: "white"
+                    font.pixelSize: 32
+                    font.bold: (simpleRoller.activated && simpleRoller.currentIndex === index)
+                }
+            }
         }
 
-        clip: true
-        model: animalsModel
-        label: qsTr("Choose your second favorite animal")
+        GlacierRoller {
+            id: simpleRoller2
+            width: parent.width
+
+            clip: true
+            model: animalsModel
+            label: qsTr("Choose your second favorite animal")
 
-        delegate: GlacierRollerItem{
-            Text{
-                height: simpleRoller2.itemHeight
-                text: name
-                color: "white"
-                font.pixelSize: 32
-                font.bold: (simpleRoller2.activated && simpleRoller2.currentIndex === index)
+            delegate: GlacierRollerItem{
+                Text{
+                    height: simpleRoller2.itemHeight
+                    text: name
+                    color: "white"
+                    font.pixelSize: 32
+                    font.bold: (simpleRoller2.activated && simpleRoller2.currentIndex === index)
+                }
             }
         }
     }

diff --git a/examples/touch/content/SliderPage.qml b/examples/touch/content/SliderPage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+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

diff --git a/examples/touch/content/TabBarPage.qml b/examples/touch/content/TabBarPage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+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
@@ -79,7 +79,7 @@ Page {
                     anchors.fill: parent
                     border.bottom: size.dp(8)
                     border.top: size.dp(8)
-                    source: styleData.selected ? "../images/tab_selected.png":"../images/tabs_standard.png"
+                    source: styleData.selected ? "/usr/share/glacier-components/images/tab_selected.png":"/usr/share/glacier-components/images/tabs_standard.png"
                     Text {
                         anchors.centerIn: parent
                         color: "white"

diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+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
@@ -71,13 +71,11 @@ Page {
         TextField {
             anchors.margins: size.dp(20)
             text: "Text input"
-            //style: touchStyle
         }
 
         TextField {
             anchors.margins: size.dp(20)
             text: "Readonly Text input"
-            //style: touchStyle
             readOnly: true
         }
 
@@ -112,7 +110,7 @@ Page {
                 implicitHeight: size.dp(50)
                 implicitWidth: size.dp(320)
                 BorderImage {
-                    source: "../images/textinput.png"
+                    source: "/usr/share/glacier-components/images/textinput.png"
                     border.left: size.dp(8)
                     border.right: size.dp(8)
                     anchors.bottom: parent.bottom

diff --git a/examples/touch/glacier-gallery.desktop b/examples/touch/glacier-gallery.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Glacier UI
+Name=Glacier components
 Categories=Applications;
-Exec=env QT_QUICK_CONTROLS_STYLE=Nemo /usr/lib/qt5/examples/touch_nemo
+Exec=env QT_QUICK_CONTROLS_STYLE=Nemo /usr/bin/glacier-components
 Icon=icon-app-components
 
 X-Desktop-File-Install-Version=0.20

diff --git a/examples/touch/main.qml b/examples/touch/main.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.1
+import QtQuick 2.6
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Nemo 1.0
 import QtQuick.Controls.Styles.Nemo 1.0
@@ -126,9 +126,9 @@ ApplicationWindow {
             id: tools
 
             title: "Nemo Touch Gallery"
-            tools: [ ToolButton { iconSource: "../images/icon_cog.png"},
-                ToolButton { iconSource: "../images/icon_edit.png"},
-                ToolButton { iconSource: "../images/icon_refresh.png"} ]
+            tools: [ ToolButton { iconSource: "/usr/share/glacier-components/images/icon_cog.png"},
+                ToolButton { iconSource: "/usr/share/glacier-components/images/icon_edit.png"},
+                ToolButton { iconSource: "/usr/share/glacier-components/images/icon_refresh.png"} ]
 
             //The parent of these items is null when this ToolsLayout is not used
             //(i.e. you're on a different page) so we need to check the parent,
@@ -176,19 +176,19 @@ ApplicationWindow {
                         id: tool1
                         anchors.right: parent.right
                         anchors.verticalCenter: parent.verticalCenter
-                        iconSource: "../images/icon_cog.png"
+                        iconSource: "/usr/share/glacier-components/images/icon_cog.png"
                     }
                     ToolButton {
                         id: tool2
                         anchors.right: tool1.left
                         anchors.verticalCenter: parent.verticalCenter
-                        iconSource: "../images/icon_edit.png"
+                        iconSource: "/usr/share/glacier-components/images/icon_edit.png"
                     }
                     ToolButton {
                         id: tool3
                         anchors.right: tool2.left
                         anchors.verticalCenter: parent.verticalCenter
-                        iconSource: "../images/icon_refresh.png"
+                        iconSource: "/usr/share/glacier-components/images/icon_refresh.png"
                     }
                 },
                 ButtonRow {
@@ -219,8 +219,8 @@ ApplicationWindow {
             model: pageModel
             anchors.fill: parent
             clip: true
-            delegate: AndroidDelegate {
-                text: title
+            delegate: ListViewItemWithActions {
+                label: title
                 onClicked: pageItem.Stack.view.push(Qt.resolvedUrl(page))
             }
         }

diff --git a/examples/touch/resources.qrc b/examples/touch/resources.qrc