Version 0.002 code cleanup and event attending

README.md

@@ -2,7 +2,8 @@
 
 QML based client for the Friendica Social Network.
  Tabs for news (incl. Direct Messages), friends and photos.
-OS: currently Linux and Android(4.4.4).
+OS: currently Linux and Android(4.3).
+Source code is a QtCreator project.
 
 ## Screenshots ##
 
@@ -16,20 +17,22 @@ OS: currently Linux and Android(4.4.4).
 
 # News #
 Currently supported:
-*  Shows Posts from friends, Direct Messages and Notifications
+*  Shows Posts from friends, favorited messages, Direct Messages and Notifications
+*  Show news as timeline or tree (conversation opens in separate window)
 *  Open links in external browser
 *  Deletion, Reposting, Answering of Posts
 *  Liking, disliking, favoriting
+*  Attending events
 *  Update fetches new posts since last in local DB
 *  More shows older posts from local DB
-*  New Message with images, also possible as DM, Contact/Group access rights
+*  Create new Message with images or direct messages, Contact/Group access rights
 
 
 ToDo:
 *  Nice symbols for liking, disliking
 *  Videos and other binary data as attachment (sending and receiving)
 *  Rich text editing in Send Dialog
-*  Attachments for Direct messages (currently not supported in API
+*  Attachments for Direct messages (currently not supported in API)
 *  Better image selection (currently ugly file dialog)
 
     

v0.002/Release/source-android/common/filesystem.h

@@ -21,7 +21,6 @@ signals:
     void error(QString data, int code);
 
 public slots:
-    //void setDirectory(QString Directory);
     void makeDir(QString name);
     void rmDir();
     void rmFile(QString name);

v0.002/Release/source-android/common/xhr.cpp

@@ -88,17 +88,12 @@ void XHR::clearParams()
 void XHR::download()
 {
     QUrl requrl(m_url);
-    //qDebug()<< "replyerror"<<reply->error();
-//    qDebug() << "start download of " << requrl;
     request.setUrl(requrl);
     reply = manager.get(request);
-//    qDebug() << "reply " << reply->header(QNetworkRequest::LocationHeader)<<reply->header(QNetworkRequest::LastModifiedHeader);
- //   qDebug() << "request " << request.url();
  //   reply->ignoreSslErrors();
     connect(reply, &QNetworkReply::readyRead,this, &XHR::onReadyRead);
     //connect(reply,SIGNAL(downloadProgress(qint64,qint64)), this,SLOT(updateDownloadProgress(qint64,qint64)));
     connect(reply, &QNetworkReply::finished,this, &XHR::onRequestFinished);
-    //connect(reply, SIGNAL(finished()),this, SLOT(onRequestFinished()));
     connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError);
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
 }
@@ -200,7 +195,6 @@ void XHR::onRequestFinished()
     file.write(buffer);
     buffer.clear();
     file.close();
-    //qDebug() << m_url << "File downloaded "<<file.fileName();
     emit this->downloaded(m_downloadtype);
     //reply->deleteLater();
     }

v0.002/Release/source-android/js/news.js

