Merge lp:~roman2861/zmusic/online-accounts into lp:zmusic

[Roman Zonov]

[Roman Zonov (roman2861)]

review: Approve

=== added file '.excludes'
--- .excludes	1970-01-01 00:00:00 +0000
+++ .excludes	2014-11-29 21:53:09 +0000
@@ -0,0 +1,5 @@
+Makefile
+*.tmp
+.bzr
+.git
+

=== renamed file '.excludes' => '.excludes.moved'
=== added file 'About.qml'
--- About.qml	1970-01-01 00:00:00 +0000
+++ About.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,24 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Page {
+    id: about
+    Column {
+        spacing: units.gu(2)
+        anchors.centerIn: parent
+        UbuntuShape {
+            width: if(mainview.width > mainview.height) { mainview.height/2 } else { mainview.width/2 }
+            height: width
+            anchors.horizontalCenter: parent.horizontalCenter
+            image: Image {
+                anchors.fill: parent
+                source: "graphics/author.jpg"
+            }
+        }
+        Text {
+            anchors.horizontalCenter: parent.horizontalCenter
+            font.pointSize: units.gu(2)
+            text: "Made by Zonov Roman"
+        }
+    }
+}

=== renamed file 'About.qml' => 'About.qml.moved'
=== added file 'Collection.qml'
--- Collection.qml	1970-01-01 00:00:00 +0000
+++ Collection.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,31 @@
+import QtQuick 2.0
+
+import QtMultimedia 5.0
+import Ubuntu.DownloadManager 0.1
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtQuick.LocalStorage 2.0
+import Qt.labs.folderlistmodel 1.0
+
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+
+Page {
+    id: spage
+    UbuntuListView {
+        id: downloadedview
+        anchors.fill: parent
+        model: collectionmodel
+        anchors.bottomMargin: units.gu(7)
+        delegate: Subtitled {
+            text: tracktitle
+            subText: artist
+            progression: true
+            removable: true
+            confirmRemoval: true
+            onItemRemoved: Js.deletecollection(id_track);
+            onClicked: { player.source=url; mainview.issearch=0; mainview.ispopular=0; mainview.iscollection=1; mainview.csong=ii-1; pl.start(); /*selected = !selected;*/ Js.getAtristArt(artist); track_title.text=tracktitle; track_artist.text=artist; if(mainview.sendtostatus) { Js.setBroadcast(owner,track_id); } }
+        }
+    }
+}

=== renamed file 'Collection.qml' => 'Collection.qml.moved'
=== added file 'Functions.js'
--- Functions.js	1970-01-01 00:00:00 +0000
+++ Functions.js	2014-11-29 21:53:09 +0000
@@ -0,0 +1,303 @@
+.import QtQuick.LocalStorage 2.0 as Sql
+
+function gettoken(it) {
+    var txt;
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS at(actoken TEXT, ownerid TEXT)');
+            //tx.executeSql('INSERT INTO at VALUES(?, ?)', [ 'hello', 'world' ]);
+            var rs = tx.executeSql('SELECT * FROM at');
+            var r = ""
+            for(var i = 0; i < rs.rows.length; i++) {
+                if(it===1) {
+                    r += rs.rows.item(i).actoken;
+                }
+                else {
+                    r += rs.rows.item(i).ownerid;
+                }
+            }
+            if(rs.rows.length===0) { txt=0; } else { txt=r; }
+        }
+    )
+    //console.log(txt);
+    return txt;
+}
+function insertactoken(atval,ownerid) {
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('DELETE FROM at WHERE 1');
+            tx.executeSql('INSERT INTO at VALUES(?,?)', [ atval,ownerid ]);
+        }
+    )
+}
+function getdownloaded() {
+    var txt;
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS downloaded(link TEXT, name TEXT, artist TEXT, timestamp INT)');
+            //tx.executeSql('INSERT INTO at VALUES(?, ?)', [ 'hello', 'world' ]);
+            var rs = tx.executeSql('SELECT * FROM downloaded ORDER BY timestamp DESC');
+            var r = ""
+            downloadedmodel.clear();
+            for(var i = 0; i < rs.rows.length; i++) {
+                downloadedmodel.append({url: rs.rows.item(i).link, tracktitle: rs.rows.item(i).name, artist: rs.rows.item(i).artist});
+            }
+        }
+    )
+}
+function insertdownload(link,name,artist) {
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO downloaded VALUES(?,?,?,?)', [ link,name,artist,Date.now() ]);
+            getdownloaded();
+        }
+    )
+}
+function deletedownload(link) {
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('DELETE FROM downloaded WHERE link=?', [ link ]);
+            getdownloaded();
+        }
+    )
+}
+function getcollection() {
+    var txt;
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('CREATE TABLE IF NOT EXISTS collection(id TEXT, name TEXT, artist TEXT, owner TEXT, timestamp INT)');
+            //tx.executeSql('INSERT INTO at VALUES(?, ?)', [ 'hello', 'world' ]);
+            var rs = tx.executeSql('SELECT * FROM collection ORDER BY timestamp DESC');
+            var r = "";
+            collectionmodel.clear();
+            for(var i = 0; i < rs.rows.length; i++) {
+                getTrack(rs.rows.item(i).owner,rs.rows.item(i).id,rs.rows.item(i).artist,rs.rows.item(i).name,i);
+            }
+        }
+    )
+}
+function insertcollection(link,name,artist,owner) {
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('INSERT INTO collection VALUES(?,?,?,?,?)', [ link,name,artist,owner,Date.now() ]);
+            getcollection();
+        }
+    )
+}
+function deletecollection(link) {
+    var db = Sql.LocalStorage.openDatabaseSync("zmusicdb", "1.0", "zMusic DB", 1000000);
+    db.transaction(
+        function(tx) {
+            tx.executeSql('DELETE FROM collection WHERE id=?', [ link ]);
+        }
+    )
+}
+function success(token, user_id) {
+    mainview.at = token;
+    mainview.owner_id=user_id;
+    playeropen.start();
+    act_ind_main.running=true;
+    getcollection();
+    getTracks();
+    popularTracks();
+}
+function getAtristArt(query) {
+    var request = new XMLHttpRequest()
+    request.open('POST', 'http://ws.audioscrobbler.com/2.0')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText);
+                var pr = result.results.artistmatches.artist.image[4];
+                albumbg.source=pr['#text'];
+                console.log(request.responseText);
+                return;
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('method=artist.search&format=json&api_key=ee799b9ba0839ad080b9a935e1039a07&artist='+query+'&limit=1');
+}
+function popularTracks() {
+    var request = new XMLHttpRequest()
+    console.log(mainview.at)
+    request.open('POST', 'https://api.vk.com/method/audio.getPopular')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText)
+                if(mainview.slt>0) {
+                    popularmodel.remove(searchmodel.count-1);
+                }
+                for (var i = 0; i < result.response.length; i++) {
+                    popularmodel.append({isnn: 0, owner: result.response[i].owner_id, id_track: result.response[i].id, tracktitle: result.response[i].title, ii: i, artist: result.response[i].artist, url: result.response[i].url})
+                }
+                act_ind_main.running=false;
+                logined = 1;
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('only_eng=1&offset='+mainview.slt+'&count=50&v=5.2&access_token='+mainview.at+'');
+}
+function searchTracks(search) {
+    var request = new XMLHttpRequest()
+    console.log(mainview.at)
+    request.open('POST', 'https://api.vk.com/method/audio.search')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText)
+                if(mainview.sslt>0) {
+                    searchmodel.remove(mainview.sslt);
+                }
+                for (var i = 0; i < result.response.items.length; i++) {
+                    searchmodel.append({isnnn: 0, owner: result.response.items[i].owner_id, id_track: result.response.items[i].id, tracktitle: result.response.items[i].title, ii: i, artist: result.response.items[i].artist, url: result.response.items[i].url});
+                }
+                mainview.sslt=mainview.sslt+50;
+                if(result.response.count > mainview.sslt) {
+                    searchmodel.append({isnnn: 1})
+                }
+                act_ind_main.running=false;
+                logined = 1;
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('q='+search+'&offset=0&auto_complete=1&count=50&v=5.2&access_token='+mainview.at+'');
+}
+function getTrack(owner,id,artist,tracktitle,i) {
+    var request = new XMLHttpRequest()
+    request.open('POST', 'https://api.vk.com/method/audio.getById')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText);
+                console.log(request.responseText);
+                var res = result.response[0].url;
+                collectionmodel.append({ii: i, id_track: id, owner: owner, tracktitle: tracktitle, artist: artist, url: res});
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('audios='+owner+'_'+id+'&v=5.2&access_token='+mainview.at+'');
+}
+function setBroadcast(owner,id) {
+    console.log(owner+'_'+id);
+    var request = new XMLHttpRequest()
+    request.open('POST', 'https://api.vk.com/method/audio.setBroadcast')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText);
+                console.log(request.responseText);
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('audio='+owner+'_'+id+'&v=5.2&access_token='+mainview.at+'');
+}
+function getTracks() {
+    var request = new XMLHttpRequest()
+    //console.log(mainview.at)
+    request.open('POST', 'https://api.vk.com/method/audio.get')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                var result = JSON.parse(request.responseText);
+                if(mainview.lt>0) {
+                    musicmodel.remove(mainview.lt);
+                }
+                for (var i = 0; i < result.response.items.length; i++) {
+                    musicmodel.append({isn: 0, id_track: result.response.items[i].id, owner: result.response.items[i].owner_id, tracktitle: result.response.items[i].title, ii: i, artist: result.response.items[i].artist, url: result.response.items[i].url});
+                }
+                mainview.lt=mainview.lt+50;
+                if(result.response.count > mainview.lt) {
+                    musicmodel.append({isn: 1})
+                }
+                act_ind_main.running=false;
+                logined = 1;
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('need_user=0&offset='+mainview.lt+'&count=50&v=5.2&access_token='+mainview.at+'');
+}
+function deleteTrack(audid) {
+    var request = new XMLHttpRequest()
+    request.open('POST', 'https://api.vk.com/method/audio.delete')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                console.log('audio_id='+audid+'&owner_id='+mainview.owner_id+'&v=5.2&access_token='+mainview.at);
+                var result = JSON.parse(request.responseText)
+            } else {
+                console.log("HTTP:", request.status, request.statusText)
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('audio_id='+audid+'&owner_id='+mainview.owner_id+'&v=5.2&access_token='+mainview.at+'');
+}
+function addTrack(audid,owner) {
+    var request = new XMLHttpRequest()
+    request.open('POST', 'https://api.vk.com/method/audio.add')
+    request.onreadystatechange = function() {
+        if (request.readyState === XMLHttpRequest.DONE) {
+            if (request.status && request.status === 200) {
+                console.log('audio_id='+audid+'&owner_id='+owner+'&v=5.2&access_token='+mainview.at);
+                var result = JSON.parse(request.responseText);
+                mainview.lt=0;
+                musicmodel.clear();
+                getTracks();
+            } else {
+                console.log("HTTP:", request.status, request.statusText);
+            }
+        }
+    }
+    request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+    request.send('audio_id='+audid+'&owner_id='+owner+'&v=5.2&access_token='+mainview.at+'');
+}
+function nextSong() {
+    playingstate.visible=false; player.source=musicmodel.get(mainview.csong+1).url; player.play(); /*selected = !selected;*/ getAtristArt(musicmodel.get(mainview.csong+1).artist); track_title.text=musicmodel.get(mainview.csong+1).tracktitle; track_artist.text=musicmodel.get(mainview.csong+1).artist; csong=mainview.csong+1;
+}
+function lastSong() {
+    playingstate.visible=false; player.source=musicmodel.get(mainview.csong-1).url; player.play(); /*selected = !selected;*/ getAtristArt(musicmodel.get(mainview.csong-1).artist); track_title.text=musicmodel.get(mainview.csong-1).tracktitle; track_artist.text=musicmodel.get(mainview.csong-1).artist; csong=mainview.csong-1;
+}
+function nextSongS() {
+    playingstate.visible=false; player.source=searchmodel.get(mainview.csong+1).url; player.play(); /*selected = !selected;*/ getAtristArt(searchmodel.get(mainview.csong+1).artist); track_title.text=searchmodel.get(mainview.csong+1).tracktitle; track_artist.text=searchmodel.get(mainview.csong+1).artist; csong=mainview.csong+1;
+}
+function lastSongS() {
+    playingstate.visible=false; player.source=searchmodel.get(mainview.csong-1).url; player.play(); /*selected = !selected;*/ getAtristArt(searchmodel.get(mainview.csong-1).artist); track_title.text=searchmodel.get(mainview.csong-1).tracktitle; track_artist.text=searchmodel.get(mainview.csong-1).artist; csong=mainview.csong-1;
+}
+function nextSongP() {
+    playingstate.visible=false; player.source=popularmodel.get(mainview.csong+1).url; player.play(); /*selected = !selected;*/ getAtristArt(popularmodel.get(mainview.csong+1).artist); track_title.text=popularmodel.get(mainview.csong+1).tracktitle; track_artist.text=popularmodel.get(mainview.csong+1).artist; csong=mainview.csong+1;
+}
+function lastSongP() {
+    playingstate.visible=false; player.source=popularmodel.get(mainview.csong-1).url; player.play(); /*selected = !selected;*/ getAtristArt(popularmodel.get(mainview.csong-1).artist); track_title.text=popularmodel.get(mainview.csong-1).tracktitle; track_artist.text=popularmodel.get(mainview.csong-1).artist; csong=mainview.csong-1;
+}
+function nextSongC() {
+    playingstate.visible=false; player.source=collectionmodel.get(mainview.csong+1).url; player.play(); /*selected = !selected;*/ getAtristArt(collectionmodel.get(mainview.csong+1).artist); track_title.text=collectionmodel.get(mainview.csong+1).tracktitle; track_artist.text=collectionmodel.get(mainview.csong+1).artist; csong=mainview.csong+1;
+}
+function lastSongC() {
+    playingstate.visible=false; player.source=collectionmodel.get(mainview.csong-1).url; player.play(); /*selected = !selected;*/ getAtristArt(collectionmodel.get(mainview.csong-1).artist); track_title.text=collectionmodel.get(mainview.csong-1).tracktitle; track_artist.text=collectionmodel.get(mainview.csong-1).artist; csong=mainview.csong-1;
+}

