diff --git a/Makefile b/Makefile index 6ef5dc0..a0ad4fc 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ sdkpath:=$(HOME)/SailfishOS sourcePath:=$(shell pwd) dependencies=$(shell for file in `cat dependencies.txt`;do echo "-d "$${file};done;) arch:=armv7hl -version:=0.0.1 +version:=0.4.0 iteration:=1 rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm ssh_user:=defaultuser @@ -24,6 +24,7 @@ make-virt: build-tmp rpm-virt send-virt build-tmp: mkdir -p $(temp)/usr/share/applications mkdir -p $(temp)/usr/share/icons/hicolor/86x86/apps + mkdir -p $(temp)/usr/share/$(Appname)/src mkdir -p $(temp)/usr/bin cp -ar ./qml $(temp)/usr/share/$(Appname) cp -ar ./src/* $(temp)/usr/share/$(Appname)/src @@ -32,6 +33,7 @@ build-tmp: install -m 755 ./dat/$(Appname).sh $(temp)/usr/bin/$(Appname) rpm-virt: arch:=i686 +rpm-virt: rpmname:=$(Appname)-$(version)-$(iteration).$(arch).rpm rpm-virt: build-tmp cd $(temp);fpm -f -s dir -t rpm \ --after-install $(sourcePath)/dat/upgradeScript.sh \ diff --git a/qml/Icon.qml b/qml/Icon.qml index 14fb4f8..91344b2 100644 --- a/qml/Icon.qml +++ b/qml/Icon.qml @@ -44,11 +44,9 @@ Page { delegate: GridItem { onClicked: { - console.log("clicked " + idCell + " " + activated) activated = !activated iconEditor.corners[idCell] = activated py.importModule("main", function(){ - console.log(typeof icon.source); py.call("main.sailify", [iconEditor.attrs.Icon.toString().toString(), iconEditor.corners], function(result){ icon.source = result }) diff --git a/qml/Main.qml b/qml/Main.qml index b17f8f3..f0b5f5e 100644 --- a/qml/Main.qml +++ b/qml/Main.qml @@ -3,6 +3,7 @@ import Sailfish.Silica 1.0 import io.thp.pyotherside 1.3 Page { + property alias mainList: mainList SilicaFlickable { id: mainList anchors.fill: parent @@ -12,6 +13,10 @@ Page { text: "About" onClicked: pageStack.push(Qt.resolvedUrl("About.qml")) } + MenuItem { + text: "Refresh" + onClicked: mainList.reload() + } } PageHeader {