create and delete events

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.6.6
+
+* Create event
+* Delete event
+* New sorting of conversations
+
 ## v0.6.5
 
 * Fix reply in Friendica 3/2022 version due to API bug

README.md

@@ -87,6 +87,8 @@ Currently supported:
 * Show public events of Friendica contacts
 * List view of events of selected date
 * Click on event to show details
+* Create event
+* Delete event
 
 ToDo
 

source-android/android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.5" android:versionCode="31" android:installLocation="auto">
+<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.6" android:versionCode="32" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.

source-linux/application.qrc

@@ -241,7 +241,6 @@
         <file>qml/genericqml/DrawerAccountComponentContacts.qml</file>
         <file>qml/contactqml/ProfileTab.qml</file>
         <file>qml/contactqml/FriendsListTab.qml</file>
-        <file>qml/contactqml/ContactsListTab.qml</file>
         <file>qml/contactqml/GroupsListTab.qml</file>
         <file>qml/calendarqml/EventListItem.qml</file>
         <file>translations/friendiqa-hu.qm</file>
@@ -252,5 +251,6 @@
         <file>qml/configqml/ConfigStartPage.qml</file>
         <file>qml/contactqml/ContactsSearchPage.qml</file>
         <file>images/Friendiqa.ico</file>
+        <file>qml/calendarqml/EventCreate.qml</file>
     </qresource>
 </RCC>

source-linux/common/updatenews.cpp

@@ -752,16 +752,31 @@ void UPDATENEWS::storeEvents(QByteArray serverreply,QString apiname)
                     query.bindValue(0,username);
                     query.bindValue(1,eventitem["id"].toInt());
                     query.bindValue(2,eventitem["cid"].toInt());
-                    QString sourcedateStart=eventitem["startTime"].toString();
+                    QString sourcedateStart="";
+                    if (eventitem["start_time"].toString()!=""){
+                        sourcedateStart=eventitem["start_time"].toString();}else{
+                        sourcedateStart=eventitem["startTime"].toString();
+                    };
                     query.bindValue(3,QDateTime::fromString(sourcedateStart,Qt::ISODate).toMSecsSinceEpoch() );
-                    QString sourcedateEnd=eventitem["endTime"].toString();
+                    QString sourcedateEnd="";
+                    if (eventitem["end_time"].toString()!=""){
+                        sourcedateEnd=eventitem["end_time"].toString();} else{
+                        sourcedateEnd=eventitem["endTime"].toString();
+                    }
+
+                    if(QDateTime::fromString(sourcedateEnd,Qt::ISODate).toMSecsSinceEpoch()>QDateTime::fromString(sourcedateStart,Qt::ISODate).toMSecsSinceEpoch()){
+                        //check if end is later than start
+                        query.bindValue(4,QDateTime::fromString(sourcedateEnd,Qt::ISODate).toMSecsSinceEpoch() );
+                    } else {
+                        query.bindValue(4,0 );
+                    }
                     query.bindValue(4,QDateTime::fromString(sourcedateEnd,Qt::ISODate).toMSecsSinceEpoch() );
                     query.bindValue(5,eventitem["name"].toString());
                     query.bindValue(6,eventitem["uri"].toString());
                     query.bindValue(7,eventitem["desc"].toString().toUtf8().toBase64());
                     query.bindValue(8,eventitem["place"].toString());
                     query.bindValue(9,eventitem["type"].toString());
-                    query.bindValue(10,eventitem["nofinsh"].toInt());
+                    query.bindValue(10,eventitem["nofinish"].toInt());
                     query.bindValue(11,eventitem["adjust"].toInt());
                     query.bindValue(12,eventitem["ignore"].toInt());
                     QJsonArray permissions; permissions={eventitem["allow_cid"].toString().replace("<","[").replace(">","]"),eventitem["allow_gid"].toString().replace("<","[").replace(">","]"),eventitem["deny_cid"].toString().replace("<","[").replace(">","]"),eventitem["deny_gid"].toString().replace("<","[").replace(">","]")};

source-linux/js/helper.js

@@ -39,7 +39,7 @@ function friendicaRequest(login,api,rootwindow,callback) {
             try{
                 if (xhrequest.status==200){
                     callback(xhrequest.responseText)
-                }else{
+                }else{print("xhrequest.status "+xhrequest.status)
                     callback(xhrequest.responseText)
                     //showMessage("Error","API:\n" +login.server+api+"\n NO RESPONSE"+xhrequest.statusText,rootwindow);
                 }

source-linux/js/newsworker.js

@@ -134,17 +134,30 @@ WorkerScript.onMessage = function(msg) {
 
                 if (msg.method=="conversation"){
                     if (j==0){newsitemobject.indent=0}else{
+                        var count=0;
+                        var firstReply=0;
                         for (var k=msg.model.count-1;k>-1;k--){
+                            //print("newsitemobject.in_reply_to_status_id "+newsitemobject.in_reply_to_status_id+" msg.model.get(k).newsitemobject.in_reply_to_status_id "+msg.model.get(k).newsitemobject.in_reply_to_status_id)
                             if (newsitemobject.in_reply_to_status_id==msg.model.get(k).newsitemobject.id){
                                 newsitemobject.indent=(msg.model.get(k).newsitemobject.indent||0)+1;
                                 if (newsitemobject.indent>6){newsitemobject.indent=6};
+                                firstReply=k;
+                                //break;
+                            }
+                            if (newsitemobject.in_reply_to_status_id==msg.model.get(k).newsitemobject.in_reply_to_status_id){
+                                count+=1
                             }
                         }
                 }}
                 data=({"newsitemobject": newsitemobject})
             }
+
             if(msg.method=="append") {
-                msg.model.insert(j, data)}
+                msg.model.insert(j, data)
+            } else if (msg.method=="conversation" && firstReply>0){
+                //print("j "+j +" firstReply "+firstReply+" count "+count)
+                msg.model.insert(firstReply+count+1, data)
+            }
             else{
                 msg.model.append(data)
             }

source-linux/js/service.js

@@ -448,7 +448,7 @@ function updateContactInDB(login,database,isFriend,contact){// for newstab and f
     });
 }
 
