lubuwest/Friendiqa
1
2
Fork 1
Code Issues 9 Pull requests Releases 19 Wiki Activity

v0.6.4 contact search

Browse source
This commit is contained in:
LubuWest 2022-03-01 21:59:21 +01:00
parent 66e5c33b00
commit 5032c78de1
57 changed files with 2218 additions and 2252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
CHANGELOG.md
View file

@ -1,4 +1,16 @@
## v0.6.4
* Search for new contacts (hashtags, names)
* Filter contacts
* many new emojis
* Replaced Favorite button with Reply button due to buggy Favourite API
* View newsitem on website (works only in coversation view)
* Rebuild contacts handling due to buggy Contacts API
* Removed permissions for new messages due to buggy Contacts API
* Sync all accounts in background (not only active)
## v0.6.3
* Dark theme

15
README.md
View file

@ -18,7 +18,7 @@ Currently supported:
* Search for news
* Click on hashtag in newsitem starts search for news with that word
* Only first photo attachment in post is shown, click for more images and fullscreen image
* Click on video or youtube video shows video fullscreen
* Click on video shows video fullscreen
* For news containing urls ending with mp3, mp4, avi, webm, ogg or to a Peertube instance: media can be played in the app
* Open links in external browser
* Click on contact photo for contact details and last news
@ -26,11 +26,11 @@ Currently supported:
* Click on post text opens conversation
* Deletion, Reposting, Answering of Posts
* Expand truncated news items
* Liking, disliking, favoriting
* Liking, disliking
* Attending for event posts
* Update fetches new posts (up to last 50) since last in local DB
* More shows older posts from local DB
* Create new Message with images or direct messages, Contact/Group access rights (can be stored), smileys
* Create new Message with images or direct messages,smileys
* Send image from Android gallery
* Send text or urls from other apps to Friendiqa
* Native Android image dialog
@ -48,13 +48,14 @@ Currently supported:
* Tabs for own profiles, friends, other contacts and groups
* Show profile(s) of user and change profile picture
* List of all known contacts with locally downloaded pictures
* Follow or unfoolow contacts
* Follow or unfollow contacts
* Search for new contacts according to topic
* Show follow requests; approve, deny, ignore requests
* Additional information, last messages and other functionality shown in news tab
* Show public and private pictures of contact (screenscraping of contact's website, works only with certain theme)
* Show public and private events of contact
* Show members of groups
* Open website of contact or connect page (for other contacts)
* Open website of contact
* Clean other contacts with no news
ToDo:
@ -66,8 +67,8 @@ ToDo:
Currently supported:
* Download public own images to local directory
* Upload public picture to album with descriptions, send from gallery
* Download public own images to local directory (API is currently broken)
* Upload public picture to album with descriptions, send from gallery (API is currently broken)
* Delete own pictures and albums on client and server
* Change name or album of existing picture
* Show albums in grid, show images in album in grid and fullscreen

6
source-android/android/AndroidManifest.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.3" android:versionCode="29" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.6.4" android:versionCode="30" 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.
Remove the comment if you do not require these default permissions. -->
@ -22,7 +22,7 @@
android:logo="@drawable/friendiqa">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
android:name="androidnative.friendiqa.FriendiqaActivity"
android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="">
android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleTask" android:taskAffinity="">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

7
source-android/friendiqa.pro
View file

@ -13,7 +13,7 @@
TEMPLATE = app
TARGET = friendiqa
CONFIG += release
QT += qml quick gui widgets androidextras sql webview #webengine
QT += core core-private qml quick gui widgets sql androidextras #webengine webview
include(androidnative.pri/androidnative.pri)
@ -64,6 +64,7 @@ HEADERS += \
common/alarm.h
DISTFILES += \
android/gradle.properties \
qml/calendarqml/*.qml \
android/AndroidManifest.xml \
android/gradle/wrapper/gradle-wrapper.jar \
@ -72,6 +73,7 @@ DISTFILES += \
android/build.gradle \
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew.bat \
qml/configqml/ConfigAppearancePage.qml \
translations/*.ts \
translations/*.qm \
qml/*.qml \
@ -86,3 +88,6 @@ DISTFILES += \
ANDROID_EXTRA_LIBS = $$PWD/android/arm/libcrypto_1_1.so $$PWD/android/arm/libssl_1_1.so $$PWD/android/arm64/libcrypto_1_1.so $$PWD/android/arm64/libssl_1_1.so
#ANDROID_ABIS = arm64-v8a
#android: include(/home/pankraz/git/android_openssl/openssl.pri)
android: include(/home/pankraz/android-sdk/android_openssl/openssl.pri)

19
source-android/qml/friendiqa.qml
View file

@ -75,7 +75,7 @@ ApplicationWindow{
function onLoginChanged(login){
if(login==""){rootstackView.push("qrc:/qml/configqml/AccountPage.qml")}
else{//rootstackView.push(rootstack)
else{
if (login.newsViewType!="" || login.newsViewType!=null){newstab.newstabstatus=login.newsViewType;}
Newsjs.getCurrentContacts(login,db,function(contacts){
contactlist=contacts})}
@ -117,7 +117,7 @@ ApplicationWindow{
}
function showContact(contact){ //print(JSON.stringify(contact));
function showContact(contact){
rootstackView.push("qrc:/qml/newsqml/ContactPage.qml",{"contact": contact})
}
@ -182,7 +182,7 @@ ApplicationWindow{
footer:ToolBar{id:roottoolbar
background: Rectangle{
anchors.fill: parent
color: Material.backgroundDimColor//"#EEEEEE"//"#F8F8F8"
color: Material.backgroundDimColor
}
TabBar {
@ -224,18 +224,6 @@ ApplicationWindow{
}
}
// states: State {
// name: "fullscreen";
// PropertyChanges { target: bar; height:0 }
// PropertyChanges { target: rootstack; height:parent.height }
// }
// transitions: Transition {
// PropertyAnimation { properties: "height";
// easing.type: Easing.InOutQuad
// duration: 1000
// }
// }
StackView{id:rootstackView
width:root.width
height: root.height
@ -250,6 +238,7 @@ ApplicationWindow{
property string newstabstatus
property var conversation:[]
source:(rootstack.currentIndex==0)? "qrc:/qml/newsqml/NewsTab.qml":""
//onDoubleClicked:{newstypeSignal("refresh")}
}
Loader{
id: friendstab

60
source-linux/CMakeLists.txt
View file

@ -1,9 +1,3 @@
# TEMPLATE = app
# TARGET = friendiqa
# CONFIG += release
# QT += qml quick gui widgets sql webview dbus webengine
cmake_minimum_required(VERSION 3.1.0)
project(friendiqa VERSION 0.6 LANGUAGES CXX)
@ -19,9 +13,7 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
endif()
find_package(Qt5 COMPONENTS Widgets Quick Sql DBus WebView REQUIRED) #QuickWidgets
#Webview Webengine
find_package(Qt5 COMPONENTS Widgets Quick Sql DBus REQUIRED)
set(MOC_SOURCES common/uploadableimage.h
common/xhr.h
@ -46,52 +38,8 @@ target_link_libraries(friendiqa Qt::Core)
target_link_libraries(friendiqa Qt::Widgets)
target_link_libraries(friendiqa Qt::Quick)
target_link_libraries(friendiqa Qt::Sql)
target_link_libraries(friendiqa Qt::WebView)
target_link_libraries(friendiqa Qt::DBus)
#target_link_libraries(friendiqa Qt::QuickWidgets)
# target_link_libraries(friendiqa Qt::Webengine)
# qt5_use_modules(friendiqa Core Widgets Quick Sql DBus)
install(TARGETS friendiqa DESTINATION bin)
#RESOURCES = application.qrc
# OTHER_FILES += qml/friendiqa.qml \
# translations/*.ts \
# qml/*.qml
# qml/newsqml/*.qml
# qml/contactqml/*.qml
# qml/photoqml/*.qml
# qml/configqml/*.qml
# js/*.js
#TRANSLATIONS += translations/friendiqa-de.ts \
# translations/friendiqa-es.ts \
# translations/friendiqa-it.ts
# HEADERS += \
# common/uploadableimage.h \
# common/xhr.h \
# common/filesystem.h \
# common/remoteauthasyncimageprovider.h \
# common/updatenews.h \
# common/alarm.h
#DISTFILES += \
# qml/calendarqml/*.qml \
# translations/*.ts \
# translations/*.qm \
# qml/*.qml \
# qml/newsqml/*.qml \
# qml/contactqml/*.qml \
# qml/photoqml/*.qml \
# qml/configqml/*.qml \
# js/*.js \
# target.path=/usr/bin
# desktop.path = /usr/share/applications
# desktop.files = images/de.ma-nic.Friendiqa.desktop
# icon.path = /usr/share/icons/hicolor/scalable/apps
# icon.files = images/Friendiqa.svg
# INSTALLS+=target desktop icon
install(TARGETS friendiqa DESTINATION ${CMAKE_INSTALL_BINDIR})
install(FILES images/de.manic.Friendiqa.desktop DESTINATION share/applications)
install(FILES images/de.manic.Friendiqa.svg DESTINATION share/icons/hicolor/scalable/apps)

4
source-linux/application.qrc
View file

@ -13,7 +13,6 @@
<file>qml/newsqml/NewsVideo.qml</file>
<file>qml/newsqml/ContactPage.qml</file>
<file>qml/newsqml/NewsVideoLarge.qml</file>
<file>qml/newsqml/NewsYplayer.qml</file>
<file>qml/newsqml/SmileyDialog.qml</file>
<file>qml/contactqml/FriendsTab.qml</file>
<file>qml/contactqml/GroupComponent.qml</file>
@ -35,7 +34,6 @@
<file>qml/calendarqml/CalendarTab.qml</file>
<file>qml/calendarqml/CalendarDay.qml</file>
<file>qml/calendarqml/EventList.qml</file>
<file>qml/configqml/RegisterPage.qml</file>
<file>qml/configqml/AccountPage.qml</file>
<file>qml/configqml/SyncConfig.qml</file>
<file>qml/configqml/SyncComponent.qml</file>
@ -252,5 +250,7 @@
<file>images/Friendica_monochrome.png</file>
<file>qml/configqml/ConfigAppearancePage.qml</file>
<file>qml/configqml/ConfigStartPage.qml</file>
<file>qml/contactqml/ContactsSearchPage.qml</file>
<file>images/Friendiqa.ico</file>
</qresource>
</RCC>

2
source-linux/common/filesystem.cpp
View file

@ -154,10 +154,8 @@ bool FILESYSTEM::isAutostart() {
QFileInfo check_file(QDir::homePath() + "/.config/autostart/friendiqa.desktop");
if (check_file.exists() && check_file.isFile()) {
qDebug()<<"autostart "<<true;
return true;
}
qDebug()<<"autostart "<<false;
return false;
}

3
source-linux/common/friendiqa.cpp
View file

@ -74,6 +74,7 @@ int main(int argc, char *argv[]) {
UPDATENEWS* updatenews= UPDATENEWS::instance();
updatenews->setDatabase();
updatenews->login();
updatenews->setSyncAll(true);
updatenews->startsync();
//app.connect (updatenews,SIGNAL(quitapp()),&app,SLOT(quit()));
@ -86,6 +87,7 @@ int main(int argc, char *argv[]) {
QQmlApplicationEngine view;
//QQuickView view;
//view.setResizeMode(QQuickView::SizeRootObjectToView);
app.setWindowIcon(QIcon(":/images/Friendiqa.ico"));
QTranslator qtTranslator;
qtTranslator.load("friendiqa-" + QLocale::system().name(),":/translations");
app.installTranslator(&qtTranslator);
@ -108,6 +110,7 @@ int main(int argc, char *argv[]) {
qmlRegisterType<QSystemTrayIcon>("QSystemTrayIcon", 1, 0, "QSystemTrayIcon");
qRegisterMetaType<QSystemTrayIcon::ActivationReason>("ActivationReason");
view.rootContext()->setContextProperty("iconTray", QIcon(":/images/Friendica_monochrome.png"));
view.rootContext()->setContextProperty("iconTrayAvailable", QSystemTrayIcon::isSystemTrayAvailable());
view.load(QUrl("qrc:/qml/friendiqa.qml"));
//view.show();

96
source-linux/common/updatenews.cpp
View file

@ -32,7 +32,7 @@
#include "updatenews.h"
#include <QHttpPart>
#include <QTextCodec>
//#include <QTextCodec>
#include <QUrlQuery>
#include <QList>
#include <QDataStream>
@ -68,6 +68,10 @@ void UPDATENEWS::setUrl(QString url)
}
}
void UPDATENEWS::setSyncAll(bool syncAll)
{
m_syncAll=syncAll;
}
void UPDATENEWS::setDatabase()
{
@ -75,7 +79,6 @@ void UPDATENEWS::setDatabase()
QString db_url=qe.offlineStorageDatabaseFilePath("Friendiqa");
m_db = QSqlDatabase::addDatabase("QSQLITE");
m_db.setDatabaseName(QUrl("file://"+db_url+".sqlite").toLocalFile());
//qDebug() << db_url;
if (!m_db.open())
{
@ -86,26 +89,8 @@ void UPDATENEWS::setDatabase()
void UPDATENEWS::login()
{
QSqlQuery query("SELECT * FROM config WHERE isActive=0",m_db);
while (query.next())
{
username = query.value(1).toString();
QByteArray bpassword=query.value(2).toByteArray();
QString password=QByteArray::fromBase64(bpassword);
m_login=username+":"+password ;
xhr.setLogin(m_login);
m_url=query.value(0).toString();
xhr.setUrl(m_url);
m_imagedir=query.value(3).toString();
xhr.setImagedir(m_imagedir);
QString isActive=query.value(7).toString();
}
//m_updateInterval=query.value(5).toInt();
QSqlQuery syncquery("SELECT * FROM globaloptions",m_db);
// QSqlQuery delquery("DELETE FROM globaloptions WHERE k='sync_interval'",m_db);
// delquery.exec();
m_updateInterval=0;
syncindex=0;
synclist.clear();
@ -132,12 +117,28 @@ void UPDATENEWS::login()
if(!(synctimequery3.exec())) {qDebug() << " synctimequery3 " << synctimequery3.lastError();}
}
QSqlQuery query("SELECT * FROM config ORDER BY isActive ASC, username ASC",m_db);
query.last();
usernamelength=query.at()+1;
if (query.isActive()&&(usernameindex<usernamelength))
{ query.seek(usernameindex);
username = query.value(1).toString();
QByteArray bpassword=query.value(2).toByteArray();
QString password=QByteArray::fromBase64(bpassword);
m_login=username+":"+password ;
xhr.setLogin(m_login);
m_url=query.value(0).toString();
xhr.setUrl(m_url);
m_imagedir=query.value(3).toString();
xhr.setImagedir(m_imagedir);
QString isActive=query.value(7).toString();
}
}
void UPDATENEWS::startsync()
{ qDebug()<<"Friendiqa start syncing "<<syncindex <<" of "<<synclist.length(); //<< "Type "<<synclist[syncindex];
//QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
//QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
{ //qDebug()<<"Friendiqa start syncing "<<syncindex <<" of "<<synclist.length() << " m_login "<<m_login;
if (syncindex<synclist.length()){
if (synclist[syncindex]=="sync_Timeline"){
timeline();
@ -152,10 +153,11 @@ void UPDATENEWS::startsync()
}else if (synclist[syncindex]=="sync_Events") {
events();
}
} else if (syncindex==synclist.length()) {
} else if ((syncindex==synclist.length())&&(!(usernameindex<usernamelength-1))) {
m_api="";
if(m_updateInterval!=0){
syncindex=0;
usernameindex=0;
synclist.clear();
m_db.close();
m_db.removeDatabase(m_db.connectionName());
@ -165,6 +167,11 @@ void UPDATENEWS::startsync()
m_updateInterval=0;
}
}
else{
usernameindex+=1;
login();
startsync();
}
}
@ -229,7 +236,7 @@ void UPDATENEWS::directmessages()
void UPDATENEWS::notifications()
{
m_api="/api/friendica/notifications";
m_api="/api/friendica/notification";
xhr.clearParams();
xhr.setUrl(m_url);
xhr.setApi(m_api);
@ -282,7 +289,7 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
for (int i=0; i < news.array().count();i++){
QJsonValue newsitem=news[i];
try{
if (apiname=="/api/friendica/notifications"){
if (apiname=="/api/friendica/notification"){
QSqlQuery testquery("SELECT status_id FROM news WHERE status_id=" + QString::number(newsitem["id"].toInt()) + " AND messagetype=2 AND username='"+ username +"'",m_db);
if (testquery.first()) {continue;}
}
@ -303,10 +310,11 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
query.bindValue(8,newsitem["geo"]);
query.bindValue( 9, newsitem["favorited"].toInt());
query.bindValue(10, newsitem["user"]["id"].toInt());
if (newsitem["friendica_title"]!="") {
QString friendicaHtml="<b>" + newsitem["friendica_title"].toString() +"</b><br><br>"+newsitem["friendica_html"].toString();
query.bindValue(11, friendicaHtml.toUtf8().toBase64());}
else{query.bindValue(11, newsitem["friendica_html"].toString().toUtf8().toBase64());}
//if (newsitem["friendica_title"]!="") {
// QString friendicaHtml="<b>" + newsitem["friendica_title"].toString() +"</b><br><br>"+newsitem["friendica_html"].toString();
// query.bindValue(11, friendicaHtml.toUtf8().toBase64());}
//else{
query.bindValue(11, newsitem["friendica_html"].toString().toUtf8().toBase64());//}
if (newsitem["statusnet_conversation_id"].isDouble()){
query.bindValue(12, newsitem["statusnet_conversation_id"].toInt());
}else{query.bindValue(12, newsitem["statusnet_conversation_id"].toString());}
@ -351,14 +359,14 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
if (apiname == "/api/direct_messages/all"){
query.bindValue(1,"1");
query.bindValue(5,"Friendica");
query.bindValue(6,newsitem["id"].toString().toInt());
query.bindValue(6,newsitem["id"].toInt());
if(newsitem["recipient"]["id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["recipient"]["id"].toInt());}
query.bindValue(10, newsitem["sender_id"].toInt());
query.bindValue(11, newsitem["text"].toString().toUtf8().toBase64());
if(newsitem["friendica_parent_uri"]!=QJsonValue::Null){ query.bindValue(12,newsitem["friendica_parent_uri"]);}
query.bindValue(16, newsitem["sender"]["url"]);
}
if (apiname == "/api/friendica/notifications"){
if (apiname == "/api/friendica/notification"){
query.bindValue(1,"2");
query.bindValue(3,QDateTime::fromString(newsitem["date"].toString(),"yyyy-MM-dd hh:mm:ss").toMSecsSinceEpoch());
query.bindValue(5,"Friendica");
@ -387,7 +395,7 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
alarm.notify("DirectMessage: "+newsitem["sender"]["name"].toString(),newsitem["text"].toString(),2);
}
}
if (apiname=="/api/friendica/notifications"){
if (apiname=="/api/friendica/notification"){
if(notifylist.contains("notify_Notifications")){
alarm.notify("Notification: "+newsitem["name"].toString(),newsitem["text"].toString(),3);
}
@ -403,7 +411,7 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
startImagedownload("contactlist");
} else {
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}
@ -411,11 +419,14 @@ void UPDATENEWS::store(QByteArray serverreply,QString apiname)
}
else {
qDebug()<< "Friendiqa updatenews error " << serverreply;
emit this->error(m_api,QTextCodec::codecForName("utf-8")->toUnicode(serverreply));
//emit this->error(m_api,QTextCodec::codecForName("utf-8")->toUnicode(serverreply));
emit this->error(m_api,QString(serverreply));
if(m_syncAll){
syncindex+=1;
startsync();
}
}
}
}
@ -428,10 +439,11 @@ void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QStr
testquery.first();
QSqlQuery query("UPDATE contacts SET profile_image='"+ filename +"' WHERE profile_image_url ='"+imageurl+ "' AND username = '" +username+"'",m_db);
if(!(query.exec())) {qDebug()<< "updateImagelocation " << query.lastError();}
//qDebug()<< "index " << index << " " << newcontactnames.length()-1 << " " << m_syncAll;
if (index==(newcontactnames.length()-1)){
newcontactnames.clear();
newcontactimagelinks.clear();
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}
@ -445,7 +457,7 @@ void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QStr
if (index==(newcontactnames.length()-1)){
newcontactnames.clear();
newcontactimagelinks.clear();
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}
@ -628,6 +640,7 @@ void UPDATENEWS::storeFriendrequests(QByteArray serverreply,QString apiname)
QSqlQuery imagequery("SELECT avatar FROM friendshiprequests",m_db);
QList<QString> imageurls;
while (imagequery.next()){
imageurls.append(imagequery.value(0).toString());
}
@ -710,13 +723,12 @@ void UPDATENEWS::storeFriendrequests(QByteArray serverreply,QString apiname)
newcontactimagelinks.append(friendrequestitem["avatar"].toString());
newcontactnames.append(friendrequestitem["username"].toString());
}
}
if (newcontactimagelinks.length()>0){
//qDebug() << "start Friendrequests imagedownload";
startImagedownload("friendrequests");
}else{
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}
@ -769,7 +781,7 @@ void UPDATENEWS::storeEvents(QByteArray serverreply,QString apiname)
alarm.notify("Event: "+ QDateTime::fromMSecsSinceEpoch(eventnotifyquery.value(0).toLongLong()).toString("dd.MM.yyyy hh:mm"),eventnotifyquery.value(1).toString(),1);
}
}
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}
@ -795,7 +807,7 @@ void UPDATENEWS::showError(QString data, QString url,QString api, int code )
//qDebug() << "showerror " << api << " data " << data;
emit this->error(api,data);
if (api!=m_api || xhr.downloadtype()!=""){} else{
if(m_updateInterval!=0){
if((m_updateInterval!=0) && m_syncAll){
syncindex+=1;
startsync();
}

4
source-linux/common/updatenews.h
View file

@ -61,6 +61,7 @@ signals:
public slots:
void setUrl(QString url);
void setSyncAll(bool syncAll);
void setDatabase();
void login();
void timeline();
@ -84,7 +85,10 @@ private:
QString m_imagedir;
QString m_login;
QString username;
bool m_syncAll;
int syncindex;
int usernameindex;
int usernamelength;
QSqlDatabase m_db;
QList<QString> synclist;
QList <QString> notifylist;

9
source-linux/common/xhr.cpp
View file

@ -32,10 +32,11 @@
#include "xhr.h"
#include <QHttpPart>
#include <QTextCodec>
//#include <QTextCodec>
#include <QUrlQuery>
#include <QList>
#include <QDataStream>
#include <QFile>
#include <QJsonDocument>
#include <QJsonObject>
#include "uploadableimage.h"
@ -223,7 +224,7 @@ void XHR::getlist()
XHR::setUrl(m_filelist.at(dlindex));}
else {
XHR::setUrl(m_filelist.at(dlindex));}
qDebug() << "start download" << m_url;
//qDebug() << "start download" << m_url;
XHR::download();
} else {dlindex=0;m_downloadtype="";m_contactlist.clear();m_filelist.clear();}
}
@ -291,7 +292,6 @@ void XHR::onReplySuccess()
void XHR::onRequestFinished()
{
qDebug()<<"download requestFinished ";
// Save the file here
if (buffer.isNull()){qDebug() << "File empty"<<m_url; buffer.clear(); emit this->error(m_downloadtype,m_url,m_api,1);}
else if (m_downloadtype=="picturelist") {
@ -359,5 +359,6 @@ void XHR::onSSLError(const QList<QSslError> &errors)
QString XHR::bufferToString()
{
return QTextCodec::codecForName("utf-8")->toUnicode(buffer);
//return QTextCodec::codecForName("utf-8")->toUnicode(buffer);
return QString(buffer);
}

2
source-linux/common/xhr.h
View file

@ -37,7 +37,7 @@
#include <QNetworkRequest>
#include <QObject>
#include <QJsonObject>
#include <QNetworkConfiguration>
//#include <QNetworkConfiguration>
class XHR : public QObject
{

BIN
source-linux/images/Friendiqa.ico Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

2
source-linux/images/de.ma-nic.Friendiqa.desktop → source-linux/images/de.manic.Friendiqa.desktop
View file

@ -2,7 +2,7 @@
Version=1.0
Type=Application
Exec=friendiqa %u
Icon=Friendiqa.svg
Icon=de.manic.Friendiqa.svg
Terminal=false
Name=Friendiqa
GenericName=Social Media

0
source-linux/images/Friendiqa.svg → source-linux/images/de.manic.Friendiqa.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

6
source-linux/js/helper.js
View file

@ -62,11 +62,13 @@ function friendicaPostRequest(login,api,data,method,rootwindow,callback) {
try{ if (xhrequest.responseText!=""){
callback(xhrequest.responseText)
}else{//print("API:\n" +api+" NO RESPONSE");
showMessage("Error","API:\n" +api+" NO RESPONSE",rootwindow)
//showMessage("Error","API:\n" +api+" NO RESPONSE",rootwindow)
callback(xhrequest.responseText)
}
}
catch (e){print("API:\n" + api+" "+e+"\n Return:"+xhrequest.responseText);showMessage("Error", "API:\n" + api+" "+e+"\n Return:"+xhrequest.responseText,rootwindow)}
catch (e){
print("API:\n" + api+" "+e+"\n Return:"+xhrequest.responseText);
showMessage("Error", "API:\n" + api+" "+e+"\n Return:"+xhrequest.responseText,rootwindow)}
}
}
xhrequest.open(method, login.server+api,true,login.username,Qt.atob(login.password));

88
source-linux/js/news.js
View file

@ -37,19 +37,47 @@ function requestFriends(login,database,rootwindow,callback){
// return array of friends
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
db.transaction( function(tx) {
var result = tx.executeSql('UPDATE contacts SET isFriend=0 where username="'+login.username+'"')}); // clean old friends
Helperjs.friendicaRequest(login,"/api/statuses/friends?count=9999", rootwindow,function (obj){
var result = tx.executeSql('UPDATE contacts SET isFriend=0 where username="'+login.username+'"'); // clean old friends
var result2 = tx.executeSql('DELETE from groups where username="'+login.username+'"'); // clean old groups
})
// /api/statuses/friends not working in Friendica 2/2022 , switching to api/v1/lists and download of all list members
// Helperjs.friendicaRequest(login,"/api/statuses/friends?count=9999", rootwindow,function (obj){
var allfriends=[];
Helperjs.friendicaRequest(login,"/api/v1/lists",rootwindow,function(listsobj){
var lists=JSON.parse(listsobj)
for (var list in lists){
Helperjs.friendicaRequest(login,"/api/v1/lists/"+lists[list].id+"/accounts?limit=0", rootwindow,function (obj){
var friends=JSON.parse(obj);
var memberarray=[];
for (var i=0;i<friends.length;i++){
friends[i].created_at=Date.parse(cleanDate(friends[i].created_at));
if (friends[i].note!=null){
friends[i].description=friends[i].note;}
else{friends[i].description=""}
friends[i].name=friends[i].display_name;
friends[i].screen_name=friends[i].acct;
friends[i].location="";
friends[i].profile_image=friends[i].avatar_static;
friends[i].profile_image_url=friends[i].avatar;
friends[i].protected=false;
friends[i].friends_count=friends[i].following_count;
friends[i].created_at=Date.parse(friends[i].created_at);
friends[i].favorites_count=0;
friends[i].utc_offset=0;
friends[i].isFriend=1
friends[i].cid=0
friends[i].following=true
memberarray.push(parseInt(friends[i].id))
}
//try{requestProfile(login,friends,rootwindow,function(friends_profile){callback(friends_profile)})}
//catch(e){
callback(friends)//}
//requestGroups() not working with Friendica 02/2022
db.transaction( function(tx) {
var result3 = tx.executeSql('INSERT INTO groups VALUES (?,?,?,?)', [login.username,lists[list].title,lists[list].id,JSON.stringify(memberarray)])
})
callback(friends)
})};
});
}
function requestGroups(login,database,rootwindow,callback){
// retrieve, save and return groups. Other features currently not implemented
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
@ -65,20 +93,18 @@ function requestGroups(login,database,rootwindow,callback){
});
})}
function listFriends(login,database,callback,filter){
function listFriends(login,database,callback,filter,isFriend=0){
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
var filtertext='';
//try {filtertext=' AND screen_name like "' + filter+'%"'}catch(e){}
var filtertext=new RegExp(".*"+filter.toLowerCase()+".*")
// if (filter){filtertext=' AND (screen_name like "' + filter+'%" OR name like "' + Qt.btoa(filter)+'%")'}
if (filter!=null){var filtertext=new RegExp(".*"+filter.toLowerCase()+".*")}else{var filtertext=new RegExp(".*")}
db.transaction( function(tx) {
//var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0'+filtertext);
var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>0');
var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend>'+isFriend+' ORDER BY screen_name');
// check for friends
var contactlist=[];
for (var i=0;i<result.rows.length;i++){
var contact=result.rows.item(i)
contact.name=Qt.atob(contact.name);
if (contact.screen_name==null){contact.screen_name=""}
if(filtertext.test(contact.name.toLowerCase())|| filtertext.test(contact.screen_name.toLowerCase())){
contactlist.push(contact)}
}
@ -108,7 +134,7 @@ function storeHashtags(login,database,newstext,rootwindow){
for (var tag in hashtags){
db.transaction( function(tx) {
var result = tx.executeSql('SELECT * from hashtags where username="'+login.username+'" AND tag = "'+Qt.btoa(tag)+'"'); // check for tag
if(result.rows.length === 1) {// use update
if(result.rows.length > 0) {// use update
result = tx.executeSql('UPDATE hashtags SET tag="'+'", date='+curDate+', ownership=0 where username="'+login.username+'" AND tag="'+Qt.btoa(hashtags[tag])+'"');
} else {// use insert
result = tx.executeSql('INSERT INTO hashtags (username,tag,date,statuses,ownership) VALUES (?,?,?,?,?)', [login.username,Qt.btoa(hashtags[tag]),curDate,"[]",0])
@ -231,8 +257,9 @@ function storeNews(login,database,news,rootwindow){
var friendica_activities=[likearray,dislikearray,attendyesarray,attendnoarray,attendmaybearray]
var attachments="";if (news[i].attachments){attachments=Qt.btoa(JSON.stringify(news[i].attachments))}
if (news[i].friendica_title!="") {news[i].statusnet_html="<b>"+news[i].friendica_title +"</b><br><br>"+news[i].friendica_html;}
else{news[i].statusnet_html=news[i].friendica_html}
//if (news[i].friendica_title!="") {news[i].statusnet_html="<b>"+news[i].friendica_title +"</b><br><br>"+news[i].friendica_html;}
//else{
news[i].statusnet_html=news[i].friendica_html//}
db.transaction( function(tx) {
var result = tx.executeSql('SELECT * from news where username="'+login.username+'" AND status_id = "'+news[i].id+'" AND messagetype='+news[i].messagetype); // check for news id
@ -428,16 +455,19 @@ function requestFavorites(login,database,contacts,rootwindow,callback){
})}
function chatsfromdb(database,login,messagetype,callback,stop_time){
function chatsfromdb(database,login,messagetype,currentconversations,callback,stop_id){
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
db.transaction( function(tx) {
if (!stop_time){var stop="";
try{var rs = tx.executeSql('select created_at from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" ORDER BY created_at DESC LIMIT 1');
stop="<="+rs.rows.item(0).created_at}catch(e){stop="<99999999999999"}}
else{var stop="<"+stop_time}
if (!stop_id){var stop="";
try{var rs = tx.executeSql('select status_id from news WHERE username="'+login.username+'" AND messagetype="'+messagetype+'" ORDER BY status_id DESC LIMIT 1');
stop="<="+rs.rows.item(0).status_id}catch(e){stop="<99999999999999"}}
else{var stop="<"+stop_id}
if (messagetype=="1"){messagetype="1,5"}
var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+login.username+'" AND created_at'+stop+' AND messagetype IN ( "'+messagetype+'" ) ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
let conversationfilter="";
if (currentconversations.length>0){conversationfilter="AND statusnet_conversation_id NOT IN ("+currentconversations.toString()+") "}
var conversationsrs=tx.executeSql('select DISTINCT statusnet_conversation_id from news WHERE username="'+login.username+'" AND status_id'+stop+' AND messagetype IN ( "'+messagetype+'" ) '+ conversationfilter +'ORDER BY created_at DESC LIMIT 20'); //+' ORDER BY created_at DESC LIMIT 20');
var result = tx.executeSql('SELECT status_id from news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY status_id DESC LIMIT 1');
try{var lastid=result.rows.item(0).status_id;}catch(e){var lastid=0};
var conversations=[];
@ -516,24 +546,28 @@ function oldchatfromdb(database,user,conversationId,lastpost,allcontacts,callbac
// var countArray=[];
//var allcontacts=getAllContacts(database,user);
var newsrs=tx.executeSql('select * from news WHERE username="'+user+'" AND statusnet_conversation_id="'+conversationId +'" AND status_id<'+lastpost+' ORDER BY created_at ASC');
let conversation=[];
var helpernews={currentconversation:conversation}
if(newsrs.rows.length>0){
var helpernews=newsrs.rows.item(0);
var helpernews=cleanhelpernews(database,user,helpernews,allcontacts)
helpernews.currentconversation=[];
//helpernews=newsrs.rows.item(0);
//helpernews=cleanhelpernews(database,user,helpernews,allcontacts)
//helpernews.currentconversation=[];
for (var h = 0;h<newsrs.rows.length;h++){
var helpernews2=newsrs.rows.item(h);
if(helpernews.id!=helpernews2.status_id){
helpernews2.newscount=0;
helpernews2=cleanhelpernews(database,user,helpernews2,allcontacts)
//print(" helpernews "+JSON.stringify(helpernews.currentconversation))
helpernews.currentconversation.push(helpernews2)
}
}
}
var newscount=newsrs.rows.length;
callback(helpernews,newscount);}
callback(helpernews,newscount);
// var conversationobject={news:helpernews,newscount:newscount};
// return conversationobject;
})}
})
}
function cleanhelpernews(database,user,helpernews,allcontacts){
helpernews=fetchUsersForNews(database,user,helpernews,allcontacts);

41
source-linux/js/newsworker.js
View file

@ -64,26 +64,17 @@ function beautify(newsitemobject,msg){
var attachArray=newsitemobject.attachments;
for (var image in attachArray){
var attachhelper={mimetype:attachArray[image].mimetype}
var attachhelperstring="<img" //Qt.btoa(attachArray[image].url)
var attachhelperstring="<img"
var helperstringposition=newsitemobject.statusnet_html.indexOf(attachhelperstring);
// if (helperstringposition>-1){attachhelper.url=newsitemobject.statusnet_html.substring(newsitemobject.statusnet_html.lastIndexOf("http",helperstringposition),helperstringposition+attachhelperstring.length);
// if (attachArray[image].mimetype=="image/jpeg"){attachhelper.url=attachhelper.url+".jpg"}
// else if (attachArray[image].mimetype=="image/gif"){attachhelper.url=attachhelper.url+".gif"}
// else if (attachArray[image].mimetype=="image/png"){attachhelper.url=attachhelper.url+".png"}
// }
// else {
attachhelper.url=attachArray[image].url
// }
if (helperstringposition>-1){var removeme=newsitemobject.statusnet_html.substring(helperstringposition,newsitemobject.statusnet_html.indexOf('">',helperstringposition)+2);}
//print("Attachhelper "+attachhelper.url)
newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(removeme,"")
//newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4)+".jpeg","")
//newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(attachhelper.url.substring(0,attachhelper.url.length-4),"")
imageAttachmentList.push(attachhelper)
}
}
}catch(e){print("attachment "+e)}
newsitemobject.statusnet_html=newsitemobject.statusnet_html.replace(/class=\"attachment-image\"/g,"width=\"600\" ");
for (var format in videoformats){
if (newsitemobject.text.indexOf("."+videoformats[format])>-1){
var videohelper={mimetype:"video/"+videoformats[format]}
@ -109,17 +100,7 @@ function beautify(newsitemobject,msg){
if ((videoAttachmentList.length==0) || (videoAttachmentList[videoAttachmentList.length-1].url!=ptvideohelper.url)){videoAttachmentList.push(ptvideohelper)}
}
}
if (newsitemobject.text.indexOf("youtube.com/watch?v")>-1){
var yttext=newsitemobject.text;
while (yttext.indexOf("youtube.com/watch?v")>-1){
var ythelperstringposition=yttext.indexOf("watch?v=");
var ytposend=findend(yttext,ythelperstringposition);
var ythelper={mimetype:"video/youtube"}
ythelper.url=yttext.substring(ythelperstringposition+8,ytposend);
yttext=yttext.substring(ytposend,yttext.length);
if ((videoAttachmentList.length==0) || (videoAttachmentList[videoAttachmentList.length-1].url!=ythelper.url)){videoAttachmentList.push(ythelper)}
}
}
newsitemobject.videoAttachmentList=videoAttachmentList;
newsitemobject.imageAttachmentList=imageAttachmentList;
if ((msg.options.hasOwnProperty("hide_nsfw"))&&(msg.options.hide_nsfw==1)&&(newsitemobject.text.indexOf("#nsfw")>-1)){
@ -132,8 +113,6 @@ function beautify(newsitemobject,msg){
return newsitemobject;
}
WorkerScript.onMessage = function(msg) {
if(msg.deleteId!==undefined)
{msg.model.remove(msg.deleteId);
@ -142,16 +121,15 @@ if(msg.deleteId!==undefined)
else{
if(msg.method=="refresh" || msg.method=="contact" ||(msg.method=="conversation"&&msg.news.length>0)){msg.model.clear()};
msg.model.sync()
//for (var j=0;j<msg.news.length;j++){
for (var j in msg.news){
let data=({})
if (msg.news[j]) {
let data=({});
if (typeof(msg.news[j])=='object') {
var newsitemobject=msg.news[j];
newsitemobject=beautify(newsitemobject,msg);
if (newsitemobject.hasOwnProperty("currentconversation")&&(newsitemobject.currentconversation.length>0)){
if (!(typeof(newsitemobject.currentconversation)=='undefined') && (newsitemobject.currentconversation.length>0)){
newsitemobject.lastcomment=beautify(newsitemobject.currentconversation[newsitemobject.currentconversation.length-1],msg);
newsitemobject.lastcomment.indent=1
newsitemobject.lastcomment.isLastComment=true
}
if (msg.method=="conversation"){
@ -171,9 +149,6 @@ else{
msg.model.append(data)
}
}
//if (j==msg.news.length){
msg.model.sync()
//}
}
}

116
source-linux/js/service.js
View file

@ -207,15 +207,15 @@ function storeConfig(database,obj) { // stores config to DB
//print(JSON.stringify(obj));
var result = tx.executeSql('SELECT * from config WHERE username="'+obj.username+'"');
if(result.rows.length === 1) {// use update
var result2 = tx.executeSql('UPDATE config SET server="'+obj.server+'",password="'+obj.password+'", imagestore="'+obj.imagestore+'", maxnews=0, timerInterval=0, newsViewType="'+obj.newsViewType+'", isActive=0 WHERE username="'+obj.username +'"');
var result2 = tx.executeSql('UPDATE config SET server="'+obj.server+'",password="'+obj.password+'", imagestore="'+obj.imagestore+'", maxnews="'+obj.accountId+'", timerInterval=0, newsViewType="'+obj.newsViewType+'", isActive=0 WHERE username="'+obj.username +'"');
var result3 = tx.executeSql('UPDATE config SET isActive=1 WHERE username !="'+obj.username +'"');
} else {// use insert print('... does not exists, create it')
var result2 = tx.executeSql('INSERT INTO config VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)', [obj.server, obj.username, obj.password, obj.imagestore, 0, 0,obj.newsViewType,0,"[[],[],[],[]]",0,"","",""]);
var result2 = tx.executeSql('INSERT INTO config VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)', [obj.server, obj.username, obj.password, obj.imagestore, obj.accountId, 0,obj.newsViewType,0,"[[],[],[],[]]",0,"","",""]);
var result3 = tx.executeSql('UPDATE config SET isActive=1 WHERE username !="'+obj.username +'"');
}
})}
function showServerConfig(url,rootwindow,callback){//print(url);
function showServerConfig(url,rootwindow,callback){
Helperjs.friendicaWebRequest(url+"/api/statusnet/config",rootwindow, function (obj){
var serverconfig = JSON.parse(obj);
var serverConfigString="import QtQuick 2.0; import QtQuick.Dialogs 1.2; MessageDialog{ visible: true; title:'Server';standardButtons: StandardButton.Ok;text: 'Name: "+serverconfig.site.name+"\nLanguage: "+serverconfig.site.language+
@ -226,14 +226,14 @@ Helperjs.friendicaWebRequest(url+"/api/statusnet/config",rootwindow, function (o
callback(serverConfigString)
})}
function checkLogin(login,rootwindow,callback){
// check server with given credentials
try {Helperjs.friendicaRequest(login,"/api/account/verify_credentials",rootwindow, function (obj){
var account = JSON.parse(obj);
callback(account)
})}
catch(e){}
}
//function checkLogin(login,rootwindow,callback){
// // check server with given credentials
// try {Helperjs.friendicaRequest(login,"/api/account/verify_credentials",rootwindow, function (obj){
// var account = JSON.parse(obj);
// callback(account)
// })}
// catch(e){}
//}
function requestProfile(login,database,rootwindow,callback){
// return profile data
@ -241,7 +241,6 @@ function requestProfile(login,database,rootwindow,callback){
var profiledata=JSON.parse(obj);
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
for (var i=0;i<profiledata.profiles.length;i++){
//print('store profile data for '+JSON.stringify(profiledata.profiles[i]));
db.transaction( function(tx) {
var result = tx.executeSql('SELECT * from profiles where username="'+login.username+'" AND id = '+profiledata.profiles[i].profile_id); // check for profile id
if(result.rows.length === 1) {// use update
@ -289,8 +288,8 @@ function readConfig(database,callback,filter,filtervalue) { // reads config
for(var i = 0; i < rs.rows.length; i++) {
rsArray.push(rs.rows.item(i))
}
var rsObject={server:rsArray[0].server,username:rsArray[0].username, password:rsArray[0].password,imagestore:rsArray[0].imagestore,isActive:rsArray[0].isActive, newsViewType:rsArray[0].newsViewType,permissions:JSON.parse(rsArray[0].permissions),maxContactAge:rsArray[0].maxContactAge,APIVersion:rsArray[0].APIVersion,addons:rsArray[0].addons};
if (rsObject.newsViewType!="" && rsObject.newsViewType!=null){updateNewsviewtype(database,rsObject.newsViewType)}
var rsObject={server:rsArray[0].server,username:rsArray[0].username, password:rsArray[0].password,imagestore:rsArray[0].imagestore,isActive:rsArray[0].isActive, newsViewType:rsArray[0].newsViewType,accountId:rsArray[0].maxnews,permissions:JSON.parse(rsArray[0].permissions),maxContactAge:rsArray[0].maxContactAge,APIVersion:rsArray[0].APIVersion,addons:rsArray[0].addons};
if (rsObject.newsViewType!="" && rsObject.newsViewType!=null &&!typeof(rsObject.newsViewType)=='undefined'){updateNewsviewtype(database,rsObject.newsViewType)}
} else {var rsObject=""}
callback(rsObject)}}
)
@ -394,7 +393,7 @@ function cleanNews(database,callback){
if (i!=0){var maxnewsa=maxnews/5}else{maxnewsa=maxnews}
var newscountrs = tx.executeSql('SELECT COUNT(*) from news WHERE messagetype='+i);
var newscount = 0;
if (newscountrs.rows.length>0){newscount=newscountrs.rows.item(0)["COUNT(*)"]};//print(i+" "+maxnewsa+" newscount "+newscount)
if (newscountrs.rows.length>0){newscount=newscountrs.rows.item(0)["COUNT(*)"]};
if (newscount>maxnewsa){
var lastvalidtimers= tx.executeSql('SELECT DISTINCT created_at FROM news WHERE messagetype='+i+' ORDER BY created_at ASC LIMIT ' +(newscount-maxnewsa));
var lastvalidtime=lastvalidtimers.rows.item(newscount-maxnewsa-1).created_at;
@ -409,10 +408,8 @@ function cleanContacts(login,database,callback){
db.transaction( function(tx) {
var oldestnewsrs= tx.executeSql('SELECT created_at FROM news WHERE username="'+login.username+'" AND messagetype=0 ORDER BY created_at ASC LIMIT 1');
if (oldestnewsrs.rows.length>0){ var oldestnewsTime=oldestnewsrs.rows.item(0).created_at- 604800000;} else{var oldestnewsTime=0} //contacts can be 7 days old
//print(login.username+" älteste news: "+ oldestnewsTime);
var result = tx.executeSql('SELECT * from contacts WHERE username="'+login.username+'" AND isFriend=0 AND imageAge<'+oldestnewsTime); // check for friends
//print ("Contact result length: "+ result.rows.length)
for (var i=0;i<result.rows.length;i++){//print("rm "+result.rows.item(i).profile_image)
for (var i=0;i<result.rows.length;i++){
filesystem.rmFile(result.rows.item(i).profile_image);
var deleters = tx.executeSql('DELETE from contacts WHERE username="'+login.username+'" AND url="'+result.rows.item(i).url+'"');
}
@ -440,7 +437,7 @@ function updateContactInDB(login,database,isFriend,contact){// for newstab and f
var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]);
db.transaction( function(tx) {
var imagename_helper=[];
imagename_helper=contact.profile_image_url.split('?');//print("substring: "+JSON.stringify(imagename_helper)+imagename_helper[0].substring(imagename_helper[0].lastIndexOf("/")+1, imagename_helper[0].length))
imagename_helper=contact.profile_image_url.split('?');
try {parseInt(image_timestamp=imagename_helper[1].substring(imagename_helper[1].indexOf("ts=")+3,imagename_helper[1].length))} catch(e){};
var result;
result = tx.executeSql('SELECT * from contacts where username="'+login.username+'" AND url = "'+contact.url+'"'); // check for news url
@ -452,28 +449,33 @@ function updateContactInDB(login,database,isFriend,contact){// for newstab and f
}
function processNews(api,data){
try{var newslist=JSON.parse(data)} catch(e){newsBusy.running=false;};
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=[];
usermessages.push(newslist.status);
newslist=usermessages;
}
if (data==""){}
if (data==""){newsBusy.running=false}
else if (typeof(newslist)=='undefined'){
Helperjs.showMessage(qsTr("Undefined Array Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
}
else if (newslist.hasOwnProperty('status')){
Helperjs.showMessage(qsTr("JSON status Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root)
}
else if (!(Array.isArray(newslist))){
replytimer.restart()
}
else {
var allcontacts=[];
allcontacts=Newsjs.getAllContacts(db,login.username);
if (api=="/api/direct_messages/all" || api=="/api/direct_messages/conversation"){
if (!(Array.isArray(newslist)) && (typeof(newslist)==='object')){//answers return object, not array
newslist=[];newslist.push(JSON.parse(data));
}
if (api=="/api/direct_messages/all" || api=="/api/direct_messages/conversation" ||api=="/api/direct_messages/new"){
for (var n in newslist){
newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));
try{newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));}catch(e){
newslist[n].created_at=Date.parse(newslist[n].created_at)
}
newslist[n].messagetype=1;
newslist[n].source=" Friendica";
newslist[n].status_id=newslist[n].id;
@ -486,7 +488,7 @@ function processNews(api,data){
newslist[n].in_reply_to_user_id=newslist[n].recipient_id
if(newslist[n].in_reply_to_user_id){newslist[n].reply_user=Newsjs.objFromArray(allcontacts,"id",newslist[n].in_reply_to_user_id)}
}}
else if (api=="/api/friendica/notifications"){
else if (api=="/api/friendica/notification"){
for (var n in newslist){
newslist[n].created_at=Date.parse(newslist[n].date);
newslist[n].messagetype=2;
@ -502,20 +504,24 @@ function processNews(api,data){
}
}
else {//if(api!="/api/statuses/user_timeline"){
var chatlist=[];
var chatlistclean=[];
var conversationIds=[];
var commentCount=[];
for (var n in newslist){
if (newslist[n]!=null){
newslist[n].created_at=Date.parse(Newsjs.cleanDate(newslist[n].created_at));
newslist[n].messagetype=5;
newslist[n].status_id=newslist[n].id;
if (api=="/api/statuses/replies"){newslist[n].messagetype=3}else{newslist[n].messagetype=0;}
newslist[n].friendica_author=cleanUser(newslist[n].friendica_author);
newslist[n].user=cleanUser(newslist[n].user);
if (newslist[n].friendica_title!="") {newslist[n].statusnet_html="<b>"+newslist[n].friendica_title +"</b><br><br>"+newslist[n].friendica_html;}
else{newslist[n].statusnet_html=newslist[n].friendica_html}
//if (newslist[n].friendica_title!="") {newslist[n].statusnet_html="<b>"+newslist[n].friendica_title +"</b><br><br>"+newslist[n].friendica_html;}
//else{ //friendica_title also included in html
newslist[n].statusnet_html=newslist[n].friendica_html
//}
if(newslist[n].in_reply_to_user_id){newslist[n].reply_user=Newsjs.objFromArray(allcontacts,"id",newslist[n].in_reply_to_user_id)}
if(newslist[n].hasOwnProperty('friendica_activities')){
@ -542,29 +548,50 @@ function processNews(api,data){
//fill chatlist
if (conversationindex==-1){
chatlist.push(newslist[n]);
let conversation=[];conversation.push(newslist[n]);
let firstmessage={currentconversation:conversation};
chatlist.push(firstmessage);
conversationIds.push(newslist[n].statusnet_conversation_id);
commentCount.push(1);
} else{
commentCount[conversationindex]=commentCount[conversationindex]+1;
chatlist[conversationindex]=newslist[n];
chatlist[conversationindex].currentconversation.push(newslist[n]);
}
}
}
//enrich chatlist with old entries
for (var count in chatlist){ //print("chat "+JSON.stringify(chatlist[count])+" count: "+commentCount[count])
//chatlist[count].newscount=commentCount[count]
if (chatlist[count].id_str!==chatlist[count].statusnet_conversation_id){
if ((newstab.newstabstatus=="Conversations")&&!(api=="/api/conversation/show"|| api=="/api/direct_messages/conversation")){
//enrich chatlist with old entries
for (var count in chatlist){
chatlist[count].currentconversation.reverse();
if (chatlist[count].currentconversation[0].id_str!==chatlist[count].currentconversation[0].statusnet_conversation_id){
try{
Newsjs.oldchatfromdb(db,login.username,chatlist[count].statusnet_conversation_id,chatlist[count].id,allcontacts,function(oldpost,oldcount){
chatlist[count]=oldpost;
chatlist[count].newscount=oldcount+commentCount[count];
//print("JSON "+chatlist[count].statusnet_conversation_id+" "+chatlist[count].id+JSON.stringify(oldpost))
Newsjs.oldchatfromdb(db,login.username,chatlist[count].currentconversation[0].statusnet_conversation_id,chatlist[count].currentconversation[0].id,allcontacts,function(oldpost,oldcount){
let completeChat=oldpost.currentconversation.concat(chatlist[count].currentconversation);
let newChat=completeChat[0];
newChat.currentconversation=[];
for (let c in completeChat){
if (completeChat[c].status_id!=newChat.status_id){
newChat["currentconversation"].push(completeChat[c])
}
}
newChat.newscount=oldcount+commentCount[count];
chatlistclean.push(newChat);
})
}catch(e){print(e)}
}
else{chatlist[count].newscount=commentCount[count]}
else{
let newChat=chatlist[count].currentconversation[0];
newChat["currentconversation"]=[];
for (let c in chatlist[count].currentconversation){
if (chatlist[count].currentconversation[c].status_id!=newChat.status_id){
newChat["currentconversation"].push(chatlist[count].currentconversation[c])
}
}
newChat.newscount=commentCount[count];
chatlistclean.push(newChat);
}
}
}
}
@ -575,8 +602,8 @@ function processNews(api,data){
else if (api=="/api/statuses/user_timeline" || api=="/api/users/show"){
root.contactposts=newslist
}
else if ((api!="/api/direct_messages/all")&&(api!="/api/friendica/notifications")&&(newstab.newstabstatus==="Conversations")){
showNews(chatlist);root.news=newslist
else if ((api!="/api/direct_messages/all")&&(api!="/api/friendica/notification")&&(api!="/api/direct_messages/new")&&(newstab.newstabstatus==="Conversations")){
showNews(chatlistclean);root.news=newslist
}
else {
showNews(newslist);root.news=newslist
@ -585,7 +612,6 @@ function processNews(api,data){
var newstabarray=["Conversations","Favorites","Timeline","DirectMessage","Replies"];
if (newstabarray.indexOf(newstab.newstabstatus)>-1){contacttimer.start()}
}
}
@ -630,7 +656,7 @@ function updateView(viewtype){
case "Notifications":
xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server);
xhr.setApi("/api/friendica/notifications");
xhr.setApi("/api/friendica/notification");
xhr.clearParams();
break;
case "Direct Messages":

50
source-linux/js/smiley.js
View file

@ -32,6 +32,56 @@
var html=[//Smileys
'\u263A',
'\ud83d\ude00',
'\ud83d\ude02',
'\ud83d\ude06',
'\ud83d\ude07',
'\ud83d\ude08',
'\ud83d\ude09',
'\ud83d\ude0B',
'\ud83d\ude0D',
'\ud83d\ude0E',
'\ud83d\ude0F',
'\ud83d\ude10',
'\ud83d\ude15',
'\ud83d\ude18',
'\ud83d\ude1B',
'\ud83d\ude1C',
'\ud83d\ude1D',
'\ud83d\ude1E',
'\ud83d\ude1F',
'\ud83d\ude20',
'\ud83d\ude21',
'\ud83d\ude22',
'\ud83d\ude23',
'\ud83d\ude24',
'\ud83d\ude26',
'\ud83d\ude27',
'\ud83d\ude2C',
'\ud83d\ude2D',
'\ud83d\ude2E',
'\ud83d\ude2F',
'\ud83d\ude31',
'\ud83d\ude32',
'\ud83d\ude33',
'\ud83d\ude31',
'\ud83d\ude32',
'\ud83d\ude33',
'\ud83d\ude34',
'\ud83d\ude37',
'\ud83d\ude41',
'\ud83d\ude42',
'\ud83d\ude43',
'\ud83d\ude44',
'\ud83d\ude45',
'\ud83d\ude46',
'\ud83d\ude47',
'\ud83d\ude4B',
'\ud83d\ude4C',
'\ud83d\ude4D',
'\ud83d\ude4E',
'\ud83d\ude4F',
'\ud83e\udd2F',
'\u2639',
'\u263B',
//Weather

3
source-linux/qml/calendarqml/CalendarTab.qml
View file

@ -106,7 +106,7 @@ Rectangle {
id:leftDrawer
property var newstabstatus: newstab.newstabstatus
visible: wideScreen&&rootstackView.depth<2
width: visible?osSettings.systemFontSize*15:0
width: visible?root.fontFactor*osSettings.systemFontSize*15:0
height: root.height-bar.height
}
@ -126,6 +126,7 @@ Rectangle {
calBusy.running=true;
updatenews.setDatabase();
updatenews.login();
updatenews.setSyncAll(false);
updatenews.events();
// Service.getEvents(db,login, calendartab,function(){
// showEvents("")

3
source-linux/qml/configqml/AccountPage.qml
View file

@ -281,7 +281,7 @@ Page{
font.pointSize: osSettings.bigFontSize
onClicked:{
accountBusy.running=true;//servername.displayText
var userconfig={server: servername.displayText, username: username.text, password:Qt.btoa(password.text), imagestore:imagestoredir, maxnews:"",interval: ""};
var userconfig={server: servername.displayText, username: username.text, password:Qt.btoa(password.text), imagestore:imagestoredir,interval: ""};
var errormessage="";
if (servername.text==""){errormessage=qsTr("No server given! ")}
else if (username.text==""){errormessage+=qsTr("No nickname given! ")}
@ -305,6 +305,7 @@ Page{
filesystem.Directory=imagestoredir //userconfig.imagestore;
filesystem.makeDir("contacts");
filesystem.makeDir("albums");
userconfig.accountId=credentials.id
Service.storeConfig(db,userconfig);
Service.readConfig(db,function(userconfig){
Helperjs.readData(db,"config","",function(storedUsers){

5
source-linux/qml/configqml/InfoBox.qml
View file

@ -35,9 +35,6 @@ import QtQuick.Controls.Material 2.12
import "qrc:/qml/genericqml"
Page{
//color:"white"
// width:infoBoxText.contentWidth
// height:infoBoxText.contentHeight
Text{id:infoBoxText
anchors.top:closeButton.bottom
anchors.topMargin: mm
@ -46,7 +43,7 @@ Page{
font.pointSize: osSettings.systemFontSize
color:Material.primaryTextColor
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: "<b>Friendiqa v0.6.3 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
text: "<b>Friendiqa v0.6.4 </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>"+

57
source-linux/qml/configqml/RegisterPage.qml
View file

@ -1,57 +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.9
import QtQuick.Controls 2.12
import QtWebView 1.1
import "qrc:/qml/genericqml"
Rectangle{
color:"white"
property alias url:htmlview.url
WebView {id:htmlview;
height:parent.height-7*mm
width:parent.width
y:7*mm
}
Button{
id:closeButton
height: 3*root.fontFactor*osSettings.bigFontSize
anchors.top: parent.top
anchors.topMargin: 1*mm
anchors.right: parent.right
anchors.rightMargin: 1*mm
text: "\uf057"
font.pointSize: osSettings.bigFontSize
onClicked:{root.pop()}
}
}

177
source-linux/qml/contactqml/ContactDetailsComponent.qml
View file

@ -1,177 +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.0
import QtQuick.Controls 2.12
import "qrc:/qml/genericqml"
Item {
id: contactLargeComponent
x:mm
y:mm
property var contact:({})
property var createdAtDate: new Date(contact.created_at)
property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend!=0)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")
Rectangle {
id: wrapper
width:root.width-2*mm //friendsTabView.width;
height:root.height-20*mm// friendsTabView.height-15*mm
border.color: "grey"
color:"white"
radius: 0.5*mm
Image {
id: photoImage
x:mm
y:mm
width: 15*mm
height:15*mm
source:(contact.profile_image!="")? "file://"+contact.profile_image : contact.profile_image_url
onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
}
Label {
id: namelabel
x: mm
width: root.width-6*mm //friendsTabView.width-4*mm
height: 3*mm
text:contact.name+" (@"+contact.screen_name+")"
elide:Text.ElideRight
anchors.topMargin: 0
anchors.left: photoImage.left
color: "#303030"
font.pixelSize: 4*mm
anchors.top: photoImage.bottom
}
Rectangle{
id: detailsrectangle
anchors.top: namelabel.bottom
anchors.topMargin: 2*mm
ScrollView{
ScrollBar.horizontal.policy: ScrollBar.AlwaysOff
//frameVisible: true
id:namelabelflickable
width: root.width-10*mm
height:root.height-50*mm
x: mm
clip:true
Text{
id:namelabeltext
width: namelabelflickable.width
height: implicitHeight
font.pixelSize: 3*mm
textFormat:Text.RichText
wrapMode: Text.Wrap
text:"<b>"+qsTr("Description")+": </b> "+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>"+
connectUrl+ "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
onLinkActivated: {
Qt.openUrlExternally(link)}
}
}
Row{
anchors.top: namelabelflickable.bottom
anchors.topMargin: 2*mm
x: mm
spacing:4
MButton{
id:photobutton
height: 6*mm
width: 8*mm
text: "\uf03e" // "Photos"
visible:(contact.network=="dfrn")
onClicked:{
fotostab.phototabstatus="Contact";
root.currentIndex=2;
fotostab.active=true;
root.fotoSignal(contact) ;
contactLargeComponent.destroy();
}
}
MButton{
id:messagebutton
height: 6*mm
width: 8*mm
text: "\uf0e6" //"Messages"
onClicked:{
root.currentIndex=0;
//newstab.active=true;
root.messageSignal(contact) ;
contactLargeComponent.destroy();
}
}
MButton{
id:dmbutton
visible: (contact.following=="true")
height: 6*mm
width: 8*mm
text: "\uf040" //"DM"
onClicked:{
root.currentIndex=0;
root.directmessageSignal(contact.screen_name);
contactLargeComponent.destroy();
}
}
MButton{
id:eventbutton
visible:(contact.network=="dfrn")
height: 6*mm
width: 8*mm
text:"\uf073" //Events
onClicked:{
root.currentIndex=3;
calendartab.active=true;
calendartab.calendartabstatus="Friend"
root.eventSignal(contact);
contactLargeComponent.destroy();
}
}
MButton{
id: closeButton
height: 6*mm
width: 8*mm
text: "\uf057" //"close"
onClicked:{contactLargeComponent.destroy();
}
}
}
}
}
}

52
source-linux/qml/contactqml/ContactsListTab.qml
View file

@ -31,11 +31,12 @@
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/news.js" as Newsjs
import "qrc:/js/service.js" as Service
import "qrc:/js/news.js" as Newsjs
import "qrc:/qml/contactqml"
import "qrc:/qml/genericqml"
@ -44,14 +45,16 @@ Item{
Layout.fillWidth:true
Layout.fillHeight: true
function showContacts(contact){
try {contactsModel.clear()} catch(e){print(e)};
Helperjs.readData(db, "contacts",root.login.username,function(contactsobject){
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);
contactsobject[j].name=Qt.atob(contactsobject[j].name);
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]});
}
},"isFriend",0,"screen_name ASC");
},searchText.text,-1);
}
MButton {
id: cleanButton
@ -61,17 +64,40 @@ Item{
anchors.right: parent.right
onClicked: {
Service.cleanContacts(root.login,root.db,function(){
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");
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

169
source-linux/qml/contactqml/ContactsSearchPage.qml Normal file
View file

@ -0,0 +1,169 @@
// 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"
Page{
id: contactsSearchPage
function search(term){
contactSearchBusy.running=true;
try {contactsSearchModel.clear()} catch(e){};
xhr.clearParams();
xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server);
xhr.setApi("/api/v1/accounts/search");
xhr.setParam("q",term);
xhr.setParam("limit",99)
xhr.get();
}
Connections{
target:xhr
function onError(data,url,api,code){
if (data !="contactlist"){Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);}
contactSearchBusy.running=false;
}
function onSuccess(data,api){
if (api=="/api/v1/accounts/search" && data!=""){
try{var searchlist = JSON.parse(data);}catch(e){print("Error "+e)}
contactSearchBusy.running=false;
if (Array.isArray(searchlist)){
searchlist.sort(function(a,b){
if (a.group > b.group) {
return -1;
}
if (a.group < b.group) {
return 1;
}
return 0
})
for (let i=0;i<searchlist.length;i++){
if (searchlist[i].id!="0"){
if (searchlist[i].note!=null){
searchlist[i].description=searchlist[i].note;}
else{searchlist[i].description=""}
searchlist[i].name=(searchlist[i].display_name);
searchlist[i].screen_name=searchlist[i].username;
searchlist[i].location="";
searchlist[i].profile_image=""
searchlist[i].profile_image_url=searchlist[i].avatar;
searchlist[i].curIndex=contactsSearchModel.count;
let contactType="";
if (searchlist[i].group){contactType=qsTr("Forum")}
//else if (contactlist[i].bot){contactType=qsTr("Bot")}
else{contactType=qsTr("Person")}
contactsSearchModel.append({"contact":searchlist[i],"contactType":contactType});
}
}
}
}
}
}
MButton {
id: closeButton
anchors.top: parent.top
anchors.topMargin: 0.5*root.fontFactor*osSettings.bigFontSize
anchors.right: parent.right
anchors.rightMargin: 1*mm
width: 2*root.fontFactor*osSettings.bigFontSize;
text: "\uf057"
onClicked: {
rootstackView.pop()
}
}
Search{
y:0.5*root.fontFactor*osSettings.bigFontSize;
x:1.5*root.fontFactor*osSettings.systemFontSize;
width:root.width-(7*root.fontFactor*osSettings.systemFontSize+mm);
height: 2.5*root.fontFactor*osSettings.systemFontSize;
color:Material.dialogColor
selfdestroying:false
}
BusyIndicator{
id: contactSearchBusy
anchors.centerIn:parent
width:10*mm
height: 10*mm
running: false
}
Component {
id: sectionHeading
Rectangle {
width: contactsSearchView.width
height: childrenRect.height
color: Material.backgroundColor
required property string section
Text {
color: Material.secondaryTextColor
text: parent.section
font.bold: true
font.pointSize: osSettings.bigFontSize
}
}
}
ListView {
id: contactsSearchView
x:mm
y:4*root.fontFactor*osSettings.bigFontSize;
width:root.width-2*mm
height: root.height-7*root.fontFactor*osSettings.bigFontSize;
spacing: 2
clip: true
function processContactSelection(contactobject){contactobject.searchContact=true;showContact(contactobject)}
model: contactsSearchModel
delegate: ContactComponent { }
section.property: "contactType"
section.criteria: ViewSection.FullString
section.delegate: sectionHeading
}
ListModel{id: contactsSearchModel}
// Component.onCompleted: {
// friendsTabView.contactsSignal.connect(showContacts);
// showContacts()
// }
}

57
source-linux/qml/contactqml/FriendsListTab.qml
View file

@ -46,7 +46,7 @@ Item{
property int currentContact: 0
function showFriends(contact){
try {friendsModel.clear()} catch(e){print(e)};
try {friendsModel.clear()} catch(e){};
Helperjs.readData(db,"friendshiprequests",login.username,function(friendrequestsobject){
for (var i=0;i<friendrequestsobject.length;i++){
if (friendrequestsobject[i].note!=null){
@ -61,18 +61,18 @@ Item{
friendsModel.append({"contact":friendrequestsobject[i],"contactType":qsTr("Friend Requests")});
}
});
Helperjs.readData(db,"contacts",login.username,function(friendsobject){
Newsjs.listFriends(login,db,function(friendsobject){
for (var i=0;i<friendsobject.length;i++){
if(friendsobject[i].description!=""){
friendsobject[i].description=Qt.atob(friendsobject[i].description);}
friendsobject[i].name=Qt.atob(friendsobject[i].name);
if(Helperjs.getCount(db,login,"contacts","screen_name",friendsobject[i].screen_name)>1){
friendsobject[i].screen_name=friendsobject[i].screen_name+"+"+friendsobject[i].cid
}
friendsModel.append({"contact":friendsobject[i],"contactType":qsTr("Friends")});
}
},"isFriend",1,"screen_name ASC");
},(searchText.text==""?searchText.preeditText:searchText.text));
}
Connections{
target:xhr
function onDownloaded(type,url,filename,i){
@ -84,6 +84,7 @@ Item{
}
}
}
MButton {
id: updateFriendsButton
text: "\uf021"
@ -95,6 +96,7 @@ Item{
Helperjs.deleteData(root.db,"friendshiprequests",root.login.username,function(){});
updatenews.setDatabase();
updatenews.login();
updatenews.setSyncAll(false);
updatenews.friendrequests();
//root.contactLoadType="friends";
Newsjs.requestFriends(root.login,db,root,function(nc){
@ -115,12 +117,34 @@ Item{
value: friendsGridTab.currentContact/root.newContacts.length
}
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: if (text.length>0){showFriends(root.login.username)}
onPreeditTextChanged: {if (preeditText.length>0){showFriends(root.login.username)}}
}
}
Component {
id: sectionHeading
Rectangle {
width: friendsView.width
height: childrenRect.height
color: Material.dialogColor //color: "lightsteelblue"
color: Material.backgroundColor
required property string section
Text {
color: Material.secondaryTextColor
@ -131,6 +155,28 @@ Item{
}
}
//GridView {
Component { id:headerComponent
Rectangle{
color: Material.dialogColor
width:friendsView.width
height:6*mm
Text{
color: Material.primaryTextColor
font.pointSize: osSettings.bigFontSize
anchors.centerIn: parent
text:"\uf234"
}
MouseArea{
anchors.fill:parent
onClicked:{
rootstackView.push("qrc:/qml/contactqml/ContactsSearchPage.qml")
}
}
}
}
ListView{
id: friendsView
x:mm
@ -145,6 +191,7 @@ Item{
// }
model: friendsModel
delegate: ContactComponent { }
header:headerComponent
section.property: "contactType"
section.criteria: ViewSection.FullString
section.delegate: sectionHeading

16
source-linux/qml/contactqml/FriendsTab.qml
View file

@ -65,38 +65,38 @@ Rectangle {
TabBar {
id: friendsbar
width: osSettings.osType=="Android"?parent.width-2*osSettings.bigFontSize:parent.width
height: 9*mm
x: osSettings.osType=="Android"?2*osSettings.bigFontSize:0
width: osSettings.osType=="Android"?parent.width-2*root.fontFactor*osSettings.bigFontSize:parent.width
height: 2*root.fontFactor*osSettings.bigFontSize
x: osSettings.osType=="Android"?2*root.fontFactor*osSettings.bigFontSize:0
visible: !wideScreen
position:TabBar.Header
currentIndex: 1
TabButton {
text: qsTr("Me")
font.pointSize: osSettings.systemFontSize
height: 7*mm
height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
}
TabButton {
text: qsTr("Friends")
font.pointSize: osSettings.systemFontSize
height: 7*mm
height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
}
TabButton {
text: qsTr("Contacts")
font.pointSize: osSettings.systemFontSize
height: 7*mm
height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
}
TabButton {
text: qsTr("Groups")
font.pointSize: osSettings.systemFontSize
height: 7*mm
height: 1.7*root.fontFactor*osSettings.bigFontSize//7*mm
}
}
LeftDrawerLinux{
id:leftDrawer
visible: wideScreen&&rootstackView.depth<2
width: visible?osSettings.systemFontSize*15:0
width: visible?root.fontFactor*osSettings.systemFontSize*15:0
height: root.height-bar.height
}

120
source-linux/qml/contactqml/GroupComponent.qml
View file

@ -56,16 +56,8 @@ Item {
height: parent.height-mm
radius: 0.5*mm
border.color: "grey"
color:Material.backgroundColor//"white"
color:Material.backgroundColor
// Image {
// id: photoImage
// x:1
// y:1
// width: 10*mm
// height:10*mm
// source:"qrc:/images/defaultcontact.jpg"
// }
Rectangle{
id:namelabelRect
x: 1
@ -147,112 +139,7 @@ Item {
delegate: ContactComponent { }// groupMember
function processContactSelection(contactobject){showContactdetails(contactobject)}
}
ListModel{id: groupModel}
// Component {
// id:groupMember
// Rectangle{
// width:parent.width
// height:6*mm
// Rectangle{id:memberrectangle
// border.color: "#EEEEEE"
// border.width: 1
// width:parent.width-12*mm
// height:6*mm
// Image {
// id: memberImage
// x:1
// y:1
// width: 5*mm
// height:5*mm
// source:(groupmember.isFriend==1)? "file://"+groupmember.profile_image :groupmember.profile_image_url
// onStatusChanged: if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
// }
// Text{
// font.pixelSize: 3*mm
// anchors.left: memberImage.right
// anchors.margins: 1*mm
// width:parent.width-1
// text:groupmember.name
// }
// MouseArea{
// anchors.fill: parent
// onClicked:{
//// root.currentIndex=1;
//// friendstab.active=true;
//// root.contactdetailsSignal(groupmember)
// root.currentIndex=0;
// root.contactdetailsSignal(groupmember)
// }
// }
// // BlueButton{
// // anchors.left: memberrectangle.right
// // anchors.margins: 1*mm
// // text: "\uf056"
// // onClicked:{
// // groupModel.remove(index)
// // }
// // }
// }
// }
// }
// Row{
// anchors.top: groupListView.bottom
// anchors.topMargin: mm
// spacing: mm
// }
// BlueButton{
// id: addMembers
// text:"\uf234"
// onClicked: {
// Newsjs.listFriends(root.login,root.db,function(userdata){
// var newlistcontacts=[];
// for (var n in userdata){
// if (groupmembers.indexOf(userdata[n].id)==-1){
// newlistcontacts.push(userdata[n])
// }
// }
// var component = Qt.createComponent("qrc:/qml/contactqml/Contactlist.qml");
// var contactlistobject = component.createObject(groupListView,{"possibleUsers":newlistcontacts});
// })
// }
// }
// BlueButton{
// id: updateButton
// text: "\uf0ee"
// onClicked:{
// var groupobject={};
// var groupmembers=[];
// for (var i=0;i<groupModel.count;i++){groupmembers.push(groupModel.get(i).groupmember)}
// try{ groupobject.id=group.gid} catch(e){};
// try{ groupobject.new=group.new} catch(e){};
// if (namelabel.text==""){
// Helperjs.showMessage(qsTr("Error"),qsTr("No name given"),root)}
// else {
// groupobject.name=namelabel.text;
// groupobject.user=groupmembers;
// updateGroup(login,db,groupobject)
// groupComponent.state="";
// }
// }
// }
// BlueButton{
// id: deleteButton
// text: "\uf056"
// onClicked:{
// Newsjs.deleteGroup(root.login,root.db,root,group,function(){
// groupComponent.state="";
// groupsModel.remove(index)})
// }
// }
}
Component.onCompleted:{if(group.new){groupComponent.state="large"}}
}
@ -262,12 +149,7 @@ Item {
name: "large"
PropertyChanges { target: groupComponent; height: groupsView.height - 6*root.fontFactor*osSettings.bigFontSize }
PropertyChanges { target: namelabel; font.pointSize: 1.2*osSettings.bigFontSize; readOnly:false}
//PropertyChanges { target: namelabelRect; height: 2*osSettings.bigFontSize}
PropertyChanges { target: closeButton; visible: true}
//PropertyChanges { target: groupComponent; z: 2 }
//PropertyChanges { target: wrapper; width:groupsView.width-2*mm;height:groupsView.height -2*mm-1}
//PropertyChanges { target: photoImage; width:15*mm;height:15*mm }
//PropertyChanges { target:groupComponent.GridView.view ;contentY:groupComponent.y;contentX:groupComponent.x;interactive:false}
PropertyChanges { target: detailsrectangle; visible:true }
PropertyChanges { target: infobutton; visible: false}
}

24
source-linux/qml/contactqml/GroupsListTab.qml
View file

@ -76,17 +76,17 @@ Item{
}
}
}
MButton {
id: updateGroupsButton
text: "\uf021"
anchors.top: parent.top
anchors.topMargin: mm
anchors.right: parent.right
anchors.rightMargin: mm
onClicked: {
Newsjs.requestGroups(root.login,root.db,root,function(){
groupsGridTab.showGroups(root.login.username)})}
}
// MButton {//requestGroups() not working with Friendica 02/2022
// id: updateGroupsButton
// text: "\uf021"
// anchors.top: parent.top
// anchors.topMargin: mm
// anchors.right: parent.right
// anchors.rightMargin: mm
// onClicked: {
// Newsjs.requestGroups(root.login,root.db,root,function(){
// groupsGridTab.showGroups(root.login.username)})}
// }
// BlueButton {
// id: newGroupButton
// text: "\uf234"
@ -103,7 +103,7 @@ Item{
x:mm
y:updateGroupsButton.height+4*mm
width:groupsGridTab.width-2*mm
height:groupsGridTab.height-updateGroupsButton.height-2*mm
height:groupsGridTab.height-2*mm//-updateGroupsButton.height
clip: true
// cellHeight: 16*mm
// cellWidth: 17*mm

47
source-linux/qml/friendiqa.qml
View file

@ -74,7 +74,7 @@ ApplicationWindow{
property bool imagePicking: false
Material.theme: Material.System // globaloptions.view_darkmode==1?Material.Dark:Material.Light
Material.theme: Material.System
color: Material.backgroundColor
function onLoginChanged(login){
@ -104,7 +104,7 @@ ApplicationWindow{
}
}
function showContact(contact){ //print(JSON.stringify(contact));
function showContact(contact){
rootstackView.push("qrc:/qml/newsqml/ContactPage.qml",{"contact": contact})
}
@ -143,14 +143,14 @@ ApplicationWindow{
onClosing: {
if (rootstack.currentIndex==0){
newstab.active=true;print("newstabstatus "+newstab.newstabstatus + " newsViewType " +globaloptions.newsViewType)
newstab.active=true;
if (newstab.newstabstatus!=globaloptions.newsViewType){
newstab.newstabstatus=globaloptions.newsViewType;
if(globaloptions.newsViewType=="Timeline"){Newsjs.newsfromdb(db,login.username,0,function(dbnews){
newsSignal(dbnews)
})}
else{
Newsjs.chatsfromdb(db,login.username,0,function(dbnews){
Newsjs.chatsfromdb(db,login.username,0,[],function(dbnews){
newsSignal(dbnews)
})}
close.accepted=false;
@ -164,13 +164,14 @@ ApplicationWindow{
root.pop();
close.accepted=false
}
else{print("Closing");
Service.cleanNews(root.db,function(){print("cleannews");
Service.cleanHashtags(root.db,function(){print("cleanhashtags");
Service.cleanContacts(root.login,root.db,function(){print("cleancontacts");
if (osSettings.osType=="Android"){
Qt.quit()}
else{print("show systray")
else{
Service.cleanNews(root.db,function(){
Service.cleanHashtags(root.db,function(){
Service.cleanContacts(root.login,root.db,function(){
if (osSettings.osType=="Android" || !iconTrayAvailable){
Qt.quit()
}
else{
systemTray.show();
systemTray.showMessage("",qsTr("Background Sync\n Rightclick or Middleclick to Quit"),"",5000)
root.hide()
@ -180,7 +181,7 @@ ApplicationWindow{
close.accepted=true
}
}
else if (rootstack.currentIndex==2){fotoSignal(login.username,"backButton");print("close rootstack currentindex==2");close.accepted=false}
else if (rootstack.currentIndex==2){fotoSignal(login.username,"backButton");close.accepted=false}
else {rootstack.currentIndex=0;close.accepted=false}
}
@ -191,24 +192,16 @@ ApplicationWindow{
}
header: ToolBar{
position: wideScreen?ToolBar.Header:ToolBar.Footer
background: Rectangle{
anchors.fill: parent
color: Material.backgroundDimColor//"#EEEEEE"//"#F8F8F8"
color: Material.backgroundDimColor
}
RowLayout{
anchors.fill: parent
ToolButton{
visible: !wideScreen
text: "\uf0c9"
onClicked:{
leftDrawer.visible?leftDrawer.close():leftDrawer.open()}
}
TabBar {
id: bar
Layout.fillWidth: true
//width: wideScreen?contentWidth:parent.width-10*mm
//x: 7*mm
onCurrentIndexChanged: rootstack.currentIndex=bar.currentIndex
TabButton {
text: "\uf03a"
@ -216,6 +209,7 @@ ApplicationWindow{
anchors.fill: parent
color: Material.backgroundDimColor
}
onDoubleClicked: {newstypeSignal("refresh")}
}
TabButton {
text: "\uf0c0"
@ -242,10 +236,6 @@ ApplicationWindow{
}
}
LeftDrawerAndroid{
id: leftDrawer
visible:!wideScreen
}
StackView{id:rootstackView
width:root.width
@ -295,7 +285,7 @@ StackView{id:rootstackView
Qt.quit()
}
}
Component.onCompleted: {print("systray completed")
Component.onCompleted: {
icon = iconTray
toolTip = qsTr("Click to open Friendiqa")
//&hide()
@ -309,7 +299,6 @@ StackView{id:rootstackView
if(globaloptions.view_darkmode==1){Material.theme=Material.Dark}
else if (globaloptions.view_darkmode==2){Material.theme=Material.Light}
else {Material.theme=Material.System}
if(!filesystem.Visibility){
systemTray.icon = iconTray;
// systemTray.toolTip = qsTr("Click to open Friendiqa");
@ -322,7 +311,7 @@ StackView{id:rootstackView
var IntentReceiverQml = component.createObject(root);
}
else if (osSettings.osType=="Linux"){
newstypeSignal("refresh")
if (login!=""){newstypeSignal("refresh")}
var component = Qt.createComponent("qrc:/qml/genericqml/LinuxSync.qml");
var LinuxSyncQml = component.createObject(root);
}

40
source-linux/qml/genericqml/ContactComponent.qml
View file

@ -36,60 +36,60 @@ import "qrc:/qml/genericqml"
Item {
id: contactComponent
height: 4.5*root.fontFactor*osSettings.systemFontSize//8*mm
width: contactComponent.ListView.view.width//parent.width
height: 5*root.fontFactor*osSettings.systemFontSize
width: contactComponent.ListView.view.width
property var createdAtDate: new Date(contact.created_at)
property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend==1)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")
Rectangle {
id: wrapper
width:parent.width
height: parent.height//8*mm
height: parent.height
radius: 0.5*mm
border.color: Material.backgroundDimColor// "grey"
color: Material.backgroundColor//"white"
border.color: Material.backgroundDimColor
color: Material.backgroundColor
Image {
id: photoImage
x:0.5*mm
y:0.5*mm
width: 4*root.fontFactor*osSettings.systemFontSize//7*mm
height:4*root.fontFactor*osSettings.systemFontSize//7*mm
width: 4*root.fontFactor*osSettings.systemFontSize
height:4*root.fontFactor*osSettings.systemFontSize
source:((contact.profile_image!="") && (typeof(contact.profile_image)=="string"))? "file://"+contact.profile_image : contact.profile_image_url
onStatusChanged: {if (photoImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}}
}
Flow{
width: wrapper.width-4*root.fontFactor*osSettings.systemFontSize//8*mm
width: wrapper.width-4*root.fontFactor*osSettings.systemFontSize
height: wrapper.height-mm
anchors.left: photoImage.right
anchors.margins: 1*mm
//spacing: mm
anchors.margins: 0.5*mm
clip: true
Label {
id: namelabel
width: Math.min(wrapper.width-(photoImage.width+mm),contentWidth)//wrapper.width-4
height: 1.1*root.fontFactor*osSettings.bigFontSize//3*mm
width: Math.min(wrapper.width-(photoImage.width+mm),contentWidth)
height: 1.1*root.fontFactor*osSettings.bigFontSize
text: contact.name
elide: contentWidth>wrapper.width-4*osSettings.systemFontSize?Text.ElideRight:Text.ElideNone
color: Material.secondaryTextColor//"#303030"
color: Material.secondaryTextColor
font.pointSize: osSettings.bigFontSize
}
Label {
id: screennamelabel
width: Math.min(wrapper.width-4*root.fontFactor*osSettings.systemFontSize,contentWidth)//contentWidth+2*mm//wrapper.width-8*mm
height: 1.1*root.fontFactor*osSettings.bigFontSize//3*mm
width: Math.min(wrapper.width-4*root.fontFactor*osSettings.systemFontSize,contentWidth)
height: 1.1*root.fontFactor*osSettings.bigFontSize
text: "(@"+contact.screen_name+")"
elide: contentWidth>wrapper.width-4*root.fontFactor*osSettings.systemFontSize?Text.ElideRight:Text.ElideNone
color: Material.secondaryTextColor//"#303030"
color: Material.secondaryTextColor
font.pointSize: osSettings.bigFontSize
}
Label {
id: descriptionlabel
width: Math.min(wrapper.width-4*root.fontFactor*osSettings.systemFontSize,contentWidth)//contentWidth+2*mm//wrapper.width-8*mm
height: 2*root.fontFactor*osSettings.systemFontSize//2.5*mm
width: wrapper.width-5*root.fontFactor*osSettings.systemFontSize
height: wrapper.height-mm-1.1*root.fontFactor*osSettings.bigFontSize
maximumLineCount:2
text: Qt.atob(contact.description)!=""?contact.description:""
elide:contentWidth>wrapper.width-4*root.fontFactor*osSettings.systemFontSize?Text.ElideRight:Text.ElideNone
color: Material.secondaryTextColor//"#303030"
elide:Text.ElideRight
color: Material.secondaryTextColor
font.pointSize: osSettings.systemFontSize
}
}

2
source-linux/qml/genericqml/LeftDrawerLinux.qml
View file

@ -53,5 +53,5 @@ Rectangle{
anchors.right: leftDrawer.right
color: Material.dialogColor//"#EEEEEE"
}
Component.onCompleted: {opened();}
//Component.onCompleted: {opened();}
}

1
source-linux/qml/genericqml/LinuxSync.qml
View file

@ -8,6 +8,7 @@ Item {
onTriggered: {
updatenews.setDatabase();
updatenews.login();
updatenews.setSyncAll(true)
updatenews.startsync();
}
}

8
source-linux/qml/genericqml/PermissionDialog.qml
View file

@ -60,9 +60,10 @@ Rectangle{
if ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))
{permButton.text="\uf09c"}
else{permButton.text="\uf023"}
}}
}
}
Text{
Text{ //cid not working in Friendica 02/2022
x:0.5*mm
y:0.5*mm
color: Material.primaryTextColor
@ -199,7 +200,8 @@ Rectangle{
anchors.bottom: parent.bottom
anchors.bottomMargin:1
text:"\u2713"
onClicked:{updatePerms();
onClicked:{
updatePerms();
permissionDialog.visible=false;
}
}

6
source-linux/qml/genericqml/Search.qml
View file

@ -38,6 +38,7 @@ Rectangle {
id:searchComponent
color: Material.backgroundColor
radius:0.5*mm
property bool selfdestroying:false
/* anchors.left: parent.left
anchors.leftMargin:mm
anchors.top:parent.top
@ -54,7 +55,10 @@ Rectangle {
anchors.fill: parent
selectByMouse: true
cursorVisible: false
onEditingFinished:{ if (displayText!=""){search(displayText)};searchComponent.destroy()}
onAccepted:{
if (displayText!=""){search(displayText)};
if(selfdestroying){searchComponent.destroy()}
}
}
Component.onCompleted: searchText.forceActiveFocus()
}

50
source-linux/qml/newsqml/ContactPage.qml
View file

@ -44,8 +44,6 @@ Page {
property var contact:({})
property string profileimagesource:contact.profile_image
//function backRequested(){pageStack.pop()}
function getDateDiffString (seconds){
var timestring="";
if (seconds<60) {timestring= Math.round(seconds) + " " +qsTr("seconds");}
@ -141,14 +139,12 @@ Page {
Component { id: contactHeader
Rectangle{
border.color: Material.backgroundDimColor//"#EEEEEE"
border.color: Material.backgroundDimColor
border.width: 1
color: Material.backgroundColor//"white"
color: Material.backgroundColor
width:contactView.width
height: contactView.width<35*root.fontFactor*osSettings.systemFontSize?(profileImage.height+namelabel.height+detailtext.height+7*mm):Math.max(profileImage.height,(buttonflow.height+namelabel.height+detailtext.height))+7*mm
//height: wrapper.height
property var createdAtDate: new Date(contact.created_at)
property string connectUrl: (contact.network!=="dfrn")||(contact.isFriend!=0)?"":( "<a href='"+contact.url.replace("profile","dfrn_request") +"'>"+qsTr("Connect")+"</a><br>")
Image {
id: profileImage
@ -160,7 +156,7 @@ Page {
onStatusChanged: if (profileImage.status == Image.Error) {source="qrc:/images/defaultcontact.jpg"}
Connections{
target:contactList
onProfileimagesourceChanged:profileImage.source=profileimagesource
function onProfileimagesourceChanged(){profileImage.source=profileimagesource}
}
}
Flow{id:buttonflow
@ -175,7 +171,7 @@ Page {
id:photobutton
height: 6*mm
width: 8*mm
text: "\uf03e" // "Photos"
text: "\uf03e"
visible:(contact.network=="dfrn")
onClicked:{
rootstack.currentIndex=2;
@ -193,7 +189,7 @@ Page {
height: 6*mm
width: 8*mm
visible: (contact.following=="true")
text: "\uf040" //"DM"
text: "\uf040"
onClicked:{
rootstack.currentIndex=0;
newsSwipeview.currentIndex=2;
@ -217,9 +213,8 @@ Page {
}
MButton{
id:approvebutton
visible:(contact.hasOwnProperty("acct"))
visible:(contact.hasOwnProperty("acct")&&!contact.searchContact)
height: 6*mm
//width: implicitContentWidth+2*mm//8*mm
text:qsTr("Approve")
onClicked:{
@ -232,9 +227,8 @@ Page {
}
MButton{
id:rejectbutton
visible:(contact.hasOwnProperty("acct"))
visible:(contact.hasOwnProperty("acct")&&!contact.searchContact)
height: 6*mm
//width: implicitContentWidth+2*mm//8*mm
text:qsTr("Reject")
onClicked:{
Helperjs.friendicaPostRequest(login,"/api/v1/follow_requests/" + contact.id + "/reject",'',"POST",root,function(returnvalue){
@ -246,9 +240,8 @@ Page {
}
MButton{
id:ignorebutton
visible:(contact.hasOwnProperty("acct"))
visible:(contact.hasOwnProperty("acct")&&!contact.searchContact)
height: 6*mm
//width: implicitContentWidth+2*mm//8*mm
text:qsTr("Ignore")
onClicked:{
Helperjs.friendicaPostRequest(login,"/api/v1/follow_requests/" + contact.id + "/ignore",'',"POST",root,function(returnvalue){
@ -260,9 +253,8 @@ Page {
}
MButton{
id:followbutton
visible:(contact.isFriend==0)
visible:(contact.isFriend==0 || !contact.hasOwnProperty("isFriend"))
height: 6*mm
//width: implicitContentWidth+2*mm//8*mm
text:qsTr("Follow")
onClicked:{
contactBusy.running=true;
@ -281,7 +273,6 @@ Page {
id:unfollowbutton
visible:(contact.isFriend==1)
height: 6*mm
//width: implicitContentWidth+2*mm//8*mm
text:qsTr("Unfollow")
onClicked:{
Helperjs.friendicaPostRequest(login,"/api/v1/accounts/" + contact.id + "/unfollow",'',"POST",root,function(returnvalue){
@ -297,12 +288,11 @@ Page {
}//Flow end
Label {
id: namelabel
//x:mm
width: contactView.width<35*root.fontFactor*osSettings.systemFontSize?contactView.width-2*mm:contactView.width-17*root.fontFactor*osSettings.bigFontSize
height: implicitHeight
text:contact.name+" (@"+contact.screen_name+")"
wrapMode: Text.Wrap//elide:Text.ElideRight
color: Material.primaryTextColor//"#303030"
wrapMode: Text.Wrap
color: Material.primaryTextColor
font.pointSize: 1.2*osSettings.bigFontSize
font.family: "Noto Sans"
anchors.top: contactView.width<35*root.fontFactor*osSettings.systemFontSize?profileImage.bottom:buttonflow.bottom
@ -314,7 +304,6 @@ Page {
anchors.top: namelabel.bottom
anchors.left: contactView.width<35*root.fontFactor*osSettings.systemFontSize?contactView.left:profileImage.right
anchors.margins: 2*mm
//x:mm
width: contactView.width<35*root.fontFactor*osSettings.systemFontSize?contactView.width-2*mm:contactView.width-17*root.fontFactor*osSettings.bigFontSize
height: implicitHeight
font.pointSize: osSettings.systemFontSize
@ -324,15 +313,11 @@ 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>"+
connectUrl+ "<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
"<b>"+qsTr("Created at")+":</b> "+createdAtDate.toLocaleString(Qt.locale())
onLinkActivated: {
Qt.openUrlExternally(link)}
}
//}
}
}//Component end
Connections{
@ -342,8 +327,9 @@ Page {
contactBusy.running=false;
}
function onSuccess(data,api){
if (api=="/api/statuses/user_timeline"){
Service.processNews(api,data)
//replySignal("")
}
}
}
@ -373,7 +359,6 @@ Page {
anchors.rightMargin: 1*mm
width: 2*root.fontFactor*osSettings.bigFontSize;
text: "\uf057"
//font.pixelSize: 3*mm
onClicked: {
rootstackView.pop()
}
@ -382,9 +367,10 @@ Page {
xhr.clearParams();
xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server);
if(contact.isFriend==1 || contact.hasOwnProperty("acct")){
xhr.setApi("/api/statuses/user_timeline");}
else{xhr.setApi("/api/users/show");}
// if(contact.isFriend==1 || contact.hasOwnProperty("acct")){
// xhr.setApi("/api/statuses/user_timeline");}
// else{xhr.setApi("/api/users/show");}
xhr.setApi("/api/statuses/user_timeline")
xhr.setParam("user_id",contact.id)
xhr.get();
}

86
source-linux/qml/newsqml/MessageSend.qml
View file

@ -34,7 +34,6 @@
import QtQuick 2.4
import QtQuick.Controls 2.12
import QtQuick.Controls.Material 2.12
//import QtQuick.Dialogs 1.2
import "qrc:/js/helper.js" as Helperjs
import "qrc:/js/smiley.js" as Smileyjs
import "qrc:/js/news.js" as Newsjs
@ -42,19 +41,17 @@ import "qrc:/qml/genericqml"
Rectangle{
color:Material.dialogColor//"#EEEEEE"
color:Material.dialogColor
width:parent.width
height: conversation || (newsSwipeview.stacktype!="Notifications")?messageColumn.height+mm:0
height: conversation || (newsSwipeview.stacktype!="Notifications")?messageColumn.height+2*mm:0
id:messageSend
visible:conversation || (newsSwipeview.stacktype!="Notifications")||(newstab.newstabstatus!="Search")?true:false
property string parentId: ""
property bool textfocus: false
//property var parentObject:({})
property bool conversation: false
property string reply_to_user:""
property alias bodyMessage: bodyField.text
property var attachImageURLs: [];
//property int directmessage: 0;
property var contacts: []
property var groups: []
property var contact_allow:login.hasOwnProperty("permissions")?login.permissions[0]:[]
@ -130,13 +127,12 @@ Rectangle{
}
function setParent(newsitemobject){
//print("Newsobject "+newsitemobject.id+ " "+JSON.stringify(newsitemobject.user));
if (newsitemobject!=""){
messageSend.state="conversation"
messageSend.reply_to_user=newsitemobject.user.screen_name;
messageSend.parentId=newsitemobject.id
} else {
//messageSend.state=null;
messageSend.state=null;
messageSend.reply_to_user="";
messageSend.parentId="";
bodyField.text="";
@ -145,7 +141,7 @@ Rectangle{
}
}
function contactmenu(letter){//print("letter "+letter)
function contactmenu(letter){
Newsjs.listFriends(login,db,function(contacts){
contactModel.clear();
for (var i=0;i<contacts.length;i++){
@ -158,7 +154,7 @@ Rectangle{
},letter);
}
function hashtagmenu(){//print("letter "+letter)
function hashtagmenu(){
Newsjs.listHashtags(login,db,function(tags){
tagModel.clear();
for (var i=0;i<tags.length;i++){
@ -191,7 +187,7 @@ Rectangle{
id:messageColumn
spacing: 0.5*mm
width: parent.width
height: 11*mm+stackTypeDescription.height//implicitHeight
height: 2.6*root.fontFactor*osSettings.bigFontSize+stackTypeDescription.height
Label{id:stackTypeDescription
width: parent.width
horizontalAlignment:Text.AlignHCenter
@ -200,7 +196,7 @@ Rectangle{
}
TextArea{
id:receiverLabel
width: messageColumn.width//-8*mm
width: messageColumn.width
font.pointSize: osSettings.bigFontSize
placeholderText:qsTr("to:")
text: ""
@ -222,11 +218,12 @@ Rectangle{
}
Rectangle{
color: Material.backgroundColor//"white"
color: Material.backgroundColor
radius: 0.5*mm
visible:(newsSwipeview.stacktype!="Notifications")
x:mm
width: parent.width-2*mm
height:Math.max(bodyField.contentHeight+4*mm,10*mm)
height:Math.max(bodyField.contentHeight+4*mm,2.5*root.fontFactor*osSettings.bigFontSize)
TextArea {
id: bodyField
@ -238,14 +235,27 @@ Rectangle{
wrapMode: Text.Wrap
selectByMouse: true
placeholderText: conversation?"": (qsTr("What's on your mind?")+placeholder)
textFormat: TextEdit.RichText //TextEdit.PlainText
onLineCountChanged: (conversation==true)?conversationView.contentY=conversationView.contentY+3*mm:newsView.contentY=newsView.contentY+3*mm
onLinkActivated:{Qt.openUrlExternally(link)}
onActiveFocusChanged:{//print(placeholder)
if (activeFocus==true){
print("contenty "+messageSend.ListView.view.contentY)
if (messageSend.ListView.view.contentY==null){messageSend.parent.ListView.view.y=0}else{messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+8*mm};
textFormat: TextEdit.RichText
onLineCountChanged: {
if (messageSend.ListView.view==null){
if (newsitem.ListView.view==null){}
else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize}
}
if(conversation==true){
conversationView.contentY=conversationView.contentY+root.fontFactor*osSettings.systemFontSize
}
else{
messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+root.fontFactor*osSettings.systemFontSize
}
}
onLinkActivated:{Qt.openUrlExternally(link)}
onActiveFocusChanged:{
if (activeFocus==true){
if (messageSend.ListView.view==null){
if (newsitem.ListView.view==null){}
else {newsitem.ListView.view.contentY=newsitem.ListView.view.contentY+newsitem.height/2}
}
else if (conversation==true){
if(parentId==""){setParent(conversationModel.get(0).newsitemobject);}
messageSend.state="conversation";
try{conversationView.contentY=conversationView.contentY+20*mm}catch(e){}
@ -253,15 +263,15 @@ Rectangle{
messageSend.state="active";
newsView.positionViewAtBeginning();
}
else{
messageSend.ListView.view.contentY=messageSend.ListView.view.contentY+8*mm
};
}
}
onTextChanged:{
if (text!=""){
var plaintext=getText(0,cursorPosition)
//print(plaintext+plaintext.lastIndexOf("@",cursorPosition)+getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition) +" preedit: "+ preeditText+cursorPosition);
var regex1 = /@[a-z]+/;var regex2 = /![a-z]+/;var regex3 = /\s/;
//print(text.substring(cursorPosition-2,cursorPosition));
//if (regex.test(getText(bodyField.cursorPosition-2,bodyField.cursorPosition)) || regex.test(preeditText) || regex.test(text)){
var regex1 = /@[a-z]+/;var regex2 = /\![a-z]+/;var regex3 = /\s/;
if (regex1.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText) && !regex3.test(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)+preeditText)){
var letter=(getText(plaintext.lastIndexOf('@',cursorPosition),cursorPosition)).match(/[a-z]+/);
contactprefix="@";
@ -280,8 +290,8 @@ Rectangle{
id:contactSelector
visible: false
z:3
x:8*mm
width: parent.width-9*mm
x:2*root.fontFactor*osSettings.bigFontSize//8*mm
width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
height: messageSend.height/2
model:contactModel
function processContactSelection(contact){
@ -307,8 +317,8 @@ Rectangle{
id: tagSelector
visible: false
z:3
x:8*mm
width: parent.width-9*mm
x:2*root.fontFactor*osSettings.bigFontSize//8*mm
width: parent.width-2.2*root.fontFactor*osSettings.bigFontSize//9*mm
height: messageSend.height/2
model:tagModel
clip: true
@ -367,15 +377,15 @@ Rectangle{
id:buttonRow
visible:false //(bodyField.length>1)||(attachImageURLs.length>0)
spacing: mm
height: 12*mm
height: 2.5*root.fontFactor*osSettings.bigFontSize//12*mm
x: 0.5*mm
MButton{id:permButton
visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages")
height: 2*root.fontFactor*osSettings.bigFontSize
width: 2*root.fontFactor*osSettings.bigFontSize
text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}}
}
// MButton{id:permButton //Permissions not working in Friendica 02/2022
// visible: !conversation && (newsSwipeview.stacktype!=="DirectMessages")
// height: 2*root.fontFactor*osSettings.bigFontSize
// width: 2*root.fontFactor*osSettings.bigFontSize
// text: ((contact_allow.length==0)&&(contact_deny.length==0)&&(group_allow.length==0)&&(group_deny.length==0))?"\uf09c":"\uf023"
// onClicked: { if (permissionDialog.visible==false){permissionDialog.visible=true} else{permissionDialog.visible=false}}
// }
MButton {
id: attachButton
height: 2*root.fontFactor*osSettings.bigFontSize
@ -440,8 +450,8 @@ Rectangle{
var body=bodyField.getFormattedText(0,bodyField.length);
var dmbody=bodyField.getText(0,bodyField.length);
if (conversation || newsSwipeview.stacktype!=="DirectMessages"){
statusUpdate(title,body,parentId,attachImageURLs)}
else {
statusUpdate(title,body,parentId,attachImageURLs)
}else {
if (reply_to_user!=""){dmUpdate(title,dmbody,parentId,reply_to_user)}
else{Helperjs.showMessage(qsTr("Error"),qsTr("No receiver supplied!"),root)}
}

2
source-linux/qml/newsqml/NewsImage.qml
View file

@ -55,7 +55,7 @@ AnimatedImage {id:gif;
MouseArea {anchors.fill:parent;
onClicked:{
rootstackView.push("qrc:/qml/newsqml/NewsPhotolist.qml",{"photolistarray": model.newsitemobject.imageAttachmentList})
roottoolbar.visible=false
//roottoolbar.visible=false
}
}
}

2
source-linux/qml/newsqml/NewsPhotolist.qml
View file

@ -69,7 +69,7 @@ Page{
text: "\uf057"
onClicked: {
if (rootstackView.depth>1){
roottoolbar.visible=true;
//roottoolbar.visible=true;
rootstackView.pop()}
}
}

39
source-linux/qml/newsqml/NewsStack.qml
View file

@ -49,7 +49,6 @@ Rectangle{
BusyIndicator{
id: newsBusy
//visible: false
anchors.horizontalCenter: parent.horizontalCenter
anchors.top:parent.top
anchors.topMargin: 2*mm
@ -60,10 +59,8 @@ Rectangle{
}
function newstypeHandling(newstype){
newsBusy.running=true;
try{newsBusy.running=true}catch(e){print(e)};
replySignal("");
//messagesend.state="";
//newsModel.clear();
switch(newstype){
case "timeline":
newstab.newstabstatus="Timeline";
@ -75,7 +72,7 @@ Rectangle{
case "conversation":
newsStack.updateMethodNews="conversation";
newstab.newstabstatus="Conversations";
Newsjs.chatsfromdb(root.db,root.login,0,function(news,lastid){
Newsjs.chatsfromdb(root.db,root.login,0,[],function(news,lastid){
lastnewsid=lastid;
showNews(news)});
break;
@ -105,7 +102,7 @@ Rectangle{
newsBusy.running=false;
var leftoffset=(osSettings.osType=="Android")?2*root.fontFactor*osSettings.bigFontSize:0
var component = Qt.createComponent("qrc:/qml/genericqml/Search.qml");
var searchItem = component.createObject(newsStack,{y:mm,x:leftoffset,width:root.width-(leftoffset+mm),height: 1.5*root.fontFactor*osSettings.systemFontSize});
var searchItem = component.createObject(newsStack,{y:mm,x:leftoffset,width:root.width-(leftoffset+mm),height: 1.5*root.fontFactor*osSettings.systemFontSize,selfdestroying:true});
break;
case "refresh":
if (newstab.newstabstatus=="Timeline" || newstabstatus=="Timeline"){
@ -147,20 +144,19 @@ Rectangle{
function showNews(newsToShow){
try{if (rootstackView.depth>1){rootstackView.pop()}}catch(e){}
newsBusy.running=false;
var currentTime= new Date();
if(newsToShow.length>0){
var currentTime= new Date()
// downloadNotice.text=downloadNotice.text + "\n shownews start "+ Date.now();
//print("appendnews "+JSON.stringify(newsToShow))
if (newsToShow.length==1){var method="refresh"}else{var method = newsStack.updateMethodNews}
var msg = {'currentTime': currentTime, 'model': newsModel,'news':newsToShow,'method':method, 'options':globaloptions};
newsWorker.sendMessage(msg);
//newsStack.appendNews=false
}
}
function search(term){
if (term!=""){
//newstab.newstabstatus="Search";
newstabstatus="Search";
newsBusy.running=true;
newsStack.updateMethodNews="refresh";
@ -179,8 +175,10 @@ Rectangle{
try{var oldnewsitemobject=newsModel.get(newsModel.count-1).newsitemobject;
if(oldnewsitemobject.hasOwnProperty("lastcomment")){
var lastnews_id=oldnewsitemobject.lastcomment.created_at;
//var lastconv_id=oldnewsitemobject.lastcomment.statusnet_conversation_id
}else{
var lastnews_id=oldnewsitemobject.created_at;
//var lastconv_id=oldnewsitemobject.statusnet_conversation_id
}
} catch(e){print(e);var lastnews_id=99999999999999}
var messagetype=0;
@ -192,14 +190,19 @@ Rectangle{
default:messagetype=0;
}
if(newstab.newstabstatus=="Timeline" || newstabstatus=="Timeline" ){
if(newsSwipeview.stacktype!="Home"|| newstab.newstabstatus=="Timeline" || newstabstatus=="Timeline" ){
Newsjs.newsfromdb(root.db,root.login, messagetype,function(news){
var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'method':"", 'options':globaloptions};
newsWorker.sendMessage(msg);
},false,lastnews_id)}
else if(newstab.newstabstatus=="Conversations" || newstabstatus=="Conversations"){
Newsjs.chatsfromdb(root.db,root.login, messagetype,function(news){
var currentconversations=[];
for (let c=0;c<newsModel.count;c++){
currentconversations.push(parseInt(newsModel.get(c).newsitemobject.statusnet_conversation_id))
}
Newsjs.chatsfromdb(root.db,root.login, messagetype,currentconversations,function(news){
var msg = {'currentTime': currentTime, 'model': newsModel,'news':news,'method':"", 'options':globaloptions};
newsWorker.sendMessage(msg);
},lastnews_id)}
@ -252,7 +255,6 @@ Rectangle{
Service.updateView("Replies")
}
replySignal("")
//Service.updateView(newstab.newstabstatus)
}
}
}
@ -301,7 +303,6 @@ Rectangle{
property string viewtype: "news"
width: parent.width
height: parent.height-3*mm
//anchors.fill: parent
anchors.margins: 0.5*mm
clip: true
spacing: 0
@ -355,11 +356,11 @@ Rectangle{
})}catch(e){Helperjs.showMessage("Error",e,root)};
}
if(newstab.newstabstatus=="Conversations"){
Newsjs.chatsfromdb(db,root.login,0,function(news,lastid){
Newsjs.chatsfromdb(db,root.login,0,[],function(news,lastid){
lastnewsid=lastid;
showNews(news)});
}
} else {
} else {print("newstab.newstabstatus "+newstab.newstabstatus)
Service.updateView(newstab.newstabstatus)
}
});
@ -424,7 +425,7 @@ Rectangle{
root.searchSignal.connect(search);
try{newsModel.clear()} catch(e){}
swipeIndicator.visible=true;
//newsSwipeview.height=rootstack.height//-12*mm;
//newsSwipeview.height=rootstack.height
//newsSwipeview.y=5*mm;
//rootStackItem.state=""
root.globaloptions.hasOwnProperty("newsViewType")?newstab.newstabstatus=root.globaloptions.newsViewType:newstab.newstabstatus="Conversations";
@ -438,9 +439,8 @@ Rectangle{
default:messagetype=0;
}
//if((newstab.newstabstatus=="Conversations")&&(newsSwipeview.stacktype=="Home")){
if((newstabstatus=="Conversations")&&(newsSwipeview.stacktype=="Home")){
Newsjs.chatsfromdb(db,login,messagetype,function(dbnews,lastid){
Newsjs.chatsfromdb(db,login,messagetype,[],function(dbnews,lastid){
lastnewsid=lastid;
showNews(dbnews);
})
@ -451,5 +451,4 @@ Rectangle{
showNews(dbnews)
})}
}
//}
}

5
source-linux/qml/newsqml/NewsVideo.qml
View file

@ -33,7 +33,6 @@ import QtQuick 2.9
Rectangle{
color:"black"
//border.color: "light grey"
width:toprow.width/2;
height:toprow.width/3//video.hasVideo?newscolumn.width/4*3:10*mm
property var attachment:({})
@ -49,11 +48,7 @@ Rectangle{
MouseArea {anchors.fill:parent;
onClicked:{
if(attachment.mimetype=="video/youtube"){
rootstackView.push("qrc:/qml/newsqml/NewsYplayer.qml",{"ytcode":attachment.url,"mimetype":attachment.mimetype});
} else {
rootstackView.push("qrc:/qml/newsqml/NewsVideoLarge.qml",{"source": attachment.url,"mimetype": attachment.mimetype});
}
}
}
}

77
source-linux/qml/newsqml/NewsYplayer.qml
View file

@ -1,77 +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.8
import QtQuick.Controls 2.12
import "qrc:/js/helper.js" as Helperjs
import QtWebView 1.1
Page {
id:newsYplayer
//color:"black"
width:root.width;
height:root.height-7*mm
property string url:""
property string ytcode:""
WebView {
id: webView
anchors.fill: parent
z:1
opacity: 0
url: root.osSettings.osType=="Android"?"https://youtube.com/watch?v="+ytcode:"qrc:/js/yplayer.html?" + ytcode
Behavior on opacity { NumberAnimation { duration: 200 } }
onLoadingChanged: {
switch (loadRequest.status)
{
case WebView.LoadSucceededStatus:
opacity = 1
return
case WebView.LoadStartedStatus:
case WebView.LoadStoppedStatus:
break
case WebView.LoadFailedStatus:
print("Failed to load the requested video" + url)
break
}
opacity = 0
}
onTitleChanged: {
if (title==2){root.pop()}
}
}
}

199
source-linux/qml/newsqml/Newsitem.qml
View file

@ -58,23 +58,21 @@ Item {
function pushConversation(){
if (model.newsitemobject.hasOwnProperty("currentconversation")){
rootstackView.push("qrc:/qml/newsqml/Conversation.qml",{"news": model.newsitemobject.currentconversation})}
//newsStack.push("qrc:/qml/newsqml/Conversation.qml",{"news": model.newsitemobject.currentconversation})}
//else{newsStack.push("qrc:/qml/newsqml/Conversation.qml")};
else{rootstackView.push("qrc:/qml/newsqml/Conversation.qml")};
showConversation(index,newsitemobject)
}
Rectangle{width:newsitem.width; height: 1; anchors.bottom: newsitem.bottom;
color: Material.backgroundDimColor//"light grey"
color: Material.backgroundDimColor
}
Rectangle{
width:newsitem.width
height:newsitem.height-1
color: Material.background//"white"
color: Material.background
Column {
id:toprow //newscolumn
id:toprow
width: newsitemobject.hasOwnProperty("indent")?newsitem.width-(newsitem.width/20 *(newsitemobject.indent+1)):newsitem.width//-8*mm
x:newsitemobject.hasOwnProperty("indent")?newsitem.width/20*(newsitemobject.indent):0
height: newsitemobject.nsfw?5*mm:Math.min(implicitHeight,3/4*root.height)
@ -105,7 +103,6 @@ Item {
anchors.margins: mm
Label {
id:user_name
//color: "grey"
width:parent.width
font.bold: true
font.pointSize: osSettings.systemFontSize
@ -115,25 +112,24 @@ Item {
Label {
id:messageTypeLabel
color: Material.secondaryTextColor//"grey"
color: Material.secondaryTextColor
text: if (newsitemobject.messagetype==1){ qsTr("Direct Message")} else if(newsitemobject.messagetype==2) {" Notification"} else {qsTr("Source: ")+newsitemobject.source}
font.pointSize: 0.6*osSettings.systemFontSize
}
Label {
id:createdAtLabel
color: Material.secondaryTextColor//"grey"
color: Material.secondaryTextColor
font.pointSize: 0.6*osSettings.systemFontSize
horizontalAlignment: Label.AlignRight
text: " \u00B7 "+getDateDiffString(newsitemobject.dateDiff) + " " +qsTr("ago")
}
Label {
id:replytoLabel
color: Material.secondaryTextColor//"grey"
color: Material.secondaryTextColor
font.pointSize: 0.6*osSettings.systemFontSize
font.family: "Noto Sans"
horizontalAlignment: Label.AlignRight
text: try {" \u00B7 "+qsTr("In reply to ")+newsitemobject.reply_user.screen_name
}catch(e){" "}
text: (newsitemobject.in_reply_to_status_id!="null"&&newsitemobject.in_reply_to_status_id!=null)?" \u00B7 "+qsTr("In reply to ")+newsitemobject.reply_user.screen_name:" "
}
}
}
@ -141,32 +137,27 @@ Item {
MouseArea{id: itemBody
width: toprow.width-2
height: itemMessage.height
//onPressAndHold: {pushConversation()}
onClicked: {pushConversation()}
Text {
color: Material.primaryTextColor//"#404040"
linkColor: Material.accentColor//"light green"
color: Material.primaryTextColor
linkColor: Material.accentColor
id: itemMessage
textFormat: Text.RichText
font.family: "Noto Sans"
font.pointSize: osSettings.systemFontSize
text: newsitemobject.statusnet_html
width: toprow.width-2
//height:newsitemobject.nsfw?5*mm:Math.min(implicitHeight,3/4*root.height)
height: implicitHeight
wrapMode: Text.Wrap
clip:true
onLinkActivated:{Qt.openUrlExternally(link)}
onLinkActivated:{
if(link.startsWith(root.login.server+"\/search\?tag=")){
newstab.newstabstatus="Search";
root.searchSignal(link.substring(root.login.server.length+12,link.length))
}
else{Qt.openUrlExternally(link)}
}
Component.onCompleted:{
if (newsitemobject.messagetype==0){
var hashtags=[];
hashtags=Newsjs.findTags(newsitemobject.text);
var component = Qt.createComponent("qrc:/qml/newsqml/Hashtag.qml");
for (var tags in hashtags){
var hashtagQml = component.createObject(friendicaActivities,{"text":hashtags[tags].trim()});
}
}
if (newsitemobject.imageAttachmentList.length>0){
if(newsitemobject.imageAttachmentList[0].mimetype.substring(0,5)=="image"){
var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml");
@ -195,15 +186,15 @@ Item {
BlueButton{
width: newsitem.width-2
height:5*mm
anchors.bottom: toprow.bottom//itemMessage.bottom
visible: toprow.implicitHeight>3/4*root.height || newsitemobject.nsfw//messageColumn.implicitHeight>3/4*root.height || newsitemobject.nsfw//itemMessage.implicitHeight>3/4*root.height
anchors.bottom: toprow.bottom
visible: toprow.implicitHeight>3/4*root.height || newsitemobject.nsfw
text:"\uf078"
fontColor: Material.secondaryTextColor//"grey"
fontColor: Material.secondaryTextColor
border.color: "transparent"
color: Material.backgroundColor//"white"
color: Material.backgroundColor
// gradient: Gradient {
// GradientStop { position: 0.0; color: "transparent" }
// GradientStop { position: 0.5; color: "white" }
// GradientStop { position: 0.5; color: Material.backgroundDimColor}
// }
radius:0
onClicked: {
@ -224,45 +215,45 @@ Item {
width:parent.width
spacing:mm
Label{color: Material.secondaryTextColor//"grey"
Label{color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
text: friendica_activities_view.likeText
text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.likeText
MouseArea{
anchors.fill: parent
onClicked: { showActivityContacts(newsitemobject.friendica_activities.like)}
}
}
Label{color: Material.secondaryTextColor//"grey"
Label{color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
text: friendica_activities_view.dislikeText
text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.dislikeText
MouseArea{
anchors.fill: parent
onClicked: { showActivityContacts(newsitemobject.friendica_activities.dislike)}
}
}
Label{color: Material.secondaryTextColor//"grey"
Label{color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
text: friendica_activities_view.attendyesText
text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendyesText
MouseArea{
anchors.fill: parent
onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendyes)}
}}
Label{color: Material.secondaryTextColor//"grey"
Label{color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
text: friendica_activities_view.attendnoText
text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendnoText
MouseArea{
anchors.fill: parent
onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendno)}
}
}
Label{color: Material.secondaryTextColor//"grey"
Label{color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
text: friendica_activities_view.attendmaybeText
text: newsitemobject.hasOwnProperty("isLastComment")?"":friendica_activities_view.attendmaybeText
MouseArea{
anchors.fill: parent
onClicked: { showActivityContacts(newsitemobject.friendica_activities.attendmaybe)}
@ -270,7 +261,7 @@ Item {
}
Label{
id:attendLabel
color: Material.secondaryTextColor//"grey"
color: Material.secondaryTextColor
height:3.5*mm
font.pointSize: 0.75*osSettings.systemFontSize
horizontalAlignment: Label.AlignRight
@ -284,12 +275,12 @@ Item {
height: root.fontFactor*osSettings.bigFontSize
CheckBox{
id:likeCheckbox
width:newsitem.width/5 //10*mm
width:newsitem.width/5
height: parent.height
visible: ((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))? true:false
checked:(model.newsitemobject.friendica_activities_view.self.liked==1)?true:false
indicator: Rectangle{
implicitWidth: newsitem.width/5 //10*mm
implicitWidth: newsitem.width/5
implicitHeight:root.fontFactor*osSettings.bigFontSize
color:"transparent"
Text{
@ -312,12 +303,12 @@ Item {
}
CheckBox{
id: dislikeCheckbox
width:newsitem.width/5 //10*mm
width:newsitem.width/5
height: parent.height
visible: ((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))? true:false
checked: (newsitemobject.friendica_activities_view.self.disliked==1)?true:false
indicator: Rectangle{
implicitWidth: newsitem.width/5 //10*mm
implicitWidth: newsitem.width/5
implicitHeight:root.fontFactor*osSettings.bigFontSize
color:"transparent"
Text{
@ -339,39 +330,72 @@ Item {
}}
}
CheckBox {
id:favoritedCheckbox
visible:((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))
width: newsitem.width/5 // 10*mm
// CheckBox {
// id:favoritedCheckbox
// visible:((newsitemobject.messagetype==0)||(newsitemobject.messagetype==3))
// width: newsitem.width/5
// height: parent.height
// indicator:Rectangle{
// implicitWidth: newsitem.width/5
// implicitHeight:root.fontFactor*osSettings.bigFontSize
// color:"transparent"
// Text{
// anchors.centerIn: parent
// font.pointSize: osSettings.systemFontSize
// font.family:fontAwesome.name
// color: favoritedCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor
// text:"\uf005"
// }
// }
// checked:(newsitemobject.favorited>0)
// onClicked:{
// if(favoritedCheckbox.checkState==Qt.Checked){
// Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
// else if(favoritedCheckbox.checkState==Qt.Unchecked){
// Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
// }
// }
Rectangle{
width: newsitem.width/5
height: parent.height
indicator:Rectangle{
implicitWidth: newsitem.width/5 //10*mm
implicitHeight:root.fontFactor*osSettings.bigFontSize
visible:(newsitemobject.messagetype!==2)
color:"transparent"
Text{
id:replysymbol
color: Material.secondaryTextColor
anchors.centerIn: parent
font.pointSize: osSettings.systemFontSize
font.family:fontAwesome.name
color: favoritedCheckbox.checked?Material.primaryTextColor: Material.secondaryTextColor
text:"\uf005"
text: "\uf112"
}
}
checked:(newsitemobject.favorited>0)
MouseArea{
anchors.fill:parent
onClicked: {
if(favoritedCheckbox.checkState==Qt.Checked){
Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
else if(favoritedCheckbox.checkState==Qt.Unchecked){
Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
var directmessage=0;
if (newsitemobject.messagetype==1){ directmessage=1}
var replycomp=Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml");
var conversation;
if (newsitem.ListView.view==null){conversation=true}
else if (newsitem.ListView.view.viewtype=="conversation"){
conversation=true
newsitem.ListView.view.currentIndex=itemindex
}
else{
conversation=false;
newsitem.ListView.view.currentIndex=itemindex
};
var reply=replycomp.createObject(friendicaActivities,{parentId:newsitemobject.id,reply_to_user:newsitemobject.user.screen_name, state:"reply",conversation:conversation,textfocus:true})
}
}
}
Rectangle{
width: newsitem.width/5 //10*mm
width: newsitem.width/5
height: parent.height
visible:(newsitemobject.messagetype!==2)
color:"transparent"
Text{
id:newsmenusymbol
color: Material.secondaryTextColor//"grey"
color: Material.secondaryTextColor
anchors.centerIn: parent
font.pointSize: osSettings.systemFontSize
font.family:fontAwesome.name
@ -393,30 +417,8 @@ Item {
text: parent.text
}
}
Action{
text: qsTr("Reply")
onTriggered: {
var directmessage=0;
if (newsitemobject.messagetype==1){ directmessage=1}
var replycomp=Qt.createComponent("qrc:/qml/newsqml/MessageSend.qml");
var conversation;
if (newsitem.ListView.view==null){conversation=true}
else if (newsitem.ListView.view.viewtype=="conversation"){
conversation=true
newsitem.ListView.view.currentIndex=itemindex
}
else{
conversation=false;
newsitem.ListView.view.currentIndex=itemindex
};
var reply=replycomp.createObject(friendicaActivities,{parentId:newsitemobject.id,reply_to_user:newsitemobject.user.screen_name, state:"reply",conversation:conversation,textfocus:true})
}
}
Action {
text: qsTr("DM")
onTriggered: {
root.directmessageSignal(newsitemobject.user.screen_name);
}
onAboutToShow:{if(newsitemobject.hasOwnProperty("external_url")){
insertAction(4,externalAction)}
}
Action {
text: qsTr("Repost")
@ -432,7 +434,21 @@ Item {
pushConversation();
}
}
Action {
text: qsTr("DM")
onTriggered: {
root.directmessageSignal(newsitemobject.user.screen_name);
}
}
Action {
text: qsTr("Bookmark")
onTriggered: {
if(model.newsitemobject.favorited==0){
Newsjs.favorite(login,true,newsitemobject.id,root); model.newsitemobject.favorited=1}
else if(model.newsitemobject.favorited==1){
Newsjs.favorite(login,false,newsitemobject.id,root);model.newsitemobject.favorited=0}
}
}
Menu{
title: qsTr("Attending")
width: 10*root.fontFactor*osSettings.systemFontSize
@ -469,11 +485,6 @@ Item {
})
}
}
//MenuItem{
// text:qsTr("Show on website")
// onTriggered:Qt.openUrlExternally(login.server+"/display/"+newsitemobject
//}
}
Column{
id:conversationColumn
@ -481,4 +492,8 @@ Item {
width: newsitem.width
}
}
Action{id:externalAction
text: qsTr("External")
onTriggered: {Qt.openUrlExternally(newsitemobject.external_url)}
}
}

2
source-linux/qml/newsqml/SmileyDialog.qml
View file

@ -207,7 +207,7 @@ Rectangle{
width:4.5*mm
height: 4.5*mm
textFormat:Text.RichText
font.pointSize: 1.2*osSettings.systemFontSize
font.pointSize: osSettings.osType=="Linux"?1.7*osSettings.systemFontSize:1.2*osSettings.systemFontSize
text: emoji
MouseArea{

2
source-linux/qml/photoqml/ImageUploadDialog.qml
View file

@ -88,7 +88,7 @@ Page{
Connections{
target:xhr
onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
//onError:{print(data)}//if (data=="image"){Helperjs.showMessage()}}
onSuccess:{
if (imageId==""){
imageNo=imageNo+1;

27
source-linux/qml/photoqml/PhotoTab.qml
View file

@ -41,14 +41,10 @@ import "qrc:/qml/genericqml"
StackView{
id: photoStack
//anchors.fill:parent
initialItem:Rectangle {
id:fotorectangle
anchors.fill:parent
// y:1
// width:root.width-mm
// height:root.height-5*mm
color: Material.backgroundColor//'#fff'
color: Material.backgroundColor
property var newimages:[]
property int currentimageno: 0
property bool remoteContact: false
@ -97,7 +93,7 @@ StackView{
function onDownloaded(type,url,filename,i){
if(type=="picture"){fotorectangle.currentimageno=fotorectangle.currentimageno+1}
}
function onError(data,url,api,code){//print("Url "+url+" api " +api + " data "+data)
function onError(data,url,api,code){
if(data=="picturelist"){
var requestid=url.substring(url.lastIndexOf("=")+1);
Imagejs.dataRequest(login,requestid,db,xhr,fotorectangle);
@ -182,7 +178,7 @@ StackView{
id:leftDrawer
property var newstabstatus: newstab.newstabstatus
visible: wideScreen&&rootstackView.depth<2
width: visible?osSettings.systemFontSize*15:0
width: visible?root.fontFactor*osSettings.systemFontSize*15:0
height: root.height-bar.height
}
@ -208,11 +204,8 @@ StackView{
anchors.right:updatePhotolist.left
anchors.rightMargin:mm
text:"\uf0ee"
onClicked: {
photoStack.push("qrc:/qml/photoqml/ImageUploadDialog.qml");
// var component = Qt.createComponent("qrc:/qml/photoqml/ImageUploadDialog.qml");
// var imageUpload = component.createObject(fotorectangle);
}}
onClicked: {photoStack.push("qrc:/qml/photoqml/ImageUploadDialog.qml")}
}
MButton{
id: updatePhotolist
@ -279,24 +272,26 @@ StackView{
id: albumgridview
cellWidth: 17*mm
cellHeight: 17*mm
x: leftDrawer.width//mm;
x: leftDrawer.width
y:8*mm
width: wideScreen&&rootstackView.depth<2?parent.width-leftDrawer.width-mm:parent.width-mm //parent.width-2*mm;
width: wideScreen&&rootstackView.depth<2?parent.width-leftDrawer.width-mm:parent.width-mm
height: parent.height-9*mm
clip: true
model: visualphotoModel.parts.album
footer:Rectangle{
border.color: Material.backgroundDimColor//"#EEEEEE"
border.color: Material.backgroundDimColor
border.width: 1
color: Material.dialogColor
width:12*mm
height:6*mm
Text{
color: Material.primaryTextColor
font.pointSize: 0.75*osSettings.systemFontSize
anchors.centerIn: parent
text:qsTr("More")
}
MouseArea{anchors.fill:parent
onClicked:{//print(photogroupModel.get(0).foreignPicture);
onClicked:{
var lastalbum_id=photogroupModel.count-1;
if(photogroupModel.get(photogroupModel.count-1).foreignPicture==true){
Imagejs.newRequestFriendsAlbumPictures(login,photogroupModel.get(0).friend,fotorectangle,function(albums,remoteAuthBool){

BIN
source-linux/translations/friendiqa-de.qm
View file

Binary file not shown.

33
source-linux/translations/friendiqa-de.ts
View file

@ -80,11 +80,11 @@
<name>CalendarTab</name>
<message>
<source>Events</source>
<translation>Termine</translation>
<translation type="vanished">Termine</translation>
</message>
<message>
<source>Own Calendar</source>
<translation>Eigener Kalender</translation>
<translation type="vanished">Eigener Kalender</translation>
</message>
</context>
<context>
@ -393,7 +393,7 @@
</message>
<message>
<source>Connect</source>
<translation>Kontaktanfrage</translation>
<translation type="vanished">Kontaktanfrage</translation>
</message>
<message>
<source>Approve</source>
@ -440,6 +440,21 @@
<translation>Netzwerk-Fehler</translation>
</message>
</context>
<context>
<name>ContactsSearchPage</name>
<message>
<source>Network Error</source>
<translation>Netzwerk-Fehler</translation>
</message>
<message>
<source>Forum</source>
<translation>Forum</translation>
</message>
<message>
<source>Person</source>
<translation>Person</translation>
</message>
</context>
<context>
<name>Conversation</name>
<message>
@ -596,7 +611,7 @@
<name>EventListItem</name>
<message>
<source>Location</source>
<translation>Ort</translation>
<translation type="vanished">Ort</translation>
</message>
</context>
<context>
@ -912,7 +927,7 @@
</message>
<message>
<source>Reply</source>
<translation>Antworten</translation>
<translation type="vanished">Antworten</translation>
</message>
<message>
<source>DM</source>
@ -950,6 +965,14 @@
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
<source>Bookmark</source>
<translation>Markieren</translation>
</message>
<message>
<source>External</source>
<translation>Webseite</translation>
</message>
</context>
<context>
<name>PermissionDialog</name>

BIN
source-linux/translations/friendiqa-es.qm
View file

Binary file not shown.

217
source-linux/translations/friendiqa-es.ts
View file

@ -4,9 +4,9 @@
<context>
<name>AccountPage</name>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="60"/>
<location filename="../qml/configqml/AccountPage.qml" line="319"/>
<location filename="../qml/configqml/AccountPage.qml" line="341"/>
<location filename="../qml/configqml/AccountPage.qml" line="64"/>
<location filename="../qml/configqml/AccountPage.qml" line="361"/>
<location filename="../qml/configqml/AccountPage.qml" line="382"/>
<source>User</source>
<translation>Usuario</translation>
</message>
@ -15,17 +15,17 @@
<translation type="vanished">Servidor</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="165"/>
<location filename="../qml/configqml/AccountPage.qml" line="206"/>
<source>Nickname</source>
<translation>Usuario</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="183"/>
<location filename="../qml/configqml/AccountPage.qml" line="224"/>
<source>Password</source>
<translation>Contraseña</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="190"/>
<location filename="../qml/configqml/AccountPage.qml" line="231"/>
<source>Image dir.</source>
<translation>Dir. de imágenes</translation>
</message>
@ -34,54 +34,54 @@
<translation type="vanished">Noticias como</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<location filename="../qml/configqml/AccountPage.qml" line="330"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation>No se admiten los apodos que contienen el símbolo @ actualmente</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="239"/>
<location filename="../qml/configqml/AccountPage.qml" line="280"/>
<source>Confirm</source>
<translation>Confirmar</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="245"/>
<location filename="../qml/configqml/AccountPage.qml" line="286"/>
<source>No server given! </source>
<translation>¡Servidor no encontrado!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="246"/>
<location filename="../qml/configqml/AccountPage.qml" line="287"/>
<source>No nickname given! </source>
<translation>¡Usuario incorrecto!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="247"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<source>No password given! </source>
<translation>¡Contraseña incorrecta!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="248"/>
<location filename="../qml/configqml/AccountPage.qml" line="289"/>
<source>No image directory given!</source>
<translation>¡No se ha encontrado el directorio de imágenes!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<source>Wrong password!</source>
<translation>¡Contraseña incorrecta!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Success</source>
<translation>éxito!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Name</source>
<translation>Nombre</translation>
</message>
@ -97,14 +97,12 @@
<context>
<name>CalendarTab</name>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="152"/>
<source>Events</source>
<translation>Eventos</translation>
<translation type="vanished">Eventos</translation>
</message>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="157"/>
<source>Own Calendar</source>
<translation>Calendario propio</translation>
<translation type="vanished">Calendario propio</translation>
</message>
</context>
<context>
@ -333,166 +331,183 @@
<context>
<name>ContactPage</name>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<location filename="../qml/newsqml/ContactPage.qml" line="49"/>
<source>seconds</source>
<translation>Segundos</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<location filename="../qml/newsqml/ContactPage.qml" line="50"/>
<source>minute</source>
<translation>Minuto</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<source>minutes</source>
<translation>Minutos</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<source>hour</source>
<translation>Hora</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<source>hours</source>
<translation>Horas</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<source>day</source>
<translation>Dia</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<source>days</source>
<translation>Dias</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<source>month</source>
<translation>Mes</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="59"/>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<source>months</source>
<translation>Meses</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="60"/>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<source>years</source>
<translation>Años</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="69"/>
<location filename="../qml/newsqml/ContactPage.qml" line="67"/>
<source>likes this.</source>
<translation>le gusta esto.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="70"/>
<location filename="../qml/newsqml/ContactPage.qml" line="68"/>
<source>like this.</source>
<translation>me gusta esto.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="73"/>
<location filename="../qml/newsqml/ContactPage.qml" line="71"/>
<source>doesn&apos;t like this.</source>
<translation>no de ése.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="74"/>
<location filename="../qml/newsqml/ContactPage.qml" line="72"/>
<source>don&apos;t like this.</source>
<translation>no me gusta.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="77"/>
<location filename="../qml/newsqml/ContactPage.qml" line="75"/>
<source>will attend.</source>
<translation>asistirá.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="78"/>
<location filename="../qml/newsqml/ContactPage.qml" line="76"/>
<source>persons will attend.</source>
<translation>Personas que asistirán.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="81"/>
<location filename="../qml/newsqml/ContactPage.qml" line="79"/>
<source>will not attend.</source>
<translation>no asistirá.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="82"/>
<location filename="../qml/newsqml/ContactPage.qml" line="80"/>
<source>persons will not attend.</source>
<translation>Personas que no asistirán.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="85"/>
<location filename="../qml/newsqml/ContactPage.qml" line="83"/>
<source>may attend.</source>
<translation>Puede asistir.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="86"/>
<location filename="../qml/newsqml/ContactPage.qml" line="84"/>
<source>persons may attend.</source>
<translation>Personas que pueden asistir.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Connect</source>
<translation>Conectar</translation>
<translation type="vanished">Conectar</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="223"/>
<location filename="../qml/newsqml/ContactPage.qml" line="218"/>
<source>Approve</source>
<translation>Aprobar</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="238"/>
<location filename="../qml/newsqml/ContactPage.qml" line="232"/>
<source>Reject</source>
<translation>Rechazar</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="252"/>
<location filename="../qml/newsqml/ContactPage.qml" line="245"/>
<source>Ignore</source>
<translation>Ignorar</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="266"/>
<location filename="../qml/newsqml/ContactPage.qml" line="258"/>
<source>Follow</source>
<translation>Seguir</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="285"/>
<location filename="../qml/newsqml/ContactPage.qml" line="276"/>
<source>Unfollow</source>
<translation>Dejar de seguir</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Description</source>
<translation>Descripción</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Location</source>
<translation>Localización</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Posts</source>
<translation>Mensajes</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="325"/>
<location filename="../qml/newsqml/ContactPage.qml" line="315"/>
<source>URL</source>
<translation>URL</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<location filename="../qml/newsqml/ContactPage.qml" line="316"/>
<source>Created at</source>
<translation>Creado en</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="340"/>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<source>Network Error</source>
<translation>Fallo de red</translation>
</message>
</context>
<context>
<name>ContactsSearchPage</name>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="62"/>
<source>Network Error</source>
<translation>Fallo de red</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="91"/>
<source>Forum</source>
<translation>Foro</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="93"/>
<source>Person</source>
<translation>Persona</translation>
</message>
</context>
<context>
<name>Conversation</name>
<message>
@ -682,9 +697,8 @@
<context>
<name>EventListItem</name>
<message>
<location filename="../qml/calendarqml/EventListItem.qml" line="80"/>
<source>Location</source>
<translation>Localización</translation>
<translation type="vanished">Localización</translation>
</message>
</context>
<context>
@ -695,7 +709,7 @@
<translation>Solicitudes de contacto</translation>
</message>
<message>
<location filename="../qml/contactqml/FriendsListTab.qml" line="72"/>
<location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
<source>Friends</source>
<translation>Amigos</translation>
</message>
@ -785,40 +799,40 @@
<context>
<name>MessageSend</name>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="205"/>
<location filename="../qml/newsqml/MessageSend.qml" line="204"/>
<source>to:</source>
<translation>a:</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="217"/>
<location filename="../qml/newsqml/MessageSend.qml" line="216"/>
<source>Title (optional)</source>
<translation>Título (opcional)</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="234"/>
<location filename="../qml/newsqml/MessageSend.qml" line="233"/>
<source> Drop your Content here.</source>
<translation> Deje caer su contenido aquí.</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="240"/>
<location filename="../qml/newsqml/MessageSend.qml" line="239"/>
<source>What&apos;s on your mind?</source>
<translation>¿Qué tienes en mente?</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<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="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>No receiver supplied!</source>
<translation>No se ha suministrado ningún receptor!</translation>
</message>
@ -834,12 +848,12 @@
<context>
<name>NewsStack</name>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="224"/>
<location filename="../qml/newsqml/NewsStack.qml" line="222"/>
<source>Network Error</source>
<translation>Fallo de red</translation>
</message>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="270"/>
<location filename="../qml/newsqml/NewsStack.qml" line="268"/>
<source>More</source>
<translation>Mas</translation>
</message>
@ -1002,17 +1016,17 @@
<translation type="vanished">Asistiendo: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Source: </source>
<translation>Fuente: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Direct Message</source>
<translation>Mensaje directo</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="135"/>
<location filename="../qml/newsqml/Newsitem.qml" line="132"/>
<source>In reply to </source>
<translation>En respuesta a </translation>
</message>
@ -1026,75 +1040,86 @@
<translation>asistencia</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="127"/>
<location filename="../qml/newsqml/Newsitem.qml" line="124"/>
<source>ago</source>
<translation>hace</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="277"/>
<location filename="../qml/newsqml/Newsitem.qml" line="269"/>
<source>Attending: </source>
<translation>Asistiendo: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="397"/>
<source>Reply</source>
<translation>Respuesta</translation>
<translation type="vanished">Respuesta</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="416"/>
<location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>DM</source>
<translation>Mensaje directo</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<source>Repost</source>
<translation>Volver a publicar</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<location filename="../qml/newsqml/Newsitem.qml" line="428"/>
<source>Success!</source>
<translation>éxito!</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="430"/>
<location filename="../qml/newsqml/Newsitem.qml" line="433"/>
<source>Conversation</source>
<translation>Conversación</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<location filename="../qml/newsqml/Newsitem.qml" line="445"/>
<source>Bookmark</source>
<translation>marca</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/>
<source>Attending</source>
<translation>Asistiendo</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<source>yes</source>
<translation>si</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="452"/>
<location filename="../qml/newsqml/Newsitem.qml" line="469"/>
<source>maybe</source>
<translation>quizás</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="457"/>
<location filename="../qml/newsqml/Newsitem.qml" line="474"/>
<source>no</source>
<translation>no</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<location filename="../qml/newsqml/Newsitem.qml" line="481"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="497"/>
<source>External</source>
<translation>sitio web</translation>
</message>
</context>
<context>
<name>PermissionDialog</name>
<message>
<location filename="../qml/genericqml/PermissionDialog.qml" line="69"/>
<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="131"/>
<location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
<location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
<source>Groups</source>
<translation>Grupos</translation>
</message>
@ -1102,28 +1127,28 @@
<context>
<name>PhotoTab</name>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="137"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="133"/>
<source>&apos;s images</source>
<translation>s Imágenes</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="229"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
<source>All Images</source>
<translation>Todas las imagenes</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="235"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
<source>Only new</source>
<translation>Solo nueva</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="251"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="256"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
<source>Own Images</source>
<translation>Mis imágenes</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="296"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
<source>More</source>
<translation>Mas</translation>
</message>
@ -1447,14 +1472,14 @@
<translation type="vanished">Salida</translation>
</message>
<message>
<location filename="../qml/friendiqa.qml" line="175"/>
<location filename="../qml/friendiqa.qml" line="176"/>
<source>Background Sync
Rightclick or Middleclick to Quit</source>
<translation>Sincronización de fondo
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="300"/>
<location filename="../qml/friendiqa.qml" line="302"/>
<source>Click to open Friendiqa</source>
<translation>Haga clic para abrir Friendiqa</translation>
</message>
@ -1572,12 +1597,12 @@ Haga clic con el botón derecho del ratón o con el botón central para salir.</
<translation type="vanished">La configuración del tipo de vista de las noticias se ha movido de la página de la cuenta a la página de configuración.</translation>
</message>
<message>
<location filename="../js/service.js" line="463"/>
<location filename="../js/service.js" line="460"/>
<source>Undefined Array Error</source>
<translation></translation>
</message>
<message>
<location filename="../js/service.js" line="466"/>
<location filename="../js/service.js" line="463"/>
<source>JSON status Error</source>
<translation></translation>
</message>

BIN
source-linux/translations/friendiqa-hu.qm
View file

Binary file not shown.

229
source-linux/translations/friendiqa-hu.ts
View file

@ -4,9 +4,9 @@
<context>
<name>AccountPage</name>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="60"/>
<location filename="../qml/configqml/AccountPage.qml" line="319"/>
<location filename="../qml/configqml/AccountPage.qml" line="341"/>
<location filename="../qml/configqml/AccountPage.qml" line="64"/>
<location filename="../qml/configqml/AccountPage.qml" line="361"/>
<location filename="../qml/configqml/AccountPage.qml" line="382"/>
<source>User</source>
<translation>Felhasználó</translation>
</message>
@ -15,17 +15,17 @@
<translation type="vanished">Kiszolgáló</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="165"/>
<location filename="../qml/configqml/AccountPage.qml" line="206"/>
<source>Nickname</source>
<translation>Becenév</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="183"/>
<location filename="../qml/configqml/AccountPage.qml" line="224"/>
<source>Password</source>
<translation>Jelszó</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="190"/>
<location filename="../qml/configqml/AccountPage.qml" line="231"/>
<source>Image dir.</source>
<translation>Képkönyvtár</translation>
</message>
@ -34,54 +34,54 @@
<translation type="vanished">Hírek mint</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<location filename="../qml/configqml/AccountPage.qml" line="330"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation>A @ szimbólumot tartalmazó becenevek jelenleg nem támogatottak</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="239"/>
<location filename="../qml/configqml/AccountPage.qml" line="280"/>
<source>Confirm</source>
<translation>Megerősítés</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="245"/>
<location filename="../qml/configqml/AccountPage.qml" line="286"/>
<source>No server given! </source>
<translation>Nincs kiszolgáló megadva! </translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="246"/>
<location filename="../qml/configqml/AccountPage.qml" line="287"/>
<source>No nickname given! </source>
<translation>Nincs becenév megadva! </translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="247"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<source>No password given! </source>
<translation>Nincs jelszó megadva! </translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="248"/>
<location filename="../qml/configqml/AccountPage.qml" line="289"/>
<source>No image directory given!</source>
<translation>Nincs képkönyvtár megadva!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<source>Wrong password!</source>
<translation>Hibás jelszó!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Success</source>
<translation>Sikeres</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Name</source>
<translation>Név</translation>
</message>
@ -97,14 +97,12 @@
<context>
<name>CalendarTab</name>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="152"/>
<source>Events</source>
<translation>Események</translation>
<translation type="vanished">Események</translation>
</message>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="157"/>
<source>Own Calendar</source>
<translation>Saját naptár</translation>
<translation type="vanished">Saját naptár</translation>
</message>
</context>
<context>
@ -140,22 +138,22 @@
<message>
<location filename="../qml/configqml/ConfigAppearancePage.qml" line="159"/>
<source>Dark Mode</source>
<translation>Tervezés</translation>
<translation>Sötét mód</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigAppearancePage.qml" line="163"/>
<source>System</source>
<translation>Szabványos kivitel</translation>
<translation>Rendszer</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigAppearancePage.qml" line="174"/>
<source>Dark</source>
<translation>Sötét design</translation>
<translation>Sötét</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigAppearancePage.qml" line="185"/>
<source>Light</source>
<translation>Fényes design</translation>
<translation>Világos</translation>
</message>
</context>
<context>
@ -193,7 +191,7 @@
<message>
<location filename="../qml/configqml/ConfigPage.qml" line="67"/>
<source>Start</source>
<translation>Indítsd el</translation>
<translation>Indítás</translation>
</message>
</context>
<context>
@ -349,166 +347,183 @@
<context>
<name>ContactPage</name>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<location filename="../qml/newsqml/ContactPage.qml" line="49"/>
<source>seconds</source>
<translation>másodperc</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<location filename="../qml/newsqml/ContactPage.qml" line="50"/>
<source>minute</source>
<translation>perc</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<source>minutes</source>
<translation>perc</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<source>hour</source>
<translation>óra</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<source>hours</source>
<translation>óra</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<source>day</source>
<translation>nap</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<source>days</source>
<translation>nap</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<source>month</source>
<translation>hónap</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="59"/>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<source>months</source>
<translation>hónap</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="60"/>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<source>years</source>
<translation>év</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="69"/>
<location filename="../qml/newsqml/ContactPage.qml" line="67"/>
<source>likes this.</source>
<translation>kedveli ezt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="70"/>
<location filename="../qml/newsqml/ContactPage.qml" line="68"/>
<source>like this.</source>
<translation>kedveli ezt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="73"/>
<location filename="../qml/newsqml/ContactPage.qml" line="71"/>
<source>doesn&apos;t like this.</source>
<translation>nem kedveli ezt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="74"/>
<location filename="../qml/newsqml/ContactPage.qml" line="72"/>
<source>don&apos;t like this.</source>
<translation>nem kedveli ezt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="77"/>
<location filename="../qml/newsqml/ContactPage.qml" line="75"/>
<source>will attend.</source>
<translation>részt vesz.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="78"/>
<location filename="../qml/newsqml/ContactPage.qml" line="76"/>
<source>persons will attend.</source>
<translation>személy részt vesz.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="81"/>
<location filename="../qml/newsqml/ContactPage.qml" line="79"/>
<source>will not attend.</source>
<translation>nem vesz részt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="82"/>
<location filename="../qml/newsqml/ContactPage.qml" line="80"/>
<source>persons will not attend.</source>
<translation>személy nem vesz részt.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="85"/>
<location filename="../qml/newsqml/ContactPage.qml" line="83"/>
<source>may attend.</source>
<translation>talán részt vesz.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="86"/>
<location filename="../qml/newsqml/ContactPage.qml" line="84"/>
<source>persons may attend.</source>
<translation>személy talán részt vesz.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Connect</source>
<translation>Kapcsolódás</translation>
<translation type="vanished">Kapcsolódás</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="223"/>
<location filename="../qml/newsqml/ContactPage.qml" line="218"/>
<source>Approve</source>
<translation>Jóváhagyás</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="238"/>
<location filename="../qml/newsqml/ContactPage.qml" line="232"/>
<source>Reject</source>
<translation>Visszautasítás</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="252"/>
<location filename="../qml/newsqml/ContactPage.qml" line="245"/>
<source>Ignore</source>
<translation>Mellőzés</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="266"/>
<location filename="../qml/newsqml/ContactPage.qml" line="258"/>
<source>Follow</source>
<translation>Kövesse</translation>
<translation>Követés</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="285"/>
<location filename="../qml/newsqml/ContactPage.qml" line="276"/>
<source>Unfollow</source>
<translation>Követés megszüntetése</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Description</source>
<translation>Leírás</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Location</source>
<translation>Hely</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Posts</source>
<translation>Bejegyzések</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="325"/>
<location filename="../qml/newsqml/ContactPage.qml" line="315"/>
<source>URL</source>
<translation>URL</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<location filename="../qml/newsqml/ContactPage.qml" line="316"/>
<source>Created at</source>
<translation>Létrehozva</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="340"/>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<source>Network Error</source>
<translation>Hálózati hiba</translation>
</message>
</context>
<context>
<name>ContactsSearchPage</name>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="62"/>
<source>Network Error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="91"/>
<source>Forum</source>
<translation>fórum</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="93"/>
<source>Person</source>
<translation>személy</translation>
</message>
</context>
<context>
<name>Conversation</name>
<message>
@ -698,9 +713,8 @@
<context>
<name>EventListItem</name>
<message>
<location filename="../qml/calendarqml/EventListItem.qml" line="80"/>
<source>Location</source>
<translation>Hely</translation>
<translation type="vanished">Hely</translation>
</message>
</context>
<context>
@ -711,7 +725,7 @@
<translation>Barátkérések</translation>
</message>
<message>
<location filename="../qml/contactqml/FriendsListTab.qml" line="72"/>
<location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
<source>Friends</source>
<translation>Ismerősök</translation>
</message>
@ -812,40 +826,40 @@
<context>
<name>MessageSend</name>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="205"/>
<location filename="../qml/newsqml/MessageSend.qml" line="204"/>
<source>to:</source>
<translation>címzett:</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="217"/>
<location filename="../qml/newsqml/MessageSend.qml" line="216"/>
<source>Title (optional)</source>
<translation>Cím (elhagyható)</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="234"/>
<location filename="../qml/newsqml/MessageSend.qml" line="233"/>
<source> Drop your Content here.</source>
<translation> Ejtse ide a tartalmat.</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="240"/>
<location filename="../qml/newsqml/MessageSend.qml" line="239"/>
<source>What&apos;s on your mind?</source>
<translation>Mire gondol?</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<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="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>No receiver supplied!</source>
<translation>Nincs fogadó megadva!</translation>
</message>
@ -861,12 +875,12 @@
<context>
<name>NewsStack</name>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="224"/>
<location filename="../qml/newsqml/NewsStack.qml" line="222"/>
<source>Network Error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="270"/>
<location filename="../qml/newsqml/NewsStack.qml" line="268"/>
<source>More</source>
<translation>Több</translation>
</message>
@ -1033,17 +1047,17 @@
<translation type="vanished">részvétel: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Source: </source>
<translation>Forrás: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Direct Message</source>
<translation>Közvetlen üzenet</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="135"/>
<location filename="../qml/newsqml/Newsitem.qml" line="132"/>
<source>In reply to </source>
<translation>Válaszul erre: </translation>
</message>
@ -1057,75 +1071,86 @@
<translation>részvétel</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="127"/>
<location filename="../qml/newsqml/Newsitem.qml" line="124"/>
<source>ago</source>
<translation>óta</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="277"/>
<location filename="../qml/newsqml/Newsitem.qml" line="269"/>
<source>Attending: </source>
<translation>Részvétel: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="397"/>
<source>Reply</source>
<translation>Válasz</translation>
<translation type="vanished">Válasz</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="416"/>
<location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>DM</source>
<translation>DM</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<source>Repost</source>
<translation>Újraküldés</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<location filename="../qml/newsqml/Newsitem.qml" line="428"/>
<source>Success!</source>
<translation>Sikeres!</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="430"/>
<location filename="../qml/newsqml/Newsitem.qml" line="433"/>
<source>Conversation</source>
<translation>Beszélgetés</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<location filename="../qml/newsqml/Newsitem.qml" line="445"/>
<source>Bookmark</source>
<translation>könyvjelző</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/>
<source>Attending</source>
<translation>Részvétel</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<source>yes</source>
<translation>igen</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="452"/>
<location filename="../qml/newsqml/Newsitem.qml" line="469"/>
<source>maybe</source>
<translation>talán</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="457"/>
<location filename="../qml/newsqml/Newsitem.qml" line="474"/>
<source>no</source>
<translation>nem</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<location filename="../qml/newsqml/Newsitem.qml" line="481"/>
<source>Delete</source>
<translation>Törlés</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="497"/>
<source>External</source>
<translation>weboldal</translation>
</message>
</context>
<context>
<name>PermissionDialog</name>
<message>
<location filename="../qml/genericqml/PermissionDialog.qml" line="69"/>
<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="131"/>
<location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
<location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
<source>Groups</source>
<translation>Csoportok</translation>
</message>
@ -1133,28 +1158,28 @@
<context>
<name>PhotoTab</name>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="137"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="133"/>
<source>&apos;s images</source>
<translation> képei</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="229"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
<source>All Images</source>
<translation>Összes kép</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="235"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
<source>Only new</source>
<translation>Csak újak</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="251"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="256"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
<source>Own Images</source>
<translation>Saját képek</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="296"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
<source>More</source>
<translation>Több</translation>
</message>
@ -1478,14 +1503,14 @@
<translation type="vanished">Kilépés</translation>
</message>
<message>
<location filename="../qml/friendiqa.qml" line="175"/>
<location filename="../qml/friendiqa.qml" line="176"/>
<source>Background Sync
Rightclick or Middleclick to Quit</source>
<translation>Háttérszinkronizálás
Kilépéshez kattintson a jobb gombbal vagy középső gombbal</translation>
</message>
<message>
<location filename="../qml/friendiqa.qml" line="300"/>
<location filename="../qml/friendiqa.qml" line="302"/>
<source>Click to open Friendiqa</source>
<translation>Kattintson a Friendiqa megnyitásához</translation>
</message>
@ -1603,12 +1628,12 @@ Kilépéshez kattintson a jobb gombbal vagy középső gombbal</translation>
<translation type="vanished">A hírek nézettípusának beállítása át lett helyezve a fiókoldalról a beállítási oldalra.</translation>
</message>
<message>
<location filename="../js/service.js" line="463"/>
<location filename="../js/service.js" line="460"/>
<source>Undefined Array Error</source>
<translation>Meghatározatlan tömbhiba</translation>
</message>
<message>
<location filename="../js/service.js" line="466"/>
<location filename="../js/service.js" line="463"/>
<source>JSON status Error</source>
<translation>JSON-állapothiba</translation>
</message>

BIN
source-linux/translations/friendiqa-it.qm
View file

Binary file not shown.

217
source-linux/translations/friendiqa-it.ts
View file

@ -4,9 +4,9 @@
<context>
<name>AccountPage</name>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="60"/>
<location filename="../qml/configqml/AccountPage.qml" line="319"/>
<location filename="../qml/configqml/AccountPage.qml" line="341"/>
<location filename="../qml/configqml/AccountPage.qml" line="64"/>
<location filename="../qml/configqml/AccountPage.qml" line="361"/>
<location filename="../qml/configqml/AccountPage.qml" line="382"/>
<source>User</source>
<translation>Utente</translation>
</message>
@ -15,17 +15,17 @@
<translation type="vanished">Server</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="165"/>
<location filename="../qml/configqml/AccountPage.qml" line="206"/>
<source>Nickname</source>
<translation>Utente</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="183"/>
<location filename="../qml/configqml/AccountPage.qml" line="224"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="190"/>
<location filename="../qml/configqml/AccountPage.qml" line="231"/>
<source>Image dir.</source>
<translation>Directory immagini</translation>
</message>
@ -34,54 +34,54 @@
<translation type="vanished">News come</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<location filename="../qml/configqml/AccountPage.qml" line="330"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="169"/>
<location filename="../qml/configqml/AccountPage.qml" line="210"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation>I soprannomi contenenti il simbolo @ attualmente non sono supportati</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="239"/>
<location filename="../qml/configqml/AccountPage.qml" line="280"/>
<source>Confirm</source>
<translation>Conferma</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="245"/>
<location filename="../qml/configqml/AccountPage.qml" line="286"/>
<source>No server given! </source>
<translation>Nessun server inserito!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="246"/>
<location filename="../qml/configqml/AccountPage.qml" line="287"/>
<source>No nickname given! </source>
<translation>Nessun utente inserito!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="247"/>
<location filename="../qml/configqml/AccountPage.qml" line="288"/>
<source>No password given! </source>
<translation>Nessuna password inserita!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="248"/>
<location filename="../qml/configqml/AccountPage.qml" line="289"/>
<source>No image directory given!</source>
<translation>Nessuna directory immagini inserita!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="256"/>
<location filename="../qml/configqml/AccountPage.qml" line="297"/>
<source>Wrong password!</source>
<translation>Password sbagliata!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Success</source>
<translation>Ha funzionato!</translation>
</message>
<message>
<location filename="../qml/configqml/AccountPage.qml" line="282"/>
<location filename="../qml/configqml/AccountPage.qml" line="324"/>
<source>Name</source>
<translation>Nome</translation>
</message>
@ -97,14 +97,12 @@
<context>
<name>CalendarTab</name>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="152"/>
<source>Events</source>
<translation>Eventi</translation>
<translation type="vanished">Eventi</translation>
</message>
<message>
<location filename="../qml/calendarqml/CalendarTab.qml" line="157"/>
<source>Own Calendar</source>
<translation>Calendario</translation>
<translation type="vanished">Calendario</translation>
</message>
</context>
<context>
@ -321,166 +319,183 @@
<context>
<name>ContactPage</name>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<location filename="../qml/newsqml/ContactPage.qml" line="49"/>
<source>seconds</source>
<translation>secondi</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<location filename="../qml/newsqml/ContactPage.qml" line="50"/>
<source>minute</source>
<translation>minuti</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<location filename="../qml/newsqml/ContactPage.qml" line="51"/>
<source>minutes</source>
<translation>minuti</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<location filename="../qml/newsqml/ContactPage.qml" line="52"/>
<source>hour</source>
<translation>ora</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<location filename="../qml/newsqml/ContactPage.qml" line="53"/>
<source>hours</source>
<translation>ore</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<location filename="../qml/newsqml/ContactPage.qml" line="54"/>
<source>day</source>
<translation>giorno</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<location filename="../qml/newsqml/ContactPage.qml" line="55"/>
<source>days</source>
<translation>giorni</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<location filename="../qml/newsqml/ContactPage.qml" line="56"/>
<source>month</source>
<translation>mese</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="59"/>
<location filename="../qml/newsqml/ContactPage.qml" line="57"/>
<source>months</source>
<translation>mesi</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="60"/>
<location filename="../qml/newsqml/ContactPage.qml" line="58"/>
<source>years</source>
<translation>anni</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="69"/>
<location filename="../qml/newsqml/ContactPage.qml" line="67"/>
<source>likes this.</source>
<translation>mi piace.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="70"/>
<location filename="../qml/newsqml/ContactPage.qml" line="68"/>
<source>like this.</source>
<translation>mi piace.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="73"/>
<location filename="../qml/newsqml/ContactPage.qml" line="71"/>
<source>doesn&apos;t like this.</source>
<translation>non mi piace.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="74"/>
<location filename="../qml/newsqml/ContactPage.qml" line="72"/>
<source>don&apos;t like this.</source>
<translation>non mi piace.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="77"/>
<location filename="../qml/newsqml/ContactPage.qml" line="75"/>
<source>will attend.</source>
<translation>attendere.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="78"/>
<location filename="../qml/newsqml/ContactPage.qml" line="76"/>
<source>persons will attend.</source>
<translation>Persone che attendono.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="81"/>
<location filename="../qml/newsqml/ContactPage.qml" line="79"/>
<source>will not attend.</source>
<translation>non aspettare.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="82"/>
<location filename="../qml/newsqml/ContactPage.qml" line="80"/>
<source>persons will not attend.</source>
<translation>Persone che non aspettano.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="85"/>
<location filename="../qml/newsqml/ContactPage.qml" line="83"/>
<source>may attend.</source>
<translation>puoi attendere.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="86"/>
<location filename="../qml/newsqml/ContactPage.qml" line="84"/>
<source>persons may attend.</source>
<translation>Persone che possono attendere.</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Connect</source>
<translation>Connetti</translation>
<translation type="vanished">Connetti</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="223"/>
<location filename="../qml/newsqml/ContactPage.qml" line="218"/>
<source>Approve</source>
<translation>Approvare</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="238"/>
<location filename="../qml/newsqml/ContactPage.qml" line="232"/>
<source>Reject</source>
<translation>Rifiutare</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="252"/>
<location filename="../qml/newsqml/ContactPage.qml" line="245"/>
<source>Ignore</source>
<translation>Ignorare</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="266"/>
<location filename="../qml/newsqml/ContactPage.qml" line="258"/>
<source>Follow</source>
<translation>Seguire</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="285"/>
<location filename="../qml/newsqml/ContactPage.qml" line="276"/>
<source>Unfollow</source>
<translation>Non seguire</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Description</source>
<translation>Descrizione</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Location</source>
<translation>Località</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="324"/>
<location filename="../qml/newsqml/ContactPage.qml" line="314"/>
<source>Posts</source>
<translation>Messaggi</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="325"/>
<location filename="../qml/newsqml/ContactPage.qml" line="315"/>
<source>URL</source>
<translation>URL</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<location filename="../qml/newsqml/ContactPage.qml" line="316"/>
<source>Created at</source>
<translation>Creato il</translation>
</message>
<message>
<location filename="../qml/newsqml/ContactPage.qml" line="340"/>
<location filename="../qml/newsqml/ContactPage.qml" line="326"/>
<source>Network Error</source>
<translation>Errore di rete</translation>
</message>
</context>
<context>
<name>ContactsSearchPage</name>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="62"/>
<source>Network Error</source>
<translation>Errore di rete</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="91"/>
<source>Forum</source>
<translation>Forum</translation>
</message>
<message>
<location filename="../qml/contactqml/ContactsSearchPage.qml" line="93"/>
<source>Person</source>
<translation>Persona</translation>
</message>
</context>
<context>
<name>Conversation</name>
<message>
@ -670,9 +685,8 @@
<context>
<name>EventListItem</name>
<message>
<location filename="../qml/calendarqml/EventListItem.qml" line="80"/>
<source>Location</source>
<translation>Località</translation>
<translation type="vanished">Località</translation>
</message>
</context>
<context>
@ -683,7 +697,7 @@
<translation>Richieste di contatto</translation>
</message>
<message>
<location filename="../qml/contactqml/FriendsListTab.qml" line="72"/>
<location filename="../qml/contactqml/FriendsListTab.qml" line="71"/>
<source>Friends</source>
<translation>Amici</translation>
</message>
@ -773,40 +787,40 @@
<context>
<name>MessageSend</name>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="205"/>
<location filename="../qml/newsqml/MessageSend.qml" line="204"/>
<source>to:</source>
<translation>a:</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="217"/>
<location filename="../qml/newsqml/MessageSend.qml" line="216"/>
<source>Title (optional)</source>
<translation>Titolo (opzionale)</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="234"/>
<location filename="../qml/newsqml/MessageSend.qml" line="233"/>
<source> Drop your Content here.</source>
<translation> Lascia qui il tuo contenuto.</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="240"/>
<location filename="../qml/newsqml/MessageSend.qml" line="239"/>
<source>What&apos;s on your mind?</source>
<translation>A cosa stai pensando?</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
<location filename="../qml/newsqml/MessageSend.qml" line="387"/>
<location filename="../qml/newsqml/MessageSend.qml" line="388"/>
<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="446"/>
<location filename="../qml/newsqml/MessageSend.qml" line="447"/>
<source>No receiver supplied!</source>
<translation>Nessun ricevitore in dotazione!</translation>
</message>
@ -822,12 +836,12 @@
<context>
<name>NewsStack</name>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="224"/>
<location filename="../qml/newsqml/NewsStack.qml" line="222"/>
<source>Network Error</source>
<translation>Errore di rete</translation>
</message>
<message>
<location filename="../qml/newsqml/NewsStack.qml" line="270"/>
<location filename="../qml/newsqml/NewsStack.qml" line="268"/>
<source>More</source>
<translation>Ancora</translation>
</message>
@ -978,17 +992,17 @@
<translation type="vanished">attendere: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Source: </source>
<translation>Codice: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="119"/>
<location filename="../qml/newsqml/Newsitem.qml" line="116"/>
<source>Direct Message</source>
<translation>Messaggio diretto</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="135"/>
<location filename="../qml/newsqml/Newsitem.qml" line="132"/>
<source>In reply to </source>
<translation>In risposta a </translation>
</message>
@ -1002,75 +1016,86 @@
<translation>partecipare</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="127"/>
<location filename="../qml/newsqml/Newsitem.qml" line="124"/>
<source>ago</source>
<translation>fa</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="277"/>
<location filename="../qml/newsqml/Newsitem.qml" line="269"/>
<source>Attending: </source>
<translation>Attendi: </translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="397"/>
<source>Reply</source>
<translation>Risposta</translation>
<translation type="vanished">Risposta</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="416"/>
<location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>DM</source>
<translation>Messaggio diretto</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<source>Repost</source>
<translation>Condividi</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/>
<location filename="../qml/newsqml/Newsitem.qml" line="428"/>
<source>Success!</source>
<translation>Ha funzionato!</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="430"/>
<location filename="../qml/newsqml/Newsitem.qml" line="433"/>
<source>Conversation</source>
<translation>Conversazione</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<location filename="../qml/newsqml/Newsitem.qml" line="445"/>
<source>Bookmark</source>
<translation>Segnalibro</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/>
<source>Attending</source>
<translation>Attendi</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<source>yes</source>
<translation>si</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="452"/>
<location filename="../qml/newsqml/Newsitem.qml" line="469"/>
<source>maybe</source>
<translation>potrebbe</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="457"/>
<location filename="../qml/newsqml/Newsitem.qml" line="474"/>
<source>no</source>
<translation>no</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="464"/>
<location filename="../qml/newsqml/Newsitem.qml" line="481"/>
<source>Delete</source>
<translation>Cancella</translation>
</message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="497"/>
<source>External</source>
<translation>Sito web</translation>
</message>
</context>
<context>
<name>PermissionDialog</name>
<message>
<location filename="../qml/genericqml/PermissionDialog.qml" line="69"/>
<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="131"/>
<location filename="../qml/genericqml/PermissionDialog.qml" line="132"/>
<location filename="../qml/newsqml/PermissionDialog.qml" line="130"/>
<source>Groups</source>
<translation>Gruppi</translation>
</message>
@ -1078,28 +1103,28 @@
<context>
<name>PhotoTab</name>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="137"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="133"/>
<source>&apos;s images</source>
<translation> Immagini</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="229"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="222"/>
<source>All Images</source>
<translation>Tutte immagini</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="235"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="228"/>
<source>Only new</source>
<translation>Solo nuovo</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="251"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="256"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="244"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="249"/>
<source>Own Images</source>
<translation>Mie immagini</translation>
</message>
<message>
<location filename="../qml/photoqml/PhotoTab.qml" line="296"/>
<location filename="../qml/photoqml/PhotoTab.qml" line="291"/>
<source>More</source>
<translation>Ancora</translation>
</message>
@ -1423,14 +1448,14 @@
<translation type="vanished">Chiudi</translation>
</message>
<message>
<location filename="../qml/friendiqa.qml" line="175"/>
<location filename="../qml/friendiqa.qml" line="176"/>
<source>Background Sync
Rightclick or Middleclick to Quit</source>
<translation>Sincronizzazione dello sfondo
Fare clic con il tasto destro del mouse o con il tasto centrale per uscire</translation>
</message>
<message>
<location filename="../qml/friendiqa.qml" line="300"/>
<location filename="../qml/friendiqa.qml" line="302"/>
<source>Click to open Friendiqa</source>
<translation>Clicca per aprire Friendiqa</translation>
</message>
@ -1552,12 +1577,12 @@ Fare clic con il tasto destro del mouse o con il tasto centrale per uscire</tran
<translation type="vanished">L&apos;impostazione del tipo di visualizzazione delle notizie è stata spostata dalla pagina del conto alla pagina di configurazione.</translation>
</message>
<message>
<location filename="../js/service.js" line="463"/>
<location filename="../js/service.js" line="460"/>
<source>Undefined Array Error</source>
<translation></translation>
</message>
<message>
<location filename="../js/service.js" line="466"/>
<location filename="../js/service.js" line="463"/>
<source>JSON status Error</source>
<translation></translation>
</message>