@@ -292,32 +292,32 @@ function like(login,database,toggle,verb,newsid,rootwindow){
 
 function attend(login,database,attend,newsid,rootwindow,callback){
     Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, rootwindow,function (obj){
-    var attendReturn=JSON.parse(obj);
+            //print("attend: "+attend+obj);
- //           print("attend: "+obj);
+    if (obj=='"ok"')
-    if (attendReturn=="OK")
+        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-        {var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
         db.transaction( function(tx) {
             var currentActivities_rs=tx.executeSql('select friendica_activities_self from news WHERE username="'+login.username+'" AND status_id='+newsid) ;
-            var currentActivities=JSON.parse(currentActivities_rs.rows.item(0));
+            var currentActivities=JSON.parse(currentActivities_rs.rows.item(0).friendica_activities_self);
-            print("currentActivities "+JSON.stringify(currentActivities));
+            if ((attend=="yes")&&(currentActivities.indexOf(3)==-1)){
-            if ((attend=="attendyes")&&(currentActivities.indexOf(3)==-1)){
                 currentActivities.push(3);
-                currentActivities.splice(currentActivities.indexOf(4),1)
+                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
-                currentActivities.splice(currentActivities.indexOf(5),1)
+                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
+                             print(JSON.stringify(currentActivities));
              }
-             if ((attend=="attendno")&&(currentActivities.indexOf(4)==-1)){
+             if ((attend=="no")&&(currentActivities.indexOf(4)==-1)){
                 currentActivities.push(4);
-                currentActivities.splice(currentActivities.indexOf(3),1)
+                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                currentActivities.splice(currentActivities.indexOf(5),1)
+                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
              }
-             if ((attend=="attendmaybe")&&(currentActivities.indexOf(5)==-1)){
+             if ((attend=="maybe")&&(currentActivities.indexOf(5)==-1)){
                 currentActivities.push(5);
-                currentActivities.splice(currentActivities.indexOf(3),1)
+                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                currentActivities.splice(currentActivities.indexOf(4),1)
+                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
              }
+
              var result = tx.executeSql('UPDATE news SET friendica_activities_self ="'+JSON.stringify(currentActivities)+'" where username="'+login.username+'" AND status_id ='+newsid);
              callback();
- })}})}
+ })})}
 
 function requestConversation(login,database,newsid,contacts,rootwindow,callback){
     Helperjs.friendicaRequest(login,"/api/conversation/show?id="+newsid,rootwindow, function (obj){

v0.002/Release/source-android/js/newsworker.js

@@ -4,7 +4,7 @@ WorkerScript.onMessage = function(msg) {
  for (var j=0;j<msg.news.length;j++){
     if (msg.news[j]) {
         var newsitemobject=msg.news[j];
-        //print("Newsitem"+JSON.stringify(newsitemobject));
+        //print("Newsitem"+JSON.stringify(newsitemobject.friendica_activities_self));
         if (newsitemobject.messagetype==2){
             newsitemobject.user={};
             newsitemobject.user.profile_image="";
@@ -33,12 +33,12 @@ WorkerScript.onMessage = function(msg) {
               if (newsitemobject.attendmaybe.length==1){attendmaybeText= Qt.atob(newsitemobject.attendmaybe[0].name)+" "+ qsTr("may attend.")}
               else {attendmaybeText= newsitemobject.attendmaybe.length+" "+ qsTr("persons may attend.")}
            }
-           var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self);
+           //var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self);
-           if (friendica_activities_self.indexOf(3)!=-1){self.attending=qsTr("yes")}
+           if (newsitemobject.friendica_activities_self.indexOf(3)!=-1){self.attending=qsTr("yes")}
-           if (friendica_activities_self.indexOf(4)!=-1){self.attending=qsTr("no")}
+           if (newsitemobject.friendica_activities_self.indexOf(4)!=-1){self.attending=qsTr("no")}
-           if (friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
+           if (newsitemobject.friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
-           if (friendica_activities_self.indexOf(1)!=-1){self.liked=1}
+           if (newsitemobject.friendica_activities_self.indexOf(1)!=-1){self.liked=1}
-           if (friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
+           if (newsitemobject.friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
           }
            var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
         //print(JSON.stringify(friendica_activities) )  ;

v0.002/Release/source-android/js/service.js

@@ -214,8 +214,8 @@ function  cleanNews(database,callback){
  }
 
 function processNews(callback){
-    Newsjs.getCurrentContacts(login,db,function(contacts){
+//    Newsjs.getCurrentContacts(login,db,function(contacts){
-        contactlist=contacts});
+//        contactlist=contacts});
 
     if (contactLoadType=="news"){
         if(root.news.length==0){}

v0.002/Release/source-android/qml/configqml/ConfigTab.qml

@@ -214,14 +214,15 @@ StackView{
                     return obj1.isActive - obj2.isActive;
                 });
                 configBackground.users=storedUsers});
-             isActiveField.text="yes"
+             isActiveField.text="yes";
              //reset values
              root.login=userconfig;
              root.contactlist=[];
-             root.news=[]
+             root.news=[];
-             root.newContacts=[]
+             root.newContacts=[];
-             root.currentContact= 0
+             root.currentContact= 0;
-             root.contactLoadType= ""
+             root.contactLoadType= "";
+             newstab.newstabstatus=userconfig.newsViewType;
              root.currentIndex=0;
              newstab.active=true;
              })},"isActive",0);

v0.002/Release/source-android/qml/contactqml/ContactComponent.qml

@@ -1,6 +1,5 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.3
-import "qrc:/js/layout.js" as Layoutjs
 import "qrc:/qml/genericqml"
 
 Item {
@@ -61,7 +60,9 @@ states: [
         PropertyChanges { target: contactComponent; z: 2  }
         PropertyChanges { target: wrapper; width:friendsTabView.width-3*mm;height:friendsTabView.height-10*mm}
         PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
-        PropertyChanges { target:contactComponent.GridView.view;contentY:contactComponent.y;contentX:contactComponent.x;interactive:false}
+        ParentChange { target: contactComponent; parent:friendstab;x:2*mm;y:13*mm}
+        //PropertyChanges { target:contactComponent.GridView.view;contentY:0;contentX:0;interactive:false}
+        //PropertyChanges { target:contactComponent.GridView.view;contentY:contactComponent.y;contentX:contactComponent.x;interactive:false}
         }
 ]
 }

v0.002/Release/source-android/qml/contactqml/ContactDetailsComponent.qml

@@ -6,19 +6,14 @@ Rectangle{
    id: detailsrectangle
    anchors.top: namelabel.bottom
    anchors.topMargin: 2*mm
-   //opacity: 0
 
    ScrollView{
        horizontalScrollBarPolicy:Qt.ScrollBarAlwaysOff
        frameVisible: true
-       //Flickable{
        id:namelabelflickable
        width: root.width-10*mm
        height:friendsTabView.height-45*mm
-       //boundsBehavior:Flickable.StopAtBounds
+
-        //flickableDirection:Flickable.VerticalFlick
-       //contentWidth:width
-       //contentHeight: namelabeltext.height
        clip:true
        Text{
            id:namelabeltext
@@ -43,8 +38,8 @@ Rectangle{
             BlueButton{
                 id:photobutton
                 text:"Photos"
-                visible:contact.network=="dfrn"? 1:0
+                visible:(contact.network=="dfrn")
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=2;
                     fotostab.active=true;
                     root.fotoSignal(contact) ;
@@ -54,7 +49,7 @@ Rectangle{
             BlueButton{
                 id:messagebutton
                 text:"Messages"
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.messageSignal(contact.id) ;
@@ -63,9 +58,9 @@ Rectangle{
 
             BlueButton{
                 id:dmbutton
-                visible: contact.following=="true"?true:false
+                visible: (contact.following=="true")
                 text: "DM"
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.directmessageSignal(contact.screen_name);

v0.002/Release/source-android/qml/contactqml/FriendsTab.qml

@@ -1,8 +1,6 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
-import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/qml/contactqml"
@@ -31,7 +29,6 @@ Rectangle {
             frameOverlap: 1
             tab: Rectangle { 
                color: "white"
-               //border.color: "light grey"
                implicitWidth: root.width/3-2*mm
                implicitHeight: 4*mm
                Text { id: text

v0.002/Release/source-android/qml/contactqml/GroupComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.3
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
 
@@ -20,7 +19,7 @@ import "qrc:/qml/genericqml"
                       height:10*mm
                       source:"qrc:/images/defaultcontact.jpg"
                       }
-                  Label {
+                  Text {
                     id: namelabel
                     x: 1
                     width: wrapper.width-2

v0.002/Release/source-android/qml/friendiqa.qml

@@ -1,16 +1,13 @@
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0
 import QtQuick.Window 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
 
-import QtQml.Models 2.1
+//import QtQml.Models 2.1
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/js/service.js" as Service
-//import "qrc:/js/layout.js" as Layoutjs
-//import "qrc:/js/helper.js" as Helperjs
-//import "qrc:/qml"
 
 TabView{
     id:root
@@ -28,7 +25,7 @@ TabView{
     signal newsSignal(var news)
     signal friendsSignal(var username)
 
-    currentIndex: (login=="")? 3:0
+    //currentIndex: (login=="")? 3:0
 
     property var news:[]
     property var newContacts:[]
@@ -36,8 +33,11 @@ TabView{
     property string contactLoadType: ""
 
     onLoginChanged:{
-        Newsjs.getCurrentContacts(login,db,function(contacts){
+        if(login==""){root.currentIndex=3}
-            contactlist=contacts});
+        else{
+            newstab.newstabstatus=login.newsViewType;
+            Newsjs.getCurrentContacts(login,db,function(contacts){print(JSON.stringify(contacts));
+                contactlist=contacts})}
     }
     onNewContactsChanged:{
         if(newContacts.length>0){// download first contact image and update db
@@ -127,7 +127,7 @@ TabView{
     Tab{
         title: qsTr("News")
         id: newstab
-        property string newstabstatus:login.newsViewType
+        property string newstabstatus//: login.newsViewType
         property var conversation
         source:(root.currentIndex==0)? "qrc:/qml/newsqml/NewsTab.qml":""
     }

v0.002/Release/source-android/qml/genericqml/BlueButton.qml

@@ -31,8 +31,7 @@ Rectangle{
 
 states: [
     State { name: "Pressed"
-       PropertyChanges { target: blueButton; color: "lightsteelblue"} }
+       PropertyChanges { target: blueButton; color: "sky blue"} }
-    //State { name: "RELEASED" PropertyChanges { target: button; color: "lightsteelblue"} 
     ]
 transitions: [
     Transition { to:"*"

v0.002/Release/source-android/qml/newsqml/Conversation.qml

@@ -1,9 +1,7 @@
 // ConversationStack with buttons
 import QtQuick 2.0
-import QtQuick.Controls 1.2
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
-import "qrc:/qml"
 
 Rectangle {
     id:conversationStack

v0.002/Release/source-android/qml/newsqml/MessageSend.qml

@@ -1,7 +1,7 @@
 // message.qml
 // message with buttons
 import QtQuick 2.0
-import QtQml 2.2
+//import QtQml 2.2
 import QtQuick.Controls 1.3
 import QtQuick.Dialogs 1.2
 import "qrc:/js/helper.js" as Helperjs
@@ -13,7 +13,6 @@ Flickable{
     contentHeight: messageColumn.height
     boundsBehavior: Flickable.StopAtBounds
     id:messageSend
-    //property var login
     property string parentId: ""
     property string reply_to_user:""
     property string attachImageURL: "";
@@ -135,7 +134,6 @@ Flickable{
                     if (attachImageURL!=""){
                         Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment. Remove other attachment first!"), messageColumn)}
                     else{
-                      try{imageAttachmentObject.destroy()}catch(e){print(e)}
                       imageAttachmentDialog.open()}
                   }
                }
@@ -156,24 +154,21 @@ Flickable{
                    id: cancelButton
                    text: qsTr("Cancel")
                    onClicked: {newstab.newstabstatus=login.newsViewType;
-
                        newsStack.pop()}
                    }
                BlueButton {
                    id: sendButton
                    text: qsTr("Send")
                    onClicked: {
-                        //print("login: "+login.server+login.username);
                        var title=titleField.text.replace("\"","\'");
                        var body=bodyField.getText(0,bodyField.length);
                        if (directmessage==0){
                            statusUpdate(title,body,messageSend.parentId,attachImageURL.toString())}
                        else {dmUpdate(title,body,"",messageSend.reply_to_user) }
-                           newsStack.pop()
+                       newstab.newstabstatus=login.newsViewType; newsStack.pop()
                     }
                }
           }
-
     }
 
 
@@ -191,9 +186,6 @@ newsStack.pop()}
             console.log("You chose: " + attachImageURL)}
             else{attachImageURL=imageAttachmentDialog.fileUrl;}
 
-            }
-         onRejected: {
-            //console.log("Canceled")
             }
      }
 }

v0.002/Release/source-android/qml/newsqml/NewsTab.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 //import QtQuick.LocalStorage 2.0 as Sql
-import "qrc:/qml"
+//import "qrc:/qml"
 import "qrc:/qml/genericqml"
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/js/helper.js" as Helperjs
@@ -15,6 +15,7 @@ Item {
             newstabstatusButton.text= qsTr(newstab.newstabstatus)
         }
     }
+
     Connections{
         target:newstab
         onConversationChanged:{
@@ -23,14 +24,24 @@ Item {
             newsStack.push({item:"qrc:/qml/newsqml/Conversation.qml",properties:{"news": conversation}})
         }
     }
+
     Connections{
         target:root
         onCurrentContactChanged:{
             if (root.newContacts.length>0){
-                print(Qt.atob(root.newContacts[root.currentContact].name))
+                if(root.currentContact<root.newContacts.length){
+                downloadNotice.text= qsTr("Download profile image for ")+ root.newContacts[root.currentContact].name;
+                print(root.newContacts[root.currentContact].name)
+                }
+            }else{downloadNotice.text=""}
         }
      }
+
+    Connections{
+        target:xhr
+        onError:{if (data=="contact"){downloadNotice.text=downloadNotice.text+"... Error!"}}
     }
+
     function showNews(newsToShow){
        if (newsStack.depth>1){newsStack.pop()}
        newsBusy.running=false;
@@ -40,7 +51,7 @@ Item {
     }
 
     function onFriendsMessages(friend){
-        newstab.newstabstatus="Contact";
+        newstab.newstabstatus="Contact"
        Newsjs.newsfromdb(db,root.login.username, function(dbnews){showNews(dbnews)},friend)
     }
 
@@ -83,7 +94,7 @@ Item {
                var groups=[];
                 Helperjs.readData(root.db,"groups",root.login.username,function(groupobject){
                    groups=groupobject});
-                newstab.newstabstatus="SendMessage"
+                newstab.newstabstatus="SendMessage";
                 Helperjs.readData(root.db,"contacts",root.login.username,function(friends){
                    newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"contacts": friends,"login":root.login}})
                },"isFriend",1);
@@ -177,7 +188,29 @@ Item {
          width:10*mm
          height: 10*mm
        }
+       Rectangle{
+          id:downloadNotice
+          property alias text: noticeText.text
+          color:"white"
+          border.color:"grey"
+          z:1
+          anchors.horizontalCenter: newsView.horizontalCenter
+          anchors.bottom:newsView.bottom
+          anchors.bottomMargin: 2*mm
+          width: noticeText.width+2*mm
+          height: noticeText.height+2*mm
+          visible: (downloadNotice.text!="")
           
+          Text{
+              id:noticeText
+              color: "grey"
+              anchors.centerIn: parent
+              width: contentWidth
+              height: contentHeight
+              font.pixelSize: 2*mm
+              text:""
+          }
+       }
        Menu {
           id:newstabmenu
           MenuItem {
@@ -224,6 +257,7 @@ Item {
            root.directmessageSignal.connect(onDirectMessage);
            root.newsSignal.connect(showNews);
            try{newsModel.clear()} catch(e){}
+           newstab.newstabstatus=login.newsViewType;
            if(login.newsViewType=="Timeline"){Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
            else{Newsjs.chatsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
         }

v0.002/Release/source-android/qml/newsqml/Newsitem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
+//import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import "qrc:/js/news.js" as Newsjs
@@ -10,16 +10,16 @@ Item {
     width: newsView.width
     height:Math.max((itemMessage.height+topFlow.height+friendicaActivities.height+4*mm),profileImage.height+user_name.height+mm)
     
-    property string conversation_id: ""
     property string attending: ""
     onAttendingChanged: {attendLabel.visible=true;
             attendLabel.text= qsTr("attending: ")+ qsTr(attending)}
+
     signal replyto(string parent_id)
+
     function showConversation(){
         conversationsymbol.color="black";
         newsBusy.running=true;
         root.contactLoadType="conversation";
-        //newstabstatus="Conversation";
 
        if(newsitemobject.messagetype==0){
            Newsjs.requestConversation(root.login,db,newsitemobject.status_id,root.contactlist,root,function(ns,nc){
@@ -27,14 +27,11 @@ Item {
         })}
        else{Newsjs.conversationfromdb(root.db,root.login.username,newsitemobject.statusnet_conversation_id, function(newsarray){
            root.news=newsarray;root.newContacts=[];root.currentContact=1;
-       })}}
+       })}
+    }
 
     Rectangle{width:newsitem.width; height: 1; anchors.bottom: newsitem.bottom; color:"light grey"}
-    //MouseArea{
+
-    //    anchors.fill: parent;
-     //   enabled: (newstabstatus=="Chats")
-     //   onClicked: {showConversation()}
-    //}
     Rectangle{
     width:newsitem.width
     height:newsitem.height-1
@@ -59,7 +56,6 @@ Item {
         Label {
             id:user_name
             color: "grey"
-            //height:3.5*mm
             width:parent.width
             font.pixelSize: 1.5*mm
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@@ -85,7 +81,6 @@ Item {
             Label {
                 id:createdAtLabel
                 color: "grey"
-                //height:3.5*mm
                 font.pixelSize: 1.5*mm
                 horizontalAlignment: Label.AlignRight
                 text: dateDiff
@@ -93,7 +88,6 @@ Item {
             Label {
                 id:replytoLabel
                 color: "grey"
-                //height:3.5*mm
                 font.pixelSize: 1.5*mm
                 horizontalAlignment: Label.AlignRight
                 text:   try {qsTr("In reply to ")+newsitemobject.reply_user.screen_name
@@ -129,7 +123,8 @@ Item {
                Qt.openUrlExternally(link)}
         }
 
-   Row{id:friendicaActivities
+   Row{
+       id:friendicaActivities
        spacing:mm
        Label{color: "grey"
              font.pixelSize: 1.5*mm
@@ -153,7 +148,8 @@ Item {
             }
        }
    Row{
-             CheckBox{id:likeCheckbox
+       CheckBox{
+           id:likeCheckbox
            height:3*mm
            width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
@@ -164,14 +160,13 @@ Item {
                 implicitHeight: 3*mm
                 color:"white"
                }
-                         indicator:
+               indicator: Rectangle{
-                         Rectangle{
                 implicitWidth: 3*mm
                 implicitHeight:3*mm
                 color:control.checked?"yellow":"white"
                 x: 5*mm
                 Text{
-                                 font.pixelSize: 2*mm
+                    font.pixelSize: 3*mm
                     color:"grey"
                     text:":-)"
                     }}
@@ -180,7 +175,8 @@ Item {
             if(likeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"like",newsitemobject.status_id,root);dislikeCheckbox.checked=false; model.friendica_activities.self.liked=0 }
             else{Newsjs.like(root.login,root.db,0,"like",newsitemobject.status_id,root); model.friendica_activities.self.liked=1}}
            }
-            CheckBox{id: dislikeCheckbox
+       CheckBox{
+           id: dislikeCheckbox
            height:3*mm
            width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
@@ -191,14 +187,13 @@ Item {
                 implicitHeight:3*mm
                 color:"white"
                 }
-                         indicator:
+            indicator: Rectangle{
-                             Rectangle{
                 implicitWidth: 3*mm
                 implicitHeight:3*mm
                 color:control.checked?"yellow":"white"
                 x:5*mm
                 Text{
-                             font.pixelSize: 2*mm
+                    font.pixelSize: 3*mm
                     color:"grey"
                     text:":-("
                     }}
@@ -216,8 +211,8 @@ Item {
                implicitHeight:3*mm
                color:"transparent"
                }
-                    indicator:
+           indicator:Rectangle{
-                        Rectangle{x:3*mm
+               x:3*mm
                width: 3*mm
                implicitHeight:3*mm
                Text{
@@ -228,10 +223,10 @@ Item {
                   }
            checked:(newsitemobject.favorited>0)
            onClicked:{
-                    if(favoritedCheckbox.checkedState==Qt.Checked)
+               if(favoritedCheckbox.checkedState==Qt.Checked){
-                    {Newsjs.favorite(login,true,newsitemobject.status_id,root); model.newsitemobject.favorited=1}
+                   Newsjs.favorite(login,true,newsitemobject.status_id,root); model.newsitemobject.favorited=1}
-                    else if(favoritedCheckbox.checkedState==Qt.Unchecked)
+               else if(favoritedCheckbox.checkedState==Qt.Unchecked){
-                        {Newsjs.favorite(login,false,newsitemobject.status_id,root);model.newsitemobject.favorited=0}
+                   Newsjs.favorite(login,false,newsitemobject.status_id,root);model.newsitemobject.favorited=0}
            }
        }
        Rectangle{
@@ -249,14 +244,11 @@ Item {
             MouseArea{
                 anchors.fill:parent
                 onClicked: {newsmenu.popup()}}
-
             }
-
        Rectangle{
             width: 4*mm
             height: 3*mm
             color:"transparent"
-                //visible:(newsitemobject.in_reply_to_status_id!="")?true:false
             Text{
                 id:conversationsymbol
                 color: "grey"
@@ -271,16 +263,15 @@ Item {
         }
         Label{
             id:attendLabel
-            visible: false
+            //visible: false
             color: "grey"
             height:3.5*mm
             font.pixelSize: 1.5*mm
             horizontalAlignment: Label.AlignRight
-            text: (friendica_activities.self.attending)?qsTr("attending: ")+ qsTr(attending):""
+            text: (friendica_activities.self.attending)?(qsTr("Attending: ")+ qsTr(friendica_activities.self.attending)):""
         }
     }
 }
-
     Menu {
         id:newsmenu
         MenuItem {
@@ -301,8 +292,7 @@ Item {
             text: qsTr("Repost")
             onTriggered: {
                 Newsjs.retweetNews(root.login,db,newsitemobject.status_id,root,function(reply){
-            print(reply);
+                    print(reply)})
-            })
             }
         }
         MenuItem {
@@ -312,20 +302,20 @@ Item {
 
         Menu{
             title: qsTr("Attending")
-        MenuItem{text:qsTr("yes")
+            MenuItem{
+                text:qsTr("yes")
                 onTriggered: {Newsjs.attend(root.login,db,"yes",newsitemobject.status_id,root,function(){
-                    newsitem.attending="yes";
+                    model.friendica_activities.self.attending="yes";attending="yes"})
-                    attendLabel.visible=true})}
+                }
             }
-
             MenuItem{text:qsTr("maybe")
                 onTriggered: {Newsjs.attend(root.login,db,"maybe",newsitemobject.status_id,root,function(){
-                newsitem.attending="maybe"})}
+                    model.friendica_activities.self.attending="maybe";attending="maybe"})
+                }
             }
-
             MenuItem{text:qsTr("no")
                 onTriggered: {Newsjs.attend(root.login,db,"no",newsitemobject.status_id,root,function(){
-                newsitem.attending="no"})}
+                model.friendica_activities.self.attending="no";attending="no"})}
             }
         }
 
@@ -333,8 +323,7 @@ Item {
             text: qsTr("Delete")
             onTriggered: {
                 Newsjs.deleteNews(root.login,root.db,newsitemobject.status_id,newsitemobject.messagetype,root,function(reply){
-            newsModel.remove(index);
+                    newsModel.remove(index)})
-            })
             }
         }
     }

v0.002/Release/source-android/qml/newsqml/PermissionDialog.qml

@@ -1,7 +1,4 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 1.4
-import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -20,10 +17,8 @@ Rectangle{
              group_deny.push(groupModel.get(i).group.gid)
              }
          }
-     for (var j=0;j<contactModel.count;j++)
+        for (var j=0;j<contactModel.count;j++){
-        {//print("contact: "+JSON.stringify(contactModel.get(j).contact));
          if (contactModel.get(j).contactstatus=="positive"){
-             print(JSON.stringify(contact_allow));
              contact_allow.push(contactModel.get(j).contact.cid)
              }
          if (contactModel.get(j).contactstatus=="negative"){
@@ -155,7 +150,8 @@ Rectangle{
          onClicked:{
             updatePerms();
             var perms=[];
-            perms.push(contact_allow,contact_deny,group_allow,group_deny); Service.savePermissions(db,perms)
+            perms.push(contact_allow,contact_deny,group_allow,group_deny);
+            Service.savePermissions(db,perms)
                    }
       }
       BlueButton{
@@ -163,15 +159,12 @@ Rectangle{
          anchors.bottom: parent.bottom
          anchors.bottomMargin:1
          text:qsTr("Done")
-         onClicked:{//var group_allow=[];var group_deny=[];
+         onClicked:{updatePerms();
-
-                    //print("contacts: "+Helperjs.cleanArray(contact_allow))
                     permissionDialog.destroy();
                     }
         }
 
      Component.onCompleted:{
-         
          Helperjs.readData(db,"contacts",login.username,function(contacts){
             for (var name in contacts){
                var contactstatus="neutral";

v0.002/Release/source-android/qml/photoqml/PhotoComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-//import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.2
 
 Package {
@@ -18,18 +17,15 @@ Package {
            color: 'lightblue'; antialiasing: true
            anchors.fill:parent
         }
-
         BusyIndicator { anchors.centerIn: parent; running: realImage.status != Image.Ready }
         Image {
             id: realImage;
- //               property string hqphotolink: photoLink
             width: photoWrapper.width; height: photoWrapper.height
             antialiasing: true;
             asynchronous: true
             cache: false
             fillMode: Image.PreserveAspectFit;
             source: imageLocation
- //               onStatusChanged: if (realImage.status == Image.Ready) print(realImage.paintedHeight+"x"+realImage.paintedWidth)
         }
         Rectangle{
             id:phototextRectangle
@@ -55,7 +51,6 @@ Package {
             onClicked: {
                 if (albumWrapper.state == 'inGrid') {
                     gridItem.GridView.view.currentIndex = index;
-                        //print("photoLink"+realImage.photoLink)
                     albumWrapper.state = 'fullscreen'
                 } else {
                     gridItem.GridView.view.currentIndex = index;
@@ -93,7 +88,5 @@ Package {
                 PropertyChanges { target: realImage; width: Math.min(listItem.width,sourceSize.width);height: Math.min(listItem.height,sourceSize.height) }
             }
         ]
-
     }
 }
-

v0.002/Release/source-android/qml/photoqml/PhotoTab.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.4
 import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
@@ -18,19 +18,15 @@ Rectangle {
     color: '#fff'
     property var newimages:[]
     property int currentimageno: 0
-//onLoginChanged:{var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+
-//         photoWorker.sendMessage(msg);
-//}
     onNewimagesChanged:{
         if(newimages.length>0){
             Helperjs.readField("album",root.db,"imageData",root.login.username,function(albums){
-             //print("albums"+JSON.stringify(albums)+JSON.stringify(newimages[currentimageno]));
                 for (var i=0;i<newimages.length;i++){
                     if(albums.indexOf(newimages[i].album)==-1){
                         filesystem.Directory=root.login.imagestore+"/albums";
                         filesystem.makeDir(newimages[i].album)}}
             })
-                //print("Current image number"+currentImageNo)
             Service.dataRequest(root.login,newimages[currentimageno].id,root.db,fotostab);
             newImagesProgress.visible=true //download first image
         }
@@ -49,16 +45,17 @@ Rectangle {
             if (albums[0]) {
                 var msg = { 'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture': false};
                 photoWorker.sendMessage(msg);
-                        };
+            }
         })
     }
+
     Connections{
         target:root
-        onLoginChanged:{var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+        onLoginChanged:{
-         photoWorker.sendMessage(msg);}
+            var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+            photoWorker.sendMessage(msg)}
     }
 
-
     Connections{
         target:xhr
         onDownloaded:{if(data=="picture"){currentimageno=currentimageno+1}}
@@ -72,10 +69,9 @@ Rectangle {
 
     function onFriendsFotos(friend){
         fotostab.phototabstatus=friend.screen_name;
-        //print("Friend "+friend.url);
         try {photogroupModel.clear()}catch (e){print(e)}
         Service.requestFriendsAlbumPictures(root.login,friend,fotostab,function(albums){
-             var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true};
+            var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true}
             photoWorker.sendMessage(msg);
         })
     }
@@ -121,6 +117,7 @@ BlueButton{
                 showOwnFotos()}
         }
     }
+
     DelegateModel{
         id: visualphotoModel
         delegate: PhotogroupComponent{}
@@ -139,8 +136,7 @@ BlueButton{
         width: parent.width-2*mm; height: parent.height-9*mm
         clip: true
         model: visualphotoModel.parts.album
-             footer:
+        footer:Rectangle{
-                 Rectangle{
             border.color: "#EEEEEE"
             border.width: 1
             width:12*mm
@@ -153,9 +149,11 @@ BlueButton{
             MouseArea{anchors.fill:parent
                 onClicked:{
                     var lastalbum_id=photogroupModel.get(photogroupModel.count-1);
-                                 if(photogroupModel.get(photogroupModel.count-1).foreignPictures==false){Service.requestFriendsAlbumPictures(friend,fotostab,function(albums){
+                    if(photogroupModel.get(photogroupModel.count-1).foreignPictures==false){
-                                     var msg = {'model': photogroupModel,'albums':albums,'firstalbum':lastalbum_id+1,'foreignPicture':true};
+                        Service.requestFriendsAlbumPictures(friend,fotostab,function(albums){
-                                     photoWorker.sendMessage(msg);  })}
+                            var msg = {'model': photogroupModel,'albums':albums,'firstalbum':lastalbum_id+1,'foreignPicture':true}
+                            photoWorker.sendMessage(msg)
+                    })}
                     else{Helperjs.readField("album",root.db, "imageData",root.login.username,function(albums){
                         var msg = { 'model': photogroupModel,'albums':albums,'foreignPicture': false,'firstalbum':lastalbum_id+1};
                         photoWorker.sendMessage(msg)})}
@@ -177,5 +175,5 @@ BlueButton {
     ListView {anchors.fill: parent; model: visualphotoModel.parts.fullscreen; interactive: false }
     WorkerScript{id: photoWorker;source: "qrc:/js/photoworker.js"}
 
-Component.onCompleted: { root.fotoSignal.connect(onFriendsFotos);}
+    Component.onCompleted: { root.fotoSignal.connect(onFriendsFotos)}
  }

v0.002/Release/source-android/qml/photoqml/PhotogroupComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.3
 import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
@@ -27,8 +26,7 @@ Package {
 
     Item {
         Package.name: 'album'
-        id: albumWrapper; width: 16.5*mm; height: 16.5*mm //-albumtext.contentHeight
+        id: albumWrapper; width: 16.5*mm; height: 16.5*mm
-
         DelegateModel {
             id: visualModel; delegate: PhotoComponent { }
             model: photoModel
@@ -55,7 +53,7 @@ Package {
          }
          Text {
             id:albumtext
-            text: albumname //foreignPicture ? album.name.trim() : album
+            text: albumname
             width:albumWrapper.width-1*mm
             height: albumtext.contentHeight
             wrapMode:Text.Wrap
@@ -72,23 +70,19 @@ Package {
         Component.onCompleted:{
             try {photoModel.clear()}catch (e){print(e)}
             if(foreignPicture){
-                //print("Albumlink"+album.link);
                 Service.requestFriendsPictures(albumlink,fotostab,function(obj){
                     if (obj) {
                         for (var k=0;k<obj.length;k++){
-                        //print("Photomodel:"+obj[k].thumb+obj[k].name+obj[k].link);
                             photoModel.append({"imageLocation": obj[k].thumb,"photoDescription":obj[k].name,"photoLink":obj[k].link})
-                         };
+                        }
                     }
             })}
             else{
                 Helperjs.readData(db,"imageData",root.login.username,function(obj){
-                            // obj.sort(function(obj1,obj2){return obj1.data-obj2.data});
                     if (obj) {
                         for (var k=0;k<obj.length;k++){
-//                     print("Photomodel:"+obj[k].location+obj[k].filename);
                             photoModel.append({"imageLocation": obj[k].location+obj[k].filename,"photoDescription":obj[k].filename,"photoLink":obj[k].location+obj[k].filename})
-                      };
+                        }
                     }
                 },"album",albumname)}
         }

v0.002/Release/source-linux/common/filesystem.h

@@ -21,7 +21,6 @@ signals:
     void error(QString data, int code);
 
 public slots:
-    //void setDirectory(QString Directory);
     void makeDir(QString name);
     void rmDir();
     void rmFile(QString name);

v0.002/Release/source-linux/common/xhr.cpp

@@ -88,17 +88,12 @@ void XHR::clearParams()
 void XHR::download()
 {
     QUrl requrl(m_url);
-    //qDebug()<< "replyerror"<<reply->error();
-//    qDebug() << "start download of " << requrl;
     request.setUrl(requrl);
     reply = manager.get(request);
-//    qDebug() << "reply " << reply->header(QNetworkRequest::LocationHeader)<<reply->header(QNetworkRequest::LastModifiedHeader);
- //   qDebug() << "request " << request.url();
  //   reply->ignoreSslErrors();
     connect(reply, &QNetworkReply::readyRead,this, &XHR::onReadyRead);
     //connect(reply,SIGNAL(downloadProgress(qint64,qint64)), this,SLOT(updateDownloadProgress(qint64,qint64)));
     connect(reply, &QNetworkReply::finished,this, &XHR::onRequestFinished);
-    //connect(reply, SIGNAL(finished()),this, SLOT(onRequestFinished()));
     connect(reply, &QNetworkReply::sslErrors, this, &XHR::onSSLError);
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
 }
@@ -200,7 +195,6 @@ void XHR::onRequestFinished()
     file.write(buffer);
     buffer.clear();
     file.close();
-    //qDebug() << m_url << "File downloaded "<<file.fileName();
     emit this->downloaded(m_downloadtype);
     //reply->deleteLater();
     }

v0.002/Release/source-linux/js/news.js

@@ -292,32 +292,32 @@ function like(login,database,toggle,verb,newsid,rootwindow){
 
 function attend(login,database,attend,newsid,rootwindow,callback){
     Helperjs.friendicaPostRequest(login,"/api/friendica/activity/attend"+attend+"?id="+newsid, rootwindow,function (obj){
-    var attendReturn=JSON.parse(obj);
+            //print("attend: "+attend+obj);
- //           print("attend: "+obj);
+    if (obj=='"ok"')
-    if (attendReturn=="OK")
+        var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
-        {var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
         db.transaction( function(tx) {
             var currentActivities_rs=tx.executeSql('select friendica_activities_self from news WHERE username="'+login.username+'" AND status_id='+newsid) ;
-            var currentActivities=JSON.parse(currentActivities_rs.rows.item(0));
+            var currentActivities=JSON.parse(currentActivities_rs.rows.item(0).friendica_activities_self);
-            print("currentActivities "+JSON.stringify(currentActivities));
+            if ((attend=="yes")&&(currentActivities.indexOf(3)==-1)){
-            if ((attend=="attendyes")&&(currentActivities.indexOf(3)==-1)){
                 currentActivities.push(3);
-                currentActivities.splice(currentActivities.indexOf(4),1)
+                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
-                currentActivities.splice(currentActivities.indexOf(5),1)
+                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
+                             print(JSON.stringify(currentActivities));
              }
-             if ((attend=="attendno")&&(currentActivities.indexOf(4)==-1)){
+             if ((attend=="no")&&(currentActivities.indexOf(4)==-1)){
                 currentActivities.push(4);
-                currentActivities.splice(currentActivities.indexOf(3),1)
+                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                currentActivities.splice(currentActivities.indexOf(5),1)
+                if (currentActivities.indexOf(5)!=-1){currentActivities.splice(currentActivities.indexOf(5),1)}
              }
-             if ((attend=="attendmaybe")&&(currentActivities.indexOf(5)==-1)){
+             if ((attend=="maybe")&&(currentActivities.indexOf(5)==-1)){
                 currentActivities.push(5);
-                currentActivities.splice(currentActivities.indexOf(3),1)
+                if (currentActivities.indexOf(3)!=-1){currentActivities.splice(currentActivities.indexOf(3),1)}
-                currentActivities.splice(currentActivities.indexOf(4),1)
+                if (currentActivities.indexOf(4)!=-1){currentActivities.splice(currentActivities.indexOf(4),1)}
              }
+
              var result = tx.executeSql('UPDATE news SET friendica_activities_self ="'+JSON.stringify(currentActivities)+'" where username="'+login.username+'" AND status_id ='+newsid);
              callback();
- })}})}
+ })})}
 
 function requestConversation(login,database,newsid,contacts,rootwindow,callback){
     Helperjs.friendicaRequest(login,"/api/conversation/show?id="+newsid,rootwindow, function (obj){

v0.002/Release/source-linux/js/newsworker.js

@@ -4,7 +4,7 @@ WorkerScript.onMessage = function(msg) {
  for (var j=0;j<msg.news.length;j++){
     if (msg.news[j]) {
         var newsitemobject=msg.news[j];
-        //print("Newsitem"+JSON.stringify(newsitemobject));
+        //print("Newsitem"+JSON.stringify(newsitemobject.friendica_activities_self));
         if (newsitemobject.messagetype==2){
             newsitemobject.user={};
             newsitemobject.user.profile_image="";
@@ -33,12 +33,12 @@ WorkerScript.onMessage = function(msg) {
               if (newsitemobject.attendmaybe.length==1){attendmaybeText= Qt.atob(newsitemobject.attendmaybe[0].name)+" "+ qsTr("may attend.")}
               else {attendmaybeText= newsitemobject.attendmaybe.length+" "+ qsTr("persons may attend.")}
            }
-           var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self);
+           //var friendica_activities_self=JSON.parse(newsitemobject.friendica_activities_self);
-           if (friendica_activities_self.indexOf(3)!=-1){self.attending=qsTr("yes")}
+           if (newsitemobject.friendica_activities_self.indexOf(3)!=-1){self.attending=qsTr("yes")}
-           if (friendica_activities_self.indexOf(4)!=-1){self.attending=qsTr("no")}
+           if (newsitemobject.friendica_activities_self.indexOf(4)!=-1){self.attending=qsTr("no")}
-           if (friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
+           if (newsitemobject.friendica_activities_self.indexOf(5)!=-1){self.attending=qsTr("maybe")}
-           if (friendica_activities_self.indexOf(1)!=-1){self.liked=1}
+           if (newsitemobject.friendica_activities_self.indexOf(1)!=-1){self.liked=1}
-           if (friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
+           if (newsitemobject.friendica_activities_self.indexOf(2)!=-1){self.disliked=1}
           }
            var friendica_activities={likeText:likeText,dislikeText:dislikeText,attendyesText:attendyesText,attendnoText:attendnoText,attendmaybeText:attendmaybeText,self:self}
         //print(JSON.stringify(friendica_activities) )  ;

v0.002/Release/source-linux/js/service.js

@@ -214,8 +214,8 @@ function  cleanNews(database,callback){
  }
 
 function processNews(callback){
-    Newsjs.getCurrentContacts(login,db,function(contacts){
+//    Newsjs.getCurrentContacts(login,db,function(contacts){
-        contactlist=contacts});
+//        contactlist=contacts});
 
     if (contactLoadType=="news"){
         if(root.news.length==0){}

v0.002/Release/source-linux/qml/configqml/ConfigTab.qml

@@ -214,14 +214,15 @@ StackView{
                     return obj1.isActive - obj2.isActive;
                 });
                 configBackground.users=storedUsers});
-             isActiveField.text="yes"
+             isActiveField.text="yes";
              //reset values
              root.login=userconfig;
              root.contactlist=[];
-             root.news=[]
+             root.news=[];
-             root.newContacts=[]
+             root.newContacts=[];
-             root.currentContact= 0
+             root.currentContact= 0;
-             root.contactLoadType= ""
+             root.contactLoadType= "";
+             newstab.newstabstatus=userconfig.newsViewType;
              root.currentIndex=0;
              newstab.active=true;
              })},"isActive",0);

v0.002/Release/source-linux/qml/contactqml/ContactComponent.qml

@@ -1,6 +1,5 @@
 import QtQuick 2.0
 import QtQuick.Controls 1.3
-import "qrc:/js/layout.js" as Layoutjs
 import "qrc:/qml/genericqml"
 
 Item {
@@ -61,7 +60,9 @@ states: [
         PropertyChanges { target: contactComponent; z: 2  }
         PropertyChanges { target: wrapper; width:friendsTabView.width-3*mm;height:friendsTabView.height-10*mm}
         PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
-        PropertyChanges { target:contactComponent.GridView.view;contentY:contactComponent.y;contentX:contactComponent.x;interactive:false}
+        ParentChange { target: contactComponent; parent:friendstab;x:2*mm;y:13*mm}
+        //PropertyChanges { target:contactComponent.GridView.view;contentY:0;contentX:0;interactive:false}
+        //PropertyChanges { target:contactComponent.GridView.view;contentY:contactComponent.y;contentX:contactComponent.x;interactive:false}
         }
 ]
 }

v0.002/Release/source-linux/qml/contactqml/ContactDetailsComponent.qml

@@ -6,19 +6,14 @@ Rectangle{
    id: detailsrectangle
    anchors.top: namelabel.bottom
    anchors.topMargin: 2*mm
-   //opacity: 0
 
    ScrollView{
        horizontalScrollBarPolicy:Qt.ScrollBarAlwaysOff
        frameVisible: true
-       //Flickable{
        id:namelabelflickable
        width: root.width-10*mm
        height:friendsTabView.height-45*mm
-       //boundsBehavior:Flickable.StopAtBounds
+
-        //flickableDirection:Flickable.VerticalFlick
-       //contentWidth:width
-       //contentHeight: namelabeltext.height
        clip:true
        Text{
            id:namelabeltext
@@ -43,8 +38,8 @@ Rectangle{
             BlueButton{
                 id:photobutton
                 text:"Photos"
-                visible:contact.network=="dfrn"? 1:0
+                visible:(contact.network=="dfrn")
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=2;
                     fotostab.active=true;
                     root.fotoSignal(contact) ;
@@ -54,7 +49,7 @@ Rectangle{
             BlueButton{
                 id:messagebutton
                 text:"Messages"
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.messageSignal(contact.id) ;
@@ -63,9 +58,9 @@ Rectangle{
 
             BlueButton{
                 id:dmbutton
-                visible: contact.following=="true"?true:false
+                visible: (contact.following=="true")
                 text: "DM"
-                onClicked:{contactComponent.state="";detailsrectangle.destroy();
+                onClicked:{
                     root.currentIndex=0;
                     newstab.active=true;
                     root.directmessageSignal(contact.screen_name);

v0.002/Release/source-linux/qml/contactqml/FriendsTab.qml

@@ -1,8 +1,6 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
-import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/qml/contactqml"
@@ -31,7 +29,6 @@ Rectangle {
             frameOverlap: 1
             tab: Rectangle { 
                color: "white"
-               //border.color: "light grey"
                implicitWidth: root.width/3-2*mm
                implicitHeight: 4*mm
                Text { id: text

v0.002/Release/source-linux/qml/contactqml/GroupComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtQuick.Controls 1.3
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
 
@@ -20,7 +19,7 @@ import "qrc:/qml/genericqml"
                       height:10*mm
                       source:"qrc:/images/defaultcontact.jpg"
                       }
-                  Label {
+                  Text {
                     id: namelabel
                     x: 1
                     width: wrapper.width-2

v0.002/Release/source-linux/qml/friendiqa.qml

@@ -1,16 +1,13 @@
 import QtQuick 2.0
 import QtQuick.LocalStorage 2.0
 import QtQuick.Window 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 import QtQuick.Controls.Styles 1.4
 
-import QtQml.Models 2.1
+//import QtQml.Models 2.1
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/js/service.js" as Service
-//import "qrc:/js/layout.js" as Layoutjs
-//import "qrc:/js/helper.js" as Helperjs
-//import "qrc:/qml"
 
 TabView{
     id:root
@@ -28,7 +25,7 @@ TabView{
     signal newsSignal(var news)
     signal friendsSignal(var username)
 
-    currentIndex: (login=="")? 3:0
+    //currentIndex: (login=="")? 3:0
 
     property var news:[]
     property var newContacts:[]
@@ -36,8 +33,11 @@ TabView{
     property string contactLoadType: ""
 
     onLoginChanged:{
-        Newsjs.getCurrentContacts(login,db,function(contacts){
+        if(login==""){root.currentIndex=3}
-            contactlist=contacts});
+        else{
+            newstab.newstabstatus=login.newsViewType;
+            Newsjs.getCurrentContacts(login,db,function(contacts){print(JSON.stringify(contacts));
+                contactlist=contacts})}
     }
     onNewContactsChanged:{
         if(newContacts.length>0){// download first contact image and update db
@@ -127,7 +127,7 @@ TabView{
     Tab{
         title: qsTr("News")
         id: newstab
-        property string newstabstatus:login.newsViewType
+        property string newstabstatus//: login.newsViewType
         property var conversation
         source:(root.currentIndex==0)? "qrc:/qml/newsqml/NewsTab.qml":""
     }

v0.002/Release/source-linux/qml/genericqml/BlueButton.qml

@@ -31,8 +31,7 @@ Rectangle{
 
 states: [
     State { name: "Pressed"
-       PropertyChanges { target: blueButton; color: "lightsteelblue"} }
+       PropertyChanges { target: blueButton; color: "sky blue"} }
-    //State { name: "RELEASED" PropertyChanges { target: button; color: "lightsteelblue"} 
     ]
 transitions: [
     Transition { to:"*"

v0.002/Release/source-linux/qml/newsqml/Conversation.qml

@@ -1,9 +1,7 @@
 // ConversationStack with buttons
 import QtQuick 2.0
-import QtQuick.Controls 1.2
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
-import "qrc:/qml"
 
 Rectangle {
     id:conversationStack

v0.002/Release/source-linux/qml/newsqml/MessageSend.qml

@@ -1,7 +1,7 @@
 // message.qml
 // message with buttons
 import QtQuick 2.0
-import QtQml 2.2
+//import QtQml 2.2
 import QtQuick.Controls 1.3
 import QtQuick.Dialogs 1.2
 import "qrc:/js/helper.js" as Helperjs
@@ -13,7 +13,6 @@ Flickable{
     contentHeight: messageColumn.height
     boundsBehavior: Flickable.StopAtBounds
     id:messageSend
-    //property var login
     property string parentId: ""
     property string reply_to_user:""
     property string attachImageURL: "";
@@ -135,7 +134,6 @@ Flickable{
                     if (attachImageURL!=""){
                         Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment. Remove other attachment first!"), messageColumn)}
                     else{
-                      try{imageAttachmentObject.destroy()}catch(e){print(e)}
                       imageAttachmentDialog.open()}
                   }
                }
@@ -156,24 +154,21 @@ Flickable{
                    id: cancelButton
                    text: qsTr("Cancel")
                    onClicked: {newstab.newstabstatus=login.newsViewType;
-
                        newsStack.pop()}
                    }
                BlueButton {
                    id: sendButton
                    text: qsTr("Send")
                    onClicked: {
-                        //print("login: "+login.server+login.username);
                        var title=titleField.text.replace("\"","\'");
                        var body=bodyField.getText(0,bodyField.length);
                        if (directmessage==0){
                            statusUpdate(title,body,messageSend.parentId,attachImageURL.toString())}
                        else {dmUpdate(title,body,"",messageSend.reply_to_user) }
-                           newsStack.pop()
+                       newstab.newstabstatus=login.newsViewType; newsStack.pop()
                     }
                }
           }
-
     }
 
 
@@ -191,9 +186,6 @@ newsStack.pop()}
             console.log("You chose: " + attachImageURL)}
             else{attachImageURL=imageAttachmentDialog.fileUrl;}
 
-            }
-         onRejected: {
-            //console.log("Canceled")
             }
      }
 }

v0.002/Release/source-linux/qml/newsqml/NewsTab.qml

@@ -1,8 +1,8 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.2
 //import QtQuick.LocalStorage 2.0 as Sql
-import "qrc:/qml"
+//import "qrc:/qml"
 import "qrc:/qml/genericqml"
 import "qrc:/js/news.js" as Newsjs
 import "qrc:/js/helper.js" as Helperjs
@@ -15,6 +15,7 @@ Item {
             newstabstatusButton.text= qsTr(newstab.newstabstatus)
         }
     }
+
     Connections{
         target:newstab
         onConversationChanged:{
@@ -23,14 +24,24 @@ Item {
             newsStack.push({item:"qrc:/qml/newsqml/Conversation.qml",properties:{"news": conversation}})
         }
     }
+
     Connections{
         target:root
         onCurrentContactChanged:{
             if (root.newContacts.length>0){
-                print(Qt.atob(root.newContacts[root.currentContact].name))
+                if(root.currentContact<root.newContacts.length){
+                downloadNotice.text= qsTr("Download profile image for ")+ root.newContacts[root.currentContact].name;
+                print(root.newContacts[root.currentContact].name)
+                }
+            }else{downloadNotice.text=""}
         }
      }
+
+    Connections{
+        target:xhr
+        onError:{if (data=="contact"){downloadNotice.text=downloadNotice.text+"... Error!"}}
     }
+
     function showNews(newsToShow){
        if (newsStack.depth>1){newsStack.pop()}
        newsBusy.running=false;
@@ -40,7 +51,7 @@ Item {
     }
 
     function onFriendsMessages(friend){
-        newstab.newstabstatus="Contact";
+        newstab.newstabstatus="Contact"
        Newsjs.newsfromdb(db,root.login.username, function(dbnews){showNews(dbnews)},friend)
     }
 
@@ -83,7 +94,7 @@ Item {
                var groups=[];
                 Helperjs.readData(root.db,"groups",root.login.username,function(groupobject){
                    groups=groupobject});
-                newstab.newstabstatus="SendMessage"
+                newstab.newstabstatus="SendMessage";
                 Helperjs.readData(root.db,"contacts",root.login.username,function(friends){
                    newsStack.push({item:"qrc:/qml/newsqml/MessageSend.qml",properties:{"contacts": friends,"login":root.login}})
                },"isFriend",1);
@@ -177,7 +188,29 @@ Item {
          width:10*mm
          height: 10*mm
        }
+       Rectangle{
+          id:downloadNotice
+          property alias text: noticeText.text
+          color:"white"
+          border.color:"grey"
+          z:1
+          anchors.horizontalCenter: newsView.horizontalCenter
+          anchors.bottom:newsView.bottom
+          anchors.bottomMargin: 2*mm
+          width: noticeText.width+2*mm
+          height: noticeText.height+2*mm
+          visible: (downloadNotice.text!="")
           
+          Text{
+              id:noticeText
+              color: "grey"
+              anchors.centerIn: parent
+              width: contentWidth
+              height: contentHeight
+              font.pixelSize: 2*mm
+              text:""
+          }
+       }
        Menu {
           id:newstabmenu
           MenuItem {
@@ -224,6 +257,7 @@ Item {
            root.directmessageSignal.connect(onDirectMessage);
            root.newsSignal.connect(showNews);
            try{newsModel.clear()} catch(e){}
+           newstab.newstabstatus=login.newsViewType;
            if(login.newsViewType=="Timeline"){Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
            else{Newsjs.chatsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
         }

v0.002/Release/source-linux/qml/newsqml/Newsitem.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
+//import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import "qrc:/js/news.js" as Newsjs
@@ -10,16 +10,18 @@ Item {
     width: newsView.width
     height:Math.max((itemMessage.height+topFlow.height+friendicaActivities.height+4*mm),profileImage.height+user_name.height+mm)
     
-    property string conversation_id: ""
+    //property string conversation_id: ""
     property string attending: ""
+
     onAttendingChanged: {attendLabel.visible=true;
             attendLabel.text= qsTr("attending: ")+ qsTr(attending)}
+
     signal replyto(string parent_id)
+
     function showConversation(){
         conversationsymbol.color="black";
         newsBusy.running=true;
         root.contactLoadType="conversation";
-        //newstabstatus="Conversation";
 
        if(newsitemobject.messagetype==0){
            Newsjs.requestConversation(root.login,db,newsitemobject.status_id,root.contactlist,root,function(ns,nc){
@@ -27,14 +29,11 @@ Item {
         })}
        else{Newsjs.conversationfromdb(root.db,root.login.username,newsitemobject.statusnet_conversation_id, function(newsarray){
            root.news=newsarray;root.newContacts=[];root.currentContact=1;
-       })}}
+       })}
+    }
 
     Rectangle{width:newsitem.width; height: 1; anchors.bottom: newsitem.bottom; color:"light grey"}
-    //MouseArea{
+
-    //    anchors.fill: parent;
-     //   enabled: (newstabstatus=="Chats")
-     //   onClicked: {showConversation()}
-    //}
     Rectangle{
     width:newsitem.width
     height:newsitem.height-1
@@ -59,7 +58,6 @@ Item {
         Label {
             id:user_name
             color: "grey"
-            //height:3.5*mm
             width:parent.width
             font.pixelSize: 1.5*mm
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@@ -85,7 +83,6 @@ Item {
             Label {
                 id:createdAtLabel
                 color: "grey"
-                //height:3.5*mm
                 font.pixelSize: 1.5*mm
                 horizontalAlignment: Label.AlignRight
                 text: dateDiff
@@ -93,7 +90,6 @@ Item {
             Label {
                 id:replytoLabel
                 color: "grey"
-                //height:3.5*mm
                 font.pixelSize: 1.5*mm
                 horizontalAlignment: Label.AlignRight
                 text:   try {qsTr("In reply to ")+newsitemobject.reply_user.screen_name
@@ -129,7 +125,8 @@ Item {
                Qt.openUrlExternally(link)}
         }
 
-   Row{id:friendicaActivities
+   Row{
+       id:friendicaActivities
        spacing:mm
        Label{color: "grey"
              font.pixelSize: 1.5*mm
@@ -153,7 +150,8 @@ Item {
             }
        }
    Row{
-             CheckBox{id:likeCheckbox
+       CheckBox{
+           id:likeCheckbox
            height:3*mm
            width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
@@ -164,14 +162,13 @@ Item {
                 implicitHeight: 3*mm
                 color:"white"
                }
-                         indicator:
+               indicator: Rectangle{
-                         Rectangle{
                 implicitWidth: 3*mm
                 implicitHeight:3*mm
                 color:control.checked?"yellow":"white"
                 x: 5*mm
                 Text{
-                                 font.pixelSize: 2*mm
+                    font.pixelSize: 3*mm
                     color:"grey"
                     text:":-)"
                     }}
@@ -180,7 +177,8 @@ Item {
             if(likeCheckbox.checked==true){Newsjs.like(root.login,root.db,1,"like",newsitemobject.status_id,root);dislikeCheckbox.checked=false; model.friendica_activities.self.liked=0 }
             else{Newsjs.like(root.login,root.db,0,"like",newsitemobject.status_id,root); model.friendica_activities.self.liked=1}}
            }
-            CheckBox{id: dislikeCheckbox
+       CheckBox{
+           id: dislikeCheckbox
            height:3*mm
            width:8*mm
            visible: (newsitemobject.messagetype==0)? true:false
@@ -191,14 +189,13 @@ Item {
                 implicitHeight:3*mm
                 color:"white"
                 }
-                         indicator:
+            indicator: Rectangle{
-                             Rectangle{
                 implicitWidth: 3*mm
                 implicitHeight:3*mm
                 color:control.checked?"yellow":"white"
                 x:5*mm
                 Text{
-                             font.pixelSize: 2*mm
+                    font.pixelSize: 3*mm
                     color:"grey"
                     text:":-("
                     }}
@@ -216,8 +213,8 @@ Item {
                implicitHeight:3*mm
                color:"transparent"
                }
-                    indicator:
+           indicator:Rectangle{
-                        Rectangle{x:3*mm
+               x:3*mm
                width: 3*mm
                implicitHeight:3*mm
                Text{
@@ -228,10 +225,10 @@ Item {
                   }
            checked:(newsitemobject.favorited>0)
            onClicked:{
-                    if(favoritedCheckbox.checkedState==Qt.Checked)
+               if(favoritedCheckbox.checkedState==Qt.Checked){
-                    {Newsjs.favorite(login,true,newsitemobject.status_id,root); model.newsitemobject.favorited=1}
+                   Newsjs.favorite(login,true,newsitemobject.status_id,root); model.newsitemobject.favorited=1}
-                    else if(favoritedCheckbox.checkedState==Qt.Unchecked)
+               else if(favoritedCheckbox.checkedState==Qt.Unchecked){
-                        {Newsjs.favorite(login,false,newsitemobject.status_id,root);model.newsitemobject.favorited=0}
+                   Newsjs.favorite(login,false,newsitemobject.status_id,root);model.newsitemobject.favorited=0}
            }
        }
        Rectangle{
@@ -249,14 +246,11 @@ Item {
             MouseArea{
                 anchors.fill:parent
                 onClicked: {newsmenu.popup()}}
-
             }
-
        Rectangle{
             width: 4*mm
             height: 3*mm
             color:"transparent"
-                //visible:(newsitemobject.in_reply_to_status_id!="")?true:false
             Text{
                 id:conversationsymbol
                 color: "grey"
@@ -271,16 +265,15 @@ Item {
         }
         Label{
             id:attendLabel
-            visible: false
+            //visible: false
             color: "grey"
             height:3.5*mm
-            font.pixelSize: 1.5*mm
+            font.pixelSize: 2*mm
             horizontalAlignment: Label.AlignRight
-            text: (friendica_activities.self.attending)?qsTr("attending: ")+ qsTr(attending):""
+            text: (friendica_activities.self.attending)?(qsTr("Attending: ")+ qsTr(friendica_activities.self.attending)):""
         }
     }
 }
-
     Menu {
         id:newsmenu
         MenuItem {
@@ -301,8 +294,7 @@ Item {
             text: qsTr("Repost")
             onTriggered: {
                 Newsjs.retweetNews(root.login,db,newsitemobject.status_id,root,function(reply){
-            print(reply);
+                    print(reply)})
-            })
             }
         }
         MenuItem {
@@ -312,20 +304,20 @@ Item {
 
         Menu{
             title: qsTr("Attending")
-        MenuItem{text:qsTr("yes")
+            MenuItem{
+                text:qsTr("yes")
                 onTriggered: {Newsjs.attend(root.login,db,"yes",newsitemobject.status_id,root,function(){
-                    newsitem.attending="yes";
+                    model.friendica_activities.self.attending="yes";attending="yes"})
-                    attendLabel.visible=true})}
+                }
             }
-
             MenuItem{text:qsTr("maybe")
                 onTriggered: {Newsjs.attend(root.login,db,"maybe",newsitemobject.status_id,root,function(){
-                newsitem.attending="maybe"})}
+                    model.friendica_activities.self.attending="maybe";attending="maybe"})
+                }
             }
-
             MenuItem{text:qsTr("no")
                 onTriggered: {Newsjs.attend(root.login,db,"no",newsitemobject.status_id,root,function(){
-                newsitem.attending="no"})}
+                model.friendica_activities.self.attending="no";attending="no"})}
             }
         }
 
@@ -333,8 +325,7 @@ Item {
             text: qsTr("Delete")
             onTriggered: {
                 Newsjs.deleteNews(root.login,root.db,newsitemobject.status_id,newsitemobject.messagetype,root,function(reply){
-            newsModel.remove(index);
+                    newsModel.remove(index)})
-            })
             }
         }
     }

v0.002/Release/source-linux/qml/newsqml/PermissionDialog.qml

@@ -1,7 +1,4 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
-import QtQuick.Controls 1.4
-import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
 import "qrc:/js/helper.js" as Helperjs
 import "qrc:/qml/genericqml"
@@ -20,10 +17,8 @@ Rectangle{
              group_deny.push(groupModel.get(i).group.gid)
              }
          }
-     for (var j=0;j<contactModel.count;j++)
+        for (var j=0;j<contactModel.count;j++){
-        {//print("contact: "+JSON.stringify(contactModel.get(j).contact));
          if (contactModel.get(j).contactstatus=="positive"){
-             print(JSON.stringify(contact_allow));
              contact_allow.push(contactModel.get(j).contact.cid)
              }
          if (contactModel.get(j).contactstatus=="negative"){
@@ -155,7 +150,8 @@ Rectangle{
          onClicked:{
             updatePerms();
             var perms=[];
-            perms.push(contact_allow,contact_deny,group_allow,group_deny); Service.savePermissions(db,perms)
+            perms.push(contact_allow,contact_deny,group_allow,group_deny);
+            Service.savePermissions(db,perms)
                    }
       }
       BlueButton{
@@ -163,15 +159,12 @@ Rectangle{
          anchors.bottom: parent.bottom
          anchors.bottomMargin:1
          text:qsTr("Done")
-         onClicked:{//var group_allow=[];var group_deny=[];
+         onClicked:{updatePerms();
-
-                    //print("contacts: "+Helperjs.cleanArray(contact_allow))
                     permissionDialog.destroy();
                     }
         }
 
      Component.onCompleted:{
-         
          Helperjs.readData(db,"contacts",login.username,function(contacts){
             for (var name in contacts){
                var contactstatus="neutral";

v0.002/Release/source-linux/qml/photoqml/PhotoComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-//import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.2
 
 Package {
@@ -18,18 +17,15 @@ Package {
            color: 'lightblue'; antialiasing: true
            anchors.fill:parent
         }
-
         BusyIndicator { anchors.centerIn: parent; running: realImage.status != Image.Ready }
         Image {
             id: realImage;
- //               property string hqphotolink: photoLink
             width: photoWrapper.width; height: photoWrapper.height
             antialiasing: true;
             asynchronous: true
             cache: false
             fillMode: Image.PreserveAspectFit;
             source: imageLocation
- //               onStatusChanged: if (realImage.status == Image.Ready) print(realImage.paintedHeight+"x"+realImage.paintedWidth)
         }
         Rectangle{
             id:phototextRectangle
@@ -55,7 +51,6 @@ Package {
             onClicked: {
                 if (albumWrapper.state == 'inGrid') {
                     gridItem.GridView.view.currentIndex = index;
-                        //print("photoLink"+realImage.photoLink)
                     albumWrapper.state = 'fullscreen'
                 } else {
                     gridItem.GridView.view.currentIndex = index;
@@ -93,7 +88,5 @@ Package {
                 PropertyChanges { target: realImage; width: Math.min(listItem.width,sourceSize.width);height: Math.min(listItem.height,sourceSize.height) }
             }
         ]
-
     }
 }
-

v0.002/Release/source-linux/qml/photoqml/PhotoTab.qml

@@ -1,5 +1,5 @@
 import QtQuick 2.0
-import QtQuick.Dialogs 1.2
+//import QtQuick.Dialogs 1.2
 import QtQuick.Controls 1.4
 import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
@@ -18,19 +18,15 @@ Rectangle {
     color: '#fff'
     property var newimages:[]
     property int currentimageno: 0
-//onLoginChanged:{var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+
-//         photoWorker.sendMessage(msg);
-//}
     onNewimagesChanged:{
         if(newimages.length>0){
             Helperjs.readField("album",root.db,"imageData",root.login.username,function(albums){
-             //print("albums"+JSON.stringify(albums)+JSON.stringify(newimages[currentimageno]));
                 for (var i=0;i<newimages.length;i++){
                     if(albums.indexOf(newimages[i].album)==-1){
                         filesystem.Directory=root.login.imagestore+"/albums";
                         filesystem.makeDir(newimages[i].album)}}
             })
-                //print("Current image number"+currentImageNo)
             Service.dataRequest(root.login,newimages[currentimageno].id,root.db,fotostab);
             newImagesProgress.visible=true //download first image
         }
@@ -49,16 +45,17 @@ Rectangle {
             if (albums[0]) {
                 var msg = { 'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture': false};
                 photoWorker.sendMessage(msg);
-                        };
+            }
         })
     }
+
     Connections{
         target:root
-        onLoginChanged:{var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+        onLoginChanged:{
-         photoWorker.sendMessage(msg);}
+            var msg = {'model': photogroupModel,'albums':[],'firstalbum':0,'foreignPicture':false};
+            photoWorker.sendMessage(msg)}
     }
 
-
     Connections{
         target:xhr
         onDownloaded:{if(data=="picture"){currentimageno=currentimageno+1}}
@@ -72,10 +69,9 @@ Rectangle {
 
     function onFriendsFotos(friend){
         fotostab.phototabstatus=friend.screen_name;
-        //print("Friend "+friend.url);
         try {photogroupModel.clear()}catch (e){print(e)}
         Service.requestFriendsAlbumPictures(root.login,friend,fotostab,function(albums){
-             var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true};
+            var msg = {'model': photogroupModel,'albums':albums,'firstalbum':0,'foreignPicture':true}
             photoWorker.sendMessage(msg);
         })
     }
@@ -121,6 +117,7 @@ BlueButton{
                 showOwnFotos()}
         }
     }
+
     DelegateModel{
         id: visualphotoModel
         delegate: PhotogroupComponent{}
@@ -139,8 +136,7 @@ BlueButton{
         width: parent.width-2*mm; height: parent.height-9*mm
         clip: true
         model: visualphotoModel.parts.album
-             footer:
+        footer:Rectangle{
-                 Rectangle{
             border.color: "#EEEEEE"
             border.width: 1
             width:12*mm
@@ -153,9 +149,11 @@ BlueButton{
             MouseArea{anchors.fill:parent
                 onClicked:{
                     var lastalbum_id=photogroupModel.get(photogroupModel.count-1);
-                                 if(photogroupModel.get(photogroupModel.count-1).foreignPictures==false){Service.requestFriendsAlbumPictures(friend,fotostab,function(albums){
+                    if(photogroupModel.get(photogroupModel.count-1).foreignPictures==false){
-                                     var msg = {'model': photogroupModel,'albums':albums,'firstalbum':lastalbum_id+1,'foreignPicture':true};
+                        Service.requestFriendsAlbumPictures(friend,fotostab,function(albums){
-                                     photoWorker.sendMessage(msg);  })}
+                            var msg = {'model': photogroupModel,'albums':albums,'firstalbum':lastalbum_id+1,'foreignPicture':true}
+                            photoWorker.sendMessage(msg)
+                    })}
                     else{Helperjs.readField("album",root.db, "imageData",root.login.username,function(albums){
                         var msg = { 'model': photogroupModel,'albums':albums,'foreignPicture': false,'firstalbum':lastalbum_id+1};
                         photoWorker.sendMessage(msg)})}
@@ -177,5 +175,5 @@ BlueButton {
     ListView {anchors.fill: parent; model: visualphotoModel.parts.fullscreen; interactive: false }
     WorkerScript{id: photoWorker;source: "qrc:/js/photoworker.js"}
 
-Component.onCompleted: { root.fotoSignal.connect(onFriendsFotos);}
+    Component.onCompleted: { root.fotoSignal.connect(onFriendsFotos)}
  }

v0.002/Release/source-linux/qml/photoqml/PhotogroupComponent.qml

@@ -1,5 +1,4 @@
 import QtQuick 2.0
-import QtQuick.LocalStorage 2.0
 import QtQuick.Controls 1.3
 import QtQml.Models 2.1
 import "qrc:/js/service.js" as Service
@@ -27,8 +26,7 @@ Package {
 
     Item {
         Package.name: 'album'
-        id: albumWrapper; width: 16.5*mm; height: 16.5*mm //-albumtext.contentHeight
+        id: albumWrapper; width: 16.5*mm; height: 16.5*mm
-
         DelegateModel {
             id: visualModel; delegate: PhotoComponent { }
             model: photoModel
@@ -55,7 +53,7 @@ Package {
          }
          Text {
             id:albumtext
-            text: albumname //foreignPicture ? album.name.trim() : album
+            text: albumname
             width:albumWrapper.width-1*mm
             height: albumtext.contentHeight
             wrapMode:Text.Wrap
@@ -72,23 +70,19 @@ Package {
         Component.onCompleted:{
             try {photoModel.clear()}catch (e){print(e)}
             if(foreignPicture){
-                //print("Albumlink"+album.link);
                 Service.requestFriendsPictures(albumlink,fotostab,function(obj){
                     if (obj) {
                         for (var k=0;k<obj.length;k++){
-                        //print("Photomodel:"+obj[k].thumb+obj[k].name+obj[k].link);
                             photoModel.append({"imageLocation": obj[k].thumb,"photoDescription":obj[k].name,"photoLink":obj[k].link})
-                         };
+                        }
                     }
             })}
             else{
                 Helperjs.readData(db,"imageData",root.login.username,function(obj){
-                            // obj.sort(function(obj1,obj2){return obj1.data-obj2.data});
                     if (obj) {
                         for (var k=0;k<obj.length;k++){
-//                     print("Photomodel:"+obj[k].location+obj[k].filename);
                             photoModel.append({"imageLocation": obj[k].location+obj[k].filename,"photoDescription":obj[k].filename,"photoLink":obj[k].location+obj[k].filename})
-                      };
+                        }
                     }
                 },"album",albumname)}
         }