=== renamed file 'Functions.js' => 'Functions.js.moved'
=== added file 'MyTracks.qml'
--- MyTracks.qml	1970-01-01 00:00:00 +0000
+++ MyTracks.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,65 @@
+import QtQuick 2.0
+import QtMultimedia 5.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+
+Page {
+    id: mtpage
+
+    UbuntuListView {
+        id: musicview
+        anchors.fill: parent
+        model: musicmodel
+        anchors.bottomMargin: units.gu(7)
+        delegate: Subtitled {
+            text: if(isn==1) { "" } else { tracktitle }
+            subText: if(isn==1) { "" } else { artist }
+            progression: if(isn==0) { true } else { false }
+            removable: true
+            confirmRemoval: true
+            onPressAndHold: { PopupUtils.open(aystd); }
+            onItemRemoved: { Js.deleteTrack(id_track); }
+            onClicked: { player.source=url; csong=ii; mainview.ispopular=0; mainview.issearch=0; mainview.iscollection=0; Js.getAtristArt(artist); track_title.text=tracktitle; track_artist.text=artist; pl.start(); if(mainview.sendtostatus===true) { Js.setBroadcast(owner,id_track); } }
+            Component {
+                id: aystd
+                Dialog {
+                    id: aystdue
+                    title: i18n.tr("Actions")
+                    text: i18n.tr("What do you want to do?")
+                    Row {
+                        spacing: units.gu(1)
+
+                        Button {
+                            text: i18n.tr("To my best")
+                            color: "green"
+                            onClicked: { Js.insertcollection(id_track,tracktitle,artist,owner); PopupUtils.close(aystdue) }
+                            width: (parent.width)/2
+                        }
+                        Button {
+                            text: i18n.tr("Cancel")
+                            onClicked: { PopupUtils.close(aystdue) }
+                            width: (parent.width)/2
+                        }
+                    }
+                }
+            }
+            Button {
+                id: buttnext
+                visible: if(isn==1) { true } else { false }
+                width: mainview.width/1.5
+                anchors.centerIn: parent
+                text: "Next"
+                onClicked: { ntact.running=true; Js.getTracks(); this.visible=false; }
+            }
+            ActivityIndicator {
+                id: ntact
+                running: false
+                anchors.centerIn: buttnext
+            }
+        }
+    }
+}