-function processNews(api,data){
+function processNews(api,data){//print("processnews "+ " api "+ api + " data "+data);
     try{var newslist=JSON.parse(data)} catch(e){print("processnews "+e+ " api "+ api + " data "+data);newsBusy.running=false;};
     if (api=="/api/users/show"){
         var usermessages=[];
@@ -624,7 +624,7 @@ function cleanUser(user){
     return user
 }
 
-function updateView(viewtype){
+function updateView(viewtype){//print("lastnews "+lastnews);
     //messageSend.state="";
     //newsBusy.running=true;
     //downloadNotice.text="xhr start "+Date.now()

source-linux/qml/calendarqml/CalendarDay.qml

@@ -35,9 +35,9 @@ import QtQuick.Controls.Material 2.12
 
 Item {
     id: calendarDay
-    width: root.fontFactor*osSettings.bigFontSize*2//5*mm
+    width: root.fontFactor*osSettings.bigFontSize*2
-    height: root.fontFactor*osSettings.bigFontSize*2//5*mm
+    height: root.fontFactor*osSettings.bigFontSize*2
-    property int dateInt: Math.floor(Date.parse(model.date)/86400000) //Math.floor((Date.parse(model.date)-(new Date().getTimezoneOffset() * 60 * 1000))/86400000)
+    property int dateInt: Math.floor(model.date.valueOf()/86400000)
     Rectangle {
         id: placeHolder
         color: model.today?'lightblue':'transparent';
@@ -68,10 +68,8 @@ Item {
     }
     MouseArea {
         anchors.fill: calendarDay
-        onClicked: {rootstackView.push("qrc:/qml/calendarqml/EventList.qml",{"dayint": dateInt,"events":events});
+        onClicked: {
-//            var component = Qt.createComponent("qrc:/qml/calendarqml/EventList.qml");
+            rootstackView.push("qrc:/qml/calendarqml/EventList.qml",{"dayint": dateInt,"events":events});
-//            if (component.status== Component.Ready){
-//                var eventlist = component.createObject(calendartab,{"dayint": dateInt})}
         }
     }
 }

source-linux/qml/calendarqml/CalendarTab.qml

@@ -30,7 +30,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import QtQuick 2.0
-import QtQuick.Controls 2.12
+import QtQuick.Controls 2.15
 import QtQuick.Controls.Material 2.12
 import QtQml 2.2
 import Qt.labs.calendar 1.0
@@ -53,21 +53,21 @@ Rectangle {
 
     function showEvents(friend){
         if(friend=="backButton"){Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
-            events=eventArray;
+            events=cleanEvents(eventArray);
             eventdays=dayArray})
         }
         else if (friend!=""){
             calendartab.calendartabstatus=friend.url.substring(friend.url.lastIndexOf("/")+1,friend.url.length)
             Service.newRequestFriendsEvents(login,friend,calendartab,function(eventArray,dayArray){
-            events=eventArray;
+                events=cleanEvents(eventArray);
                 eventdays=dayArray})
         }
         else {calendartab.calendartabstatus="Events";
             Service.eventsfromdb(db,login.username,function(eventArray,dayArray){
-                events=eventArray;
+                events=cleanEvents(eventArray);
                 eventdays=dayArray;
                 calBusy.running=false
-
+                var currentevents=events;
                 var currentevents=events.filter(event=>(currentTime<=event.end));
                 for (var i=0; i<Math.min(5,currentevents.length);i++){
                     var liststate="";
@@ -77,6 +77,14 @@ Rectangle {
         }
     }
 
+    function cleanEvents(events){
+        for (var item in events){
+            events[item].start=events[item].start-offsetTime;
+            if(events[item].end>0){events[item].end=events[item].end-offsetTime};
+        }
+        return events
+    }
+
     BusyIndicator{
         id: calBusy
         anchors.horizontalCenter: calendarView.horizontalCenter
@@ -135,6 +143,50 @@ Rectangle {
         }
     }
 
+    Dialog {
+        id: deleteDialog
+        anchors.centerIn: parent
+        property int eventid:0
+        title: qsTr("Delete Event?")
+        standardButtons: Dialog.Ok | Dialog.Cancel
+        modal: true
+        onAccepted: {//print("event.id"+event.id);
+            xhr.setUrl(login.server);
+            xhr.setLogin(login.username+":"+Qt.atob(login.password));
+            xhr.setApi("/api/friendica/event_delete");
+            xhr.clearParams();
+            xhr.setParam("id",eventid);
+            xhr.post();
+        }
+        onRejected: {print("eventid "+eventid);close()}
+    }
+
+    MButton{
+        id:  createNewEvent
+        anchors.top: parent.top
+        anchors.topMargin: 0.5*mm
+        anchors.right:updateEvents.left
+        anchors.rightMargin:mm
+        width: 2*root.fontFactor*osSettings.bigFontSize;
+        text:"+"
+        onClicked: {
+            rootstackView.push("qrc:/qml/calendarqml/EventCreate.qml")
+        }
+    }
+
+    Connections{
+        target: xhr
+        function onSuccess(text,api){
+            if(api=="/api/friendica/event_create"){
+                calBusy.running=true;
+                updatenews.setDatabase();
+                updatenews.login();
+                updatenews.setSyncAll(false);
+                updatenews.events();
+            }
+        }
+    }
+
     MButton{
         id:  calendartabstatusButton
         anchors.top: parent.top

source-linux/qml/calendarqml/EventCreate.qml

@@ -0,0 +1,391 @@
+//  This file is part of Friendiqa
+//  https://git.friendi.ca/lubuwest/Friendiqa
+//  Copyright (C) 2020 Marco R. <thomasschmidt45@gmx.net>
+//
+//  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.
+//
+//  In addition, as a special exception, the copyright holders give
+//  permission to link the code of portions of this program with the
+//  OpenSSL library under certain conditions as described in each
+//  individual source file, and distribute linked combinations including
+//  the two.
+//
+//  You must obey the GNU General Public License in all respects for all
+//  of the code used other than OpenSSL. If you modify file(s) with this
+//  exception, you may extend this exception to your version of the
+//  file(s), but you are not obligated to do so. If you do not wish to do
+//  so, delete this exception statement from your version. If you delete
+//  this exception statement from all source files in the program, then
+//  also delete it here.
+//
+//  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 QtQuick.Controls 2.12
+import QtQuick.Controls.Material 2.12
+import QtQuick.Controls 1.4 as Oldcontrols
+import "qrc:/js/service.js" as Service
+import "qrc:/js/helper.js" as Helperjs
+import "qrc:/qml/genericqml"
+import "qrc:/qml/calendarqml"
+
+Rectangle{
+    id:eventCreateBox
+    color: Material.backgroundColor
+    property date startDate: new Date()
+
+    function formatText(count, modelData) {
+         var data = count === 12 ? modelData + 1 : modelData;
+         return data.toString().length < 2 ? "0" + data : data;
+     }
+
+    MButton{
+       id:closeButton
+       anchors.top: parent.top
+       anchors.topMargin: 1*mm
+       anchors.right: parent.right
+       anchors.rightMargin: 1*mm
+       text: "\uf057"
+       onClicked:{rootstackView.pop()}
+    }
+
+    Label{
+        x: 0.5*root.fontFactor*osSettings.bigFontSize
+        y: 2*root.fontFactor*osSettings.bigFontSize
+        width: 3*root.fontFactor*osSettings.bigFontSize
+        height: root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        //verticalAlignment: TextInput.AlignBottom
+        color: Material.primaryTextColor
+        text:qsTr("Start")
+    }
+
+    TextField {
+        id: textStartDate
+        property string dateDay:(startDate.getDate()).toString().length<2?"0"+(startDate.getDate()):(startDate.getDate())
+        property string dateMonth: (startDate.getMonth()+1).toString().length<2?"0"+(startDate.getMonth()+1):(startDate.getMonth()+1)
+        x: 4*root.fontFactor*osSettings.bigFontSize
+        y: root.fontFactor*osSettings.bigFontSize
+        width: 5*root.fontFactor*osSettings.bigFontSize
+        height: 2.5*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        horizontalAlignment: TextInput.AlignRight
+        text: dateDay+"-"+dateMonth+"-"+startDate.getFullYear()
+        inputMask: "99-99-9999"
+        validator: RegExpValidator{regExp: /^([0-2\s]?[0-9\s]|3[0-1\s])-(0[0-9\s]|1[0-2\s])-([0-9\s][0-9\s][0-9\s][0-9\s])$ / }
+        font.bold: true
+    }
+
+    MButton {
+        id: textStartDateDropdown
+        x: 9.5*root.fontFactor*osSettings.bigFontSize
+        y: root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize
+        height: 2*root.fontFactor*osSettings.bigFontSize
+        text:"\uf0d7"
+        onClicked:{
+            cal.visible=true;
+            cal.curSelection="start"
+        }
+    }
+
+    TextField {
+        id: textStartTime
+        x: 13*root.fontFactor*osSettings.bigFontSize
+        y: root.fontFactor*osSettings.bigFontSize
+        width: 3*root.fontFactor*osSettings.bigFontSize
+        height: 2.5*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        inputMask: "99:99"
+        text: "00:00"
+        horizontalAlignment: TextInput.AlignRight
+        validator: RegExpValidator{regExp: /^([0-1\s]?[0-9\s]|2[0-3\s]):([0-5\s][0-9\s])$ / }
+        font.bold: true
+    }
+
+    MButton {
+        id: textStartTimeDropdown
+        x: 16.5*root.fontFactor*osSettings.bigFontSize
+        y: root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize
+        height: 2*root.fontFactor*osSettings.bigFontSize
+        text:"\uf0d7"
+        onClicked:{
+            onClicked: {timeTumbler.visible=true;timeTumbler.curSelection="start"}
+        }
+    }
+
+    Label{
+        x: 0.5*root.fontFactor*osSettings.bigFontSize
+        y: 4*root.fontFactor*osSettings.bigFontSize
+        width: 3*root.fontFactor*osSettings.bigFontSize
+        height: root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        color: Material.primaryTextColor
+        text:qsTr("End")
+    }
+    TextField {
+        id: textEndDate
+        x: 4*root.fontFactor*osSettings.bigFontSize
+        y: 3*root.fontFactor*osSettings.bigFontSize
+        width: 5*root.fontFactor*osSettings.bigFontSize
+        height: 2.5*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        horizontalAlignment: TextInput.AlignRight
+        inputMask: "99-99-9999"
+        validator: RegExpValidator{regExp: /^([0-2\s]?[0-9\s]|3[0-1\s])-(0[0-9\s]|1[0-2\s])-([0-9\s][0-9\s][0-9\s][0-9\s])$ / }
+        enabled: false
+        font.bold: true
+    }
+
+    MButton {
+        id: textEndDateDropdown
+        x: 9.5*root.fontFactor*osSettings.bigFontSize
+        y: 3*root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize
+        height: 2*root.fontFactor*osSettings.bigFontSize
+        enabled: false
+        text:"\uf0d7"
+        onClicked:{
+            cal.visible=true;
+            cal.curSelection="end"
+        }
+    }
+
+    TextField {
+        id: textEndTime
+        x: 13*root.fontFactor*osSettings.bigFontSize
+        y: 3*root.fontFactor*osSettings.bigFontSize
+        width: 3*root.fontFactor*osSettings.bigFontSize
+        height: 2.5*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        enabled: false
+        horizontalAlignment: TextInput.AlignRight
+        inputMask: "99:99"
+        validator: RegExpValidator{regExp: /^([0-1\s]?[0-9\s]|2[0-3\s]):([0-5\s][0-9\s])$ / }
+        font.bold: true
+    }
+
+    MButton {
+        id: textEndTimeDropdown
+        x: 16.5*root.fontFactor*osSettings.bigFontSize
+        y: 3*root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize
+        height: 2*root.fontFactor*osSettings.bigFontSize
+        enabled: false
+        text:"\uf0d7"
+        onClicked:{
+            onClicked: {timeTumbler.visible=true;timeTumbler.curSelection="end"}
+        }
+    }
+
+    Column{
+        x: 4*root.fontFactor*osSettings.bigFontSize
+        y: 6*root.fontFactor*osSettings.bigFontSize
+        width: parent.width-7*root.fontFactor*osSettings.bigFontSize
+        Oldcontrols.Calendar{
+            id:cal
+            property string curSelection: "start"
+            width: 12*root.fontFactor*osSettings.bigFontSize
+            height: 15*root.fontFactor*osSettings.bigFontSize
+            visible: false
+            selectedDate: new Date()
+            onClicked:  {
+                if (curSelection=="start"){
+                    textStartDate.text=Qt.formatDate(cal.selectedDate, "dd-MM-yyyy");
+                }else{
+                    textEndDate.text=Qt.formatDate(cal.selectedDate, "dd-MM-yyyy");
+                }
+                cal.visible=false
+            }
+        }
+
+        Frame {
+            id: timeTumbler
+            width: 12*root.fontFactor*osSettings.bigFontSize
+            height: 10*root.fontFactor*osSettings.bigFontSize
+            visible: false
+            property string curSelection: "start"
+
+            Row {
+                Tumbler {
+                    id: hoursTumbler
+                    model: 24
+                    delegate: tumblerDelegateComponent
+                    currentIndex: 12
+                }
+                Tumbler {
+                    id: minutesTumbler
+                    model: 60
+                    delegate: tumblerDelegateComponent
+                }
+            }
+            MButton {
+                 id: timeInputfinished
+                 width: 2*root.fontFactor*osSettings.bigFontSize
+                 height: 2*root.fontFactor*osSettings.bigFontSize
+                 anchors.right: parent.right
+                 anchors.verticalCenter: parent.verticalCenter
+
+                 text:"\uf00c"
+                 onClicked:{
+                     if (timeTumbler.curSelection=="start"){
+                         textStartTime.text=formatText(24,hoursTumbler.currentIndex)+":"+formatText(60,minutesTumbler.currentIndex);
+                     }else{
+                         textEndTime.text=formatText(24,hoursTumbler.currentIndex)+":"+formatText(60,minutesTumbler.currentIndex);
+                     }
+                     timeTumbler.visible=false
+                 }
+             }
+        }
+
+        CheckBox{
+            id: checkNoEndTime
+            width: 12*root.fontFactor*osSettings.bigFontSize
+            height: 2.5*root.fontFactor*osSettings.bigFontSize
+            checked: true
+            font.pointSize: osSettings.systemFontSize
+            text: qsTr("no end")
+            onCheckedChanged: {
+                if(checked==true){
+                    textEndDate.enabled=false;
+                    textEndDateDropdown.enabled=false;
+                    textEndTime.enabled=false;
+                    textEndTimeDropdown.enabled=false;
+                    textEndDate.text="";
+                    textEndTime.text=""
+                }else{
+                    textEndDate.enabled=true;
+                    textEndDateDropdown.enabled=true;
+                    textEndTime.enabled=true;
+                    textEndTimeDropdown.enabled=true;
+                    textEndDate.text=textStartDate.text;
+                    textEndTime.text=textStartTime.text
+                }
+            }
+        }
+
+        TextField {
+            id: titleField
+            width: parent.width-root.fontFactor*osSettings.bigFontSize
+            font.pointSize: osSettings.systemFontSize
+            font.bold: true
+            placeholderText: qsTr("Title (required)")
+        }
+
+        Rectangle{
+            color: Material.backgroundColor
+            radius: 0.5*mm
+            width: parent.width-root.fontFactor*osSettings.bigFontSize
+            height:Math.max(bodyField.contentHeight+root.fontFactor*osSettings.bigFontSize,2.5*root.fontFactor*osSettings.bigFontSize)
+            TextArea {
+                id: bodyField
+                anchors.fill: parent
+                font.pointSize: osSettings.systemFontSize
+                font.family: "Noto Sans"
+                wrapMode: Text.Wrap
+                selectByMouse: true
+                placeholderText: qsTr("Event description (optional)")
+                textFormat: TextEdit.PlainText
+                onLinkActivated:{Qt.openUrlExternally(link)}
+            }
+        }
+
+        TextField {
+            id: locationField
+            width: parent.width-root.fontFactor*osSettings.bigFontSize
+            font.pointSize: osSettings.systemFontSize
+            placeholderText: qsTr("Location (optional)")
+        }
+
+        CheckBox{
+            id: chkbxPublish
+            width: 10*root.fontFactor*osSettings.bigFontSize
+            height: 2.5*root.fontFactor*osSettings.bigFontSize
+            checked: true
+            font.pointSize: osSettings.systemFontSize
+            text: qsTr("Publish event?")
+        }
+
+        BusyIndicator{
+             id: eventCreateBusy
+             anchors.horizontalCenter: eventCreateBox.horizontalCenter
+             anchors.top:eventCreateBox.top
+             anchors.topMargin: 2*root.fontFactor*osSettings.bigFontSize
+             width:3*root.fontFactor*osSettings.bigFontSize
+             height: 3*root.fontFactor*osSettings.bigFontSize
+             running: false
+        }
+
+        MButton{
+            id:createEventButton
+            text: qsTr("Create event")
+            onClicked:{
+                let startdatetext=textStartDate.getText(0,textStartDate.length);
+                let startdate=new Date(startdatetext.substring(6,10)+"-"+startdatetext.substring(3,5)+"-"+startdatetext.substring(0,2)+"T"+textStartTime.text)
+
+                if (titleField.text==""){
+                    Helperjs.showMessage(qsTr("Error"),qsTr("No event name supplied"),eventCreateBox)
+                }else{
+                    let startdatetext=textStartDate.getText(0,textStartDate.length);
+                    let startdate=new Date(startdatetext.substring(6,10)+"-"+startdatetext.substring(3,5)+"-"+startdatetext.substring(0,2)+"T"+textStartTime.text)
+                    eventCreateBusy.running=true;
+                    xhr.setLogin(login.username+":"+Qt.atob(login.password));
+                    xhr.setUrl(login.server);
+                    xhr.setApi("/api/friendica/event_create");
+                    xhr.clearParams();
+                    xhr.setParam("name", titleField.text);
+                    xhr.setParam("start_time",startdate.toISOString())
+                    if(!checkNoEndTime.checked){
+                        let enddatetext=textEndDate.getText(0,textEndDate.length);
+                        let enddate=new Date(enddatetext.substring(6,10)+"-"+enddatetext.substring(3,5)+"-"+enddatetext.substring(0,2)+"T"+textEndTime.text)
+                        xhr.setParam("end_time",enddate.toISOString())
+                    }
+                    xhr.setParam("name",titleField.text)
+                    if (bodyField.text!=""){xhr.setParam("desc",bodyField.text)}
+                    if (locationField.text!=""){xhr.setParam("place",locationField.text)}
+                    xhr.setParam("publish",chkbxPublish.checked)
+                    xhr.post();
+                }
+           }
+        }
+        Connections{
+           target: xhr
+           function onSuccess(text,api){
+               if (api=="/api/friendica/event_create"){
+                   updatenews.setDatabase();
+                   updatenews.login();
+                   updatenews.setSyncAll(false);
+                   updatenews.events();
+                   try{while(rootstackView.depth>1){rootstackView.pop()}}catch(e){}
+               }
+           }
+           function onError(text,api){
+                if (api=="/api/friendica/event_create"){
+                    Helperjs.showMessage(qsTr("Error"),text,root)
+                }
+           }
+        }
+    }
+
+    Component {
+        id: tumblerDelegateComponent
+         Label {
+            text: formatText(Tumbler.tumbler.count, modelData)
+            opacity: 1.0 - Math.abs(Tumbler.displacement) / (Tumbler.tumbler.visibleItemCount / 2)
+            color:Material.primaryTextColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            font.pointSize: osSettings.systemFontSize
+        }
+    }
+}

source-linux/qml/calendarqml/EventList.qml

@@ -39,10 +39,7 @@ import "qrc:/qml/calendarqml"
 
 Rectangle{
     id:eventList
-//    height: parent.height
-//    width:parent.width
     color: Material.backgroundColor
-    //radius: 0.5*mm
     property var daylist:[]
     property int dayint: 0
     property var events:[]
@@ -56,6 +53,37 @@ Rectangle{
        text: "\uf057"
        onClicked:{rootstackView.pop()}
     }
+
+    MButton{
+        id:  createNewEvent
+        anchors.top: parent.top
+        anchors.topMargin: 1*mm
+        anchors.right:closeButton.left
+        anchors.rightMargin:mm
+        width: 2*root.fontFactor*osSettings.bigFontSize;
+        text:"+"
+        onClicked: {
+            rootstackView.push("qrc:/qml/calendarqml/EventCreate.qml",{"startDate": new Date(dayint*86400000)})
+        }
+    }
+    Dialog {
+        id: deleteDialog
+        anchors.centerIn: parent
+        property int eventid:0
+        title: qsTr("Delete Event?")
+        standardButtons: Dialog.Ok | Dialog.Cancel
+        modal: true
+        onAccepted: {//print("event.id"+event.id);
+            xhr.setUrl(login.server);
+            xhr.setLogin(login.username+":"+Qt.atob(login.password));
+            xhr.setApi("/api/friendica/event_delete");
+            xhr.clearParams();
+            xhr.setParam("id",eventid);
+            xhr.post();
+        }
+        onRejected: {print("eventid "+eventid);close()}
+    }
+
     ListView {
         id: eventlistView
         y:closeButton.height+2*mm
@@ -65,11 +93,9 @@ Rectangle{
         model: eventModel
         delegate: EventListItem{}
     }
-
     ListModel{
         id: eventModel
     }
-
     Component.onCompleted:{
          var currentevents=events.filter(event=>(dayint>=event.startday)&&(dayint<=event.endday));
          for (var i=0; i<currentevents.length;i++){

source-linux/qml/calendarqml/EventListItem.qml

@@ -42,8 +42,8 @@ Rectangle{
     property string status: eventstatus
     property var currEvent: event
     width:parent.width
-    height:eventNameText.height+eventDetailsText.height+mm
+    height:Math.max(eventNameText.height+eventDetailsText.height,profileImage.height)+mm
-    border.color: Material.backgroundDimColor//"light grey"
+    border.color: Material.backgroundDimColor
     color: Material.backgroundColor
     border.width: 1
     radius: 0.5*mm
@@ -54,8 +54,6 @@ Rectangle{
         y:1
         width: 7*mm
         height: 7*mm
-        //radius:mm
-
         onStatusChanged: if (profileImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
     }
     Text {
@@ -64,8 +62,9 @@ Rectangle{
         width:parent.width-8*mm
         height:contentHeight
         color: Material.primaryTextColor
+        textFormat: Text.RichText
         font.pointSize: osSettings.systemFontSize
-        text: new Date(event.start).toLocaleString(Qt.locale(),Locale.NarrowFormat)+ " - " +((event.end>0)&&(event.end!=null)?new Date(event.end).toLocaleString(Qt.locale(),Locale.NarrowFormat):"\u221E")+":\n"+event.title //+calendarrectangle.offsetTime
+        text: new Date(event.start).toLocaleString(Qt.locale(),Locale.NarrowFormat)+ " - " +((event.end>0)&&(event.end!=null)?new Date(event.end).toLocaleString(Qt.locale(),Locale.NarrowFormat):"\u221E")+":<br>"+(status=="large"?"<b>"+event.title+"</b>":event.title)
         wrapMode:Text.Wrap
     }
 
@@ -77,18 +76,51 @@ Rectangle{
         height: contentHeight
         color: Material.primaryTextColor
         textFormat: Text.RichText
-        text: status!="large"?"":Qt.atob(event.desc) + (event.location==""?"":"<br><br>"+qsTr("Location")+": "+event.location)//Qt.atob(event.html)
+        text: status!="large"?"":Qt.atob(event.desc) + (event.location==""?"":"<br><br>"+qsTr("Location")+": "+event.location)
         anchors.top: eventNameText.bottom
         font.pointSize: osSettings.systemFontSize
         wrapMode:Text.Wrap
         onLinkActivated:{Qt.openUrlExternally(link)}
     }
+
     MouseArea{
         anchors.fill: parent
+        MButton{
+            id:  deleteEvent
+            anchors.top: parent.top
+            anchors.topMargin: 0.5*mm
+            anchors.right:parent.right
+            anchors.rightMargin:mm
+            width: 2*root.fontFactor*osSettings.bigFontSize;
+            text:"\uf1f8"
             onClicked: {
+                deleteDialog.eventid=event.id
+                deleteDialog.open()
+            }
+        }
+
+        onClicked:{print("status "+status)
             if (status==""){
                 rootstackView.push("qrc:/qml/calendarqml/EventList.qml",{"dayint": event.startday, "events":[event]});
             } else {rootstackView.pop()}
         }
     }
+
+
+
+
+
+    Connections{
+       target: xhr
+       function onSuccess(text,api){
+            if (api=="/api/friendica/event_delete"){
+                let obj=JSON.parse(text);
+                if(obj.status=="deleted"&&obj.id==event.id){
+                    Helperjs.deleteData(db,"events",login.username, function(){
+                        eventModel.remove(index);
+                    },"id",obj.id)
+                }
+           }
+       }
+    }
 }

source-linux/qml/configqml/AccountPage.qml

@@ -290,10 +290,10 @@ Page{
 
         else {errormessage=""}
         if (errormessage=="") {
-            Helperjs.friendicaRequest(userconfig,"/api/account/verify_credentials?skip_status=true",root,function(obj){
+            Helperjs.friendicaRequest(userconfig,"/api/account/verify_credentials.json?skip_status=true",root,function(obj){
                 accountBusy.running=false;
-                var credentials=JSON.parse(obj);
+                try{var credentials=JSON.parse(obj);
-                if (credentials.hasOwnProperty('status')){
+                    if (credentials.hasOwnProperty('error')){
                         Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password!"),root)
                     }
                     else{
@@ -325,9 +325,9 @@ Page{
                          Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root)
                         rootstackView.pop()
                      }
-             });
+                }catch(e){Helperjs.showMessage(qsTr("Error"),qsTr("Wrong password!"),root)};
 
-        }
+        })}
          else {Helperjs.showMessage(qsTr("Error"), errormessage,root)}
     }}
 

source-linux/qml/configqml/InfoBox.qml

@@ -43,7 +43,7 @@ Page{
         font.pointSize: osSettings.systemFontSize
         color:Material.primaryTextColor
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-        text: "<b>Friendiqa v0.6.5 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
+        text: "<b>Friendiqa v0.6.6 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
               "Website <a href='https://friendiqa.ma-nic.de'>https://friendiqa.ma-nic.de</a><br>"+
               "Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+
               "Privacy Policy: <a href='https://git.friendi.ca/lubuwest/Friendiqa/src/branch/master/PrivacyPolicy.md'>http://git.friendi.ca/lubuwest/Friendiqa/src/branch/master/PrivacyPolicy.md</a><br>"+

source-linux/qml/contactqml/ContactsListTab.qml

@@ -1,122 +0,0 @@
-//  This file is part of Friendiqa
-//  https://git.friendi.ca/lubuwest/Friendiqa
-//  Copyright (C) 2020 Marco R. <thomasschmidt45@gmx.net>
-//
-//  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.
-//
-//  In addition, as a special exception, the copyright holders give
-//  permission to link the code of portions of this program with the
-//  OpenSSL library under certain conditions as described in each
-//  individual source file, and distribute linked combinations including
-//  the two.
-//
-//  You must obey the GNU General Public License in all respects for all
-//  of the code used other than OpenSSL. If you modify file(s) with this
-//  exception, you may extend this exception to your version of the
-//  file(s), but you are not obligated to do so. If you do not wish to do
-//  so, delete this exception statement from your version. If you delete
-//  this exception statement from all source files in the program, then
-//  also delete it here.
-//
-//  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.11
-import QtQuick.Controls 2.12
-import QtQuick.Controls.Material 2.12
-import QtQuick.Layouts 1.11
-import QtQuick.LocalStorage 2.0
-import "qrc:/js/helper.js" as Helperjs
-import "qrc:/js/service.js" as Service
-import "qrc:/js/news.js" as Newsjs
-import "qrc:/qml/contactqml"
-import "qrc:/qml/genericqml"
-
-Item{
-    id: contactsGridTab
-    Layout.fillWidth:true
-    Layout.fillHeight: true
-    function showContacts(contact){
-        try {contactsModel.clear()} catch(e){};
-        Newsjs.listFriends(login,db,function(contactsobject){
-            for (var j=0;j<contactsobject.length;j++){
-                contactsobject[j].description=Qt.atob(contactsobject[j].description);
-                if(Helperjs.getCount(db,login,"contacts","screen_name",contactsobject[j].screen_name)>1){
-                    contactsobject[j].screen_name=contactsobject[j].screen_name+"+"+contactsobject[j].cid
-                }
-                 contactsModel.append({"contact":contactsobject[j]});
-                }
-          },searchText.text,-1);
-    }
-    MButton {
-        id: cleanButton
-        text:  "\uf021"
-        anchors.top: parent.top
-        anchors.topMargin: mm
-        anchors.right: parent.right
-        onClicked: {
-            Service.cleanContacts(root.login,root.db,function(){
-                showContacts()
-//                try {contactsModel.clear()} catch(e){print(e)};
-//                Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
-//                    for (var j=0;j<contactsobject.length;j++){
-//                        contactsobject[j].description=Qt.atob(contactsobject[j].description);
-//                        contactsobject[j].name=Qt.atob(contactsobject[j].name);
-//                         contactsModel.append({"contact":contactsobject[j]});
-//                        }
-//                },"isFriend",0,"screen_name ASC");
-            })
-        }
-    }
-
-    Rectangle {
-        id:searchComponent
-        x: mm; y:mm
-        color: Material.backgroundColor
-        radius:0.5*mm
-        width: 10*root.fontFactor*osSettings.bigFontSize
-        height: 2*root.fontFactor*osSettings.bigFontSize
-        TextField {
-            id: searchText
-            color: Material.primaryTextColor
-            focus: true
-            font.pointSize: osSettings.systemFontSize
-            wrapMode: Text.Wrap
-            anchors.fill:parent
-            selectByMouse: true
-            cursorVisible: false
-            placeholderText: "\uf0b0"
-            onTextChanged: {showContacts(root.login.username)}
-        }
-    }
-
-    ListView {
-        id: contactsView
-        x:mm
-        y:cleanButton.height+2*mm
-        width:contactsGridTab.width-2*mm
-        height:contactsGridTab.height-cleanButton.height-2*mm
-        spacing: 2
-        clip: true
-        function processContactSelection(contactobject){showContactdetails(contactobject)}
-             //add: Transition {
-              //        NumberAnimation { properties: "x,y"; from: 300; duration: 1000 }
-              //    }
-        model: contactsModel
-        delegate: ContactComponent { }
-    }
-
-    ListModel{id: contactsModel}
-    Component.onCompleted: {
-        friendsTabView.contactsSignal.connect(showContacts);
-        showContacts()
-    }
-}

source-linux/qml/contactqml/FriendsListTab.qml

@@ -45,9 +45,9 @@ Item{
     Layout.fillHeight: true
     property int currentContact: 0
 
-    function showFriends(contact){
+    function showFriends(username){
         try {friendsModel.clear()} catch(e){};
-        Helperjs.readData(db,"friendshiprequests",login.username,function(friendrequestsobject){
+        Helperjs.readData(db,"friendshiprequests",username,function(friendrequestsobject){
             for (var i=0;i<friendrequestsobject.length;i++){
                 if (friendrequestsobject[i].note!=null){
                      friendrequestsobject[i].description=Qt.atob(friendrequestsobject[i].note);}
@@ -73,6 +73,19 @@ Item{
           },(searchText.text==""?searchText.preeditText:searchText.text));
     }
 
+    function showContacts(contact){
+        try {friendsModel.clear()} catch(e){};
+        Newsjs.listFriends(login,db,function(contactsobject){
+            for (var j=0;j<contactsobject.length;j++){
+                contactsobject[j].description=Qt.atob(contactsobject[j].description);
+                if(Helperjs.getCount(db,login,"contacts","screen_name",contactsobject[j].screen_name)>1){
+                    contactsobject[j].screen_name=contactsobject[j].screen_name+"+"+contactsobject[j].cid
+                }
+                 friendsModel.append({"contact":contactsobject[j]});
+                }
+          },searchText.text,-1);
+    }
+
     Connections{
         target:xhr
         function onDownloaded(type,url,filename,i){
@@ -108,11 +121,10 @@ Item{
 
     ProgressBar{
         id: newContactsProgress
-        width: 15*mm
+        width: friendsView.width
-        height: updateFriendsButton.height
+        height: 2*mm
-        anchors.top: parent.top
+        x: mm
-        anchors.right:updateFriendsButton.left
+        y: updateFriendsButton.height+mm
-        anchors.rightMargin:mm
         visible: (friendsGridTab.currentContact!=(root.newContacts.length))?true:false
         value: friendsGridTab.currentContact/root.newContacts.length
     }
@@ -134,11 +146,30 @@ Item{
             selectByMouse: true
             cursorVisible: false
             placeholderText: "\uf0b0"
-            onTextChanged: if (text.length>0){showFriends(root.login.username)}
+            onTextChanged: {showFriends(root.login.username)}//if (text.length>0)
-            onPreeditTextChanged: {if (preeditText.length>0){showFriends(root.login.username)}}
+            onPreeditTextChanged: {{showFriends(root.login.username)}}//if (preeditText.length>0)
         }
     }
 
+    ComboBox{
+        id: friendsCombo
+        anchors.left: searchComponent.right
+        anchors.leftMargin: root.fontFactor*osSettings.bigFontSize
+        y: mm
+        width: 6*root.fontFactor*osSettings.bigFontSize
+        height: 1.5*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.systemFontSize
+        model: [qsTr("Friends"), qsTr("All")]
+        onCurrentIndexChanged:{
+            if (currentIndex === 0) {
+                showFriends(root.login.username);
+            } else{
+                showContacts()
+            }
+        }
+    }
+
+
     Component {
         id: sectionHeading
         Rectangle {
@@ -180,9 +211,9 @@ Item{
     ListView{
         id: friendsView
         x:mm
-        y:updateFriendsButton.height+mm
+        y:updateFriendsButton.height+2*mm
         width:friendsGridTab.width-2*mm
-        height:friendsGridTab.height-(updateFriendsButton.height+7*mm)
+        height:friendsGridTab.height-(updateFriendsButton.height+10*mm)
         clip: true
         spacing: 2
               function processContactSelection(contactobject){showContactdetails(contactobject)}

source-linux/qml/contactqml/FriendsTab.qml

@@ -79,11 +79,6 @@ Rectangle {
             font.pointSize: osSettings.systemFontSize
             height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
         }
-        TabButton {
-            text:  qsTr("Contacts")
-            font.pointSize: osSettings.systemFontSize
-            height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
-        }
         TabButton {
             text: qsTr("Groups")
             font.pointSize: osSettings.systemFontSize
@@ -117,10 +112,7 @@ Rectangle {
             if (currentIndex==1){
                 contactsSignal("")
             }
-            else if (currentIndex==2){
+            else if (currentIndex==2){groupsSignal(root.login.username)}
-                contactsSignal("")
-            }
-            else if (currentIndex==3){groupsSignal(root.login.username)}
         }
 
         Loader{
@@ -133,14 +125,9 @@ Rectangle {
             source:(friendsTabView.currentIndex==1)? "qrc:/qml/contactqml/FriendsListTab.qml":""
         }
 
-        Loader{
-            id: contactsListLoader
-            source:(friendsTabView.currentIndex==2)? "qrc:/qml/contactqml/ContactsListTab.qml":""
-        }
-
         Loader{
             id: groupsListLoader
-            source:(friendsTabView.currentIndex==3)? "qrc:/qml/contactqml/GroupsListTab.qml":""
+            source:(friendsTabView.currentIndex==2)? "qrc:/qml/contactqml/GroupsListTab.qml":""
         }
     }
 }

source-linux/qml/contactqml/GroupsListTab.qml

@@ -56,8 +56,9 @@ Item{
         //print("Groupdata  "+JSON.stringify(group));
         var api="";
         if (group.new){api="/api/friendica/group_create.json?name="+group.name}else{api="/api/friendica/group_update.json?gid="+group.id}
-        xhr.url= login.server + api;
+        xhr.setUrl(login.server);
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
+        xhr.setApi(api);
         xhr.clearParams();
         xhr.setParam("gid",group.id);
         xhr.setParam("name",group.name);

source-linux/qml/contactqml/ProfileComponent.qml

@@ -45,8 +45,9 @@ Rectangle {
     property var createdAtDate: new Date(profile.friendica_owner.created_at)
 
     function updateProfileImage(){
-        xhr.url= login.server + "/api/account/update_profile_image.json";
+        xhr.setUrl(login.server);
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
+        xhr.setApi("/api/account/update_profile_image.json");
         xhr.clearParams();
         xhr.setImageFileParam("image", photoImage.source );
         xhr.post();
@@ -96,11 +97,21 @@ Rectangle {
                     case "education":keytext=qsTr("education");break;
                     case "social_networks":keytext=qsTr("social networks");break;
                     case "homepage":keytext=qsTr("homepage");break;
+                    case "custom_fields":keytext=qsTr("other");break;
                     default:keytext=key;
                 }
+                if (key=="custom_fields"){
+                    var customObject=pobject[key];
+                    for (var customkey in customObject){
+                        profiletext=profiletext+("<b>"+customObject[customkey].label+": </b> "+(customObject[customkey].value)+"<br>");}
+                }else if(key=="homepage" || key=="profile_photo" || key=="profile_thumb"){
+                    profiletext=profiletext+("<b>"+keytext+": </b> <a href='"+(pobject[key])+"'>"+(pobject[key])+"</a><br>");
+                }
+                else{
                     profiletext=profiletext+("<b>"+keytext+": </b> "+(pobject[key])+"<br>");
                 }
             }
+        }
         callback(profiletext)
     }
 
@@ -224,7 +235,8 @@ Rectangle {
                 wrapMode: Text.Wrap
                 font.pointSize: osSettings.systemFontSize
                 text:profiletext
-                color:Material.primaryTextColor//"black"
+                color:Material.primaryTextColor
+                onLinkActivated: Qt.openUrlExternally(link)
             }
         }
     }

source-linux/qml/genericqml/DrawerAccountComponentContacts.qml

@@ -93,8 +93,8 @@ Item {
         y:5*root.fontFactor*osSettings.bigFontSize
         width:parent.width
         font.pointSize: osSettings.systemFontSize
-        font.bold: account.username==login.username && friendsTabView.currentIndex==2
+        font.bold: account.username==login.username && friendsTabView.currentIndex==3
-        text: "  "+qsTr("Contacts")
+        text: "  "+qsTr("Groups")
         MouseArea{
             anchors.fill:parent
             onClicked:{
@@ -104,23 +104,5 @@ Item {
             }
         }
     }
-
-
-
-    Label{
-        y:6.5*root.fontFactor*osSettings.bigFontSize
-        width:parent.width
-        font.pointSize: osSettings.systemFontSize
-        font.bold: account.username==login.username && friendsTabView.currentIndex==3
-        text: "  "+qsTr("Groups")
-        MouseArea{
-            anchors.fill:parent
-            onClicked:{
-                login=account;
-                if(!wideScreen){leftDrawerAndroid.close()}
-                friendsTabView.currentIndex=3
-            }
-        }
-    }
  }
 

source-linux/qml/newsqml/ContactPage.qml

@@ -217,11 +217,11 @@ Page {
                     height: 6*mm
                     text:qsTr("Approve")
                     onClicked:{
-
                         Helperjs.friendicaPostRequest(login,"/api/v1/follow_requests/" + contact.id + "/authorize",'',"POST",root,function(returnvalue){
-                            Helperjs.deleteData(db,"friendshiprequests",login.username,function(){},"id", contact.id)
+
                         })
-                        root.friendsSignal();
+                        Helperjs.deleteData(root.db,"friendshiprequests",root.login.username,function(){},"id", contact.id)
+                        //if (rootstack.currentIndex==1){root.friendsSignal(login.username)}
                         rootstackView.pop()
                     }
                 }
@@ -232,9 +232,10 @@ Page {
                     text:qsTr("Reject")
                     onClicked:{
                         Helperjs.friendicaPostRequest(login,"/api/v1/follow_requests/" + contact.id + "/reject",'',"POST",root,function(returnvalue){
-                            Helperjs.deleteData(db,"friendshiprequests",login.username,function(){},"id", contact.id)
+
                         })
-                        root.friendsSignal();
+                        Helperjs.deleteData(root.db,"friendshiprequests",root.login.username,function(){},"id", contact.id)
+                        //if (rootstack.currentIndex==1){root.friendsSignal(login.username)}
                         rootstackView.pop()
                     }
                 }
@@ -245,9 +246,10 @@ Page {
                     text:qsTr("Ignore")
                     onClicked:{
                         Helperjs.friendicaPostRequest(login,"/api/v1/follow_requests/" + contact.id + "/ignore",'',"POST",root,function(returnvalue){
-                            Helperjs.deleteData(db,"friendshiprequests",login.username,function(){},"id", contact.id)
+
                         });
-                        root.friendsSignal();
+                        Helperjs.deleteData(root.db,"friendshiprequests",root.login.username,function(){},"id", contact.id)
+                        //if (rootstack.currentIndex==1){root.friendsSignal(login.username)}
                         rootstackView.pop()
                     }
                 }
@@ -259,13 +261,11 @@ Page {
                     onClicked:{
                         contactBusy.running=true;
                         Helperjs.friendicaPostRequest(login,"/api/v1/accounts/" + contact.id + "/follow",'',"POST",root,function(returnvalue){
-                            Helperjs.updateData(db,"contacts",login.username,"isFriend",1,function(){},"id",contact.id)
-                            root.friendsSignal(login.username);
-                            rootstackView.pop()
-//                            var username=login.username
-                            //
-                        });
 
+                        });
+                        Helperjs.updateData(root.db,"contacts",root.login.username,"isFriend",1,function(){},"id",contact.id)
+                        //if (rootstack.currentIndex==1){root.friendsSignal(login.username)}
+                        rootstackView.pop()
                     }
                 }
 
@@ -275,12 +275,13 @@ Page {
                     height: 6*mm
                     text:qsTr("Unfollow")
                     onClicked:{
-                        Helperjs.friendicaPostRequest(login,"/api/v1/accounts/" + contact.id + "/unfollow",'',"POST",root,function(returnvalue){
                         contactBusy.running=true;
-                            Helperjs.updateData(db,"contacts",login.username,"isFriend",0,function(){},"id",contact.id)
+                        Helperjs.friendicaPostRequest(login,"/api/v1/accounts/" + contact.id + "/unfollow",'',"POST",root,function(returnvalue){
-                            root.friendsSignal(login.username);
+
-                            rootstackView.pop()
                         });
+                        Helperjs.updateData(root.db,"contacts",root.login.username,"isFriend",0,function(){},"id",contact.id)
+                        //if (rootstack.currentIndex==1){root.friendsSignal(login.username)}
+                        rootstackView.pop()
                     }
                 }
 
@@ -313,7 +314,9 @@ Page {
                 color: Material.primaryTextColor
                 text:"<b>"+qsTr("Description")+": </b> "+(Qt.atob(contact.description)!=""?contact.description:"")+"<br> <b>"+qsTr("Location")+":</b> "+contact.location+"<br> <b>"+qsTr("Posts")+":</b> "+contact.statuses_count+
                      "<br> <b>"+qsTr("URL")+":</b> <a href='"+ contact.url+"'>"+contact.url+"</a><br>"+
-                     "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
+                     "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())+"<br>"+
+                     "<b>"+qsTr("Followers")+":</b> "+contact.followers_count+"<br>"+
+                     "<b>"+qsTr("Following")+":</b> "+contact.friends_count+"<br>"
                 onLinkActivated: {
                     Qt.openUrlExternally(link)}
             }

source-linux/qml/newsqml/Conversation.qml

@@ -92,13 +92,11 @@ Page {
    ListView {
           id: conversationView
           property string viewtype: "conversation"
-          //x:3*mm
-          //y:8*mm
           width: conversationList.width//-4*mm
-          height:conversationList.height-root.fontFactor*osSettings.bigFontSize//-20*mm
+          height:conversationList.height-2*root.fontFactor*osSettings.bigFontSize//-20*mm
           clip: true
           spacing: 0
-          footer: MessageSend{conversation:true}
+          //footer: MessageSend{conversation:true}
           model: conversationModel
           delegate: Newsitem{}
           }
@@ -114,7 +112,7 @@ Page {
 
     Connections{
         target:newstab
-        onConversationChanged:{
+        function onConversationChanged(){
             if(newstab.conversation.length==0){
                 rootstackView.pop()
             } else { conversationBusy.running=false;

source-linux/qml/newsqml/MessageSend.qml

@@ -92,7 +92,7 @@ Rectangle{
         try{newsBusy.running=true;conversationBusy.running=true}catch(e){}
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
         xhr.setUrl(login.server);
-        if (in_reply_to_status_id==""){
+        //if (in_reply_to_status_id==""){
             xhr.setApi("/api/statuses/update");
             xhr.clearParams();
             xhr.setParam("source", "Friendiqa");
@@ -111,16 +111,17 @@ Rectangle{
             }
             xhr.post();
             Newsjs.storeHashtags(login,db,status,root)
-        }else {
+//        }else {
-            xhr.setApi("/api/v1/statuses");
+//            xhr.setApi("/api/v1/statuses");
-            xhr.clearParams();
+//            xhr.clearParams();
-            xhr.setParam("status", status);
+//            xhr.setParam("status", status);
-            xhr.setParam("in_reply_to_id", in_reply_to_status_id);
+//            xhr.setParam("in_reply_to_id", in_reply_to_status_id);
-            xhr.post();
+//            xhr.post();
-            Newsjs.storeHashtags(login,db,status,root)
+//            Newsjs.storeHashtags(login,db,status,root)
+//            messageSend.destroy()
+//        }
             messageSend.destroy()
     }
-    }
 
     function dmUpdate(title,text,replyto,screen_name,attachImageURL) {
         newsBusy.running=true;
@@ -402,7 +403,7 @@ Rectangle{
                 height: 2*root.fontFactor*osSettings.bigFontSize
                 width: 2*root.fontFactor*osSettings.bigFontSize
                 text: "\uf03e"
-                visible:!conversation?(newsSwipeview.stacktype!="DirectMessages"):true
+                visible:(newsSwipeview.stacktype!="DirectMessages")
                 onClicked: {
                     if (attachImageURLs.length>0){//Server currently accepts only one attachment
                         Helperjs.showMessage( qsTr("Error"),qsTr("Only one attachment supported at the moment.\n Remove other attachment first!"), messageColumn)
@@ -526,9 +527,6 @@ Rectangle{
             PropertyChanges {
                 target: titleField; visible:false
             }
-            PropertyChanges {
-                target: attachButton; visible:false
-            }
             PropertyChanges {
                 target: bodyField; placeholderText:"";focus:true
             }

source-linux/qml/photoqml/ImageUploadDialog.qml

@@ -50,8 +50,9 @@ Page{
     property int imageNo: 0
 
     function uploadSelectedImage(inumber){
-        xhr.url= login.server + "/api/friendica/photo/create.json";
+        xhr.setUrl(login.server);
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
+        xhr.setApi("/api/friendica/photo/create.json");
         xhr.clearParams();
         xhr.setParam("desc",imageUploadModel.get(inumber).description);
         if(album.editText!=""){xhr.setParam("album", album.editText)}else{xhr.setParam("album", album.currentText)};
@@ -65,8 +66,9 @@ Page{
 
 
     function updateImage(){
-        xhr.url= login.server + "/api/friendica/photo/update.json";
+        xhr.setUrl(login.server);
         xhr.setLogin(login.username+":"+Qt.atob(login.password));
+        xhr.setApi("/api/friendica/photo/update.json");
         xhr.clearParams();
         xhr.setParam("desc",imageUploadModel.get(0).description);
         xhr.setParam("album", currentAlbum);

source-linux/qml/photoqml/PhotoTab.qml

@@ -64,7 +64,6 @@ StackView{
                 })
                 xhr.setLogin(login.username+":"+Qt.atob(login.password));
                 xhr.setImagedir(login.imagestore);
-                print("ownimagelist "+JSON.stringify(ownimagelist))
                 xhr.setFilelist(ownimagelist);
                 xhr.setDownloadtype("picturelist");
                 xhr.getlist();

source-linux/translations/friendiqa-de.ts

@@ -80,11 +80,15 @@
     <name>CalendarTab</name>
     <message>
         <source>Events</source>
-        <translation type="vanished">Termine</translation>
+        <translation>Termine</translation>
     </message>
     <message>
         <source>Own Calendar</source>
-        <translation type="vanished">Eigener Kalender</translation>
+        <translation>Eigener Kalender</translation>
+    </message>
+    <message>
+        <source>Delete Event?</source>
+        <translation>Termin löschen?</translation>
     </message>
 </context>
 <context>
@@ -439,6 +443,14 @@
         <source>Network Error</source>
         <translation>Netzwerk-Fehler</translation>
     </message>
+    <message>
+        <source>Followers</source>
+        <translation>Folgende</translation>
+    </message>
+    <message>
+        <source>Following</source>
+        <translation>Folgt</translation>
+    </message>
 </context>
 <context>
     <name>ContactsSearchPage</name>
@@ -593,13 +605,56 @@
     </message>
     <message>
         <source>Contacts</source>
-        <translation>Kontakte</translation>
+        <translation type="vanished">Kontakte</translation>
     </message>
     <message>
         <source>Groups</source>
         <translation>Gruppen</translation>
     </message>
 </context>
+<context>
+    <name>EventCreate</name>
+    <message>
+        <source>Start</source>
+        <translation>Start</translation>
+    </message>
+    <message>
+        <source>End</source>
+        <translation>Ende</translation>
+    </message>
+    <message>
+        <source>no end</source>
+        <translation>Ende nicht bekannt</translation>
+    </message>
+    <message>
+        <source>Title (required)</source>
+        <translation>Titel (notwendig)</translation>
+    </message>
+    <message>
+        <source>Event description (optional)</source>
+        <translation>Terminbeschreibung (optional)</translation>
+    </message>
+    <message>
+        <source>Location (optional)</source>
+        <translation>Ort (optional)</translation>
+    </message>
+    <message>
+        <source>Publish event?</source>
+        <translation>Termin teilen?</translation>
+    </message>
+    <message>
+        <source>Create event</source>
+        <translation>Termin erstellen</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Fehler</translation>
+    </message>
+    <message>
+        <source>No event name supplied</source>
+        <translation>Kein Termintitel angegeben</translation>
+    </message>
+</context>
 <context>
     <name>EventList</name>
     <message>
@@ -611,7 +666,7 @@
     <name>EventListItem</name>
     <message>
         <source>Location</source>
-        <translation type="vanished">Ort</translation>
+        <translation>Ort</translation>
     </message>
 </context>
 <context>
@@ -624,6 +679,10 @@
         <source>Friends</source>
         <translation>Kontakte</translation>
     </message>
+    <message>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
 </context>
 <context>
     <name>FriendsTab</name>
@@ -637,7 +696,7 @@
     </message>
     <message>
         <source>Contacts</source>
-        <translation>Kontakte</translation>
+        <translation type="vanished">Kontakte</translation>
     </message>
     <message>
         <source>Groups</source>
@@ -1186,6 +1245,10 @@
         <source>Created at</source>
         <translation>Erstellt</translation>
     </message>
+    <message>
+        <source>other</source>
+        <translation>Sonstige</translation>
+    </message>
 </context>
 <context>
     <name>SmileyDialog</name>

source-linux/translations/friendiqa-es.ts

@@ -5,8 +5,8 @@
     <name>AccountPage</name>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="64"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="361"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="362"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="382"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="383"/>
         <source>User</source>
         <translation>Usuario</translation>
     </message>
@@ -36,7 +36,8 @@
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="210"/>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="330"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="331"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -72,16 +73,17 @@
     </message>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
         <source>Wrong password!</source>
         <translation>¡Contraseña incorrecta!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Success</source>
         <translation>éxito!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Name</source>
         <translation>Nombre</translation>
     </message>
@@ -97,12 +99,19 @@
 <context>
     <name>CalendarTab</name>
     <message>
-        <source>Events</source>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="150"/>
-        <translation type="vanished">Eventos</translation>
+        <source>Delete Event?</source>
+        <translation>¿Borrar la cita?</translation>
     </message>
     <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="198"/>
+        <source>Events</source>
+        <translation>Eventos</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="203"/>
         <source>Own Calendar</source>
-        <translation type="vanished">Calendario propio</translation>
+        <translation>Calendario propio</translation>
     </message>
 </context>
 <context>
@@ -445,12 +454,12 @@
         <translation>Rechazar</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="245"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="246"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="258"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="260"/>
         <source>Follow</source>
         <translation>Seguir</translation>
     </message>
@@ -460,32 +469,42 @@
         <translation>Dejar de seguir</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Location</source>
         <translation>Localización</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Posts</source>
         <translation>Mensajes</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="317"/>
         <source>Created at</source>
         <translation>Creado en</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="326"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="318"/>
+        <source>Followers</source>
+        <translation>Seguidores</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="319"/>
+        <source>Following</source>
+        <translation>Siguiente</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="329"/>
         <source>Network Error</source>
         <translation>Fallo de red</translation>
     </message>
@@ -677,16 +696,69 @@
         <translation>Amigos</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Contacts</source>
-        <translation>Contactos</translation>
+        <translation type="vanished">Contactos</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="115"/>
+        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
 </context>
+<context>
+    <name>EventCreate</name>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="73"/>
+        <source>Start</source>
+        <translation>Iniciar</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="140"/>
+        <source>End</source>
+        <translation>Finalizar</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="204"/>
+        <source>no end</source>
+        <translation>sin fin</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="289"/>
+        <source>Title (required)</source>
+        <translation>título (obligatorio)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="304"/>
+        <source>Event description (optional)</source>
+        <translation>Descripción del evento (opcional)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="314"/>
+        <source>Location (optional)</source>
+        <translation>Ubicación (opcional)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="322"/>
+        <source>Publish event?</source>
+        <translation>¿Publicar el fecha?</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="341"/>
+        <source>Create event</source>
+        <translation>crear fecha</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="392"/>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <source>No event name supplied</source>
+        <translation>No se ha nombre de la fecha</translation>
+    </message>
+</context>
 <context>
     <name>EventList</name>
     <message>
@@ -697,8 +769,9 @@
 <context>
     <name>EventListItem</name>
     <message>
+        <location filename="../qml/calendarqml/EventListItem.qml" line="79"/>
         <source>Location</source>
-        <translation type="vanished">Localización</translation>
+        <translation>Localización</translation>
     </message>
 </context>
 <context>
@@ -710,29 +783,34 @@
     </message>
     <message>
         <location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
+    <message>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
+        <source>All</source>
+        <translation>Todos</translation>
+    </message>
 </context>
 <context>
     <name>FriendsTab</name>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="75"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="73"/>
         <source>Me</source>
         <translation>Yo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="78"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="85"/>
         <source>Contacts</source>
-        <translation>Contactos</translation>
+        <translation type="vanished">Contactos</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="90"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="83"/>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
@@ -740,7 +818,7 @@
 <context>
     <name>ImageUploadDialog</name>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="125"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="127"/>
         <source>Upload to album</source>
         <translation>Subir álbum</translation>
     </message>
@@ -753,27 +831,27 @@
         <translation type="vanished">imagen</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="269"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="271"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Upload</source>
         <translation>Subir</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Change</source>
         <translation>Cambiar</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source> No album name given</source>
         <translation>¡Nombre del álbum no encontrado!</translation>
     </message>
@@ -799,40 +877,40 @@
 <context>
     <name>MessageSend</name>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="204"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="211"/>
         <source>to:</source>
         <translation>a:</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="216"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="223"/>
         <source>Title (optional)</source>
         <translation>Título (opcional)</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="233"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="241"/>
         <source> Drop your Content here.</source>
         <translation> Deje caer su contenido aquí.</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="239"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="247"/>
         <source>What&apos;s on your mind?</source>
         <translation>¿Qué tienes en mente?</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>Error</source>
         <translation>Error</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
         <source>Only one attachment supported at the moment.
  Remove other attachment first!</source>
         <translation>Solo se admite adjuntar un solo archivo en este momento.
  ¡Elimine y deje un archivo adjunto!</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>No receiver supplied!</source>
         <translation>No se ha suministrado ningún receptor!</translation>
     </message>
@@ -1026,7 +1104,7 @@
         <translation>Mensaje directo</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="132"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
         <source>In reply to </source>
         <translation>En respuesta a </translation>
     </message>
@@ -1113,13 +1191,11 @@
     <name>PermissionDialog</name>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="70"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="67"/>
         <source>Friends</source>
         <translation>Amigos</translation>
     </message>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
         <source>Groups</source>
         <translation>Grupos</translation>
     </message>
@@ -1132,23 +1208,23 @@
         <translation>s Imágenes</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="220"/>
         <source>All Images</source>
         <translation>Todas las imagenes</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="226"/>
         <source>Only new</source>
         <translation>Solo nueva</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="242"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="247"/>
         <source>Own Images</source>
         <translation>Mis imágenes</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="289"/>
         <source>More</source>
         <translation>Mas</translation>
     </message>
@@ -1156,222 +1232,227 @@
 <context>
     <name>ProfileComponent</name>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
         <source>profile name</source>
         <translation>Nombre de perfil</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
         <source>is default</source>
         <translation>es por defecto</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
         <source>hide friends</source>
         <translation>ocultar amigos</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
         <source>profile photo</source>
         <translation>foto de perfil</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
         <source>profile thumb</source>
         <translation>foto de perfil pequeña</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
         <source>publish</source>
         <translation>publicar</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
         <source>publish in network</source>
         <translation>publicar en la red</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
         <source>description</source>
         <translation>descripción</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
         <source>date of birth</source>
         <translation>fecha de nacimiento</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
         <source>address</source>
         <translation>dirección</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
         <source>city</source>
         <translation>ciudad</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
         <source>region</source>
         <translation>región</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
         <source>postal code</source>
         <translation>código postal</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
         <source>country</source>
         <translation>país</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
         <source>hometown</source>
         <translation>ciudad natal</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
         <source>gender</source>
         <translation>género</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
         <source>marital status</source>
         <translation>estado civil</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
         <source>married with</source>
         <translation>casado con</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
         <source>married since</source>
         <translation>casado desde</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
         <source>sexual</source>
         <translation>orientación sexual</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
         <source>politics</source>
         <translation>política</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
         <source>religion</source>
         <translation>religión</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
         <source>public keywords</source>
         <translation>palabras clave públicas</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
         <source>private keywords</source>
         <translation>palabras clave privadas</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
         <source>likes</source>
         <translation>le gusta</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
         <source>dislikes</source>
         <translation>no le gusta</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
         <source>about</source>
         <translation>sobre</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
         <source>music</source>
         <translation>música</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
         <source>book</source>
         <translation>libro</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
         <source>tv</source>
         <translation>tv</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
         <source>film</source>
         <translation>película</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
         <source>interest</source>
         <translation>interés</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
         <source>romance</source>
         <translation>romance</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
         <source>work</source>
         <translation>trabajo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
         <source>education</source>
         <translation>educación</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
         <source>social networks</source>
         <translation>redes sociales</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="99"/>
         <source>homepage</source>
         <translation>página web</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="182"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="100"/>
+        <source>other</source>
+        <translation>otros</translation>
+    </message>
+    <message>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="193"/>
         <source>Update</source>
         <translation>Actualización</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="227"/>
         <source>profile id</source>
         <translation>profile id</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Description</source>
         <translation>Descripción</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Location</source>
         <translation>Localización</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Posts</source>
         <translation>Mensajes</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="254"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="243"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="255"/>
         <source>Created at</source>
         <translation>Creado en</translation>
     </message>
@@ -1479,7 +1560,7 @@
 Haga clic con el botón derecho del ratón o con el botón central para salir.</translation>
     </message>
     <message>
-        <location filename="../qml/friendiqa.qml" line="302"/>
+        <location filename="../qml/friendiqa.qml" line="290"/>
         <source>Click to open Friendiqa</source>
         <translation>Haga clic para abrir Friendiqa</translation>
     </message>

source-linux/translations/friendiqa-hu.ts

@@ -5,8 +5,8 @@
     <name>AccountPage</name>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="64"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="361"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="362"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="382"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="383"/>
         <source>User</source>
         <translation>Felhasználó</translation>
     </message>
@@ -36,7 +36,8 @@
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="210"/>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="330"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="331"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
@@ -72,16 +73,17 @@
     </message>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
         <source>Wrong password!</source>
         <translation>Hibás jelszó!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Success</source>
         <translation>Sikeres</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Name</source>
         <translation>Név</translation>
     </message>
@@ -97,12 +99,19 @@
 <context>
     <name>CalendarTab</name>
     <message>
-        <source>Events</source>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="150"/>
-        <translation type="vanished">Események</translation>
+        <source>Delete Event?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="198"/>
+        <source>Events</source>
+        <translation>Események</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="203"/>
         <source>Own Calendar</source>
-        <translation type="vanished">Saját naptár</translation>
+        <translation>Saját naptár</translation>
     </message>
 </context>
 <context>
@@ -461,12 +470,12 @@
         <translation>Visszautasítás</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="245"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="246"/>
         <source>Ignore</source>
         <translation>Mellőzés</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="258"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="260"/>
         <source>Follow</source>
         <translation>Követés</translation>
     </message>
@@ -476,32 +485,42 @@
         <translation>Követés megszüntetése</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Posts</source>
         <translation>Bejegyzések</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="317"/>
         <source>Created at</source>
         <translation>Létrehozva</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="326"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="318"/>
+        <source>Followers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="319"/>
+        <source>Following</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="329"/>
         <source>Network Error</source>
         <translation>Hálózati hiba</translation>
     </message>
@@ -693,16 +712,69 @@
         <translation>Ismerősök</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Contacts</source>
-        <translation>Partnerek</translation>
+        <translation type="vanished">Partnerek</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="115"/>
+        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
 </context>
+<context>
+    <name>EventCreate</name>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="73"/>
+        <source>Start</source>
+        <translation type="unfinished">Indítás</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="140"/>
+        <source>End</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="204"/>
+        <source>no end</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="289"/>
+        <source>Title (required)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="304"/>
+        <source>Event description (optional)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="314"/>
+        <source>Location (optional)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="322"/>
+        <source>Publish event?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="341"/>
+        <source>Create event</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="392"/>
+        <source>Error</source>
+        <translation type="unfinished">Hiba</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <source>No event name supplied</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EventList</name>
     <message>
@@ -713,8 +785,9 @@
 <context>
     <name>EventListItem</name>
     <message>
+        <location filename="../qml/calendarqml/EventListItem.qml" line="79"/>
         <source>Location</source>
-        <translation type="vanished">Hely</translation>
+        <translation>Hely</translation>
     </message>
 </context>
 <context>
@@ -726,29 +799,34 @@
     </message>
     <message>
         <location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
         <source>Friends</source>
         <translation>Ismerősök</translation>
     </message>
+    <message>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FriendsTab</name>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="75"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="73"/>
         <source>Me</source>
         <translation>Én</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="78"/>
         <source>Friends</source>
         <translation>Ismerősök</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="85"/>
         <source>Contacts</source>
-        <translation>Partnerek</translation>
+        <translation type="vanished">Partnerek</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="90"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="83"/>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
@@ -767,7 +845,7 @@
 <context>
     <name>ImageUploadDialog</name>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="125"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="127"/>
         <source>Upload to album</source>
         <translation>Feltöltés albumba</translation>
     </message>
@@ -780,27 +858,27 @@
         <translation type="vanished">Kép</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="269"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="271"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Upload</source>
         <translation>Feltöltés</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Change</source>
         <translation>Változtatás</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source> No album name given</source>
         <translation> Nincs albumnév megadva</translation>
     </message>
@@ -826,40 +904,40 @@
 <context>
     <name>MessageSend</name>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="204"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="211"/>
         <source>to:</source>
         <translation>címzett:</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="216"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="223"/>
         <source>Title (optional)</source>
         <translation>Cím (elhagyható)</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="233"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="241"/>
         <source> Drop your Content here.</source>
         <translation> Ejtse ide a tartalmat.</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="239"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="247"/>
         <source>What&apos;s on your mind?</source>
         <translation>Mire gondol?</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
         <source>Only one attachment supported at the moment.
  Remove other attachment first!</source>
         <translation>Csak egyetlen melléklet támogatott jelenleg.
  Először távolítsa el a másik mellékletet.</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>No receiver supplied!</source>
         <translation>Nincs fogadó megadva!</translation>
     </message>
@@ -1057,7 +1135,7 @@
         <translation>Közvetlen üzenet</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="132"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
         <source>In reply to </source>
         <translation>Válaszul erre: </translation>
     </message>
@@ -1144,13 +1222,11 @@
     <name>PermissionDialog</name>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="70"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="67"/>
         <source>Friends</source>
         <translation>Ismerősök</translation>
     </message>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
         <source>Groups</source>
         <translation>Csoportok</translation>
     </message>
@@ -1163,23 +1239,23 @@
         <translation> képei</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="220"/>
         <source>All Images</source>
         <translation>Összes kép</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="226"/>
         <source>Only new</source>
         <translation>Csak újak</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="242"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="247"/>
         <source>Own Images</source>
         <translation>Saját képek</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="289"/>
         <source>More</source>
         <translation>Több</translation>
     </message>
@@ -1187,222 +1263,227 @@
 <context>
     <name>ProfileComponent</name>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
         <source>profile name</source>
         <translation>profilnév</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
         <source>is default</source>
         <translation>alapértelmezett</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
         <source>hide friends</source>
         <translation>ismerősök elrejtése</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
         <source>profile photo</source>
         <translation>profilfénykép</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
         <source>profile thumb</source>
         <translation>profilbélyegkép</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
         <source>publish</source>
         <translation>közzététel</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
         <source>publish in network</source>
         <translation>közzététel hálózaton</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
         <source>description</source>
         <translation>leírás</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
         <source>date of birth</source>
         <translation>születési dátum</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
         <source>address</source>
         <translation>cím</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
         <source>city</source>
         <translation>település</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
         <source>region</source>
         <translation>régió</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
         <source>postal code</source>
         <translation>irányítószám</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
         <source>country</source>
         <translation>ország</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
         <source>hometown</source>
         <translation>szülőváros</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
         <source>gender</source>
         <translation>nem</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
         <source>marital status</source>
         <translation>családi állapot</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
         <source>married with</source>
         <translation>házas vele</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
         <source>married since</source>
         <translation>házas ekkortól</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
         <source>sexual</source>
         <translation>szexuális</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
         <source>politics</source>
         <translation>politika</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
         <source>religion</source>
         <translation>vallás</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
         <source>public keywords</source>
         <translation>nyilvános kulcsszavak</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
         <source>private keywords</source>
         <translation>személyes kulcsszavak</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
         <source>likes</source>
         <translation>kedvelések</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
         <source>dislikes</source>
         <translation>nem kedvelések</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
         <source>about</source>
         <translation>névjegy</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
         <source>music</source>
         <translation>zene</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
         <source>book</source>
         <translation>könyv</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
         <source>tv</source>
         <translation>TV</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
         <source>film</source>
         <translation>film</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
         <source>interest</source>
         <translation>érdeklődés</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
         <source>romance</source>
         <translation>romantika</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
         <source>work</source>
         <translation>munka</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
         <source>education</source>
         <translation>oktatás</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
         <source>social networks</source>
         <translation>közösségi hálózatok</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="99"/>
         <source>homepage</source>
         <translation>honlap</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="182"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="100"/>
+        <source>other</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="193"/>
         <source>Update</source>
         <translation>Frissítés</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="227"/>
         <source>profile id</source>
         <translation>profilazonosító</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Description</source>
         <translation>Leírás</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Location</source>
         <translation>Hely</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Posts</source>
         <translation>Bejegyzések</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="254"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="243"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="255"/>
         <source>Created at</source>
         <translation>Létrehozva</translation>
     </message>
@@ -1510,7 +1591,7 @@
 Kilépéshez kattintson a jobb gombbal vagy középső gombbal</translation>
     </message>
     <message>
-        <location filename="../qml/friendiqa.qml" line="302"/>
+        <location filename="../qml/friendiqa.qml" line="290"/>
         <source>Click to open Friendiqa</source>
         <translation>Kattintson a Friendiqa megnyitásához</translation>
     </message>

source-linux/translations/friendiqa-it.ts

@@ -5,8 +5,8 @@
     <name>AccountPage</name>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="64"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="361"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="362"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="382"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="383"/>
         <source>User</source>
         <translation>Utente</translation>
     </message>
@@ -36,7 +36,8 @@
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="210"/>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
-        <location filename="../qml/configqml/AccountPage.qml" line="330"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="331"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -72,16 +73,17 @@
     </message>
     <message>
         <location filename="../qml/configqml/AccountPage.qml" line="297"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="328"/>
         <source>Wrong password!</source>
         <translation>Password sbagliata!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Success</source>
         <translation>Ha funzionato!</translation>
     </message>
     <message>
-        <location filename="../qml/configqml/AccountPage.qml" line="324"/>
+        <location filename="../qml/configqml/AccountPage.qml" line="325"/>
         <source>Name</source>
         <translation>Nome</translation>
     </message>
@@ -97,12 +99,19 @@
 <context>
     <name>CalendarTab</name>
     <message>
-        <source>Events</source>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="150"/>
-        <translation type="vanished">Eventi</translation>
+        <source>Delete Event?</source>
+        <translation>Cancellare la data?</translation>
     </message>
     <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="198"/>
+        <source>Events</source>
+        <translation>Eventi</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/CalendarTab.qml" line="203"/>
         <source>Own Calendar</source>
-        <translation type="vanished">Calendario</translation>
+        <translation>Calendario</translation>
     </message>
 </context>
 <context>
@@ -433,12 +442,12 @@
         <translation>Rifiutare</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="245"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="246"/>
         <source>Ignore</source>
         <translation>Ignorare</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="258"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="260"/>
         <source>Follow</source>
         <translation>Seguire</translation>
     </message>
@@ -448,32 +457,42 @@
         <translation>Non seguire</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Location</source>
         <translation>Località</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="314"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
         <source>Posts</source>
         <translation>Messaggi</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="315"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="316"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="317"/>
         <source>Created at</source>
         <translation>Creato il</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/ContactPage.qml" line="326"/>
+        <location filename="../qml/newsqml/ContactPage.qml" line="318"/>
+        <source>Followers</source>
+        <translation>Seguaci</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="319"/>
+        <source>Following</source>
+        <translation>Seguente</translation>
+    </message>
+    <message>
+        <location filename="../qml/newsqml/ContactPage.qml" line="329"/>
         <source>Network Error</source>
         <translation>Errore di rete</translation>
     </message>
@@ -665,16 +684,69 @@
         <translation>Amici</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Contacts</source>
-        <translation>Contatti</translation>
+        <translation type="vanished">Contatti</translation>
     </message>
     <message>
-        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="115"/>
+        <location filename="../qml/genericqml/DrawerAccountComponentContacts.qml" line="97"/>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
 </context>
+<context>
+    <name>EventCreate</name>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="73"/>
+        <source>Start</source>
+        <translation>Avviare</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="140"/>
+        <source>End</source>
+        <translation>Fine</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="204"/>
+        <source>no end</source>
+        <translation>senza fine</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="289"/>
+        <source>Title (required)</source>
+        <translation>Titolo (obbligatorio)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="304"/>
+        <source>Event description (optional)</source>
+        <translation>descrizione della data (opzionale)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="314"/>
+        <source>Location (optional)</source>
+        <translation>Posizione (opzionale)</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="322"/>
+        <source>Publish event?</source>
+        <translation>Pubblicare l&apos;evento?</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="341"/>
+        <source>Create event</source>
+        <translation>Creare l&apos;evento</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="392"/>
+        <source>Error</source>
+        <translation>Errore</translation>
+    </message>
+    <message>
+        <location filename="../qml/calendarqml/EventCreate.qml" line="349"/>
+        <source>No event name supplied</source>
+        <translation>Nessun nome di evento</translation>
+    </message>
+</context>
 <context>
     <name>EventList</name>
     <message>
@@ -685,8 +757,9 @@
 <context>
     <name>EventListItem</name>
     <message>
+        <location filename="../qml/calendarqml/EventListItem.qml" line="79"/>
         <source>Location</source>
-        <translation type="vanished">Località</translation>
+        <translation>Località</translation>
     </message>
 </context>
 <context>
@@ -698,29 +771,34 @@
     </message>
     <message>
         <location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
         <source>Friends</source>
         <translation>Amici</translation>
     </message>
+    <message>
+        <location filename="../qml/contactqml/FriendsListTab.qml" line="162"/>
+        <source>All</source>
+        <translation>Tutti</translation>
+    </message>
 </context>
 <context>
     <name>FriendsTab</name>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="75"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="73"/>
         <source>Me</source>
         <translation>Me</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="80"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="78"/>
         <source>Friends</source>
         <translation>Amici</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="85"/>
         <source>Contacts</source>
-        <translation>Contatti</translation>
+        <translation type="vanished">Contatti</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/FriendsTab.qml" line="90"/>
+        <location filename="../qml/contactqml/FriendsTab.qml" line="83"/>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
@@ -728,7 +806,7 @@
 <context>
     <name>ImageUploadDialog</name>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="125"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="127"/>
         <source>Upload to album</source>
         <translation>Carica su album</translation>
     </message>
@@ -741,27 +819,27 @@
         <translation type="vanished">Immagine</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="269"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="271"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Upload</source>
         <translation>Carica</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="306"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="308"/>
         <source>Change</source>
         <translation>Modifica</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="309"/>
+        <location filename="../qml/photoqml/ImageUploadDialog.qml" line="311"/>
         <source> No album name given</source>
         <translation>Nessun nome album inserito!</translation>
     </message>
@@ -787,40 +865,40 @@
 <context>
     <name>MessageSend</name>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="204"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="211"/>
         <source>to:</source>
         <translation>a:</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="216"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="223"/>
         <source>Title (optional)</source>
         <translation>Titolo (opzionale)</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="233"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="241"/>
         <source> Drop your Content here.</source>
         <translation> Lascia qui il tuo contenuto.</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="239"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="247"/>
         <source>What&apos;s on your mind?</source>
         <translation>A cosa stai pensando?</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="388"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="408"/>
         <source>Only one attachment supported at the moment.
  Remove other attachment first!</source>
         <translation>Solo un allegato è attualmente supportato.
  Rimuovere prima gli altri allegati!</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/MessageSend.qml" line="447"/>
+        <location filename="../qml/newsqml/MessageSend.qml" line="470"/>
         <source>No receiver supplied!</source>
         <translation>Nessun ricevitore in dotazione!</translation>
     </message>
@@ -1002,7 +1080,7 @@
         <translation>Messaggio diretto</translation>
     </message>
     <message>
-        <location filename="../qml/newsqml/Newsitem.qml" line="132"/>
+        <location filename="../qml/newsqml/Newsitem.qml" line="133"/>
         <source>In reply to </source>
         <translation>In risposta a </translation>
     </message>
@@ -1089,13 +1167,11 @@
     <name>PermissionDialog</name>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="70"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="67"/>
         <source>Friends</source>
         <translation>Amici</translation>
     </message>
     <message>
         <location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
-        <location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
         <source>Groups</source>
         <translation>Gruppi</translation>
     </message>
@@ -1108,23 +1184,23 @@
         <translation> Immagini</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="220"/>
         <source>All Images</source>
         <translation>Tutte immagini</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="226"/>
         <source>Only new</source>
         <translation>Solo nuovo</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="242"/>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="247"/>
         <source>Own Images</source>
         <translation>Mie immagini</translation>
     </message>
     <message>
-        <location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
+        <location filename="../qml/photoqml/PhotoTab.qml" line="289"/>
         <source>More</source>
         <translation>Ancora</translation>
     </message>
@@ -1132,222 +1208,227 @@
 <context>
     <name>ProfileComponent</name>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="62"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
         <source>profile name</source>
         <translation>nome del profilo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="63"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
         <source>is default</source>
         <translation>è predefinito</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="64"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
         <source>hide friends</source>
         <translation>nascondere gli amici</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="65"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
         <source>profile photo</source>
         <translation>foto del profilo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="66"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
         <source>profile thumb</source>
         <translation>piccola foto di profilo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="67"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
         <source>publish</source>
         <translation>pubblicare</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="68"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
         <source>publish in network</source>
         <translation>pubblicare in rete</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="69"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
         <source>description</source>
         <translation>descrizione</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="70"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
         <source>date of birth</source>
         <translation>data di nascita</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="71"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
         <source>address</source>
         <translation>indirizzo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="72"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
         <source>city</source>
         <translation>città</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="73"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
         <source>region</source>
         <translation>regione</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="74"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
         <source>postal code</source>
         <translation>codice postale</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="75"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
         <source>country</source>
         <translation>paese</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="76"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
         <source>hometown</source>
         <translation>città natale</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="77"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
         <source>gender</source>
         <translation>genere</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="78"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
         <source>marital status</source>
         <translation>stato civile</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="79"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
         <source>married with</source>
         <translation>sposato con</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="80"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
         <source>married since</source>
         <translation>sposato da quando</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="81"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
         <source>sexual</source>
         <translation>orientamento sessuale</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="82"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
         <source>politics</source>
         <translation>politica</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="83"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
         <source>religion</source>
         <translation>religione</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="84"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
         <source>public keywords</source>
         <translation>parole chiave pubbliche</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="85"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
         <source>private keywords</source>
         <translation>parole chiave private</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="86"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
         <source>likes</source>
         <translation>ama</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="87"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
         <source>dislikes</source>
         <translation>non piace</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="88"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
         <source>about</source>
         <translation>su</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="89"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
         <source>music</source>
         <translation>musica</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="90"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
         <source>book</source>
         <translation>libro</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="91"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
         <source>tv</source>
         <translation>tv</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="92"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
         <source>film</source>
         <translation>film</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="93"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
         <source>interest</source>
         <translation>interesse</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="94"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
         <source>romance</source>
         <translation>romanticismo</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="95"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
         <source>work</source>
         <translation>lavoro</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="96"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
         <source>education</source>
         <translation>educazione</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="97"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
         <source>social networks</source>
         <translation>reti sociali</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="98"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="99"/>
         <source>homepage</source>
         <translation>homepage</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="182"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="100"/>
+        <source>other</source>
+        <translation>altri</translation>
+    </message>
+    <message>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="193"/>
         <source>Update</source>
         <translation>Aggiornare</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="216"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="227"/>
         <source>profile id</source>
         <translation>profilo id</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Description</source>
         <translation>Descrizione</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Location</source>
         <translation>Località</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="241"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="253"/>
         <source>Posts</source>
         <translation>Messaggi</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="242"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="254"/>
         <source>URL</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="../qml/contactqml/ProfileComponent.qml" line="243"/>
+        <location filename="../qml/contactqml/ProfileComponent.qml" line="255"/>
         <source>Created at</source>
         <translation>Creato il</translation>
     </message>
@@ -1455,7 +1536,7 @@
 Fare clic con il tasto destro del mouse o con il tasto centrale per uscire</translation>
     </message>
     <message>
-        <location filename="../qml/friendiqa.qml" line="302"/>
+        <location filename="../qml/friendiqa.qml" line="290"/>
         <source>Click to open Friendiqa</source>
         <translation>Clicca per aprire Friendiqa</translation>
     </message>