=== renamed file 'MyTracks.qml' => 'MyTracks.qml.moved'
=== added file 'Popular.qml'
--- Popular.qml	1970-01-01 00:00:00 +0000
+++ Popular.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,50 @@
+import QtQuick 2.0
+
+import QtMultimedia 5.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+
+Page {
+    id: spage
+
+    UbuntuListView {
+        id: popularview
+        anchors.fill: parent
+        model: popularmodel
+        anchors.bottomMargin: units.gu(7)
+        delegate: Subtitled {
+            text: tracktitle
+            subText: artist
+            progression: true
+            onPressAndHold: { PopupUtils.open(aystd); }
+            onClicked: { player.source=url; mainview.issearch=0; mainview.iscollection=0; mainview.ispopular=1; csong=ii; pl.start(); /*selected = !selected;*/ Js.getAtristArt(artist); track_title.text=tracktitle; track_artist.text=artist; if(mainview.sendtostatus) { Js.setBroadcast(owner,id_track); } }
+            Component {
+                id: aystd
+                Dialog {
+                    id: aystdue
+                    title: i18n.tr("Actions")
+                    text: i18n.tr("What do you want to do?")
+                    Row {
+                        spacing: units.gu(1)
+                        Button {
+                            text: i18n.tr("To VK")
+                            color: "green"
+                            onClicked:  { Js.addTrack(id_track,owner); PopupUtils.close(aystdue); }
+                            width: (parent.width)/2
+                        }
+                        Button {
+                            text: i18n.tr("To your best")
+                            color: "blue"
+                            onClicked: { Js.insertcollection(id_track,tracktitle,artist,owner); PopupUtils.close(aystdue) }
+                            width: (parent.width)/2
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== renamed file 'Popular.qml' => 'Popular.qml.moved'
=== added file 'Search.qml'
--- Search.qml	1970-01-01 00:00:00 +0000
+++ Search.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,112 @@
+import QtQuick 2.0
+import Ubuntu.DownloadManager 0.1
+import QtMultimedia 5.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+
+Page {
+    id: spage
+    Rectangle {
+        id: addBar
+
+        property bool expanded: visible
+
+        color: Qt.rgba(0.2,0.2,0.2,0.2)
+
+        property alias text: filterField.text
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+        }
+
+        height: expanded ? filterField.height + addBarDivider.height + units.gu(2) : 0
+        clip: true
+        TextField {
+            id: filterField
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: addBarDivider.bottom
+                margins: units.gu(1)
+            }
+            onAccepted: { sslt=0; searchmodel.clear(); Js.searchTracks(filterField.text) }
+            placeholderText: i18n.tr("Search...")
+            onFocusChanged: {
+                if(focus==true) {
+                    //PopupUtils.open(popoverComponent, filterField)
+                }
+            }
+        }
+
+        ThinDivider {
+            id: addBarDivider
+
+            //rotation: 180
+
+            anchors {
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+            }
+        }
+    }
+    UbuntuListView {
+        id: searchview
+        model: searchmodel
+        width: mainview.width
+        height: spage.height
+        anchors.top: addBar.bottom
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: units.gu(7)
+        clip: true
+        delegate: Subtitled {
+            text: if(isnnn==1) { "" } else { tracktitle }
+            subText: if(isnnn==1) { "" } else { artist }
+            progression: if(isnnn==0) { true } else { false }
+            onPressAndHold: PopupUtils.open(aystd);
+            onClicked: { player.source=url; mainview.ispopular=0; mainview.iscollection=0; mainview.issearch=1; csong=ii; pl.start(); Js.getAtristArt(artist); track_title.text=tracktitle; track_artist.text=artist; if(mainview.sendtostatus) { Js.setBroadcast(owner,track_id); } }
+            Component {
+                id: aystd
+                Dialog {
+                    id: aystdue
+                    title: i18n.tr("Actions")
+                    text: i18n.tr("What do you want to do?")
+                    Row {
+                        spacing: units.gu(1)
+                        Button {
+                            text: i18n.tr("To VK")
+                            color: "green"
+                            onClicked:  { Js.addTrack(id_track,owner); PopupUtils.close(aystdue); }
+                            width: (parent.width)/2
+                        }
+                        Button {
+                            text: i18n.tr("To your best")
+                            color: "blue"
+                            onClicked: { Js.insertcollection(id_track,tracktitle,artist,owner); PopupUtils.close(aystdue) }
+                            width: (parent.width)/2
+                        }
+                    }
+                }
+            }
+            Button {
+                id: nextsbutt
+                visible: if(isnnn==1) { true } else { false }
+                width: mainview.width/1.5
+                anchors.centerIn: parent
+                text: "Next"
+                onClicked: { ntacts.running=true; Js.searchTracks(filterField.text); this.visible=false; }
+            }
+            ActivityIndicator {
+                id: ntacts
+                running: false
+                anchors.centerIn: nextsbutt
+            }
+        }
+    }
+}

=== renamed file 'Search.qml' => 'Search.qml.moved'
=== added file 'Settings.qml'
--- Settings.qml	1970-01-01 00:00:00 +0000
+++ Settings.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,15 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1
+
+
+Page {
+    id: settings
+    Standard {
+        text: i18n.tr("Show current song in status")
+        control: CheckBox {
+            checked: mainview.sendtostatus
+            onCheckedChanged: { mainview.sendtostatus = checked; }
+        }
+    }
+}

=== renamed file 'Settings.qml' => 'Settings.qml.moved'
=== added file 'TracksT.qml'
--- TracksT.qml	1970-01-01 00:00:00 +0000
+++ TracksT.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,47 @@
+import QtQuick 2.0
+import QtMultimedia 5.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+
+Tabs {
+    id: tabs
+    Tab {
+        id: mytracks
+        title: i18n.tr("My tracks")
+        MyTracks {
+
+        }
+    }
+    Tab {
+        id: popular
+        title: i18n.tr("Popular")
+        Popular {
+
+        }
+    }
+    Tab {
+        id: search
+        title: i18n.tr("Search")
+        Search {
+
+        }
+    }
+    Tab {
+        id: about
+        title: i18n.tr("Your best")
+        Collection {
+
+        }
+    }
+    Tab {
+        id: settings
+        title: i18n.tr("Settings")
+        Settings {
+
+        }
+    }
+}

=== renamed file 'TracksT.qml' => 'TracksT.qml.moved'
=== added file 'Tutorial.qml'
--- Tutorial.qml	1970-01-01 00:00:00 +0000
+++ Tutorial.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,314 @@
+import QtQuick 2.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import "URLQuery.js" as URLQuery
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Web 0.2
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import "components"
+
+Walkthough {
+    id: walkthrough
+    appName: "zMusic"
+
+    // Needs custom property to show up in autopilot tests
+    property bool test: true
+
+    model: [
+         Component {
+            Item {
+                Column {
+                    id: welcomeColumn
+                    anchors {
+                        centerIn: parent
+                        margins: units.gu(2)
+                    }
+
+                    Label {
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        fontSize: "large"
+                        text: i18n.tr("Welcome to")
+                    }
+
+                    Label {
+                        fontSize: "x-large"
+                        font.bold: true
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        text: i18n.tr("zMusic")
+                    }
+                }
+
+                ActivityIndicator {
+                    id: tutact
+                    running: true
+                    anchors {
+                        bottom: parent.bottom
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                }
+                Label {
+                    id: presstostart
+                    opacity: 0
+                    anchors {
+                        bottom: parent.bottom
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                    text: "Press anywhere to start!"
+                }
+
+                ParallelAnimation {
+                    running: ptsb
+                    NumberAnimation { target: tutact; property: "opacity"; to: 0; }
+                    NumberAnimation { target: presstostart; property: "opacity"; to: 1; }
+                }
+
+                Label {
+                    id: swleft
+                    opacity: 0
+                    anchors {
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                    color: "black"
+                    text: i18n.tr("Swipe left to continue")
+                }
+                Image {
+                    anchors {
+                        centerIn: parent
+                    }
+                    fillMode: Image.PreserveAspectFit
+                    width: mainview.width>mainview.height ? mainview.width/2.5 : mainview.width/1.5
+                    height: width
+                    source: Qt.resolvedUrl("graphics/logovk.png")
+                    ParallelAnimation {
+                        running: iwvl
+                        NumberAnimation { targets: [swleft]; property: "opacity"; to: 1; duration: 500 }
+                        NumberAnimation { target: tutact; property: "opacity"; to: 0; duration: 500; }
+                    }
+                }
+
+            }
+        },
+
+        Component {
+           Item {
+               Label {
+                   id: headerLabel
+                   anchors.horizontalCenter: parent.horizontalCenter
+                   fontSize: "x-large"
+                   text: i18n.tr("What is VK?")
+                   anchors.top: parent.top
+                   anchors.topMargin: units.gu(2)
+                   color: "black"
+               }
+
+               Label {
+                   id: contentsLabel
+                   anchors {
+                       top: headerLabel.bottom
+                       margins: units.gu(2)
+                   }
+
+                   width: parent.width
+                   font.pixelSize: units.dp(17)
+                   wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                   horizontalAlignment: Text.AlignHCenter
+                   color: "black"
+                   text: i18n.tr("VK is the largest European social network with more than a 100 million active users.")
+               }
+
+               Image {
+                   id: dog1
+                   fillMode: Image.PreserveAspectFit
+                   width: parent.width
+                   source: Qt.resolvedUrl("graphics/dog.png")
+                   smooth: true
+                   antialiasing: true
+                   opacity: 0
+                   anchors {
+                       top: contentsLabel.bottom
+                       bottom: parent.bottom
+                       topMargin: units.gu(2)
+                   }
+               }
+               NumberAnimation { target: dog1; property: "opacity"; from: dog1.opacity; to: 1; duration: 1000; running: ci===1; }
+           }
+        },
+        Component {
+            Item {
+                /*Rectangle {
+                    id: loadingw
+                    anchors.centerIn: parent
+                    width: column.width + units.gu(4)
+                    height: column.height + units.gu(4)
+                    color: "transparent"
+
+                    Behavior on opacity {
+                        UbuntuNumberAnimation {
+                            duration: UbuntuAnimation.SlowDuration
+                        }
+                    }
+
+                    Column {
+                        id: column
+                        anchors.centerIn: parent
+                        spacing: units.gu(1)
+
+                        Label {
+                            anchors.horizontalCenter: parent.horizontalCenter
+                            fontSize: "large"
+                            text: i18n.tr("Loading web page...")
+                            color: "black"
+                        }
+
+                        ProgressBar {
+                            anchors.horizontalCenter: parent.horizontalCenter
+
+                            width: units.gu(30)
+                            maximumValue: 100
+                            minimumValue: 0
+                            value: autww.loadProgress
+                        }
+                    }
+                }*/
+
+                Column {
+                    id: waitpl
+                    anchors.centerIn: parent
+                    spacing: units.gu(2)
+                    Label {
+                        text: "Wait, please"
+                    }
+                    ActivityIndicator {
+                        running: true
+                        anchors.horizontalCenter: parent.horizontalCenter
+                    }
+                }
+
+                ListView {
+                    id: accountsList
+                    spacing: units.gu(1)
+                    z: 1000
+                    anchors.fill: parent
+                    model: accounts
+                    delegate: Rectangle {
+                        id: wrapper
+                        width: accountsList.width
+                        height: units.gu(10)
+                        color: "transparent"
+                        Component.onCompleted: {
+                            console.log(accts.provider.id);
+                            var params = {};
+
+                        }
+                        Button {
+                            anchors.fill: parent
+                            anchors.margins: units.gu(2)
+
+                            text: i18n.tr("Authenticate %1").arg(displayName)
+
+                            onClicked: {
+                                var params = {}
+                                accts.authenticate(params)
+                            }
+                        }
+                        AccountService {
+                            id: accts
+                            objectHandle: accountServiceHandle
+                            onAuthenticated: {
+                                moar.visible=false;
+                                Js.success(reply.AccessToken, 2410788);
+                                walkthrough.visible=false;
+                            }
+                        }
+                    }
+                }
+
+                /*WebView {
+                    id: autww
+                    anchors.fill: parent
+                    scale: 1
+                    url: "https://oauth.vk.com/authorize?client_id=3609494&scope=audio,status&redirect_uri=https://oauth.vk.com/blank.html&display=touch&v=5.2&response_type=token";
+                    onLoadingChanged: {
+                        console.log(url);
+                        wvisop=true;
+                        if (loading) {
+                            autww.visible=false;
+                            loadingw.visible=true;
+                            return
+                        } else if(lastLoadSucceeded) {
+                            var urll = autww.url;
+                            urll = urll.toString();
+                            var result = URLQuery.parseParams(urll);
+                            loadingw.visible=false;
+                            var resat;
+                            resat = result.access_token;
+                            if (!resat&&!result.error) {
+                                act_ind_main.running=false;
+                                tutorial.visible=true;
+                                autww.visible=true;
+                                return;
+                            }
+                            else if(result.error) {
+                                Qt.quit();
+                            }
+                            else {
+                                if(ci==2) {
+                                    moar.visible=true;
+                                }
+                                oa=true;
+                                at=result.access_token;
+                                owner_id=result.user_id;
+                                Js.insertactoken(at,owner_id);
+                            }
+                        }
+                        else {
+                            return;
+                        }
+
+                    }
+                }*/
+                Label {
+                    id: headerlLabel
+                    opacity: oa===true ? 1 : 0
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    fontSize: "x-large"
+                    text: i18n.tr("Enjoy it!")
+                    color: "black"
+                    anchors.top: parent.top
+                    anchors.topMargin: units.gu(2)
+                }
+
+                Label {
+                    id: contentslLabel
+                    anchors {
+                        top: headerlLabel.bottom
+                        margins: units.gu(2)
+                    }
+                    opacity: oa===true ? 1 : 0
+                    width: parent.width
+                    font.pixelSize: units.dp(17)
+                    wrapMode: Text.WrapAtWordBoundaryOrAnywhere
+                    horizontalAlignment: Text.AlignHCenter
+                    color: "black"
+                    text: i18n.tr("I hope, that you'll like it! Please, write your reviews about my app! I hope, that with your help we'll make bug-free, useful and beautiful application!")
+                }
+                Label {
+                    id: openapp
+                    opacity: oa===true ? 1 : 0
+                    anchors {
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(2)
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                    color: "black"
+                    text: i18n.tr("Press anywhere to start using zMusic!")
+                    z: 10000000
+                }
+            }
+        }
+    ]
+}

=== renamed file 'Tutorial.qml' => 'Tutorial.qml.moved'
=== added file 'URLQuery.js'
--- URLQuery.js	1970-01-01 00:00:00 +0000
+++ URLQuery.js	2014-11-29 21:53:09 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 Nikita Krupenko
+ *
+ * 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.
+ */
+
+.pragma library
+
+function serializeParams(object, prefix) {
+    if (typeof object !== 'object') {
+        return ''
+    }
+
+    if (!prefix) {
+        prefix = ''
+    }
+
+    var output = []
+    var keysArray = (Array.isArray(object) ? object : Object.keys(object))
+    for (var i = 0; i < keysArray.length; i++) {
+        var key = (Array.isArray(object) ? i : keysArray[i])
+        if (typeof object[key] === 'object') {
+            output.push(serializeParams(object[key], (!prefix ? key : '%1[%2]'.arg(prefix).arg(key))))
+        } else {
+            output.push('%1=%2'.arg(encodeURIComponent(!prefix ? key : '%1[%2]'.arg(prefix).arg(Array.isArray(object) ? '' : key)))
+                        .arg(encodeURIComponent(object[key])))
+        }
+    }
+
+    return output.join('&').replace('%20', '+')
+}
+
+function parseParams(url) {
+    if (typeof url !== 'string') {
+        return null
+    }
+
+    var result = {}
+    var queries = url.replace(/[?#]/g, '&').replace(/^[^&]*?&/, '').replace(/[+]/g, '%20').split(/[&;]/)
+    for (var i = 0; i < queries.length; i++) {
+        var params = queries[i].split('=')
+        result[decodeURIComponent(params[0])] = decodeURIComponent(params[1])
+    }
+
+    return result
+}

=== renamed file 'URLQuery.js' => 'URLQuery.js.moved'
=== added directory 'components'
=== renamed directory 'components' => 'components.moved'
=== added file 'components/AwesomeIcon.qml'
--- components/AwesomeIcon.qml	1970-01-01 00:00:00 +0000
+++ components/AwesomeIcon.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,102 @@
+/*
+ * QML Air - A lightweight and mostly flat UI widget collection for QML
+ * Copyright (C) 2014 Michael Spencer
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+Item {
+    id: widget
+    property string name
+
+    property alias color: text.color
+    property alias size: text.font.pixelSize
+
+    width: Math.max(text.width, text.height)
+    height: width
+
+    property bool shadow: false
+
+    property var icons: {
+        "check-circle": "",
+        "check-square-o": "",
+        "circle": "",
+        "exclamation-triangle": "",
+        "calendar": "",
+        "github": "",
+        "file": "",
+        "clock": "",
+        "bookmark-o": "",
+        "user": "",
+        "comments-o": "",
+        "check": "",
+        "ellipse-h": "",
+        "ellipse-v": "",
+        "save": "",
+        "smile-o": "",
+        "spinner": "",
+        "square-o": "",
+        "times": "",
+        "times-circle": "",
+        "plus": "",
+        "bell-o": "",
+        "bell": "",
+        "chevron-left": "",
+        "chevron-right": "",
+        "cog": "",
+        "minus": "",
+        "dashboard": "",
+        "calendar-empty": "",
+        "calendar": "",
+        "bars":"",
+        "inbox": "",
+        "list": "",
+        "long-list": "",
+        "comment": "",
+        "download": "",
+        "tasks": "",
+        "bug": "",
+        "code-fork": "",
+        "clock-o": "",
+        "pencil-square-o":"",
+        "check-square-o":"",
+        "picture-o":"",
+        "trash": "",
+        "code": "",
+        "users": "",
+        "exchange": ""
+    }
+
+    property alias weight: text.font.weight
+
+    FontLoader { id: fontAwesome; source: Qt.resolvedUrl("../graphics/FontAwesome.otf") }
+
+    Label {
+        id: text
+        anchors.centerIn: parent
+
+        font.family: fontAwesome.name
+        font.weight: Font.Light
+        text: widget.icons.hasOwnProperty(widget.name) ? widget.icons[widget.name] : ""
+        //color: widget.enabled ? styleObject.color : styleObject.color_disabled
+        style: shadow ? Text.Raised : Text.Normal
+        styleColor: Qt.rgba(0,0,0,0.9)
+
+        Behavior on color {
+            ColorAnimation { duration: 200 }
+        }
+    }
+}

=== added file 'components/Walkthough.qml'
--- components/Walkthough.qml	1970-01-01 00:00:00 +0000
+++ components/Walkthough.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,156 @@
+/***************************************************************************
+ * Whatsoever ye do in word or deed, do all in the name of the             *
+ * Lord Jesus, giving thanks to God and the Father by him.                 *
+ * - Colossians 3:17                                                       *
+ *                                                                         *
+ * Ubuntu UI Extras - A collection of QML widgets not available            *
+ *                    in the default Ubuntu UI Toolkit                     *
+ * Copyright (C) 2013 Michael Spencer <[e-mail]>          *
+ *                                                                         *
+ * This program is free software: you can redistribute it and/or modify    *
+ * it under the terms of the GNU General Public License as published by    *
+ * the Free Software Foundation, either version 2 of the License, or       *
+ * (at your option) any later version.                                     *
+ *                                                                         *
+ * This program is distributed in the hope that it will be useful,         *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of          *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
+ * GNU General Public License for more details.                            *
+ *                                                                         *
+ * You should have received a copy of the GNU General Public License       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.    *
+ ***************************************************************************/
+import QtQuick 2.0
+import "../Functions.js" as Js
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+Page {
+    id: root
+
+    property list<Component> model
+
+    property string appName
+    property color completedPage
+    property color incompletePage
+
+    property bool exitable: false
+
+    signal finished
+
+    SequentialAnimation {
+        id: hideAnimation
+
+        UbuntuNumberAnimation {
+            duration: UbuntuAnimation.SlowDuration * 1/2
+            target: root
+            property: "opacity"
+            from: 1; to: 0;
+        }
+
+        ScriptAction {
+            script: {
+                pageStack.pop(root)
+            }
+        }
+    }
+
+    Component.onCompleted: mainview.forceActiveFocus()
+
+    Keys.onLeftPressed: {
+        if (list.currentIndex > 0)
+            list.currentIndex--
+    }
+
+    Keys.onRightPressed: {
+        if (list.currentIndex < list.count - 1)
+            list.currentIndex++
+    }
+
+    UbuntuListView {
+        id: listView
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: divider.top
+        }
+        model: root.model
+        onCurrentIndexChanged: {
+            ci=currentIndex;
+            if(accounts.count==0&&ci==2) {
+                setup.exec();
+            }
+        }
+        snapMode: ListView.SnapOneItem
+        orientation: Qt.Horizontal
+        highlightMoveDuration: UbuntuAnimation.FastDuration
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        highlightFollowsCurrentItem: true
+
+        delegate: Item {
+            width: listView.width
+            height: listView.height
+            clip: true
+
+            Loader {
+                anchors {
+                    fill: parent
+                }
+
+                sourceComponent: modelData
+            }
+        }
+    }
+
+    ListItem.ThinDivider {
+        id: divider
+        anchors.bottom: footer.top
+        opacity: 0
+        visible: iwvl
+    }
+
+    ParallelAnimation {
+        running: iwvl
+        NumberAnimation { targets: [divider,footer]; property: "opacity"; to: 1; duration: 500 }
+    }
+
+    Row {
+        id: footer
+        anchors.bottom: parent.bottom
+        anchors.horizontalCenter: parent.horizontalCenter
+        height: units.gu(6)
+        opacity: 0
+        visible: iwvl
+        spacing: (height - size)/2
+
+        property real size: units.gu(2)
+
+        Repeater {
+            model: listView.count
+            delegate: Rectangle {
+                anchors.verticalCenter: parent.verticalCenter
+                width: footer.size
+                height: width
+                radius: width/2
+
+                color: listView.currentIndex >= index ? "#4d7198" : "white"
+
+                Behavior on color {
+                    ColorAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+
+                    onClicked: {
+                        listView.currentIndex = index
+                    }
+                }
+            }
+        }
+    }
+}

=== added directory 'graphics'
=== renamed directory 'graphics' => 'graphics.moved'
=== added file 'graphics/FontAwesome.otf'
Binary files graphics/FontAwesome.otf	1970-01-01 00:00:00 +0000 and graphics/FontAwesome.otf	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/author.jpg'
Binary files graphics/author.jpg	1970-01-01 00:00:00 +0000 and graphics/author.jpg	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/back.png'
Binary files graphics/back.png	1970-01-01 00:00:00 +0000 and graphics/back.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/dog.png'
Binary files graphics/dog.png	1970-01-01 00:00:00 +0000 and graphics/dog.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/dog2.png'
Binary files graphics/dog2.png	1970-01-01 00:00:00 +0000 and graphics/dog2.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/forward.png'
Binary files graphics/forward.png	1970-01-01 00:00:00 +0000 and graphics/forward.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/logo.jpg'
Binary files graphics/logo.jpg	1970-01-01 00:00:00 +0000 and graphics/logo.jpg	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/logo.png'
Binary files graphics/logo.png	1970-01-01 00:00:00 +0000 and graphics/logo.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/logo2.png'
Binary files graphics/logo2.png	1970-01-01 00:00:00 +0000 and graphics/logo2.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/logo4.jpg'
Binary files graphics/logo4.jpg	1970-01-01 00:00:00 +0000 and graphics/logo4.jpg	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/logovk.png'
Binary files graphics/logovk.png	1970-01-01 00:00:00 +0000 and graphics/logovk.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/pause.png'
Binary files graphics/pause.png	1970-01-01 00:00:00 +0000 and graphics/pause.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/play.png'
Binary files graphics/play.png	1970-01-01 00:00:00 +0000 and graphics/play.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/settings.png'
Binary files graphics/settings.png	1970-01-01 00:00:00 +0000 and graphics/settings.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/settings2.png'
Binary files graphics/settings2.png	1970-01-01 00:00:00 +0000 and graphics/settings2.png	2014-11-29 21:53:09 +0000 differ
=== added file 'graphics/settings3.png'
Binary files graphics/settings3.png	1970-01-01 00:00:00 +0000 and graphics/settings3.png	2014-11-29 21:53:09 +0000 differ
=== added directory 'locale'
=== renamed directory 'locale' => 'locale.moved'
=== added file 'locale/en.po'
--- locale/en.po	1970-01-01 00:00:00 +0000
+++ locale/en.po	2014-11-29 21:53:09 +0000
@@ -0,0 +1,141 @@
+# Russian translations for PACKAGE package
+# Английские переводы для пакета PACKAGE.
+# Copyright (C) 2014 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Зонов Роман <[e-mail]>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-19 19:57+0400\n"
+"PO-Revision-Date: 2014-10-19 19:57+0400\n"
+"Last-Translator: Зонов Роман <[e-mail]>\n"
+"Language-Team: Russian\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#: Popular.qml:29 MyTracks.qml:31 Search.qml:78
+msgid "Actions"
+msgstr ""
+
+#: Popular.qml:30 MyTracks.qml:32 Search.qml:79
+msgid "What do you want to do?"
+msgstr ""
+
+#: Popular.qml:34 Search.qml:83
+msgid "To VK"
+msgstr ""
+
+#: Popular.qml:40 Search.qml:89
+msgid "To your best"
+msgstr ""
+
+#: MyTracks.qml:37
+msgid "To my best"
+msgstr ""
+
+#: MyTracks.qml:43
+msgid "Cancel"
+msgstr ""
+
+#: Search.qml:39
+msgid "Search..."
+msgstr ""
+
+#: TracksT.qml:14
+msgid "My tracks"
+msgstr ""
+
+#: TracksT.qml:21
+msgid "Popular"
+msgstr ""
+
+#: TracksT.qml:28
+msgid "Search"
+msgstr ""
+
+#: TracksT.qml:35
+msgid "Your best"
+msgstr ""
+
+#: TracksT.qml:42
+msgid "Settings"
+msgstr ""
+
+#: Settings.qml:9
+msgid "Show current song in status"
+msgstr ""
+
+#: Tutorial.qml:30
+msgid "Welcome to"
+msgstr ""
+
+#: Tutorial.qml:37
+msgid "zMusic"
+msgstr ""
+
+#: Tutorial.qml:58
+msgid "Swipe left to continue"
+msgstr ""
+
+#: Tutorial.qml:84 zmusic.qml:83
+msgid "What is VK?"
+msgstr ""
+
+#: Tutorial.qml:102
+msgid ""
+"VK is the largest European social network with more than a 100 million "
+"active users."
+msgstr ""
+
+#: Tutorial.qml:145
+msgid "Loading web page..."
+msgstr ""
+
+#: Tutorial.qml:209
+msgid "Enjoy it!"
+msgstr ""
+
+#: Tutorial.qml:227
+msgid ""
+"I hope, that you'll like it! Please, write your reviews about my app! I "
+"hope, that with your help we'll make bug-free, useful and beautiful "
+"application!"
+msgstr ""
+
+#: Tutorial.qml:238
+msgid "Press anywhere to start using zMusic!"
+msgstr ""
+
+#: zmusic.qml:84
+msgid ""
+"VK (Originally VKontakte, literally 'in contact') is the second biggest "
+"social network service in Europe after Facebook, it is available in several "
+"languages but popular particularly among Russian-speaking users around the "
+"world, especially in Russia, Ukraine, Azerbaijan, Kazakhstan, Moldova, "
+"Belarus, and Israel. Like other social networks, VK allows users to message "
+"contacts publicly or privately, create groups, public pages and events, "
+"share and tag images, audio and video, and play browser-based games."
+msgstr ""
+
+#: zmusic.qml:88
+msgid "Register"
+msgstr ""
+
+#: zmusic.qml:94
+msgid "Sign in"
+msgstr ""
+
+#: zmusic.qml:123
+#, qt-format
+msgid "%1 song(-s) were listened in zMusic today"
+msgstr ""
+
+#: zmusic.qml:124
+msgid "No songs were listened today"
+msgstr ""

=== added file 'locale/messages.pot'
--- locale/messages.pot	1970-01-01 00:00:00 +0000
+++ locale/messages.pot	2014-11-29 21:53:09 +0000
@@ -0,0 +1,139 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-19 19:57+0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: Popular.qml:29 MyTracks.qml:31 Search.qml:78
+msgid "Actions"
+msgstr ""
+
+#: Popular.qml:30 MyTracks.qml:32 Search.qml:79
+msgid "What do you want to do?"
+msgstr ""
+
+#: Popular.qml:34 Search.qml:83
+msgid "To VK"
+msgstr ""
+
+#: Popular.qml:40 Search.qml:89
+msgid "To your best"
+msgstr ""
+
+#: MyTracks.qml:37
+msgid "To my best"
+msgstr ""
+
+#: MyTracks.qml:43
+msgid "Cancel"
+msgstr ""
+
+#: Search.qml:39
+msgid "Search..."
+msgstr ""
+
+#: TracksT.qml:14
+msgid "My tracks"
+msgstr ""
+
+#: TracksT.qml:21
+msgid "Popular"
+msgstr ""
+
+#: TracksT.qml:28
+msgid "Search"
+msgstr ""
+
+#: TracksT.qml:35
+msgid "Your best"
+msgstr ""
+
+#: TracksT.qml:42
+msgid "Settings"
+msgstr ""
+
+#: Settings.qml:9
+msgid "Show current song in status"
+msgstr ""
+
+#: Tutorial.qml:30
+msgid "Welcome to"
+msgstr ""
+
+#: Tutorial.qml:37
+msgid "zMusic"
+msgstr ""
+
+#: Tutorial.qml:58
+msgid "Swipe left to continue"
+msgstr ""
+
+#: Tutorial.qml:84 zmusic.qml:83
+msgid "What is VK?"
+msgstr ""
+
+#: Tutorial.qml:102
+msgid ""
+"VK is the largest European social network with more than a 100 million "
+"active users."
+msgstr ""
+
+#: Tutorial.qml:145
+msgid "Loading web page..."
+msgstr ""
+
+#: Tutorial.qml:209
+msgid "Enjoy it!"
+msgstr ""
+
+#: Tutorial.qml:227
+msgid ""
+"I hope, that you'll like it! Please, write your reviews about my app! I "
+"hope, that with your help we'll make bug-free, useful and beautiful "
+"application!"
+msgstr ""
+
+#: Tutorial.qml:238
+msgid "Press anywhere to start using zMusic!"
+msgstr ""
+
+#: zmusic.qml:84
+msgid ""
+"VK (Originally VKontakte, literally 'in contact') is the second biggest "
+"social network service in Europe after Facebook, it is available in several "
+"languages but popular particularly among Russian-speaking users around the "
+"world, especially in Russia, Ukraine, Azerbaijan, Kazakhstan, Moldova, "
+"Belarus, and Israel. Like other social networks, VK allows users to message "
+"contacts publicly or privately, create groups, public pages and events, "
+"share and tag images, audio and video, and play browser-based games."
+msgstr ""
+
+#: zmusic.qml:88
+msgid "Register"
+msgstr ""
+
+#: zmusic.qml:94
+msgid "Sign in"
+msgstr ""
+
+#: zmusic.qml:123
+#, qt-format
+msgid "%1 song(-s) were listened in zMusic today"
+msgstr ""
+
+#: zmusic.qml:124
+msgid "No songs were listened today"
+msgstr ""

=== added file 'locale/ru.po'
--- locale/ru.po	1970-01-01 00:00:00 +0000
+++ locale/ru.po	2014-11-29 21:53:09 +0000
@@ -0,0 +1,143 @@
+# Russian translation for zmusic
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the zmusic package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: zmusic\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-10-19 19:57+0400\n"
+"PO-Revision-Date: 2014-10-22 19:18+0000\n"
+"Last-Translator: Zonov Roman <Unknown>\n"
+"Language-Team: Russian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-22 19:28+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#: Popular.qml:29 MyTracks.qml:31 Search.qml:78
+msgid "Actions"
+msgstr "Действия"
+
+#: Popular.qml:30 MyTracks.qml:32 Search.qml:79
+msgid "What do you want to do?"
+msgstr "Что вы хотите сделать?"
+
+#: Popular.qml:34 Search.qml:83
+msgid "To VK"
+msgstr "В VK"
+
+#: Popular.qml:40 Search.qml:89
+msgid "To your best"
+msgstr "В коллекцию"
+
+#: MyTracks.qml:37
+msgid "To my best"
+msgstr "В коллекцию"
+
+#: MyTracks.qml:43
+msgid "Cancel"
+msgstr "Отмена"
+
+#: Search.qml:39
+msgid "Search..."
+msgstr "Поиск..."
+
+#: TracksT.qml:14
+msgid "My tracks"
+msgstr "Мои аудиозаписи"
+
+#: TracksT.qml:21
+msgid "Popular"
+msgstr "Популярные"
+
+#: TracksT.qml:28
+msgid "Search"
+msgstr "Поиск"
+
+#: TracksT.qml:35
+msgid "Your best"
+msgstr "Ваша коллекция"
+
+#: TracksT.qml:42
+msgid "Settings"
+msgstr "Настройки"
+
+#: Settings.qml:9
+msgid "Show current song in status"
+msgstr "Транслировать песни в статус"
+
+#: Tutorial.qml:30
+msgid "Welcome to"
+msgstr "Добро пожаловать в"
+
+#: Tutorial.qml:37
+msgid "zMusic"
+msgstr "zMusic"
+
+#: Tutorial.qml:58
+msgid "Swipe left to continue"
+msgstr "Смахните влево для начала"
+
+#: Tutorial.qml:84 zmusic.qml:83
+msgid "What is VK?"
+msgstr "Что такое VK?"
+
+#: Tutorial.qml:102
+msgid ""
+"VK is the largest European social network with more than a 100 million "
+"active users."
+msgstr ""
+"VK это наикрупнейшная европейская социальная сеть с более, чем 100 миллионов "
+"активных пользователейю"
+
+#: Tutorial.qml:145
+msgid "Loading web page..."
+msgstr "Загрузка страницы..."
+
+#: Tutorial.qml:209
+msgid "Enjoy it!"
+msgstr "Наслаждайтесь!"
+
+#: Tutorial.qml:227
+msgid ""
+"I hope, that you'll like it! Please, write your reviews about my app! I "
+"hope, that with your help we'll make bug-free, useful and beautiful "
+"application!"
+msgstr ""
+"Я надеюсь, что вам понравится! Пожалуйста, пишите отзывы о приложении. Я "
+"надеюсь сделать приложение стабильным, красивым и удобным!"
+
+#: Tutorial.qml:238
+msgid "Press anywhere to start using zMusic!"
+msgstr "Нажмите для того, чтобы начать!"
+
+#: zmusic.qml:84
+msgid ""
+"VK (Originally VKontakte, literally 'in contact') is the second biggest "
+"social network service in Europe after Facebook, it is available in several "
+"languages but popular particularly among Russian-speaking users around the "
+"world, especially in Russia, Ukraine, Azerbaijan, Kazakhstan, Moldova, "
+"Belarus, and Israel. Like other social networks, VK allows users to message "
+"contacts publicly or privately, create groups, public pages and events, "
+"share and tag images, audio and video, and play browser-based games."
+msgstr ""
+
+#: zmusic.qml:88
+msgid "Register"
+msgstr "Регистрация"
+
+#: zmusic.qml:94
+msgid "Sign in"
+msgstr "Войти"
+
+#: zmusic.qml:123
+#, qt-format
+msgid "%1 song(-s) were listened in zMusic today"
+msgstr "%1 песня(-и) были прослушаны в zMusic сегодня"
+
+#: zmusic.qml:124
+msgid "No songs were listened today"
+msgstr "Вы сегодня не заходили в zMusic"

=== added file 'manifest.json'
--- manifest.json	1970-01-01 00:00:00 +0000
+++ manifest.json	2014-11-29 21:53:09 +0000
@@ -0,0 +1,21 @@
+{
+    "name": "com.ubuntu.developer.roman2861.zmusic",
+    "description": "description of zmusic",
+    "architecture": "all",
+    "title": "zMusic",
+    "hooks": {
+        "zmusic": {
+            "account-application": "zmusic.application",
+            "account-service": "zmusic.service",
+            "apparmor": "zmusic.apparmor",
+            "desktop": "zmusic.desktop"
+        },
+        "vk": {
+            "account-provider": "plugin/com.ubuntu.developer.roman2861.zmusic_vk.provider",
+            "account-qml-plugin": "plugin/qml"
+        }
+    },
+    "version": "2.0",
+    "maintainer": "Zonov Roman <[e-mail]>",
+    "framework": "ubuntu-sdk-14.10"
+}

=== renamed file 'manifest.json' => 'manifest.json.moved'
=== added directory 'plugin'
=== added file 'plugin/com.ubuntu.developer.roman2861.zmusic_vk.provider'
--- plugin/com.ubuntu.developer.roman2861.zmusic_vk.provider	1970-01-01 00:00:00 +0000
+++ plugin/com.ubuntu.developer.roman2861.zmusic_vk.provider	2014-11-29 21:53:09 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<provider>
+  <name>VK</name>
+  <icon>logo4.jpg</icon>
+  <domains>.*vk\.com</domains>
+  <plugin>generic-oauth</plugin>
+  <single-account>true</single-account>
+
+  <template>
+    <group name="auth">
+      <setting name="method">oauth2</setting>
+      <setting name="mechanism">user_agent</setting>
+      <group name="oauth2">
+        <group name="user_agent">
+          <setting name="Host">oauth.vk.com</setting>
+          <setting name="AuthPath">/authorize</setting>
+          <setting name="RedirectUri">https://oauth.vk.com/blank.html</setting>
+          <setting name="Display">popup</setting>
+          <setting type="as" name="Scope">['audio']</setting>
+          <setting name="ClientId">3609494</setting>
+          <setting name="ResponseType">token</setting>
+          <setting type="as" name="AllowedSchemes">['https']</setting>
+        </group>
+      </group>
+    </group>
+  </template>
+</provider>

=== added directory 'plugin/qml'
=== added file 'plugin/qml/Main.qml'
--- plugin/qml/Main.qml	1970-01-01 00:00:00 +0000
+++ plugin/qml/Main.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,33 @@
+import Ubuntu.OnlineAccounts.Plugin 1.0
+
+OAuthMain {
+    creationComponent: OAuth {
+        function completeCreation(reply) {
+            console.log("Access token: " + reply.AccessToken)
+            var http = new XMLHttpRequest()
+            var url = "https://api.vk.com/method/users.get?access_token="+reply.AccessToken;
+            http.open("POST", url, true);
+            http.onreadystatechange = function() {
+                if (http.readyState === 4){
+                    if (http.status == 200) {
+                        console.log("ok")
+                        console.log("response text: " + http.responseText)
+                        var response = JSON.parse(http.responseText)
+                        account.updateDisplayName(response.response[0].first_name+" "+response.response[0].last_name)
+                        globalAccountService.updateSettings({
+                            'id': response.response[0].uid
+                        })
+                        account.synced.connect(finished)
+                        account.sync()
+
+                    } else {
+                        console.log("error: " + http.status)
+                        cancel()
+                    }
+                }
+            };
+
+            http.send(null);
+        }
+    }
+}

=== added file 'zmusic.apparmor'
--- zmusic.apparmor	1970-01-01 00:00:00 +0000
+++ zmusic.apparmor	2014-11-29 21:53:09 +0000
@@ -0,0 +1,11 @@
+{
+    "policy_groups": [
+        "networking",
+        "audio",
+        "usermetrics",
+        "video",
+        "webview",
+        "accounts"
+    ],
+    "policy_version": 1.2
+}

=== renamed file 'zmusic.apparmor' => 'zmusic.apparmor.moved'
=== added file 'zmusic.application'
--- zmusic.application	1970-01-01 00:00:00 +0000
+++ zmusic.application	2014-11-29 21:53:09 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<application>
+  <description>VK</description>
+
+  <services>
+    <service id="com.ubuntu.developer.roman2861.zmusic_zmusic">
+      <description>Do something with your Account Tester account</description>
+    </service>
+  </services>
+
+</application>

=== added file 'zmusic.desktop'
--- zmusic.desktop	1970-01-01 00:00:00 +0000
+++ zmusic.desktop	2014-11-29 21:53:09 +0000
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=zMusic
+Exec=qmlscene $@ zmusic.qml
+Icon=graphics/logo4.jpg
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+Name[ru_RU]=zmusic
+X-Ubuntu-Default-Department-ID=sound-video
+X-Ubuntu-Gettext-Domain=com.ubuntu.developer.roman2861.zmusic

=== renamed file 'zmusic.desktop' => 'zmusic.desktop.moved'
=== added file 'zmusic.png'
Binary files zmusic.png	1970-01-01 00:00:00 +0000 and zmusic.png	2014-11-29 21:53:09 +0000 differ
=== added file 'zmusic.qml'
--- zmusic.qml	1970-01-01 00:00:00 +0000
+++ zmusic.qml	2014-11-29 21:53:09 +0000
@@ -0,0 +1,333 @@
+import QtQuick 2.0
+import UserMetrics 0.1
+import QtMultimedia 5.0
+import "Functions.js" as Js
+import Ubuntu.Components 1.1
+import QtGraphicalEffects 1.0
+import QtQuick.LocalStorage 2.0
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+import Ubuntu.Components.ListItems 0.1
+import "URLQuery.js" as URLQuery
+import "components"
+
+MainView {
+    // Note! applicationName needs to match the "name" field of the click manifest
+    applicationName: "com.ubuntu.developer.roman2861.zmusic"
+    id: mainview
+    width: units.gu(50)
+    height: units.gu(75)
+    backgroundColor: "#e5e5e5"
+    property int is_at
+    property bool wvisop: false
+    property var at
+    property var tracks
+    property int lt
+    property int slt
+    property int sslt
+    property int temp
+    property int csong
+    property int logined
+    property int issearch
+    property int ispopular
+    property int iscollection
+    property int mttd
+    property int mttd2
+    property int owner_id
+    property bool iwvl: false
+    property bool ptsb: false
+    property int ci
+    property bool sendtostatus: true
+    property bool oa: false
+    useDeprecatedToolbar: false
+    anchorToKeyboard: true
+    AccountServiceModel {
+        id: accounts
+        provider: "com.ubuntu.developer.roman2861.zmusic_vk"
+        applicationId: "com.ubuntu.developer.roman2861.zmusic_zmusic"
+        Component.onCompleted: {
+            console.log(accounts.count);
+            if(accounts.count===0) {
+                iwvl=true;
+            }
+        }
+    }
+    ListView {
+        id: accountsList
+        spacing: units.gu(1)
+        z: 0
+        anchors.fill: parent
+        model: accounts
+        delegate: Rectangle {
+            id: wrapper
+            width: accountsList.width
+            height: units.gu(10)
+            color: "transparent"
+            Component.onCompleted: {
+                console.log(accts.provider.id);
+                var params = {}
+                accts.authenticate(params)
+            }
+            AccountService {
+                id: accts
+                objectHandle: accountServiceHandle
+                onAuthenticated: {
+                    moar.visible=false;
+                    Js.success(reply.AccessToken, 2410788);
+                    tutorial.visible=false;
+                }
+            }
+        }
+    }
+
+    ActivityIndicator {
+        id: act_ind_main
+        anchors.centerIn: parent
+    }
+    Tutorial {
+        id: tutorial
+    }
+    Setup {
+        id: setup
+        applicationId: "com.ubuntu.developer.roman2861.zmusic_zmusic"
+        providerId: "com.ubuntu.developer.roman2861.zmusic_vk"
+    }
+    MouseArea {
+        id: moar
+        anchors.fill: parent
+        z: 1000000
+        visible: false
+        onClicked: {
+            visible=false;
+            oa=false;
+            iwvl=false;
+            Js.success(at, owner_id);
+            tutorial.visible=false;
+        }
+    }
+
+    Component {
+         id: dialog
+         Dialog {
+             id: dialogue
+             title: i18n.tr("What is VK?")
+             text: i18n.tr("VK (Originally VKontakte, literally 'in contact') is the second biggest social network service in Europe after Facebook, it is available in several languages but popular particularly among Russian-speaking users around the world, especially in Russia, Ukraine, Azerbaijan, Kazakhstan, Moldova, Belarus, and Israel. Like other social networks, VK allows users to message contacts publicly or privately, create groups, public pages and events, share and tag images, audio and video, and play browser-based games.");
+             Row {
+                 spacing: units.gu(1)
+                 Button {
+                     text: i18n.tr("Register");
+                     color: "green"
+                     onClicked:  Qt.openUrlExternally("http://vk.com/");
+                     width: (parent.width)/2
+                 }
+                 Button {
+                     text: i18n.tr("Sign in")
+                     onClicked: { slogo.start(); PopupUtils.close(dialogue) }
+                     width: (parent.width)/2
+                 }
+             }
+         }
+    }
+    Loader {
+        anchors.fill: parent
+        source: (logined == 1) ? Qt.resolvedUrl("TracksT.qml") : ""
+    }
+    ListModel {
+        id: musicmodel
+    }
+    ListModel {
+        id: popularmodel
+    }
+    ListModel {
+        id: searchmodel
+    }
+    ListModel {
+        id: downloadedmodel
+    }
+    ListModel {
+        id: collectionmodel
+    }
+    Metric {
+        id: zmetrics
+        name: "zmetrics"
+        format: i18n.tr("%1 song(-s) were listened in zMusic today")
+        emptyFormat: i18n.tr("No songs were listened today")
+        domain: "com.ubuntu.developer.roman2861.zmusic"
+    }
+    Image {
+        id: albumbg
+        z: -5
+        fillMode: Image.PreserveAspectCrop
+        clip: true
+        Component.onCompleted: {
+            if(mainview.width>mainview.height) { width=mainview.width; if(height<mainview.height) { height=mainview.height; } } else { height=mainview.height; if(width<mainview.width) { width=mainview.width; } }
+        }
+        opacity: 0.3
+        onSourceChanged: {
+            console.log(source);
+        }
+    }
+    ActivityIndicator {
+        id: loadimage
+        anchors.centerIn:parent
+        running: albumbg.progress!=1
+        opacity: 0
+    }
+
+    Audio {
+        id: player;
+        onVolumeChanged: { console.log(volume) }
+        onSourceChanged: { loadimage.opacity=0.3; zmetrics.increment(); }
+        onStopped: { if(status == Audio.EndOfMedia) { albumbg.source=""; if(ispopular==1) { Js.nextSongP(); } else if(issearch==1) { Js.nextSongS() } else if(iscollection==1) { Js.nextSongC() } else { Js.nextSong(); } } }
+        onPositionChanged: { playingstate.width=mainview.width*(position/duration); }
+        onBufferProgressChanged: {loadingstate.width=mainview.width*bufferProgress; if(bufferProgress==1) { hideload.start(); playingstate.visible=true; } else { playingstate.visible=false; } }
+        onPlaybackStateChanged: { if(player.playbackState==Audio.PlayingState) { play_button.source = Qt.resolvedUrl("graphics/pause.png") } else { play_button.source = Qt.resolvedUrl("graphics/play.png") } }
+    }
+    NumberAnimation { id: hideload; target: loadingstate; property: "opacity"; duration: 200; from: 1; to: 0 }
+    NumberAnimation { id: playeropen; target: playerr; property: "anchors.bottomMargin"; duration: 200; from: units.gu(-7); to: 0; }
+    ThinDivider {
+        id: pDivider
+
+        //rotation: 180
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: playerr.top
+        }
+    }
+    Rectangle {
+        z: 99999
+        width: mainview.width
+        height: units.gu(7)
+        anchors.bottom: playerr.bottom
+        anchors.bottomMargin: 0
+        color: "#d5d5d5"
+    }
+
+    Rectangle {
+        z: 100000
+        id: playerr
+        width: mainview.width
+        height: units.gu(7)
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: -units.gu(7)-pDivider.height
+        color: Qt.rgba(0.5,0.5,0.5,0.5)
+        Text {
+            id: track_title
+            color: "white"
+            font.bold: true
+            font.pointSize: units.gu(1.5)
+            anchors.top: parent.top
+            anchors.topMargin: units.gu(1)
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            width: mainview.width-controlsrow.width
+            wrapMode: Text.WordWrap
+            elide: Text.ElideRight
+            maximumLineCount: 1
+        }
+        Text {
+            id: track_artist
+            color: "white"
+            font.pointSize: units.gu(1)
+            anchors.top: track_title.bottom
+            anchors.topMargin: units.gu(0.5)
+            anchors.left: parent.left
+            anchors.leftMargin: units.gu(1)
+            width: mainview.width-controlsrow.width
+            wrapMode: Text.WordWrap
+            elide: Text.ElideRight
+            maximumLineCount: 1
+        }
+        Rectangle {
+            id: playingstate
+            height: units.gu(0.3)
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 0
+            color: "orange"
+        }
+        Rectangle {
+            id: loadingstate
+            height: units.gu(0.3)
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: 0
+            color: "grey"
+        }
+        Row {
+            id: controlsrow
+            z: 100000
+            anchors.right: parent.right
+            anchors.rightMargin: 0
+            anchors.top: parent.top
+            anchors.topMargin: 0
+            Rectangle {
+                z: 100000
+                width: playerr.height
+                height: width
+                color: "transparent"
+                UbuntuShape {
+                    anchors.centerIn: parent
+                    width: parent.width-units.gu(1)
+                    height: width
+                    image: Image {
+                        source: "graphics/back.png"
+                        anchors.fill: parent
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if(ispopular==1) { Js.lastSongP(); } else if(issearch==1) { Js.lastSongS(); } else if(iscollection==1) { Js.lastSongC(); } else { Js.lastSong(); }
+                    }
+                }
+            }
+            Rectangle {
+                z: 100000
+                width: playerr.height
+                height: width
+                color: "transparent"
+                UbuntuShape {
+                    anchors.centerIn: parent
+                    width: parent.width-units.gu(1)
+                    height: width
+                    image: Image {
+                        id: play_button
+                        Component.onCompleted: {
+                            source=Qt.resolvedUrl("graphics/play.png");
+                        }
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: { player.playbackState === MediaPlayer.PlayingState ?
+                                     player.pause() : player.play()
+                    }
+                }
+            }
+            Rectangle {
+                z: 100000
+                width: playerr.height
+                height: width
+                color: "transparent"
+                UbuntuShape {
+                    anchors.centerIn: parent
+                    width: parent.width-units.gu(1)
+                    height: width
+                    image: Image {
+                        source: "graphics/forward.png"
+                        anchors.fill: parent
+                    }
+                }
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: {
+                        if(ispopular==1) { Js.nextSongP(); } else if(issearch==1) { Js.nextSongS() } else if(iscollection==1) { Js.nextSongC() } else { Js.nextSong(); }
+                    }
+                }
+            }
+            NumberAnimation { id: pl; target: player; property: "volume"; duration: 1000; from: 0; to: 1; onStarted: player.play(); }
+        }
+    }
+}

=== renamed file 'zmusic.qml' => 'zmusic.qml.moved'
=== added file 'zmusic.qmlproject'
--- zmusic.qmlproject	1970-01-01 00:00:00 +0000
+++ zmusic.qmlproject	2014-11-29 21:53:09 +0000
@@ -0,0 +1,59 @@
+import QmlProject 1.1
+
+Project {
+    mainFile: "zmusic.qml"
+
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    Files {
+        filter: "*"
+    }
+    Files {
+        filter: "www/*.html"
+    }
+    Files {
+        filter: "Makefile"
+    }
+    Files {
+        filter: "*.apparmor"
+    }
+    Files {
+        directory: "."
+        paths: ["manifest.json",".excludes"]
+    }
+    Files {
+        directory: "www"
+        filter: "*"
+    }
+    Files {
+        directory: "www/img/"
+        filter: "*"
+    }
+    Files {
+        directory: "www/css/"
+        filter: "*"
+    }
+    Files {
+        directory: "www/js/"
+        filter: "*"
+    }
+    Files {
+        directory: "tests/"
+        filter: "*"
+    }
+    Files {
+        directory: "debian"
+        filter: "*"
+    }
+    /* List of plugin directories passed to QML runtime */
+    importPaths: [ "." ,"/usr/bin","/usr/lib/x86_64-linux-gnu/qt5/qml" ]
+}
+

=== renamed file 'zmusic.qmlproject' => 'zmusic.qmlproject.moved'
=== added file 'zmusic.qmlproject.user'
--- zmusic.qmlproject.user	1970-01-01 00:00:00 +0000
+++ zmusic.qmlproject.user	2014-11-29 21:53:09 +0000
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorProject>
+<!-- Written by QtCreator 3.1.1, 2014-11-28T00:45:44. -->
+<qtcreator>
+ <data>
+  <variable>ProjectExplorer.Project.ActiveTarget</variable>
+  <value type="int">1</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.EditorSettings</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
+   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
+   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
+    <value type="QString" key="language">Cpp</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
+    </valuemap>
+   </valuemap>
+   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
+    <value type="QString" key="language">QmlJS</value>
+    <valuemap type="QVariantMap" key="value">
+     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
+    </valuemap>
+   </valuemap>
+   <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
+   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
+   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
+   <value type="int" key="EditorConfiguration.IndentSize">4</value>
+   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
+   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
+   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
+   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
+   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
+   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
+   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
+   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
+   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
+   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
+   <value type="int" key="EditorConfiguration.TabSize">8</value>
+   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
+   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
+   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
+   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
+   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
+   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.PluginSettings</variable>
+  <valuemap type="QVariantMap"/>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.0</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{77514f38-5ba4-4eae-b0c4-4f110379c0d9}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/roman/SDK/build-zmusic-Desktop-default</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">0</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Viewer</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
+    <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Target.1</variable>
+  <valuemap type="QVariantMap">
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">UbuntuSDK for armhf (GCC ubuntu-sdk-14.10-utopic)</value>
+   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{ad84ad47-38bf-4839-904c-6def13034c97}</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/roman/SDK/build-zmusic-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-default</value>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+    </valuemap>
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Default</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UbuntuQml.BuildConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">UbuntuSDK Click build</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.ClickPackageStep</value>
+      <value type="int" key="Ubuntu.UbuntuPackageStep.PackageMode">1</value>
+     </valuemap>
+     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Upload files to Ubuntu Device</value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.UploadStep</value>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
+       <value type="QString">/home/roman/SDK/build-zmusic-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_14_10_utopic-default/com.ubuntu.developer.roman2861.zmusic_2.0_all.click</value>
+       <value type="QString">/usr/share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
+       <value type="QString">127.0.0.1</value>
+       <value type="QString">127.0.0.1</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
+       <value type="QString">/tmp</value>
+       <value type="QString">/tmp</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedSysroots">
+       <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
+       <value type="QString">/var/lib/schroot/chroots/click-ubuntu-sdk-14.10-armhf</value>
+      </valuelist>
+      <valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
+       <value type="QDateTime">2014-11-28T00:45:41</value>
+       <value type="QDateTime">2014-11-28T00:45:41</value>
+      </valuelist>
+     </valuemap>
+     <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+    </valuemap>
+    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Ubuntu Device</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.DeployConfiguration</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
+   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+     <value type="int">0</value>
+     <value type="int">1</value>
+     <value type="int">2</value>
+     <value type="int">3</value>
+     <value type="int">4</value>
+     <value type="int">5</value>
+     <value type="int">6</value>
+     <value type="int">7</value>
+     <value type="int">8</value>
+     <value type="int">9</value>
+     <value type="int">10</value>
+     <value type="int">11</value>
+     <value type="int">12</value>
+     <value type="int">13</value>
+     <value type="int">14</value>
+    </valuelist>
+    <value type="int" key="PE.EnvironmentAspect.Base">1</value>
+    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">zmusic</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">UbuntuProjectManager.RemoteRunConfiguration.Appzmusic</value>
+    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+    <value type="bool" key="UbuntuRemoteRunConfiguration.ForceInstall">false</value>
+    <value type="bool" key="UbuntuRemoteRunConfiguration.Uninstall">true</value>
+   </valuemap>
+   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.TargetCount</variable>
+  <value type="int">2</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
+  <value type="QByteArray">{a8a4b447-bcc1-4af4-a5ef-2b193d1e7e91}</value>
+ </data>
+ <data>
+  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+  <value type="int">15</value>
+ </data>
+</qtcreator>

=== renamed file 'zmusic.qmlproject.user' => 'zmusic.qmlproject.user.moved'
=== added file 'zmusic.service'
--- zmusic.service	1970-01-01 00:00:00 +0000
+++ zmusic.service	2014-11-29 21:53:09 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service>
+  <type>zm</type>
+  <name>VK</name>
+  <provider>com.ubuntu.developer.roman2861.zmusic_vk</provider>
+</service>