This commit is contained in:
LubuWest 2019-01-09 22:03:16 +01:00
parent aca94a5393
commit 63dfb9b197
70 changed files with 2829 additions and 1056 deletions

View File

@ -84,23 +84,26 @@
## v0.3.2 ## ## v0.3.2 ##
* For news containing url ending with mp3, mp4, avi, webm, ogg: media can be played in app * For news containing url ending with mp3, mp4, avi, webm, ogg: media can be played in app
* Pictures can be renamed or moved to another album * Pictures can be renamed or moved to another album
* Bugfix: random crashes for conversations * Bugfix: random crashes for conversations
* Bugfix: attach image to message works again * Bugfix: attach image to message works again
* Bugfix: check for nickname on Server has been removed due to API change * Bugfix: check for nickname on Server has been removed due to API change
## v0.3.3 ## ## v0.3.3 ##
* Update for OpenSSL and At * Update for OpenSSL and At
* Experimental support for Peertube (links are expanded to video widget) * Experimental support for Peertube (links are expanded to video widget)
* Some Unicode emojis * Some Unicode emojis
* Redesign of contact details (click on contact opens in new stack and shows last news) * Redesign of contact details (click on contact opens in new stack and shows last news)
## v0.3.4 ## ## v0.3.4 ##
* Direct message creation from profile page works again * Direct message creation from profile page works again
* Profile image upload works again * Profile image upload works again
* Viewing private album pictures of contacts works again * Viewing private album pictures of contacts works again
* On first start servername from https://dir.friendica.social/servers/surprise selected * On first start servername from https://dir.friendica.social/servers/surprise selected
* Register button opens webview of registration page on server * Register button opens webview of registration page on server
## v0.4 ##
* Background sync for friends timeline (interval on config page must be > 0) for Android > 5
* Replies timeline
* Bugfix: App asks for storage permission on first start

View File

@ -18,7 +18,8 @@ QML based client for the Friendica Social Network.
# News # # News #
Currently supported: Currently supported:
* Shows Posts from friends, selected group, favorited messages, public timeline, Direct Messages and notifications * Shows Posts from friends, selected group, replies, favorited messages, public timeline, Direct Messages and notifications
* Background sync with configurable interval of 15 min to 2h for active contact for friends timeline (Android 5 required)
* Search button for news * Search button for news
* Click on hashtag in newsitem starts search for news with that word * Click on hashtag in newsitem starts search for news with that word
* Click on image shows image fullscreen * Click on image shows image fullscreen

View File

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.3.4" android:versionCode="11" android:installLocation="auto"> <manifest package="org.qtproject.friendiqa" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.4" android:versionCode="12" android:installLocation="auto">
<application android:hardwareAccelerated="true" android:vmSafeMode="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/friendiqa" android:logo="@drawable/friendiqa" android:theme="@android:style/Theme.Holo.Light"> <application android:hardwareAccelerated="true" android:vmSafeMode="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Friendiqa" android:icon="@drawable/friendiqa" android:logo="@drawable/friendiqa" android:theme="@android:style/Theme.Holo.Light">
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="androidnative.friendiqa.FriendiqaActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity=""> <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="androidnative.friendiqa.FriendiqaActivity" android:label="Friendiqa" android:screenOrientation="unspecified" android:launchMode="singleInstance" android:taskAffinity="">
<intent-filter> <intent-filter>
@ -49,6 +49,42 @@
<meta-data android:name="android.app.background_running" android:value="false"/> <meta-data android:name="android.app.background_running" android:value="false"/>
<!-- Background running --> <!-- Background running -->
</activity> </activity>
<service android:name="androidnative.friendiqa.FriendiqaService" android:permission="android.permission.BIND_JOB_SERVICE">
<meta-data android:name="android.app.background_running" android:value="true"/>
</service>
<service android:process=":qt" android:name="androidnative.AndroidNativeService">
<meta-data android:name="android.app.background_running" android:value="true"/>
<meta-data android:name="android.app.arguments" android:value="-service"/>
<meta-data android:name="android.app.lib_name" android:value="friendiqa"/>
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
<meta-data android:name="android.app.repository" android:value="default"/>
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
<!-- Deploy Qt libs as part of package -->
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
<!-- Run with local libs -->
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
<!-- Messages maps -->
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
<!-- Messages maps -->
<meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/splash"/>
</service>
<service android:process=":qt" android:name="androidnative.friendiqa.FriendiqaStopService" android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="true">
<meta-data android:name="android.app.background_running" android:value="true"/>
</service>
</application> </application>
<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="26"/> <uses-sdk android:minSdkVersion="18" android:targetSdkVersion="26"/>
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/> <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>

View File

@ -20,6 +20,13 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
} }
//apply plugin: 'android-library'
dependencies {
compile 'com.android.support:support-v4:25.3.1'
}
android { android {
/******************************************************* /*******************************************************
* The following variables: * The following variables:
@ -56,4 +63,4 @@ android {
} }
} }
apply from: "androidnative.gradle" apply from: "androidnative.gradle"
setAndroidNativePath("/../androidnative.pri"); setAndroidNativePath("/../androidnative.pri");

View File

@ -2,10 +2,6 @@ package androidnative.friendiqa;
import androidnative.AndroidNativeActivity; import androidnative.AndroidNativeActivity;
public class FriendiqaActivity extends AndroidNativeActivity { public class FriendiqaActivity extends AndroidNativeActivity {
public FriendiqaActivity() { public FriendiqaActivity() {
super(); super();
@ -13,8 +9,4 @@ public class FriendiqaActivity extends AndroidNativeActivity {
QT_ANDROID_THEMES = new String[] {""}; QT_ANDROID_THEMES = new String[] {""};
QT_ANDROID_DEFAULT_THEME = ""; QT_ANDROID_DEFAULT_THEME = "";
} }
} }

View File

@ -0,0 +1,96 @@
package androidnative.friendiqa;
import androidnative.SystemDispatcher;
import android.app.Notification;
import android.app.NotificationManager;
import android.util.Log;
import android.os.Handler;
import android.app.Activity;
import android.view.View;
import android.content.Context;
import java.util.Map;
import org.qtproject.qt5.android.QtNative;
public class FriendiqaNotifierService {
static {
SystemDispatcher.addListener(new SystemDispatcher.Listener() {
NotificationManager m_notificationManager;
Notification.Builder m_builder;
private void notificationManagerNotify(Map data) {
final Activity activity = QtNative.activity();
final Map messageData = data;
Runnable runnable = new Runnable () {
public void run() {
try {
String title = (String) messageData.get("title");
String message = (String) messageData.get("message");
if (m_notificationManager == null) {
m_notificationManager = (NotificationManager) activity.getSystemService(Context.NOTIFICATION_SERVICE);
m_builder = new Notification.Builder(activity);
// Small Icon is a must to make notification works.
// And that is why you need to inherit QtActivity
//m_builder.setSmallIcon(drawable.icon);
}
m_builder.setContentTitle(title);
m_builder.setContentText(message);
m_notificationManager.notify(1, m_builder.build());
// Test function. Remove it later.
SystemDispatcher.dispatch("Notifier.notifyFinished");
} catch (Exception e) {
Log.d("",e.getMessage());
}
};
};
activity.runOnUiThread(runnable);
}
private void hapticFeedbackPerform(Map data) {
final Activity activity = QtNative.activity();
final Map messageData = data;
Runnable runnable = new Runnable () {
public void run() {
int feedbackConstant = (Integer) messageData.get("feedbackConstant");
int flags = (Integer) messageData.get("flags");
Log.d("",String.format("hapticFeedbackPerform(%d,%d)",feedbackConstant,flags));
View rootView = activity.getWindow().getDecorView().getRootView();
rootView.performHapticFeedback(feedbackConstant, flags);
// Test function. Remove it later.
SystemDispatcher.dispatch("hapticFeedbackPerformFinished");
};
};
activity.runOnUiThread(runnable);
}
public void onDispatched(String name , Map data) {
if (name.equals("Notifier.notify")) {
notificationManagerNotify(data);
return;
} else if (name.equals("hapticFeedbackPerform")) {
hapticFeedbackPerform(data);
return;
}
return;
}
});
}
}

View File

@ -0,0 +1,35 @@
package androidnative.friendiqa;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.app.job.JobService;
import android.app.job.JobParameters;
import androidnative.AndroidNativeService;
import org.qtproject.qt5.android.bindings.QtService;
import org.qtproject.qt5.android.QtNative;
//import androidnative.friendiqa.FriendiqaQtService;
public class FriendiqaService extends JobService{
private static String TAG = "AndroidNative";
//Log.e(TAG,"Service");
@Override
public boolean onStartJob(JobParameters params) {
//Log.d(TAG,"Friendiqa JobService");
Context context = this.getApplicationContext();
AndroidNativeService fs = new AndroidNativeService();
fs.startQtService(context);
jobFinished(params,false);
//Intent serviceIntent = new Intent(this, AndroidNativeService.class);
//startService(serviceIntent);
return false;
}
@Override
public boolean onStopJob(JobParameters params) {
// whether or not you would like JobScheduler to automatically retry your failed job.
return false;
}
}

View File

@ -0,0 +1,40 @@
package androidnative.friendiqa;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import android.app.job.JobService;
import android.app.job.JobParameters;
import androidnative.AndroidNativeService;
import org.qtproject.qt5.android.bindings.QtService;
import org.qtproject.qt5.android.QtNative;
//import androidnative.friendiqa.FriendiqaQtService;
public class FriendiqaStopService extends JobService{
private static String TAG = "AndroidNative";
//Log.e(TAG,"Service");
@Override
public boolean onStartJob(JobParameters params) {
//Log.d(TAG,"Friendiqa JobServiceStop");
Context context = this.getApplicationContext();
AndroidNativeService fs = new AndroidNativeService();
fs.stopQtService(context);
jobFinished(params,false);
//Intent serviceIntent = new Intent(this, AndroidNativeService.class);
//startService(serviceIntent);
return false;
}
@Override
public boolean onStopJob(JobParameters params) {
// whether or not you would like JobScheduler to automatically retry your failed job.
return true;
}
@Override
public boolean onUnbind(Intent intent) {
stopSelf();
return super.onUnbind(intent);
}
}

View File

@ -4,6 +4,11 @@ import android.util.Log;
import android.app.Activity; import android.app.Activity;
import android.os.*; import android.os.*;
import java.util.Map; import java.util.Map;
import android.content.pm.PackageManager;
import android.content.Context;
import android.Manifest.permission;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
/** An alternative Activity class for Qt applicaiton. /** An alternative Activity class for Qt applicaiton.
@ -11,6 +16,8 @@ import java.util.Map;
*/ */
public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.QtActivity { public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.QtActivity {
public static final int MY_PERMISSIONS_REQUEST_WRITE_STORAGE = 0x245285a8;
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { protected void onActivityResult(int requestCode, int resultCode, Intent data) {
@ -21,6 +28,17 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (ContextCompat.checkSelfPermission(this,android.Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) {
// Permission is not granted
ActivityCompat.requestPermissions(this,new String[]{android.Manifest.permission.WRITE_EXTERNAL_STORAGE},MY_PERMISSIONS_REQUEST_WRITE_STORAGE);
// MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
// app-defined int constant. The callback method gets the
// result of the request.
} else {
System.loadLibrary("friendiqa"); System.loadLibrary("friendiqa");
if((getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_NEW_TASK) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) || (getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED))) { if((getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_NEW_TASK) || (getIntent().getFlags() == Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED) || (getIntent().getFlags() == (Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED))) {
SystemDispatcher.onActivityResume(); SystemDispatcher.onActivityResume();
@ -48,6 +66,25 @@ public class AndroidNativeActivity extends org.qtproject.qt5.android.bindings.Qt
SystemDispatcher.onActivityResume(); SystemDispatcher.onActivityResume();
}} }}
} }
}
@Override public void onRequestPermissionsResult(int requestCode,String permissions[], int[] grantResults) {
switch (requestCode) {
case MY_PERMISSIONS_REQUEST_WRITE_STORAGE: {
// If request is cancelled, the result arrays are empty.
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
SystemDispatcher.onActivityResume();
} else {
}
return;
}
}
}
protected void onNewIntent(Intent data) { protected void onNewIntent(Intent data) {
System.loadLibrary("friendiqa"); System.loadLibrary("friendiqa");

View File

@ -0,0 +1,23 @@
package androidnative;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
import org.qtproject.qt5.android.bindings.QtService;
public class AndroidNativeService extends QtService
{
private static String TAG = "AndroidNative";
public void startQtService(Context ctx) {
Log.d(TAG,"Friendiqa QtService");
ctx.startService(new Intent(ctx, AndroidNativeService.class));
}
public static void stopQtService(Context ctx) {
Log.d(TAG,"Friendiqa QtServiceStop");
ctx.stopService(new Intent(ctx, AndroidNativeService.class));
}
}

View File

@ -6,9 +6,15 @@ import android.util.Log;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import android.content.Context;
import android.content.ComponentName;
import android.app.job.JobScheduler;
import android.app.job.JobInfo;
import org.qtproject.qt5.android.QtNative; import org.qtproject.qt5.android.QtNative;
import androidnative.friendiqa.FriendiqaService;
import androidnative.friendiqa.FriendiqaStopService;
import androidnative.AndroidNativeService;
import android.content.Intent;
import java.util.Map; import java.util.Map;
public class Util { public class Util {
@ -17,6 +23,7 @@ public class Util {
public static final String SET_TRANSLUCENT_STATUS_BAR = "androidnative.Util.setTranslucentStatusBar"; public static final String SET_TRANSLUCENT_STATUS_BAR = "androidnative.Util.setTranslucentStatusBar";
public static final String SET_FULL_SCREEN = "androidnative.Util.setFullScreen"; public static final String SET_FULL_SCREEN = "androidnative.Util.setFullScreen";
public static final String SET_SCHEDULE = "androidnative.Util.setSchedule";
static { static {
@ -26,6 +33,8 @@ public class Util {
setTranslucentStatusBar(message); setTranslucentStatusBar(message);
} else if (type.equals(SET_FULL_SCREEN)) { } else if (type.equals(SET_FULL_SCREEN)) {
setFullScreen(message); setFullScreen(message);
} else if (type.equals(SET_SCHEDULE)) {
setSchedule(message);
} }
} }
}); });
@ -62,6 +71,10 @@ public class Util {
return; return;
} }
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return;
}
final Boolean value = (Boolean) message.get("value"); final Boolean value = (Boolean) message.get("value");
final Activity activity = QtNative.activity(); final Activity activity = QtNative.activity();
@ -84,4 +97,52 @@ public class Util {
activity.runOnUiThread(runnable); activity.runOnUiThread(runnable);
} }
static void setSchedule(Map message) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return;
}
Log.d(TAG,"Friendiqa schedule Androidnative service");
final Integer value = (Integer) message.get("value");
//final Activity activity = QtNative.activity();
//final Service service = QtNative.service();
//final int JOB_ID = 1;
final int ONE_MIN = 60 * 1000;
Context context;
if (QtNative.activity() == null){
context = QtNative.service().getApplicationContext();
} else {
context = QtNative.activity().getApplicationContext();
}
ComponentName component = new ComponentName(context, FriendiqaService.class);
JobInfo.Builder builder = new JobInfo.Builder(2, component)
// schedule it to run any time between 1 - 5 minutes
.setMinimumLatency(value * ONE_MIN)
.setOverrideDeadline((value + 5)*ONE_MIN)
//.setPeriodic(value * ONE_MIN)
.setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY);
JobScheduler jobScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
jobScheduler.schedule(builder.build());
if (QtNative.service() != null){
Log.d(TAG,"Schedule Stopping Friendiqa Androidnative service");
ComponentName componentStopper = new ComponentName(context, FriendiqaStopService.class);
JobInfo.Builder stopbuilder = new JobInfo.Builder(1, componentStopper)
.setMinimumLatency(50)
.setOverrideDeadline(100);
JobScheduler jobStopScheduler = (JobScheduler) context.getSystemService(Context.JOB_SCHEDULER_SERVICE);
jobStopScheduler.schedule(stopbuilder.build());
//AndroidNativeService.stopQtService(context);
}
//context.stopService(new Intent(context, AndroidNativeService.class));
}
/**static void stopService(Map message){
this.stopService(new Intent(this, AndroidNativeService.class));
}
**/
} }

View File

@ -225,5 +225,7 @@
<file>qml/newsqml/ContactPage.qml</file> <file>qml/newsqml/ContactPage.qml</file>
<file>qml/newsqml/NewsLink.qml</file> <file>qml/newsqml/NewsLink.qml</file>
<file>qml/configqml/RegisterPage.qml</file> <file>qml/configqml/RegisterPage.qml</file>
<file>qml/newsqml/NewsYplayer.qml</file>
<file>js/yplayer.html</file>
</qresource> </qresource>
</RCC> </RCC>

View File

@ -0,0 +1,59 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
#ifndef ALARM_H
#define ALARM_H
#include <QObject>
class ALARM : public QObject
{
Q_OBJECT
//Q_PROPERTY(int alarmtime READ alarmtime WRITE setAlarm NOTIFY alarmChanged)
public:
static ALARM *instance();
explicit ALARM(QObject *parent = 0);
//int alarmtime() const;
signals:
void alarmChanged(QString url);
public slots:
void setAlarm(int time);
private:
int m_time;
};
#endif // UPDATENEWS_H

View File

@ -0,0 +1,82 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
//#include <QtAndroidExtras/QAndroidJniObject>
//#include <QtAndroidExtras/QAndroidJniEnvironment>
#include "alarm.h"
#include <QtCore/QDebug>
#include "AndroidNative/systemdispatcher.h"
ALARM *ALARM::instance()
{
static ALARM alarm;
return &alarm;
}
ALARM::ALARM(QObject *parent) : QObject(parent){}
void ALARM::setAlarm(int interval)
{
qDebug() << interval;
QVariantMap message;
message["value"] = interval;
AndroidNative::SystemDispatcher::instance()->loadClass("androidnative.Util");
AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.setSchedule", message);
//AndroidNative::SystemDispatcher::instance()->dispatch("androidnative.Util.stopService", message);
// auto activity = QtAndroid::androidActivity();
// auto packageManager = activity.callObjectMethod("getPackageManager",
// "()Landroid/content/pm/PackageManager;");
// auto activityIntent = packageManager.callObjectMethod("getLaunchIntentForPackage",
// "(Ljava/lang/String;)Landroid/content/Intent;",
// activity.callObjectMethod("getPackageName",
// "()Ljava/lang/String;").object());
// auto pendingIntent = QAndroidJniObject::callStaticObjectMethod("android/app/PendingIntent", "getActivity",
// "(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;",
// activity.object(), jint(0), activityIntent.object(),
// QAndroidJniObject::getStaticField<jint>("android/content/Intent",
// "FLAG_ACTIVITY_CLEAR_TOP"));
// auto alarmManager = activity.callObjectMethod("getSystemService",
// "(Ljava/lang/String;)Ljava/lang/Object;",
// QAndroidJniObject::getStaticObjectField("android/content/Context",
// "ALARM_SERVICE",
// "Ljava/lang/String;").object());
// alarmManager.callMethod<void>("set",
// "(IJLandroid/app/PendingIntent;)V",
// QAndroidJniObject::getStaticField<jint>("android/app/AlarmManager", "RTC"),
// jlong(QDateTime::currentMSecsSinceEpoch() + 100), pendingIntent.object());
}

View File

@ -31,10 +31,14 @@
#include <QApplication> #include <QApplication>
#include <QtQml/QQmlEngine> #include <QtQml/QQmlEngine>
#include <QAndroidService>
#include <QtAndroid>
#include <QtQuick> #include <QtQuick>
#include "xhr.h" #include "xhr.h"
#include "updatenews.h"
#include "filesystem.h" #include "filesystem.h"
#include "remoteauthasyncimageprovider.h" #include "remoteauthasyncimageprovider.h"
#include "alarm.h"
#include "AndroidNative/systemdispatcher.h" #include "AndroidNative/systemdispatcher.h"
#include "AndroidNative/environment.h" #include "AndroidNative/environment.h"
//#include "AndroidNative/debug.h" //#include "AndroidNative/debug.h"
@ -55,6 +59,20 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void*) {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
//qDebug()<< "argv Friendiqa"<< argv[0] <<" argv2" <<argv[1];
if (qstrcmp(argv[1],"-service")==0){
//qDebug()<<"FriendiqaMain Service";
QAndroidService app(argc, argv);
UPDATENEWS* updatenews= UPDATENEWS::instance();
updatenews->setDatabase();
updatenews->login();
updatenews->timeline();
app.connect (updatenews,SIGNAL(quitapp()),&app,SLOT(quit()));
//QtAndroid::androidService().callMethod<void>("stopSelf");
return app.exec();
}
else{
QApplication app(argc, argv); QApplication app(argc, argv);
QQuickView view; QQuickView view;
QTranslator qtTranslator; QTranslator qtTranslator;
@ -67,10 +85,14 @@ int main(int argc, char *argv[]) {
view.rootContext()->setContextProperty("xhr", xhr); view.rootContext()->setContextProperty("xhr", xhr);
FILESYSTEM* filesystem = FILESYSTEM::instance(); FILESYSTEM* filesystem = FILESYSTEM::instance();
view.rootContext()->setContextProperty("filesystem", filesystem); view.rootContext()->setContextProperty("filesystem", filesystem);
ALARM* alarm = ALARM::instance();
view.rootContext()->setContextProperty("alarm", alarm);
// UPDATENEWS* updatenews = UPDATENEWS::instance();
// view.rootContext()->setContextProperty("updatenews", updatenews);
view.setSource(QUrl("qrc:/qml/friendiqa.qml")); view.setSource(QUrl("qrc:/qml/friendiqa.qml"));
view.show(); view.show();
view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit())); view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit()));
return app.exec(); return app.exec();
}
} }

View File

@ -0,0 +1,399 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
#include "updatenews.h"
#include <QHttpPart>
#include <QTextCodec>
#include <QUrlQuery>
#include <QList>
#include <QDataStream>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonArray>
#include <QQmlEngine>
#include <QSqlQuery>
#include <QSqlRecord>
#include <QSqlDatabase>
#include <QSqlError>
#include <QDateTime>
//#include "AndroidNative/systemdispatcher.h"
UPDATENEWS *UPDATENEWS::instance()
{
static UPDATENEWS udn;
return &udn;
}
UPDATENEWS::UPDATENEWS(QObject *parent) : QObject(parent)
{
}
void UPDATENEWS::setUrl(QString url)
{
if (url!=m_url) {
m_url = url;
xhr.setUrl(url);
emit urlChanged(m_url);
}
}
void UPDATENEWS::setDatabase()
{
static QQmlEngine qe;
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())
{
qDebug() << "Error: connection with database fail " << m_db.lastError();
}
}
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();
m_api="/api/statuses/friends_timeline";
xhr.setApi(m_api);
}
}
void UPDATENEWS::timeline()
{
qDebug()<<"Friendiqa start timeline";
QSqlQuery query("SELECT status_id FROM news WHERE username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db);
if (query.isActive() && query.isSelect()){query.first();};
QString lastid=query.value(0).toString();
xhr.clearParams();
xhr.setParam("since_id",lastid);
xhr.setParam("count","50");
xhr.get();
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)));
}
//void UPDATENEWS::startservice(QString type,QVariantMap map)
//{
// qDebug ()<<"Friediqa start service "<<type;
// if (type=="androidnativeServiceStarted"){
// setDatabase();
// login();
// timeline();
// }
//}
void UPDATENEWS::store(QByteArray serverreply,QString apiname)
{
QJsonDocument news;
qDebug()<<apiname << news;
QJsonParseError jsonerror;
news=QJsonDocument::fromJson(serverreply,&jsonerror);
if (news.isArray()){
for (int i=0; i < news.array().count();i++){
QJsonValue newsitem=news[i];
QSqlQuery query(m_db);
query.prepare("INSERT INTO news (username,messagetype,text,created_at,in_reply_to_status_id,source,status_id,in_reply_to_user_id,geo,favorited,uid,statusnet_html,statusnet_conversation_id,friendica_activities,friendica_activities_self,attachments,friendica_owner) " "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
query.bindValue(0,username);
query.bindValue(1,"0");
query.bindValue(2, newsitem["text"].toString().toUtf8().toBase64());
QString sourcedate=newsitem["created_at"].toString();
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
query.bindValue(3,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
if(newsitem["in_reply_to_status_id"]!=QJsonValue::Null){query.bindValue(4, newsitem["in_reply_to_status_id"].toInt());};
query.bindValue(5,newsitem["source"]);
query.bindValue(6,newsitem["id"].toInt());
if(newsitem["in_reply_to_user_id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["in_reply_to_user_id"].toInt());};
query.bindValue(8,newsitem["geo"]);
query.bindValue( 9, newsitem["favorited"].toInt());
query.bindValue(10, newsitem["user"]["id"].toInt());
query.bindValue(11, newsitem["statusnet_html"].toString().toUtf8().toBase64());
query.bindValue(12, newsitem["statusnet_conversation_id"].toInt());
QJsonArray likeArray;QJsonArray dislikeArray;QJsonArray attendyesArray;QJsonArray attendnoArray;QJsonArray attendmaybeArray;
if (newsitem.toObject().contains("friendica_activities")){
for (int a=0; a < newsitem["friendica_activities"]["like"].toArray().count();a++){
likeArray.append(newsitem["friendica_activities"]["like"][a]["url"].toString());
}
for (int b=0; b < newsitem["friendica_activities"]["dislike"].toArray().count();b++){
dislikeArray.append(newsitem["friendica_activities"]["dislike"][b]["url"].toString());
}
for (int c=0; c < newsitem["friendica_activities"]["attendyes"].toArray().count();c++){
attendyesArray.append(newsitem["friendica_activities"]["attendyes"][c]["url"].toString());
}
for (int d=0; d < newsitem["friendica_activities"]["attendno"].toArray().count();d++){
attendnoArray.append(newsitem["friendica_activities"]["attendno"][d]["url"].toString());
}
for (int e = 0; e < newsitem["friendica_activities"]["attendmaybe"].toArray().count();e++){
attendmaybeArray.append(newsitem["friendica_activities"]["attendmaybe"][e]["url"].toString());
}
};
QJsonArray friendica_activities; friendica_activities={likeArray,dislikeArray,attendyesArray,attendnoArray,attendmaybeArray};
QJsonDocument activities; activities.setArray(friendica_activities);
query.bindValue(13,activities.toJson(QJsonDocument::Compact).toBase64());
query.bindValue(14,"[]");
if (newsitem["attachments"]!=QJsonValue::Undefined){
query.bindValue(15, QJsonDocument(newsitem["attachments"].toArray()).toJson(QJsonDocument::Compact).toBase64());
};
query.bindValue(16, newsitem["friendica_owner"]["url"]);
query.exec() ;
}
}
else {
qDebug()<< "Friendiqa updatenews error";
emit this->error(m_api,QTextCodec::codecForName("utf-8")->toUnicode(serverreply));
if(m_updateInterval!=0){
m_db.close();
m_db.removeDatabase(m_db.connectionName());
emit quitapp();
alarm.setAlarm(m_updateInterval);
};
}
QList<QJsonValue> newcontacts=findNewContacts(news);
updateContacts(newcontacts);
startImagedownload();
connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
}
void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index){
if (downloadtype=="contactlist"){
QSqlQuery testquery("SELECT profile_image FROM contacts WHERE profile_image_url ='"+imageurl+ "' AND username = '" +username+"'",m_db);
testquery.exec();
//qDebug()<< "update imageurl for " <<imageurl << " from " <<testquery.value(0).toString() <<" to "<< filename <<" index " << index << " newcontactnames.length " <<newcontactnames.length();
QSqlQuery query("UPDATE contacts SET profile_image='"+ filename +"' WHERE profile_image_url ='"+imageurl+ "' AND username = '" +username+"'",m_db);
query.exec();
if (index==(newcontactnames.length()-1)){
if(m_updateInterval!=0){
m_db.close();
m_db.removeDatabase(m_db.connectionName());
emit quitapp();
alarm.setAlarm(m_updateInterval);
};
}
}
}
QList <QJsonValue> UPDATENEWS::findNewContacts(QJsonDocument news){
QSqlQuery query("SELECT profile_image_url FROM contacts",m_db);
QList<QString> imageurls;
while (query.next()){
imageurls.append(query.value(0).toString());
}
QList<QJsonValue> newcontacts;
qDebug()<<"updatenews findcontacts count "<<news.array().count();
for (int i=0; i<news.array().count();i++){
//main contacts
if(imageurls.contains(news[i]["user"]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["user"]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["user"]);
newcontactimagelinks.append(news[i]["user"]["profile_image_url"].toString());
newcontactnames.append(news[i]["user"]["screen_name"].toString());
}
//like/dislike contacts
if (news[i].toObject().contains("friendica_activities") ){
for (int a=0; a < news[i]["friendica_activities"]["like"].toArray().count();a++){
if(imageurls.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_activities"]["like"][a]);
newcontactimagelinks.append(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_activities"][a]["screen_name"].toString());
}
}
for (int b=0; b < news[i]["friendica_activities"]["dislike"].toArray().count();b++){
if(imageurls.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_activities"]["dislike"][b]);
newcontactimagelinks.append(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_activities"][b]["screen_name"].toString());
}
}
}
//owner contacts
if (news[i].toObject().contains("friendica_owner") ){
if(imageurls.contains(news[i]["friendica_owner"]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_owner"]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_owner"]);
newcontactimagelinks.append(news[i]["friendica_owner"]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_owner"]["screen_name"].toString());
}
}
}
return newcontacts;
}
void UPDATENEWS::updateContacts(QList<QJsonValue> contacts){
qint64 currentTime =QDateTime::currentMSecsSinceEpoch();
for (int i=0; i < contacts.count();i++){
QJsonValue contact=contacts[i];
QSqlQuery query(m_db);
//qDebug() << "updatecontact " << contact["screen_name"];
QSqlQuery testquery("SELECT url FROM contacts WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'",m_db);
if (testquery.first()){
query.prepare("UPDATE contacts SET id=?, name=?, screen_name=?, location=?,imageAge=?,"
"profile_image_url=?, description=?, protected=?, followers_count=?,"
"friends_count=?, created_at=?, favourites_count=?, utc_offset=?, time_zone=?, statuses_count=?,"
"following=?, verified=?, statusnet_blocking=?, notifications=?, statusnet_profile_url=?, cid=?, network=?, timestamp=? "
" WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'");
query.bindValue(0, contact["id"].toInt());
query.bindValue(1, contact["name"].toString().toUtf8().toBase64());
query.bindValue(2, contact["screen_name"]);
query.bindValue(3, contact["location"]);
query.bindValue(4, currentTime);
query.bindValue(5, contact["profile_image_url"]);
if(contact["description"].isNull() ){query.bindValue(6,"");}else{query.bindValue(6, contact["description"].toString().toUtf8().toBase64());};
query.bindValue(7,contact["protected"].toBool());
query.bindValue(8,contact["followers_count"].toInt());
query.bindValue(9,contact["friends_count"].toInt());
QString sourcedate=contact["created_at"].toString();
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
query.bindValue(10,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
query.bindValue(11,contact["favorites_count"].toInt());
query.bindValue(12,contact["utc_offset"].toInt());
query.bindValue(13,contact["time_zone"].toString());
query.bindValue(14,contact["statuses_count"].toInt());
query.bindValue(15,contact["following"].toBool());
query.bindValue(16,contact["verfied"].toBool());
query.bindValue(17,contact["statusnet_blocking"].toBool());
query.bindValue(18,contact["notifications"].toBool());
query.bindValue(19,contact["statusnet_profile_url"]);
query.bindValue(20,contact["cid"].toInt());
query.bindValue(21,contact["network"]);
qint64 timestamp=0;
QString timestamphelper=contact["profile_image_url"].toString();
try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){};
query.bindValue(22,timestamp);
}
else{
query.prepare("INSERT INTO contacts (username, id, name, screen_name, location,imageAge,"
"profile_image_url, description, profile_image, url, protected, followers_count,"
"friends_count, created_at, favourites_count, utc_offset, time_zone, statuses_count,"
"following, verified, statusnet_blocking, notifications, statusnet_profile_url, cid, network, isFriend, timestamp)"
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
query.bindValue(0,username);
query.bindValue(1, contact["id"].toInt());
query.bindValue(2, contact["name"].toString().toUtf8().toBase64());
query.bindValue(3, contact["screen_name"]);
query.bindValue(4, contact["location"]);
query.bindValue(5, currentTime);
query.bindValue(6, contact["profile_image_url"]);
if(contact["description"].isNull() ){query.bindValue(7,"");}else{query.bindValue(7, contact["description"].toString().toUtf8().toBase64());};
query.bindValue(8,"none");
query.bindValue(9, contact["url"].toString());
query.bindValue(10,contact["protected"].toBool());
query.bindValue(11,contact["followers_count"].toInt());
query.bindValue(12,contact["friends_count"].toInt());
QString sourcedate=contact["created_at"].toString();
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
query.bindValue(13,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
query.bindValue(14,contact["favorites_count"].toInt());
query.bindValue(15,contact["utc_offset"].toInt());
query.bindValue(16,contact["time_zone"].toString());
query.bindValue(17,contact["statuses_count"].toInt());
query.bindValue(18,contact["following"].toBool());
query.bindValue(19,contact["verfied"].toBool());
query.bindValue(20,contact["statusnet_blocking"].toBool());
query.bindValue(21,contact["notifications"].toBool());
query.bindValue(22,contact["statusnet_profile_url"]);
query.bindValue(23,contact["cid"].toInt());
query.bindValue(24,contact["network"]);
query.bindValue(25, 0);
qint64 timestamp=0;
QString timestamphelper=contact["profile_image_url"].toString();
try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){};
query.bindValue(26,timestamp);
}
query.exec() ;
}
emit this->success(m_api);
if ((contacts.count()==0) && (m_updateInterval!=0)){
m_db.close();
m_db.removeDatabase(m_db.connectionName());
emit quitapp();
alarm.setAlarm(m_updateInterval);
};
}
QString UPDATENEWS::url() const
{
return m_url;
}
void UPDATENEWS::startImagedownload()
{
xhr.setDownloadtype("contactlist");
xhr.setFilelist(newcontactimagelinks);
xhr.setContactlist(newcontactnames);
xhr.setImagedir(m_imagedir);
xhr.getlist();
}
void UPDATENEWS::showError(QString data, QString url,QString api, int code )
{
emit this->error(api,data);
if(m_updateInterval!=0){
m_db.close();
m_db.removeDatabase(m_db.connectionName());
emit quitapp();
alarm.setAlarm(m_updateInterval);
};
}

View File

@ -0,0 +1,92 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
#ifndef UPDATENEWS_H
#define UPDATENEWS_H
#include <QObject>
#include <QJsonObject>
#include <QSqlDatabase>
#include "xhr.h"
#include "alarm.h"
#include "AndroidNative/systemdispatcher.h"
class UPDATENEWS : public QObject
{
Q_OBJECT
Q_PROPERTY(QString url READ url WRITE setUrl NOTIFY urlChanged)
// Q_PROPERTY(QString login READ login NOTIFY loginChanged)
public:
static UPDATENEWS *instance();
explicit UPDATENEWS(QObject *parent = 0);
QString url() const;
//QString login() const;
signals:
void urlChanged(QString url);
void success(QString api);
void error(QString api, QString content);
void quitapp();
public slots:
void setUrl(QString url);
void setDatabase();
void login();
void timeline();
//void startservice(QString type,QVariantMap map);
void startImagedownload();
void updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index);
void store(QByteArray serverreply,QString apiname);
void showError(QString data, QString url,QString api, int code);
private:
QString m_url;
QString m_api;
QString m_imagedir;
QString m_login;
QString username;
QSqlDatabase m_db;
QList<QJsonValue> findNewContacts(QJsonDocument news);
int m_updateInterval;
//void timeline();
//void store(QByteArray serverreply,QString apiname);
void updateContacts(QList<QJsonValue> contacts);
XHR xhr;
ALARM alarm;
QList<QString> newcontactimagelinks;
QList<QString> newcontactnames;
};
#endif // UPDATENEWS_H

View File

@ -290,7 +290,7 @@ void XHR::onReplyError(QNetworkReply::NetworkError code)
void XHR::onReplySuccess() void XHR::onReplySuccess()
{ {
qDebug() << "!"; qDebug() << "!";
emit this->success( bufferToString(), m_api); emit this->success(buffer, m_api);
buffer.clear(); buffer.clear();
// reply->deleteLater(); // reply->deleteLater();
} }

View File

@ -79,7 +79,7 @@ signals:
void networktypeChanged(); void networktypeChanged();
void downloaded(QString type, QString url, QString filename, int i); void downloaded(QString type, QString url, QString filename, int i);
void downloadedjson(QString type, QString url, QString filename, int i,QJsonObject jsonObject); void downloadedjson(QString type, QString url, QString filename, int i,QJsonObject jsonObject);
void success(QString data, QString api); void success(QByteArray data, QString api);
void error(QString data, QString url,QString api, int code); void error(QString data, QString url,QString api, int code);
public slots: public slots:

View File

@ -21,7 +21,9 @@ SOURCES += common/friendiqa.cpp \
common/uploadableimage.cpp \ common/uploadableimage.cpp \
common/xhr.cpp \ common/xhr.cpp \
common/filesystem.cpp \ common/filesystem.cpp \
common/remoteauthasyncimageprovider.cpp common/remoteauthasyncimageprovider.cpp \
common/updatenews.cpp \
common/alarmandroid.cpp
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
@ -38,14 +40,17 @@ OTHER_FILES += qml/friendiqa.qml \
js/*.js js/*.js
TRANSLATIONS += translations/friendiqa-de.ts \ TRANSLATIONS += translations/friendiqa-de.ts \
translations/friendiqa-es.ts translations/friendiqa-es.ts \
translations/friendiqa-it.ts
HEADERS += \ HEADERS += \
common/uploadableimage.h \ common/uploadableimage.h \
common/xhr.h \ common/xhr.h \
common/filesystem.h \ common/filesystem.h \
common/remoteauthasyncimageprovider.h common/remoteauthasyncimageprovider.h \
common/updatenews.h \
common/alarm.h
DISTFILES += \ DISTFILES += \
qml/calendarqml/*.qml \ qml/calendarqml/*.qml \
android/AndroidManifest.xml \ android/AndroidManifest.xml \

View File

@ -95,6 +95,20 @@ function friendicaWebRequest(url,rootwindow,callback) {
xhrequest.send(); xhrequest.send();
} }
function friendicaXmlRequest(url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() {
if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
else if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{callback(xhrequest.responseXML)}
catch (e){showMessage("Error","API:\n" +url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
}
}
xhrequest.open("GET", url);
xhrequest.responseType ="document";
xhrequest.send();
}
function friendicaRemoteAuthRequest(login,url,c_url,rootwindow,callback) { function friendicaRemoteAuthRequest(login,url,c_url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest(); var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {

View File

@ -465,7 +465,7 @@ function chatsfromdb(database,user,callback,stop_time){
helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html); helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
helpernews.text=Qt.atob(helpernews.text); helpernews.text=Qt.atob(helpernews.text);
helpernews.id=helpernews.status_id; helpernews.id=helpernews.status_id;
if (helpernews.attachments!==null){print(Qt.atob(helpernews.attachments));helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))}; if (helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
newsArray.push(helpernews); newsArray.push(helpernews);
} }
callback(newsArray); callback(newsArray);

View File

@ -135,6 +135,21 @@ else{
if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)} if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)}
} }
} }
// if (newsitemobject.text.indexOf("https://www.youtube.com/watch")>-1){
// //print("message "+msg.options.showWebsiteForLinks);
// if (msg.options.showYoutube!="false"){
// var ythelper={mimetype:"video/youtube"}
// var yttext=newsitemobject.text;
// while (yttext.indexOf("https://www.youtube.com/watch")>-1){
// var ythelperstringposition=linktext.indexOf("watch?v=");
// var ytposend=findend(yttext,ythelperstringposition);
// ythelper.url=yttext.substring(yttext.lastIndexOf("http",linkhelperstringposition),linkposend);
// linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
// if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
// }
// }
// }
// if (newsitemobject.text.indexOf(".html")>-1){ // if (newsitemobject.text.indexOf(".html")>-1){
// //print("message "+msg.options.showWebsiteForLinks); // //print("message "+msg.options.showWebsiteForLinks);
// if (msg.options.showWebsiteForLinks!="false"){ // if (msg.options.showWebsiteForLinks!="false"){

View File

@ -513,9 +513,6 @@ function updateView(viewtype){
//downloadNotice.text="xhr start "+Date.now() //downloadNotice.text="xhr start "+Date.now()
switch(viewtype){ switch(viewtype){
case "Conversations": case "Conversations":
// updatenews.setDatabase();
// updatenews.login();
// updatenews.timeline();
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server); xhr.setUrl(login.server);
@ -525,9 +522,6 @@ function updateView(viewtype){
xhr.setParam("count",50) xhr.setParam("count",50)
break; break;
case "Timeline": case "Timeline":
// updatenews.setDatabase();
// updatenews.login();
// updatenews.timeline();
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server); xhr.setUrl(login.server);
@ -565,6 +559,12 @@ function updateView(viewtype){
xhr.setApi("/api/favorites"); xhr.setApi("/api/favorites");
xhr.clearParams(); xhr.clearParams();
break; break;
case "Replies":
xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server);
xhr.setApi("/api/statuses/replies");
xhr.clearParams();
break;
default: default:
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
@ -575,8 +575,8 @@ function updateView(viewtype){
xhr.setParam("count",50) xhr.setParam("count",50)
newstab.newstabstatus="Conversations"; newstab.newstabstatus="Conversations";
} }
xhr.get();
xhr.get();
if (viewtype==="Conversations"){Newsjs.allchatsfromdb(db,login.username,function(temp){ if (viewtype==="Conversations"){Newsjs.allchatsfromdb(db,login.username,function(temp){
newsStack.allchats=temp newsStack.allchats=temp
})} })}

View File

@ -0,0 +1,45 @@
<html>
<head>
<title>-1</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
</head>
<body bgcolor="black" marginwidth="0" marginheight="0">
<div id="player"></div>
<script>
function getVideoId() {
return window.location.href.slice(window.location.href.indexOf('?') + 1);
}
var tag = document.createElement('script');
tag.src = "https://www.youtube.com/iframe_api";
var firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
var player;
function onYouTubeIframeAPIReady() {
player = new YT.Player('player', {
playerVars: { 'html5': 1, 'iv_load_policy': 3 },
frameborder: '0',
height: '100%',
width: '100%',
videoId: getVideoId(),
events: {
'onReady': onPlayerReady,
'onStateChange': onPlayerStateChange
}
});
}
function onPlayerReady(event) {
document.title = 0;
}
function onPlayerStateChange(event) {
if (event.data == YT.PlayerState.PLAYING) {
document.title = 1;
} else if (event.data == YT.PlayerState.ENDED || event.data == YT.PlayerState.PAUSED) {
document.title = 2;
}
}
</script>
</body>
</html>

View File

@ -93,99 +93,106 @@ StackView{
} }
Text { Text {
text: qsTr("Server") text: qsTr("Server")
x: 4*mm; y: 10*mm font.pixelSize:3*mm
x: 4*mm; y: 10*mm
} }
Text { Text {
text: qsTr("Nickname") text: qsTr("Nickname")
x: 4*mm; y: 20*mm font.pixelSize:3*mm
x: 4*mm; y: 20*mm
} }
Text { Text {
text: qsTr("Password") text: qsTr("Password")
x: 4*mm; y: 30*mm font.pixelSize:3*mm
x: 4*mm; y: 30*mm
} }
Text { Text {
text: qsTr("Image dir.") text: qsTr("Image dir.")
x: 4*mm; y: 40*mm font.pixelSize:3*mm
x: 4*mm; y: 40*mm
} }
Text { Text {
text: qsTr("Max. News") text: qsTr("Max. News")
x: 4*mm; y: 50*mm font.pixelSize:3*mm
} x: 4*mm; y: 50*mm
Text {
text: qsTr("News as")
x: 4*mm; y: 60*mm
} }
Text { Text {
text: qsTr("Interval (0=None)") text: qsTr("News as")
visible: false font.pixelSize:3*mm
x: 4*mm; y: 70*mm; width:20*mm;wrapMode: Text.Wrap x: 4*mm; y: 60*mm
} }
Text {
text: qsTr("Sync Interval (0=None)")
font.pixelSize:3*mm
//visible: false
x: 4*mm; y: 70*mm; //width:35*mm;wrapMode: Text.Wrap
}
// Text { // Text {
// text: qsTr("Show Website") // text: qsTr("Show Website")
// x: 4*mm; y: 70*mm; width: 20*mm // x: 4*mm; y:80*mm; width: 20*mm
// } // }
Image{ Image{
id:servericon id:servericon
x:19*mm;y:10*mm x:4*mm;y:13.5*mm
width:5*mm; height: 5*mm width:5*mm; height: 5*mm
visible: false visible: false
source:"" source:""
MouseArea{ MouseArea{
anchors.fill:parent anchors.fill:parent
onClicked:{ onClicked:{
Service.showServerConfig(servername.text, configBackground, function(configString){ Service.showServerConfig(servername.text, configBackground, function(configString){
var serverconfigObject=Qt.createQmlObject(configString,configBackground,"serverconfigOutput");}) var serverconfigObject=Qt.createQmlObject(configString,configBackground,"serverconfigOutput");})
}
} }
} }
}
BlueButton{ BlueButton{
id:serverSearchButton id:serverSearchButton
text:"\uf002" text:"\uf002"
x:19*mm x:4*mm
y:10*mm y:13.5*mm
width: 5*mm; height:5*mm width: 5*mm; height:5*mm
visible: servericon.visible?false:true visible: servericon.visible?false:true
onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))} onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))}
} }
Rectangle{color: "light grey"; x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;}
Rectangle{color: "light grey"; x: 25*mm; y: 10*mm; width: root.width/2; height: 5*mm;} Flickable {
Flickable { id: servernameFlickable
id: servernameFlickable x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;
x: 25*mm; y: 10*mm; width: root.width/2; height: 5*mm; contentWidth: servername.paintedWidth
contentWidth: servername.paintedWidth contentHeight: servername.paintedHeight
contentHeight: servername.paintedHeight clip: true
clip: true TextEdit {
TextEdit { id: servername
id: servername width: servernameFlickable.width
width: servernameFlickable.width height: servernameFlickable.height
height: servernameFlickable.height focus: true
focus: true font.pixelSize:3*mm
text:"https://..." text:"https://..."
onEditingFinished:{ onEditingFinished:{
if((servername.text).substring(0,14) =="https://...http"){ if((servername.text).substring(0,14) =="https://...http"){
serverstring.text= (serverstring.text).substring(11) serverstring.text= (serverstring.text).substring(11)
} }
configBackground.setServericon(servername.text) configBackground.setServericon(servername.text)
} }
onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable) onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable)
} }
} }
Rectangle{ Rectangle{
color: "light grey" color: "light grey"
x: 25*mm; y: 20*mm; width: root.width/2-9*mm; height: 5*mm; x: 4*mm; y: 23.5*mm; width: root.width-14*mm; height: 5*mm;
TextInput { TextInput {
id: username id: username
anchors.fill: parent anchors.fill: parent
selectByMouse: true font.pixelSize:3*mm
selectByMouse: true
onEditingFinished:{ onEditingFinished:{
if (username.text.indexOf('@')>-1){ if (username.text.indexOf('@')>-1){
Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground) Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground)
@ -201,84 +208,40 @@ StackView{
} }
} }
} }
BlueButton { BlueButton {
x: root.width/2+18*mm; y: 20*mm; width:7*mm x: root.width-9*mm; y: 23.5*mm; width:7*mm
text: "\uf234" text: "\uf234"
onClicked: { onClicked: {
configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}}) configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
} }
} }
Rectangle{ Rectangle{
color: "light grey" color: "light grey"
x: 25*mm; y: 30*mm; width: root.width/2; height: 5*mm; x: 4*mm; y: 33.5*mm; width: root.width-6*mm; height: 5*mm;
TextInput { TextInput {
id: password id: password
anchors.fill: parent anchors.fill: parent
font.pixelSize:3*mm
selectByMouse: true selectByMouse: true
echoMode: TextInput.PasswordEchoOnEdit echoMode: TextInput.PasswordEchoOnEdit
} }
} }
Rectangle{color: "light grey"; x: 25*mm; y: 40*mm; width: root.width/2-9*mm; height: 5*mm;} Rectangle{color: "light grey"; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;}
Flickable { Flickable {
id: imagestoreFlickable id: imagestoreFlickable
x: 25*mm; y: 40*mm; width: root.width/2-9*mm; height: 5*mm; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;
clip: true clip: true
TextInput { TextInput {
id: imagestore id: imagestore
width: imagestoreFlickable.width width: imagestoreFlickable.width
height: imagestoreFlickable.height height: imagestoreFlickable.height
font.pixelSize:3*mm
wrapMode: TextEdit.NoWrap wrapMode: TextEdit.NoWrap
onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable) onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
} }
} }
Slider{ id: maxNews
x:34*mm; y: 50*mm;width: root.width/3;height:5*mm
minimumValue: 0;maximumValue:2000; stepSize: 100
}
Rectangle{color: "light grey"; x: 25*mm; y: 50*mm; width: 9*mm; height: 5*mm;
TextEdit{id:maxNewsText;
anchors.fill: parent
verticalAlignment:TextEdit.AlignRight
text:maxNews.value
focus: true
selectByMouse: true
}
}
Rectangle{
x: 25*mm; y: 60*mm; width: root.width/2; height: 5*mm;
color:"light grey"
Text{
id: newsTypeField
anchors.fill: parent
text:"Conversations"
}
MouseArea{
anchors.fill:parent
onClicked:newstypemenu.popup()
}
}
Slider{ id: messageIntervalSlider
visible: false
x:37*mm; y: 70*mm;width: root.width/3;height:5*mm
minimumValue: 0;maximumValue:24; stepSize: 0.5
}
Rectangle{
visible:false
x: 25*mm; y: 70*mm; width: 9*mm; height: 5*mm;
TextEdit{
id: messageIntervalField
anchors.fill: parent
verticalAlignment:TextEdit.AlignRight
text:messageIntervalSlider.value
focus: true
selectByMouse: true
}
}
FileDialog { FileDialog {
id: imagestoreDialog id: imagestoreDialog
@ -290,20 +253,71 @@ StackView{
imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/" imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/"
imagestore.text=imagestoreString imagestore.text=imagestoreString
} }
} }
BlueButton { BlueButton {
x: root.width/2+18*mm; y: 40*mm; width: 7*mm; height: 5*mm; x: root.width-9*mm; y: 43.5*mm; width: 7*mm; height: 5*mm;
text: "..." text: "..."
onClicked: onClicked:
{imagestoreDialog.open()} {imagestoreDialog.open()}
} }
Slider{ id: maxNews
x:19*mm; y: 53.5*mm;width: root.width/2;height:5*mm
minimumValue: 0;maximumValue:2000; stepSize: 100
}
Rectangle{color: "light grey"; x: 4*mm; y: 53.5*mm; width: 9*mm; height: 5*mm;
TextEdit{id:maxNewsText;
anchors.fill: parent
font.pixelSize:3*mm
verticalAlignment:TextEdit.AlignRight
text:maxNews.value
focus: true
selectByMouse: true
}
}
Rectangle{
x: 4*mm; y: 63.5*mm; width: newsTypeField.contentWidth+2*mm; height: 5*mm;
color:"light grey"
Text{
id: newsTypeField
anchors.fill: parent
font.pixelSize:3*mm
text:"Conversations"
}
MouseArea{
anchors.fill:parent
onClicked:newstypemenu.popup()
}
}
Slider{ id: messageIntervalSlider
x:22*mm; y: 73.5*mm;width: root.width/2;height:5*mm
minimumValue: 0;maximumValue:120; stepSize: 15
}
Rectangle{
x: 4*mm; y: 73.5*mm; width: 9*mm; height: 5*mm;
TextEdit{
id: messageIntervalField
anchors.fill: parent
font.pixelSize:3*mm
verticalAlignment:TextEdit.AlignRight
text:messageIntervalSlider.value
focus: true
selectByMouse: true
}
}
Text{x: 14*mm; y: 73.5*mm; width: 5*mm; height: 5*mm;
font.pixelSize:3*mm
text:qsTr("Min.")
}
// CheckBox{ // CheckBox{
// id:showwebsiteCheckbox // id:showwebsiteCheckbox
// x:35*mm;y:70*mm // x:35*mm;y:80*mm
// onClicked:{ // onClicked:{
// if (checked==true){ // if (checked==true){
// Service.updateglobaloptions(root.db,"showWebsiteForLinks","true") // Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
@ -314,11 +328,10 @@ StackView{
// root.globaloptions.showWebsiteForLinks="false" // root.globaloptions.showWebsiteForLinks="false"
// } // }
// } // }
// } // }
BlueButton { BlueButton {
x: 25*mm; y: 78*mm x: 4*mm; y: 83.5*mm
text: qsTr("Confirm") text: qsTr("Confirm")
onClicked:{ onClicked:{
var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text,maxnews:maxNewsText.text,interval: messageIntervalField.text, newsViewType:newsTypeField.text}; var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text,maxnews:maxNewsText.text,interval: messageIntervalField.text, newsViewType:newsTypeField.text};
@ -352,7 +365,10 @@ StackView{
root.login=userconfig; root.login=userconfig;
root.news=[]; root.news=[];
},"isActive",0); },"isActive",0);
Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc}) Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc});
if(osSettings.osType=="Android" && userconfig.timerInterval !=0){
alarm.setAlarm(userconfig.timerInterval);
}
Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root) Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root)
} }
}); });
@ -382,7 +398,7 @@ StackView{
imagestore.text=""; imagestore.text="";
maxNews.value=0; maxNews.value=0;
newsTypeField.text="Conversations"; newsTypeField.text="Conversations";
messageIntervalSlider.value=0; messageIntervalSlider.value=30;
userButton.text=qsTr("User"); userButton.text=qsTr("User");
Helperjs.readData(db,"config","",function(storedUsers){ Helperjs.readData(db,"config","",function(storedUsers){
storedUsers.sort(function(obj1, obj2) { storedUsers.sort(function(obj1, obj2) {
@ -405,7 +421,7 @@ StackView{
imagestore.text="" imagestore.text=""
maxNews.value=0 maxNews.value=0
newsTypeField.text="Conversations" newsTypeField.text="Conversations"
messageIntervalSlider.value=0 messageIntervalSlider.value=30
userButton.text=qsTr("User") userButton.text=qsTr("User")
} }
} }
@ -449,12 +465,12 @@ StackView{
if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0 if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0
) )
}) })
//Service.readGlobaloptions(db,function(go){ // Service.readGlobaloptions(db,function(go){
// if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true} // if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
//}) // })
} }
catch (e){ catch (e){print(e)
Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){ Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){
var bpos=html.indexOf("baseurl"); var bpos=html.indexOf("baseurl");
var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos))); var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos)));

View File

@ -43,7 +43,7 @@ Rectangle{
textFormat: Text.RichText textFormat: Text.RichText
width: parent.width width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: "<b>Friendiqa v0.3.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+ text: "<b>Friendiqa v0.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
"Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+ "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+
"Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+ "Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+
"Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+ "Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+

View File

@ -36,6 +36,7 @@ QtObject{
property int appHeight: Screen.desktopAvailableHeight property int appHeight: Screen.desktopAvailableHeight
property int backKey: Qt.Key_Back property int backKey: Qt.Key_Back
//property string attachImageDir:filesystem.cameraPath+"/" //property string attachImageDir:filesystem.cameraPath+"/"
property string osType: "Android"
property string imagePickQml: "ImagePicker" property string imagePickQml: "ImagePicker"
property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+ property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+
imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+ imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+

View File

@ -34,6 +34,7 @@ QtObject{
property real appWidth: 500 property real appWidth: 500
property real appHeight: 500 property real appHeight: 500
property int backKey: Qt.Key_Escape property int backKey: Qt.Key_Escape
property string osType: "Android"
//property string attachImageDir:filesystem.homePath+"/Pictures/" //property string attachImageDir:filesystem.homePath+"/Pictures/"
property string imagePickQml: "ImagePickerLinux" property string imagePickQml: "ImagePickerLinux"
} }

View File

@ -194,8 +194,10 @@ TabView{
Component.onCompleted: { Component.onCompleted: {
Service.readGlobaloptions(db,function(go){globaloptions=go}) Service.readGlobaloptions(db,function(go){globaloptions=go})
//print(xhr.networktype); //print(xhr.networktype);
if(osSettings.imagePickQml=="ImagePicker"){var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml"); if(osSettings.osType=="Android"){
var IntentReceiverQml = component.createObject(root) var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml");
var IntentReceiverQml = component.createObject(root);
} }
} }
} }

View File

@ -38,6 +38,10 @@ Item {
Component.onCompleted: { Component.onCompleted: {
SystemDispatcher.setInitialized(); SystemDispatcher.setInitialized();
print("timer " + login.timerInterval)
if (login.timerInterval !=0){
alarm.setAlarm(login.timerInterval);
}
} }
} }

View File

@ -45,8 +45,23 @@ Rectangle{
// WebView {id:htmlview; // WebView {id:htmlview;
// anchors.fill: parent // anchors.fill: parent
// } // }
Component.onCompleted: //Helperjs.friendicaWebRequest(url,parent,function(html){ Component.onCompleted:{
//print(html);
htmlview.text="Text <iframe src='"+url+"' width = '300px' height = '300px'>" // Helperjs.friendicaWebRequest(url,parent,function(document){
//}) // print(document);
//// var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
//// //iterate through them
//// for (i=0; i<metas.length; i++) {
//// if (metas[i].getAttribute("name") == "keywords") {
//// print(metas[i].getAttribute("content"));
//// }
//// else if (metas[i].getAttribute("name") == "description") {
//// console.log(metas[i].getAttribute("content"));
//// }
//// }
// //print(html);
// htmlview.text=""
// })
}
} }

View File

@ -40,6 +40,8 @@ import "qrc:/js/helper.js" as Helperjs
import "qrc:/js/service.js" as Service import "qrc:/js/service.js" as Service
import AndroidNative 1.0
Item { Item {
Connections{ Connections{
target:newstab target:newstab
@ -59,6 +61,25 @@ Item {
} }
} }
// Connections{
// target:xhr
// onError:{
// Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);
// }
// onSuccess:{
// if (api=="/api/statuses/friends_timeline"){
// // downloadNotice.text=downloadNotice.text+ "\n xhr finished "+Date.now();
// //Service.processNews(api,data);
// if(login.newsViewType=="Timeline"){
// Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
// else{Newsjs.chatsfromdb(db,login.username,function(dbnews){
// showNews(dbnews);
// })}
// }
// }
// }
Timer {id:replytimer; interval: 1000; running: false; repeat: false Timer {id:replytimer; interval: 1000; running: false; repeat: false
onTriggered: { onTriggered: {
if(newstab.newstabstatus=="Conversation"){ if(newstab.newstabstatus=="Conversation"){
@ -221,6 +242,14 @@ Item {
Service.updateView("Favorites") Service.updateView("Favorites")
} }
} }
QC2.Action {
text: qsTr("Replies")
onTriggered:{
newsStack.updateMethodNews="refresh";
newstab.newstabstatus="Replies";
Service.updateView("Replies")
}
}
QC2.Action { QC2.Action {
text: qsTr("Public timeline") text: qsTr("Public timeline")
onTriggered:{ onTriggered:{

View File

@ -0,0 +1,100 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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 "qrc:/js/helper.js" as Helperjs
//import QtWebView 1.1
Rectangle{
color:"transparent"
width:newscolumn.width;
height:newscolumn.width/4*3
property string url:""//htmlview.text
WebView {
id: webView
anchors.fill: parent
opacity: 0
url: "qrc:///content/player.html?" + currentVideo.vId
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:
topInfo.text = "Failed to load the requested video"
break
}
opacity = 0
}
onTitleChanged: {
currentVideo.status = 1 * title
if (title == videoStatus.paused || title == videoStatus.ready)
panel.state = "list"
else if (title == videoStatus.playing)
panel.state = "hidden"
}
}
Text{id:htmlview
textFormat:Text.RichText
}
// WebView {id:htmlview;
// anchors.fill: parent
// }
Component.onCompleted:{
// Helperjs.friendicaWebRequest(url,parent,function(document){
// print(document);
//// var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
//// //iterate through them
//// for (i=0; i<metas.length; i++) {
//// if (metas[i].getAttribute("name") == "keywords") {
//// print(metas[i].getAttribute("content"));
//// }
//// else if (metas[i].getAttribute("name") == "description") {
//// console.log(metas[i].getAttribute("content"));
//// }
//// }
// //print(html);
// htmlview.text=""
// })
}
}

View File

@ -184,10 +184,10 @@ Item {
var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml");
var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype}); var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
} }
// else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){ else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){
// var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml");
// var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url}); var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url});
// } }
else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype) else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml");
var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype}); var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
@ -461,14 +461,6 @@ Item {
}) })
} }
} }
MenuItem {
text: qsTr("Post")
onTriggered: {
Helperjs.friendicaPostRequest(root.login,"/item","preview=1&"+encodeURIComponent(newsitemobject.text),"POST",root,function(reply){
print(reply)
})
}
}
//MenuItem{ //MenuItem{
// text:qsTr("Show on website") // text:qsTr("Show on website")

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
@ -29,38 +29,38 @@
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Kurzname</translation> <translation>Kurzname</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Passwort</translation> <translation>Passwort</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Bildverz.</translation> <translation>Bildverz.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation>Max. Nachr.</translation> <translation>Max. Nachr.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>Anzeige</translation> <translation>Anzeige</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervall (0=keins)</translation> <translation type="vanished">Intervall (0=keins)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
@ -69,22 +69,22 @@
<translation type="vanished">Name auf der Seite nicht registriert!</translation> <translation type="vanished">Name auf der Seite nicht registriert!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Bestätigen</translation> <translation>Bestätigen</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>Kein Server angegeben!</translation> <translation>Kein Server angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>Kein Kurzname angegeben!</translation> <translation>Kein Kurzname angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation>Name auf der Seite nicht registriert!</translation> <translation>Name auf der Seite nicht registriert!</translation>
</message> </message>
@ -93,42 +93,57 @@
<translation type="vanished">Kein Nutzername angegeben!</translation> <translation type="vanished">Kein Nutzername angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation>Akt.-intervall (0=keine)</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation>Kurznamen mit @ Zeichen werden derzeit nicht unterstützt.</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation>Min.</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>Kein Passwort angegeben!</translation> <translation>Kein Passwort angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>Kein Verzeichnis für Bilder angegeben!</translation> <translation>Kein Verzeichnis für Bilder angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>Maximale News-Anzahl nicht angegeben!</translation> <translation>Maximale News-Anzahl nicht angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation>Falsches Passwort!</translation> <translation>Falsches Passwort!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>Bestätigt</translation> <translation>Bestätigt</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Chronologisch</translation> <translation>Chronologisch</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Unterhaltungen</translation> <translation>Unterhaltungen</translation>
</message> </message>
@ -182,27 +197,27 @@
<translation>Kontaktanfrage</translation> <translation>Kontaktanfrage</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Beschreibung</translation> <translation>Beschreibung</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Ort</translation> <translation>Ort</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Beiträge</translation> <translation>Beiträge</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>Profilseite</translation> <translation>Profilseite</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Erstellt</translation> <translation>Erstellt</translation>
</message> </message>
@ -309,12 +324,12 @@
<translation type="vanished">Lade Profilbild für </translation> <translation type="vanished">Lade Profilbild für </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Mehr</translation> <translation>Mehr</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Chronologisch</translation> <translation>Chronologisch</translation>
</message> </message>
@ -323,42 +338,47 @@
<translation type="vanished">Fehler</translation> <translation type="vanished">Fehler</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Markierte News</translation> <translation>Markierte News</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Unterhaltungen</translation> <translation>Unterhaltungen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation>Netzwerk-Fehler</translation> <translation>Netzwerk-Fehler</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation>Interaktionen</translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation>Gemeinschaft</translation> <translation>Gemeinschaft</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Direktnachrichten</translation> <translation>Direktnachrichten</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Meldungen</translation> <translation>Meldungen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>News Gruppe</translation> <translation>News Gruppe</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation>Schliessen</translation> <translation>Schliessen</translation>
</message> </message>
@ -391,60 +411,65 @@
<translation> Kommentare</translation> <translation> Kommentare</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Teilnahme: </translation> <translation>Teilnahme: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Antworten</translation> <translation>Antworten</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Direktnachricht</translation> <translation>Direktnachricht</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Teilen</translation> <translation>Teilen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>Erledigt!</translation> <translation>Erledigt!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Unterhaltung</translation> <translation>Unterhaltung</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Teilnahme</translation> <translation>Teilnahme</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>ja</translation> <translation>ja</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>vielleicht</translation> <translation>vielleicht</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>nein</translation> <translation>nein</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Löschen</translation> <translation>Löschen</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -676,37 +701,37 @@
<translation>Homepage</translation> <translation>Homepage</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation>Aktualisieren</translation> <translation>Aktualisieren</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation>Profil-Nummer</translation> <translation>Profil-Nummer</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation>Beschreibung</translation> <translation>Beschreibung</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation>Ort</translation> <translation>Ort</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation>Beiträge</translation> <translation>Beiträge</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation>Profilseite</translation> <translation>Profilseite</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation>Erstellt</translation> <translation>Erstellt</translation>
</message> </message>
@ -802,66 +827,66 @@
<translation>vielleicht</translation> <translation>vielleicht</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>Sekunden</translation> <translation>Sekunden</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>her</translation> <translation>her</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>Minute</translation> <translation>Minute</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>Minuten</translation> <translation>Minuten</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>Stunde</translation> <translation>Stunde</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>Stunden</translation> <translation>Stunden</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>Tag</translation> <translation>Tag</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>Tage</translation> <translation>Tage</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>Monat</translation> <translation>Monat</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>Monate</translation> <translation>Monate</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation></translation> <translation></translation>
</message> </message>
@ -873,12 +898,12 @@
<translation type="vanished">Fehler</translation> <translation type="vanished">Fehler</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation>Antwort-Array ungültig</translation> <translation>Antwort-Array ungültig</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation>Server-Antwort: Fehler</translation> <translation>Server-Antwort: Fehler</translation>
</message> </message>

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Usuario</translation> <translation>Usuario</translation>
</message> </message>
@ -29,58 +29,58 @@
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Usuario</translation> <translation>Usuario</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Contraseña</translation> <translation>Contraseña</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Dir. de imágenes</translation> <translation>Dir. de imágenes</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation> Max. de noticias.</translation> <translation> Max. de noticias.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>Noticias como</translation> <translation>Noticias como</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervalo (0=ningún)</translation> <translation type="vanished">Intervalo (0=ningún)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Confirmar</translation> <translation>Confirmar</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>¡Servidor no encontrado!</translation> <translation>¡Servidor no encontrado!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>¡Usuario incorrecto!</translation> <translation>¡Usuario incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation>¡Usuario incorrecto!</translation> <translation>¡Usuario incorrecto!</translation>
</message> </message>
@ -89,42 +89,57 @@
<translation type="vanished">¡Usuario incorrecto!</translation> <translation type="vanished">¡Usuario incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>¡Contraseña incorrecta!</translation> <translation>¡Contraseña incorrecta!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>¡No se ha encontrado el directorio de imágenes!</translation> <translation>¡No se ha encontrado el directorio de imágenes!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>¡ máximo de noticias incorrecto!</translation> <translation>¡ máximo de noticias incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation>¡Contraseña incorrecta!</translation> <translation>¡Contraseña incorrecta!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>éxito!</translation> <translation>éxito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation>Nombre</translation> <translation>Nombre</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronología</translation> <translation>Cronología</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversaciones</translation> <translation>Conversaciones</translation>
</message> </message>
@ -178,27 +193,27 @@
<translation>Conectar</translation> <translation>Conectar</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Descripción</translation> <translation>Descripción</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Localización</translation> <translation>Localización</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Mensajes</translation> <translation>Mensajes</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>URL</translation> <translation>URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Creado en</translation> <translation>Creado en</translation>
</message> </message>
@ -294,12 +309,12 @@
<translation type="vanished">Descargar la imagen del perfil para </translation> <translation type="vanished">Descargar la imagen del perfil para </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Mas</translation> <translation>Mas</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronología</translation> <translation>Cronología</translation>
</message> </message>
@ -308,42 +323,47 @@
<translation type="obsolete">Error</translation> <translation type="obsolete">Error</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Favoritos</translation> <translation>Favoritos</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversaciones</translation> <translation>Conversaciones</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation>Fallo de red</translation> <translation>Fallo de red</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation>Cronología pública</translation> <translation>Cronología pública</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Mensaje directo</translation> <translation>Mensaje directo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Notificaciones</translation> <translation>Notificaciones</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>Grupos</translation> <translation>Grupos</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation>Salida</translation> <translation>Salida</translation>
</message> </message>
@ -376,60 +396,65 @@
<translation> comentarios</translation> <translation> comentarios</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Asistiendo: </translation> <translation>Asistiendo: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Respuesta</translation> <translation>Respuesta</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Mensaje directo</translation> <translation>Mensaje directo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Volver a publicar</translation> <translation>Volver a publicar</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>éxito!</translation> <translation>éxito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Conversación</translation> <translation>Conversación</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Asistiendo</translation> <translation>Asistiendo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>si</translation> <translation>si</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>quizás</translation> <translation>quizás</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>no</translation> <translation>no</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Borrar</translation> <translation>Borrar</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -661,37 +686,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished">Descripción</translation> <translation type="unfinished">Descripción</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation type="unfinished">Localización</translation> <translation type="unfinished">Localización</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation type="unfinished">Mensajes</translation> <translation type="unfinished">Mensajes</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished">URL</translation> <translation type="unfinished">URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation type="unfinished">Creado en</translation> <translation type="unfinished">Creado en</translation>
</message> </message>
@ -787,66 +812,66 @@
<translation>quizás</translation> <translation>quizás</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>Segundos</translation> <translation>Segundos</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>hace</translation> <translation>hace</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>Minuto</translation> <translation>Minuto</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>Minutos</translation> <translation>Minutos</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>Hora</translation> <translation>Hora</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>Horas</translation> <translation>Horas</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>Dia</translation> <translation>Dia</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>Dias</translation> <translation>Dias</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>Mes</translation> <translation>Mes</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>Meses</translation> <translation>Meses</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation>Años</translation> <translation>Años</translation>
</message> </message>
@ -858,12 +883,12 @@
<translation type="obsolete">Error</translation> <translation type="obsolete">Error</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Utente</translation> <translation>Utente</translation>
</message> </message>
@ -29,58 +29,58 @@
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Utente</translation> <translation>Utente</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Directory immagini</translation> <translation>Directory immagini</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation> Max. di notizie</translation> <translation> Max. di notizie</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>News come</translation> <translation>News come</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervallo (0=nessuno)</translation> <translation type="vanished">Intervallo (0=nessuno)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Errore</translation> <translation>Errore</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Conferma</translation> <translation>Conferma</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>Nessun server inserito!</translation> <translation>Nessun server inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>Nessun utente inserito!</translation> <translation>Nessun utente inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation></translation> <translation></translation>
</message> </message>
@ -89,42 +89,57 @@
<translation type="vanished">Nessun utente inserito!</translation> <translation type="vanished">Nessun utente inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>Nessuna password inserita!</translation> <translation>Nessuna password inserita!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>Nessuna directory immagini inserita!</translation> <translation>Nessuna directory immagini inserita!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>Nessun numero massimo di news inserito!</translation> <translation>Nessun numero massimo di news inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>Ha funzionato!</translation> <translation>Ha funzionato!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronologia</translation> <translation>Cronologia</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversazioni</translation> <translation>Conversazioni</translation>
</message> </message>
@ -178,27 +193,27 @@
<translation>Connetti</translation> <translation>Connetti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Descrizione</translation> <translation>Descrizione</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Località</translation> <translation>Località</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Messaggi</translation> <translation>Messaggi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>URL</translation> <translation>URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Creato il</translation> <translation>Creato il</translation>
</message> </message>
@ -294,12 +309,12 @@
<translation type="vanished">Download immagine profilo per </translation> <translation type="vanished">Download immagine profilo per </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Ancora</translation> <translation>Ancora</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronologia</translation> <translation>Cronologia</translation>
</message> </message>
@ -308,42 +323,47 @@
<translation type="obsolete">Errore</translation> <translation type="obsolete">Errore</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Favoriti</translation> <translation>Favoriti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversazioni</translation> <translation>Conversazioni</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Messaggio diretto</translation> <translation>Messaggio diretto</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Notifiche</translation> <translation>Notifiche</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>Gruppi</translation> <translation>Gruppi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -376,60 +396,65 @@
<translation> commenti</translation> <translation> commenti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Attendi: </translation> <translation>Attendi: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Risposta</translation> <translation>Risposta</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Messaggio diretto</translation> <translation>Messaggio diretto</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Condividi</translation> <translation>Condividi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>Ha funzionato!</translation> <translation>Ha funzionato!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Conversazione</translation> <translation>Conversazione</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Attendi</translation> <translation>Attendi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>si</translation> <translation>si</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>potrebbe</translation> <translation>potrebbe</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>no</translation> <translation>no</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Cancella</translation> <translation>Cancella</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -661,37 +686,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished">Descrizione</translation> <translation type="unfinished">Descrizione</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation type="unfinished">Località</translation> <translation type="unfinished">Località</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation type="unfinished">Messaggi</translation> <translation type="unfinished">Messaggi</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished">URL</translation> <translation type="unfinished">URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation type="unfinished">Creato il</translation> <translation type="unfinished">Creato il</translation>
</message> </message>
@ -787,66 +812,66 @@
<translation>potrebbe</translation> <translation>potrebbe</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>secondi</translation> <translation>secondi</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>fa</translation> <translation>fa</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>minuti</translation> <translation>minuti</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>minuti</translation> <translation>minuti</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>ora</translation> <translation>ora</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>ore</translation> <translation>ore</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>giorno</translation> <translation>giorno</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>giorni</translation> <translation>giorni</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>mese</translation> <translation>mese</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>mesi</translation> <translation>mesi</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation>anni</translation> <translation>anni</translation>
</message> </message>
@ -858,12 +883,12 @@
<translation type="obsolete">Errore</translation> <translation type="obsolete">Errore</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -0,0 +1,60 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
#ifndef ALARM_H
#define ALARM_H
#include <QObject>
class ALARM : public QObject
{
Q_OBJECT
//Q_PROPERTY(int alarmtime READ alarmtime WRITE setAlarm NOTIFY alarmChanged)
public:
static ALARM *instance();
explicit ALARM(QObject *parent = 0);
//int alarmtime() const;
signals:
void alarmChanged(QString url);
public slots:
void setAlarm(int time);
private:
int m_time;
};
#endif // UPDATENEWS_H

View File

@ -0,0 +1,76 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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/>.
//#include <QtAndroidExtras/QAndroidJniObject>
//#include <QtAndroidExtras/QAndroidJniEnvironment>
#include "alarm.h"
#include <QtCore/QDebug>
ALARM *ALARM::instance()
{
static ALARM alarm;
return &alarm;
}
ALARM::ALARM(QObject *parent) : QObject(parent){}
void ALARM::setAlarm(int interval)
{
qDebug() << interval;
// auto activity = QtAndroid::androidActivity();
// auto packageManager = activity.callObjectMethod("getPackageManager",
// "()Landroid/content/pm/PackageManager;");
// auto activityIntent = packageManager.callObjectMethod("getLaunchIntentForPackage",
// "(Ljava/lang/String;)Landroid/content/Intent;",
// activity.callObjectMethod("getPackageName",
// "()Ljava/lang/String;").object());
// auto pendingIntent = QAndroidJniObject::callStaticObjectMethod("android/app/PendingIntent", "getActivity",
// "(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent;",
// activity.object(), jint(0), activityIntent.object(),
// QAndroidJniObject::getStaticField<jint>("android/content/Intent",
// "FLAG_ACTIVITY_CLEAR_TOP"));
// auto alarmManager = activity.callObjectMethod("getSystemService",
// "(Ljava/lang/String;)Ljava/lang/Object;",
// QAndroidJniObject::getStaticObjectField("android/content/Context",
// "ALARM_SERVICE",
// "Ljava/lang/String;").object());
// alarmManager.callMethod<void>("set",
// "(IJLandroid/app/PendingIntent;)V",
// QAndroidJniObject::getStaticField<jint>("android/app/AlarmManager", "RTC"),
// jlong(QDateTime::currentMSecsSinceEpoch() + 100), pendingIntent.object());
}

View File

@ -68,12 +68,12 @@ int main(int argc, char *argv[]) {
view.rootContext()->setContextProperty("remoteauth", imageProvider); view.rootContext()->setContextProperty("remoteauth", imageProvider);
auto offlineStoragePath=QUrl::fromLocalFile(view.engine()->offlineStorageDatabaseFilePath("Friendiqa")); auto offlineStoragePath=QUrl::fromLocalFile(view.engine()->offlineStorageDatabaseFilePath("Friendiqa"));
view.rootContext()->setContextProperty("offlineStoragePath", offlineStoragePath); view.rootContext()->setContextProperty("offlineStoragePath", offlineStoragePath);
XHR* xhr = XHR::instance(); // XHR* xhr = XHR::instance();
view.rootContext()->setContextProperty("xhr", xhr); // view.rootContext()->setContextProperty("xhr", xhr);
FILESYSTEM* filesystem = FILESYSTEM::instance(); FILESYSTEM* filesystem = FILESYSTEM::instance();
view.rootContext()->setContextProperty("filesystem", filesystem); view.rootContext()->setContextProperty("filesystem", filesystem);
// UPDATENEWS* updatenews = UPDATENEWS::instance(); UPDATENEWS* updatenews = UPDATENEWS::instance();
// view.rootContext()->setContextProperty("updatenews", updatenews); view.rootContext()->setContextProperty("updatenews", updatenews);
view.setSource(QUrl("qrc:/qml/friendiqa.qml")); view.setSource(QUrl("qrc:/qml/friendiqa.qml"));
view.show(); view.show();
view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit())); view.connect(view.rootContext()->engine(), SIGNAL(quit()), &app, SLOT(quit()));

View File

@ -1,4 +1,4 @@
// This file is part of Friendiqa // This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa // https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net> // Copyright (C) 2017 Marco R. <thomasschmidt45@gmx.net>
// //
@ -45,7 +45,7 @@
#include <QSqlDatabase> #include <QSqlDatabase>
#include <QSqlError> #include <QSqlError>
#include <QDateTime> #include <QDateTime>
#include "xhr.h" //#include "xhr.h"
UPDATENEWS *UPDATENEWS::instance() UPDATENEWS *UPDATENEWS::instance()
@ -63,6 +63,7 @@ void UPDATENEWS::setUrl(QString url)
{ {
if (url!=m_url) { if (url!=m_url) {
m_url = url; m_url = url;
xhr.setUrl(url);
emit urlChanged(m_url); emit urlChanged(m_url);
} }
} }
@ -89,24 +90,26 @@ void UPDATENEWS::setDatabase()
void UPDATENEWS::login() void UPDATENEWS::login()
{ {
qDebug() << "login";
QSqlQuery query("SELECT * FROM config WHERE isActive=0",m_db); QSqlQuery query("SELECT * FROM config WHERE isActive=0",m_db);
qDebug() <<"size "<< query.size();
while (query.next()) while (query.next())
{ {
username = query.value(1).toString(); username = query.value(1).toString();
QByteArray bpassword=query.value(2).toByteArray(); QByteArray bpassword=query.value(2).toByteArray();
QString password=QByteArray::fromBase64(bpassword); QString password=QByteArray::fromBase64(bpassword);
m_login=username+":"+password ; m_login=username+":"+password ;
//emit this->loginChanged(m_login); xhr.setLogin(m_login);
m_url=query.value(0).toString(); 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(); QString isActive=query.value(7).toString();
updateInterval=query.value(5).toInt();
qDebug() << " username " << username<< password << m_url << isActive; //UPDATENEWS::connect(&UPDATENEWS::getLogin,SIGNAL(loginChanged(QString)),this,SLOT(XHR::login(QString)));
//UPDATENEWS::connect(&UPDATENEWS::getLogin,SIGNAL(loginChanged(QString)),this,SLOT(XHR::login(QString)));
m_api="/api/statuses/friends_timeline"; m_api="/api/statuses/friends_timeline";
xhr.setApi(m_api);
if(updateInterval!=0){alarm.setAlarm(updateInterval);};
} }
//return m_login;
} }
@ -115,82 +118,84 @@ void UPDATENEWS::timeline()
QSqlQuery query("SELECT status_id FROM news WHERE username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db); QSqlQuery query("SELECT status_id FROM news WHERE username='"+ username +"' ORDER BY status_id DESC LIMIT 1",m_db);
if (query.isActive() && query.isSelect()){query.first();}; if (query.isActive() && query.isSelect()){query.first();};
QString lastid=query.value(0).toString(); QString lastid=query.value(0).toString();
//query.finish(); xhr.clearParams();
qDebug() << lastid << query.at(); xhr.setParam("since_id",lastid);
clearParams(); xhr.setParam("count","50");
setParam("since_id",lastid); xhr.get();
setParam("count","50"); QObject::connect(&xhr,SIGNAL(success(QByteArray,QString)),this,SLOT(store(QByteArray,QString)));
get(); QObject::connect(&xhr,SIGNAL(error(QString,QString,QString,int)),this,SLOT(showError(QString,QString,QString,int)));
QObject::connect(this,&UPDATENEWS::success,this,&UPDATENEWS::store);
} }
void UPDATENEWS::store(QByteArray serverreply,QString apiname) void UPDATENEWS::store(QByteArray serverreply,QString apiname)
{ {
//qDebug() << serverreply;
QJsonDocument news; QJsonDocument news;
QJsonParseError jsonerror; QJsonParseError jsonerror;
news=QJsonDocument::fromJson(serverreply,&jsonerror); news=QJsonDocument::fromJson(serverreply,&jsonerror);
qDebug() << news.isArray()<<news.isObject()<<news.isEmpty()<<jsonerror.errorString();
if (news.isArray()){ if (news.isArray()){
qDebug() << " isArray "; for (int i=0; i < news.array().count();i++){
//QJsonArray array = news.//news.toArray(); QJsonValue newsitem=news[i];
for (int i=0; i < news.array().count();i++){ QSqlQuery query(m_db);
QJsonValue newsitem=news[i]; query.prepare("INSERT INTO news (username,messagetype,text,created_at,in_reply_to_status_id,source,status_id,in_reply_to_user_id,geo,favorited,uid,statusnet_html,statusnet_conversation_id,friendica_activities,friendica_activities_self,attachments,friendica_owner) " "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
QSqlQuery query(m_db); query.bindValue(0,username);
query.prepare("INSERT INTO news (username,messagetype,text,created_at,in_reply_to_status_id,source,status_id,in_reply_to_user_id,geo,favorited,uid,statusnet_html,statusnet_conversation_id,friendica_activities,friendica_activities_self,attachments,friendica_owner) " "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); query.bindValue(1,"0");
query.bindValue(0,username); query.bindValue(2, newsitem["text"].toString().toUtf8().toBase64());
query.bindValue(1,"0"); QString sourcedate=newsitem["created_at"].toString();
query.bindValue(2, newsitem["text"].toString().toUtf8().toBase64()); QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
QString sourcedate=newsitem["created_at"].toString(); query.bindValue(3,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15); if(newsitem["in_reply_to_status_id"]!=QJsonValue::Null){query.bindValue(4, newsitem["in_reply_to_status_id"].toInt());};
query.bindValue(3,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() ); query.bindValue(5,newsitem["source"]);
if(newsitem["in_reply_to_status_id"]!=QJsonValue::Null){query.bindValue(4, newsitem["in_reply_to_status_id"].toInt());}; query.bindValue(6,newsitem["id"].toInt());
query.bindValue(5,newsitem["source"]); if(newsitem["in_reply_to_user_id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["in_reply_to_user_id"].toInt());};
query.bindValue(6,newsitem["id"].toInt()); query.bindValue(8,newsitem["geo"]);
if(newsitem["in_reply_to_user_id"]!=QJsonValue::Null){ query.bindValue(7,newsitem["in_reply_to_user_id"].toInt());}; query.bindValue( 9, newsitem["favorited"].toInt());
query.bindValue(8,newsitem["geo"]); query.bindValue(10, newsitem["user"]["id"].toInt());
query.bindValue( 9, newsitem["favorited"].toInt()); query.bindValue(11, newsitem["statusnet_html"].toString().toUtf8().toBase64());
query.bindValue(10, newsitem["user"]["id"].toInt()); query.bindValue(12, newsitem["statusnet_conversation_id"].toInt());
query.bindValue(11, newsitem["statusnet_html"].toString().toUtf8().toBase64()); QJsonArray likeArray;QJsonArray dislikeArray;QJsonArray attendyesArray;QJsonArray attendnoArray;QJsonArray attendmaybeArray;
query.bindValue(12, newsitem["statusnet_conversation_id"].toInt()); if (newsitem.toObject().contains("friendica_activities")){
QJsonArray likeArray;QJsonArray dislikeArray;QJsonArray attendyesArray;QJsonArray attendnoArray;QJsonArray attendmaybeArray; for (int a=0; a < newsitem["friendica_activities"]["like"].toArray().count();a++){
if (newsitem.toObject().contains("friendica_activities")){ likeArray.append(newsitem["friendica_activities"]["like"][a]["url"].toString());
for (int a=0; a < newsitem["friendica_activities"]["like"].toArray().count();a++){ }
likeArray.append(newsitem["friendica_activities"]["like"][a]["url"].toString()); for (int b=0; b < newsitem["friendica_activities"]["dislike"].toArray().count();b++){
} dislikeArray.append(newsitem["friendica_activities"]["dislike"][b]["url"].toString());
for (int b=0; b < newsitem["friendica_activities"]["dislike"].toArray().count();b++){ }
dislikeArray.append(newsitem["friendica_activities"]["dislike"][b]["url"].toString()); for (int c=0; c < newsitem["friendica_activities"]["attendyes"].toArray().count();c++){
} attendyesArray.append(newsitem["friendica_activities"]["attendyes"][c]["url"].toString());
for (int c=0; c < newsitem["friendica_activities"]["attendyes"].toArray().count();c++){ }
attendyesArray.append(newsitem["friendica_activities"]["attendyes"][c]["url"].toString()); for (int d=0; d < newsitem["friendica_activities"]["attendno"].toArray().count();d++){
} attendnoArray.append(newsitem["friendica_activities"]["attendno"][d]["url"].toString());
for (int d=0; d < newsitem["friendica_activities"]["attendno"].toArray().count();d++){ }
attendnoArray.append(newsitem["friendica_activities"]["attendno"][d]["url"].toString()); for (int e = 0; e < newsitem["friendica_activities"]["attendmaybe"].toArray().count();e++){
} attendmaybeArray.append(newsitem["friendica_activities"]["attendmaybe"][e]["url"].toString());
for (int e = 0; e < newsitem["friendica_activities"]["attendmaybe"].toArray().count();e++){ }
attendmaybeArray.append(newsitem["friendica_activities"]["attendmaybe"][e]["url"].toString()); };
} QJsonArray friendica_activities; friendica_activities={likeArray,dislikeArray,attendyesArray,attendnoArray,attendmaybeArray};
}; QJsonDocument activities; activities.setArray(friendica_activities);
QJsonArray friendica_activities; friendica_activities={likeArray,dislikeArray,attendyesArray,attendnoArray,attendmaybeArray}; query.bindValue(13,activities.toJson(QJsonDocument::Compact).toBase64());
QJsonDocument activities; activities.setArray(friendica_activities); query.bindValue(14,"[]");
query.bindValue(13,activities.toJson(QJsonDocument::Compact).toBase64());
query.bindValue(14,"[]");
if (newsitem["attachments"]!=QJsonValue::Undefined){ if (newsitem["attachments"]!=QJsonValue::Undefined){
query.bindValue(15, QJsonDocument(newsitem["attachments"].toArray()).toJson(QJsonDocument::Compact).toBase64()); query.bindValue(15, QJsonDocument(newsitem["attachments"].toArray()).toJson(QJsonDocument::Compact).toBase64());
}; };
query.bindValue(16, newsitem["friendica_owner"]["url"]); query.bindValue(16, newsitem["friendica_owner"]["url"]);
qDebug() << query.exec() <<query.lastError(); query.exec() ;
//query.finish(); }
}
} }
else {emit this->error(m_api,QTextCodec::codecForName("utf-8")->toUnicode(serverreply));}
QList<QJsonValue> newcontacts=findNewContacts(news); QList<QJsonValue> newcontacts=findNewContacts(news);
updateContacts(newcontacts); updateContacts(newcontacts);
startImagedownload();
connect(&xhr, SIGNAL(downloaded(QString, QString, QString, int)), this, SLOT(updateImageLocation(QString,QString, QString, int)));
emit updatesuccess();
} }
void UPDATENEWS::updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index){
if (downloadtype=="contactlist"){
QSqlQuery query("UPDATE contacts SET imageLocation='"+ filename +"' WHERE imageurl ='"+imageurl+ "' AND username = '" +username+"'",m_db);
query.exec();
}
}
QList <QJsonValue> UPDATENEWS::findNewContacts(QJsonDocument news){ QList <QJsonValue> UPDATENEWS::findNewContacts(QJsonDocument news){
QSqlQuery query("SELECT profile_image_url FROM contacts",m_db); QSqlQuery query("SELECT profile_image_url FROM contacts",m_db);
@ -199,16 +204,48 @@ QList <QJsonValue> UPDATENEWS::findNewContacts(QJsonDocument news){
imageurls.append(query.value(0).toString()); imageurls.append(query.value(0).toString());
} }
QList<QJsonValue> newcontacts; QList<QJsonValue> newcontacts;
QList<QString> newcontactimagelinks; //qDebug()<<news.array().count();
qDebug()<<news.array().count();
for (int i=0; i<news.array().count();i++){ for (int i=0; i<news.array().count();i++){
//main contacts
if(imageurls.contains(news[i]["user"]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["user"]["profile_image_url"].toString())){ if(imageurls.contains(news[i]["user"]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["user"]["profile_image_url"].toString())){
qDebug()<<"vorhanden";
} }
else{ qDebug()<<"newcontact" <<news[i]["user"]; else{
newcontacts.append(news[i]["user"]); newcontacts.append(news[i]["user"]);
newcontactimagelinks.append(news[i]["user"]["profile_image_url"].toString()); newcontactimagelinks.append(news[i]["user"]["profile_image_url"].toString());
newcontactnames.append(news[i]["user"]["screen_name"].toString());
} }
//like/dislike contacts
if (news[i].toObject().contains("friendica_activities") ){
for (int a=0; a < news[i]["friendica_activities"]["like"].toArray().count();a++){
if(imageurls.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_activities"]["like"][a]);
newcontactimagelinks.append(news[i]["friendica_activities"]["like"][a]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_activities"][a]["screen_name"].toString());
}
}
for (int b=0; b < news[i]["friendica_activities"]["dislike"].toArray().count();b++){
if(imageurls.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_activities"]["dislike"][b]);
newcontactimagelinks.append(news[i]["friendica_activities"]["dislike"][b]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_activities"][b]["screen_name"].toString());
}
}
}
//owner contacts
if (news[i].toObject().contains("friendica_owner") ){
if(imageurls.contains(news[i]["friendica_owner"]["profile_image_url"].toString()) || newcontactimagelinks.contains(news[i]["friendica_owner"]["profile_image_url"].toString())){
}
else{
newcontacts.append(news[i]["friendica_owner"]);
newcontactimagelinks.append(news[i]["friendica_owner"]["profile_image_url"].toString());
newcontactnames.append(news[i]["friendica_owner"]["screen_name"].toString());
}
}
} }
return newcontacts; return newcontacts;
} }
@ -219,42 +256,87 @@ void UPDATENEWS::updateContacts(QList<QJsonValue> contacts){
for (int i=0; i < contacts.count();i++){ for (int i=0; i < contacts.count();i++){
QJsonValue contact=contacts[i]; QJsonValue contact=contacts[i];
QSqlQuery query(m_db); QSqlQuery query(m_db);
qDebug() << "updatecontact " << contact["screen_name"];
QSqlQuery testquery("SELECT url FROM contacts WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'",m_db);
if (testquery.first()){
query.prepare("UPDATE contacts SET id=?, name=?, screen_name=?, location=?,imageAge=?,"
"profile_image_url=?, description=?, protected=?, followers_count=?,"
"friends_count=?, created_at=?, favourites_count=?, utc_offset=?, time_zone=?, statuses_count=?,"
"following=?, verified=?, statusnet_blocking=?, notifications=?, statusnet_profile_url=?, cid=?, network=?, timestamp=? "
" WHERE username='"+ username +"' AND url='" + contact["url"].toString() +"'");
query.bindValue(0, contact["id"].toInt());
query.bindValue(1, contact["name"].toString().toUtf8().toBase64());
query.bindValue(2, contact["screen_name"]);
query.bindValue(3, contact["location"]);
query.bindValue(4, currentTime);
query.bindValue(5, contact["profile_image_url"]);
if(contact["description"].isNull() ){query.bindValue(6,"");}else{query.bindValue(6, contact["description"].toString().toUtf8().toBase64());};
query.bindValue(7,contact["protected"].toBool());
query.bindValue(8,contact["followers_count"].toInt());
query.bindValue(9,contact["friends_count"].toInt());
QString sourcedate=contact["created_at"].toString();
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
query.bindValue(10,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
query.bindValue(11,contact["favorites_count"].toInt());
query.bindValue(12,contact["utc_offset"].toInt());
query.bindValue(13,contact["time_zone"].toString());
query.bindValue(14,contact["statuses_count"].toInt());
query.bindValue(15,contact["following"].toBool());
query.bindValue(16,contact["verfied"].toBool());
query.bindValue(17,contact["statusnet_blocking"].toBool());
query.bindValue(18,contact["notifications"].toBool());
query.bindValue(19,contact["statusnet_profile_url"]);
query.bindValue(20,contact["cid"].toInt());
query.bindValue(21,contact["network"]);
qint64 timestamp=0;
QString timestamphelper=contact["profile_image_url"].toString();
try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){};
query.bindValue(22,timestamp);
}
query.prepare("INSERT INTO contacts username, id, name, screen_name, location,imageAge, " else{
"profile_image_url, description, profile_image, url, protected, followers_count, " query.prepare("INSERT INTO contacts (username, id, name, screen_name, location,imageAge,"
"profile_image_url, description, profile_image, url, protected, followers_count,"
"friends_count, created_at, favourites_count, utc_offset, time_zone, statuses_count," "friends_count, created_at, favourites_count, utc_offset, time_zone, statuses_count,"
" following, verified, statusnet_blocking, notifications, statusnet_profile_url," "following, verified, statusnet_blocking, notifications, statusnet_profile_url, cid, network, isFriend, timestamp)"
" cid, network, isFriend, timestamp"
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
query.bindValue(0,username);
query.bindValue(1, contact["id"]);
query.bindValue(2, contact["name"].toString().toUtf8().toBase64());
query.bindValue(3, contact["screen_name"]);
query.bindValue(4, contact["location"]);
query.bindValue(5, currentTime);
query.bindValue(6, contact["profile_image_url"]);
query.bindValue(7, contact["description"].toString().toUtf8().toBase64());
//query.bindValue(8,"")
query.bindValue(9, contact["url"]);
query.bindValue(10,contact["protected"]);
query.bindValue(11,contact["followers_count"]);
query.bindValue(12,contact["friends_count"]);
query.bindValue(13,contact["created_at"]);
query.bindValue(14,contact["favorites_count"]);
query.bindValue(15,contact["utc_offset"]);
query.bindValue(16,contact["time_zone"]);
query.bindValue(17,contact["statuses_count"]);
query.bindValue(18,contact["following"]);
query.bindValue(19,contact["verfied"]);
query.bindValue(20,contact["statusnet_blocking"]);
query.bindValue(21,contact["notifications"]);
query.bindValue(22,contact["statusnet_profile_url"]);
query.bindValue(23,contact["cid"]);
query.bindValue(24,contact["network"]);
query.bindValue(25, 1);
//query.bindValue(26,image_timestamp);
query.bindValue(0,username);
query.bindValue(1, contact["id"].toInt());
query.bindValue(2, contact["name"].toString().toUtf8().toBase64());
query.bindValue(3, contact["screen_name"]);
query.bindValue(4, contact["location"]);
query.bindValue(5, currentTime);
query.bindValue(6, contact["profile_image_url"]);
if(contact["description"].isNull() ){query.bindValue(7,"");}else{query.bindValue(7, contact["description"].toString().toUtf8().toBase64());};
query.bindValue(8,"none");
query.bindValue(9, contact["url"].toString());
query.bindValue(10,contact["protected"].toBool());
query.bindValue(11,contact["followers_count"].toInt());
query.bindValue(12,contact["friends_count"].toInt());
QString sourcedate=contact["created_at"].toString();
QString formateddate=sourcedate.mid(0,3)+", "+sourcedate.mid(8,3)+sourcedate.mid(4,3)+sourcedate.mid(25,5)+sourcedate.mid(10,15);
query.bindValue(13,QDateTime::fromString(formateddate,Qt::RFC2822Date).toMSecsSinceEpoch() );
query.bindValue(14,contact["favorites_count"].toInt());
query.bindValue(15,contact["utc_offset"].toInt());
query.bindValue(16,contact["time_zone"].toString());
query.bindValue(17,contact["statuses_count"].toInt());
query.bindValue(18,contact["following"].toBool());
query.bindValue(19,contact["verfied"].toBool());
query.bindValue(20,contact["statusnet_blocking"].toBool());
query.bindValue(21,contact["notifications"].toBool());
query.bindValue(22,contact["statusnet_profile_url"]);
query.bindValue(23,contact["cid"].toInt());
query.bindValue(24,contact["network"]);
query.bindValue(25, 0);
qint64 timestamp=0;
QString timestamphelper=contact["profile_image_url"].toString();
try {timestamp=timestamphelper.mid(timestamphelper.indexOf("?ts")+4,timestamphelper.length()).toUInt();} catch(...){};
query.bindValue(26,timestamp);
}
} }
emit this->success(m_api);
} }
QString UPDATENEWS::url() const QString UPDATENEWS::url() const
@ -262,80 +344,16 @@ QString UPDATENEWS::url() const
return m_url; return m_url;
} }
void UPDATENEWS::startImagedownload()
void UPDATENEWS::setParam(QString name, QString value)
{ {
params.insert(name, value); xhr.setDownloadtype("contactlist");
xhr.setFilelist(newcontactimagelinks);
xhr.setContactlist(newcontactnames);
xhr.setImagedir(m_imagedir);
xhr.getlist();
} }
void UPDATENEWS::clearParams() void UPDATENEWS::showError(QString data, QString url,QString api, int code )
{ {
files.clear(); emit this->error(api,data);
params.clear();
}
void UPDATENEWS::get()
{
QUrlQuery query;
QHashIterator<QString, QString> i(params);
while(i.hasNext()) {
i.next();
query.addQueryItem(i.key(), i.value());
}
QUrl requrl(m_url+m_api);
qDebug() << requrl;
requrl.setQuery(query);
QByteArray loginData = m_login.toLocal8Bit().toBase64();
QString headerData = "Basic " + loginData;
request.setRawHeader("Authorization", headerData.toLocal8Bit());
request.setUrl(requrl);
reply = manager.get(request);
connect(reply, &QNetworkReply::finished, this, &UPDATENEWS::onReplySuccess);
connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onReplyError(QNetworkReply::NetworkError)));
connect(reply, &QNetworkReply::readyRead, this, &UPDATENEWS::onReadyRead);
connect(reply, &QNetworkReply::sslErrors, this, &UPDATENEWS::onSSLError);
}
void UPDATENEWS::onReplyError(QNetworkReply::NetworkError code)
{
qDebug() << code;
emit this->error( bufferToString(), m_url,m_api, (int) code);
buffer.clear();
reply->deleteLater();
}
void UPDATENEWS::onReplySuccess()
{
qDebug() << "!";
emit this->success( buffer, m_api);
buffer.clear();
// reply->deleteLater();
}
void UPDATENEWS::onReadyRead()
{
qDebug() << ".";
buffer += reply->readAll();
}
void UPDATENEWS::onSSLError(const QList<QSslError> &errors)
{
qDebug() << "XHR::onSSLError :" ;
QListIterator<QSslError> ierrs(errors);
while(ierrs.hasNext()) {
qDebug() << "\t" << ierrs.next().errorString();
}
}
QString UPDATENEWS::bufferToString()
{
return QTextCodec::codecForName("utf-8")->toUnicode(buffer);
} }

View File

@ -36,6 +36,7 @@
#include <QJsonObject> #include <QJsonObject>
#include <QSqlDatabase> #include <QSqlDatabase>
#include "xhr.h" #include "xhr.h"
#include "alarm.h"
class UPDATENEWS : public QObject class UPDATENEWS : public QObject
{ {
@ -54,14 +55,15 @@ signals:
// void loginChanged(QString login); // void loginChanged(QString login);
void urlChanged(QString url); void urlChanged(QString url);
void updatesuccess(); void success(QString api);
void error(QString api, QString content);
//void apiChanged(QString api); //void apiChanged(QString api);
//network // //network
void success(QByteArray data, QString api); // void success(QByteArray data, QString api);
void error(QString data, QString url,QString api, int code); // void error(QString data, QString url,QString api, int code);
//network // //network
public slots: public slots:
void setUrl(QString url); void setUrl(QString url);
@ -70,41 +72,50 @@ public slots:
void setDatabase(); void setDatabase();
void login(); void login();
void timeline(); void timeline();
void startImagedownload();
void updateImageLocation(QString downloadtype,QString imageurl, QString filename, int index);
//network void store(QByteArray serverreply,QString apiname);
void onReplyError(QNetworkReply::NetworkError code); void showError(QString data, QString url,QString api, int code);
void onReplySuccess(); // //network
void onReadyRead(); // void onReplyError(QNetworkReply::NetworkError code);
void onSSLError(const QList<QSslError> &errors); // void onReplySuccess();
void setParam(QString name, QString value); // void onReadyRead();
void clearParams(); // void onSSLError(const QList<QSslError> &errors);
void get(); // void setParam(QString name, QString value);
//network // void clearParams();
// void get();
// //network
private: private:
QString m_url; QString m_url;
QString m_api; QString m_api;
QString m_imagedir;
QString m_login; QString m_login;
QString username; QString username;
QSqlDatabase m_db; QSqlDatabase m_db;
QList<QJsonValue> findNewContacts(QJsonDocument news); QList<QJsonValue> findNewContacts(QJsonDocument news);
int updateInterval;
//void timeline(); //void timeline();
void store(QByteArray serverreply,QString apiname); //void store(QByteArray serverreply,QString apiname);
void updateContacts(QList<QJsonValue> contacts); void updateContacts(QList<QJsonValue> contacts);
XHR xhr;
ALARM alarm;
QList<QString> newcontactimagelinks;
QList<QString> newcontactnames;
//network
QHash<QString, QString> params; // //network
QHash<QString, QString> files; // QHash<QString, QString> params;
QByteArray buffer; // QHash<QString, QString> files;
QNetworkAccessManager manager; // QByteArray buffer;
QNetworkRequest request; // QNetworkAccessManager manager;
QNetworkReply *reply; // QNetworkRequest request;
QNetworkConfiguration nc; // QNetworkReply *reply;
QString bufferToString(); // QNetworkConfiguration nc;
//network // QString bufferToString();
// //network
}; };
#endif // UPDATENEWS_H #endif // UPDATENEWS_H

View File

@ -290,7 +290,8 @@ void XHR::onReplyError(QNetworkReply::NetworkError code)
void XHR::onReplySuccess() void XHR::onReplySuccess()
{ {
qDebug() << "!"; qDebug() << "!";
emit this->success( bufferToString(), m_api); //emit this->success( bufferToString(), m_api);
emit this->success( buffer, m_api);
buffer.clear(); buffer.clear();
// reply->deleteLater(); // reply->deleteLater();
} }

View File

@ -79,7 +79,7 @@ signals:
void networktypeChanged(); void networktypeChanged();
void downloaded(QString type, QString url, QString filename, int i); void downloaded(QString type, QString url, QString filename, int i);
void downloadedjson(QString type, QString url, QString filename, int i,QJsonObject jsonObject); void downloadedjson(QString type, QString url, QString filename, int i,QJsonObject jsonObject);
void success(QString data, QString api); void success(QByteArray data, QString api);
void error(QString data, QString url,QString api, int code); void error(QString data, QString url,QString api, int code);
public slots: public slots:

View File

@ -20,7 +20,8 @@ SOURCES += common/friendiqa.cpp \
common/xhr.cpp \ common/xhr.cpp \
common/filesystem.cpp \ common/filesystem.cpp \
common/remoteauthasyncimageprovider.cpp \ common/remoteauthasyncimageprovider.cpp \
common/updatenews.cpp common/updatenews.cpp \
common/alarmandroid.cpp
RESOURCES = application.qrc RESOURCES = application.qrc
@ -41,7 +42,8 @@ HEADERS += \
common/xhr.h \ common/xhr.h \
common/filesystem.h \ common/filesystem.h \
common/remoteauthasyncimageprovider.h \ common/remoteauthasyncimageprovider.h \
common/updatenews.h common/updatenews.h \
common/alarm.h
DISTFILES += \ DISTFILES += \
qml/calendarqml/*.qml \ qml/calendarqml/*.qml \
@ -53,6 +55,3 @@ DISTFILES += \
qml/photoqml/*.qml \ qml/photoqml/*.qml \
qml/configqml/*.qml \ qml/configqml/*.qml \
js/*.js \ js/*.js \
qml/newsqml/Hashtag.qml \
qml/newsqml/NewsImage.qml \
qml/newsqml/NewsLink.qml

View File

@ -95,6 +95,20 @@ function friendicaWebRequest(url,rootwindow,callback) {
xhrequest.send(); xhrequest.send();
} }
function friendicaXmlRequest(url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() {
if (xhrequest.readyState === XMLHttpRequest.HEADERS_RECEIVED) {}
else if(xhrequest.readyState === XMLHttpRequest.DONE) {
try{callback(xhrequest.responseXML)}
catch (e){showMessage("Error","API:\n" +url+" "+e+"\n Return: "+xhrequest.responseText, rootwindow)}
}
}
xhrequest.open("GET", url);
xhrequest.responseType ="document";
xhrequest.send();
}
function friendicaRemoteAuthRequest(login,url,c_url,rootwindow,callback) { function friendicaRemoteAuthRequest(login,url,c_url,rootwindow,callback) {
var xhrequest = new XMLHttpRequest(); var xhrequest = new XMLHttpRequest();
xhrequest.onreadystatechange = function() { xhrequest.onreadystatechange = function() {

View File

@ -465,7 +465,7 @@ function chatsfromdb(database,user,callback,stop_time){
helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html); helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html);
helpernews.text=Qt.atob(helpernews.text); helpernews.text=Qt.atob(helpernews.text);
helpernews.id=helpernews.status_id; helpernews.id=helpernews.status_id;
if (helpernews.attachments!==null){print(Qt.atob(helpernews.attachments));helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))}; if (helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))};
newsArray.push(helpernews); newsArray.push(helpernews);
} }
callback(newsArray); callback(newsArray);

View File

@ -135,6 +135,21 @@ else{
if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)} if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=ptvideohelper.url)){attachmentList.push(ptvideohelper)}
} }
} }
// if (newsitemobject.text.indexOf("https://www.youtube.com/watch")>-1){
// //print("message "+msg.options.showWebsiteForLinks);
// if (msg.options.showYoutube!="false"){
// var ythelper={mimetype:"video/youtube"}
// var yttext=newsitemobject.text;
// while (yttext.indexOf("https://www.youtube.com/watch")>-1){
// var ythelperstringposition=linktext.indexOf("watch?v=");
// var ytposend=findend(yttext,ythelperstringposition);
// ythelper.url=yttext.substring(yttext.lastIndexOf("http",linkhelperstringposition),linkposend);
// linktext=linktext.substring(linkhelperstringposition+5,linktext.length)
// if ((attachmentList.length==0) || (attachmentList[attachmentList.length-1].url!=linkhelper.url)){attachmentList.push(linkhelper)}
// }
// }
// }
// if (newsitemobject.text.indexOf(".html")>-1){ // if (newsitemobject.text.indexOf(".html")>-1){
// //print("message "+msg.options.showWebsiteForLinks); // //print("message "+msg.options.showWebsiteForLinks);
// if (msg.options.showWebsiteForLinks!="false"){ // if (msg.options.showWebsiteForLinks!="false"){

View File

@ -513,9 +513,6 @@ function updateView(viewtype){
//downloadNotice.text="xhr start "+Date.now() //downloadNotice.text="xhr start "+Date.now()
switch(viewtype){ switch(viewtype){
case "Conversations": case "Conversations":
// updatenews.setDatabase();
// updatenews.login();
// updatenews.timeline();
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server); xhr.setUrl(login.server);
@ -525,9 +522,6 @@ function updateView(viewtype){
xhr.setParam("count",50) xhr.setParam("count",50)
break; break;
case "Timeline": case "Timeline":
// updatenews.setDatabase();
// updatenews.login();
// updatenews.timeline();
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server); xhr.setUrl(login.server);
@ -565,6 +559,12 @@ function updateView(viewtype){
xhr.setApi("/api/favorites"); xhr.setApi("/api/favorites");
xhr.clearParams(); xhr.clearParams();
break; break;
case "Replies":
xhr.setLogin(login.username+":"+Qt.atob(login.password));
xhr.setUrl(login.server);
xhr.setApi("/api/statuses/replies");
xhr.clearParams();
break;
default: default:
var lastnews=Newsjs.getLastNews(login,db); var lastnews=Newsjs.getLastNews(login,db);
xhr.setLogin(login.username+":"+Qt.atob(login.password)); xhr.setLogin(login.username+":"+Qt.atob(login.password));
@ -575,8 +575,8 @@ function updateView(viewtype){
xhr.setParam("count",50) xhr.setParam("count",50)
newstab.newstabstatus="Conversations"; newstab.newstabstatus="Conversations";
} }
xhr.get();
xhr.get();
if (viewtype==="Conversations"){Newsjs.allchatsfromdb(db,login.username,function(temp){ if (viewtype==="Conversations"){Newsjs.allchatsfromdb(db,login.username,function(temp){
newsStack.allchats=temp newsStack.allchats=temp
})} })}

View File

@ -0,0 +1,45 @@
<html>
<head>
<title>-1</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
</head>
<body bgcolor="black" marginwidth="0" marginheight="0">
<div id="player"></div>
<script>
function getVideoId() {
return window.location.href.slice(window.location.href.indexOf('?') + 1);
}
var tag = document.createElement('script');
tag.src = "https://www.youtube.com/iframe_api";
var firstScriptTag = document.getElementsByTagName('script')[0];
firstScriptTag.parentNode.insertBefore(tag, firstScriptTag);
var player;
function onYouTubeIframeAPIReady() {
player = new YT.Player('player', {
playerVars: { 'html5': 1, 'iv_load_policy': 3 },
frameborder: '0',
height: '100%',
width: '100%',
videoId: getVideoId(),
events: {
'onReady': onPlayerReady,
'onStateChange': onPlayerStateChange
}
});
}
function onPlayerReady(event) {
document.title = 0;
}
function onPlayerStateChange(event) {
if (event.data == YT.PlayerState.PLAYING) {
document.title = 1;
} else if (event.data == YT.PlayerState.ENDED || event.data == YT.PlayerState.PAUSED) {
document.title = 2;
}
}
</script>
</body>
</html>

View File

@ -93,99 +93,106 @@ StackView{
} }
Text { Text {
text: qsTr("Server") text: qsTr("Server")
x: 4*mm; y: 10*mm font.pixelSize:3*mm
x: 4*mm; y: 10*mm
} }
Text { Text {
text: qsTr("Nickname") text: qsTr("Nickname")
x: 4*mm; y: 20*mm font.pixelSize:3*mm
x: 4*mm; y: 20*mm
} }
Text { Text {
text: qsTr("Password") text: qsTr("Password")
x: 4*mm; y: 30*mm font.pixelSize:3*mm
x: 4*mm; y: 30*mm
} }
Text { Text {
text: qsTr("Image dir.") text: qsTr("Image dir.")
x: 4*mm; y: 40*mm font.pixelSize:3*mm
x: 4*mm; y: 40*mm
} }
Text { Text {
text: qsTr("Max. News") text: qsTr("Max. News")
x: 4*mm; y: 50*mm font.pixelSize:3*mm
} x: 4*mm; y: 50*mm
Text {
text: qsTr("News as")
x: 4*mm; y: 60*mm
} }
Text { Text {
text: qsTr("Interval (0=None)") text: qsTr("News as")
visible: false font.pixelSize:3*mm
x: 4*mm; y: 70*mm; width:20*mm;wrapMode: Text.Wrap x: 4*mm; y: 60*mm
} }
Text {
text: qsTr("Sync Interval (0=None)")
font.pixelSize:3*mm
//visible: false
x: 4*mm; y: 70*mm; //width:35*mm;wrapMode: Text.Wrap
}
// Text { // Text {
// text: qsTr("Show Website") // text: qsTr("Show Website")
// x: 4*mm; y: 70*mm; width: 20*mm // x: 4*mm; y:80*mm; width: 20*mm
// } // }
Image{ Image{
id:servericon id:servericon
x:19*mm;y:10*mm x:4*mm;y:13.5*mm
width:5*mm; height: 5*mm width:5*mm; height: 5*mm
visible: false visible: false
source:"" source:""
MouseArea{ MouseArea{
anchors.fill:parent anchors.fill:parent
onClicked:{ onClicked:{
Service.showServerConfig(servername.text, configBackground, function(configString){ Service.showServerConfig(servername.text, configBackground, function(configString){
var serverconfigObject=Qt.createQmlObject(configString,configBackground,"serverconfigOutput");}) var serverconfigObject=Qt.createQmlObject(configString,configBackground,"serverconfigOutput");})
}
} }
} }
}
BlueButton{ BlueButton{
id:serverSearchButton id:serverSearchButton
text:"\uf002" text:"\uf002"
x:19*mm x:4*mm
y:10*mm y:13.5*mm
width: 5*mm; height:5*mm width: 5*mm; height:5*mm
visible: servericon.visible?false:true visible: servericon.visible?false:true
onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))} onClicked:{Qt.openUrlExternally(Qt.resolvedUrl("https://dir.friendica.social/servers"))}
} }
Rectangle{color: "light grey"; x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;}
Rectangle{color: "light grey"; x: 25*mm; y: 10*mm; width: root.width/2; height: 5*mm;} Flickable {
Flickable { id: servernameFlickable
id: servernameFlickable x: 10*mm; y: 13.5*mm; width: root.width-12*mm; height: 5*mm;
x: 25*mm; y: 10*mm; width: root.width/2; height: 5*mm; contentWidth: servername.paintedWidth
contentWidth: servername.paintedWidth contentHeight: servername.paintedHeight
contentHeight: servername.paintedHeight clip: true
clip: true TextEdit {
TextEdit { id: servername
id: servername width: servernameFlickable.width
width: servernameFlickable.width height: servernameFlickable.height
height: servernameFlickable.height focus: true
focus: true font.pixelSize:3*mm
text:"https://..." text:"https://..."
onEditingFinished:{ onEditingFinished:{
if((servername.text).substring(0,14) =="https://...http"){ if((servername.text).substring(0,14) =="https://...http"){
serverstring.text= (serverstring.text).substring(11) serverstring.text= (serverstring.text).substring(11)
} }
configBackground.setServericon(servername.text) configBackground.setServericon(servername.text)
} }
onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable) onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,servernameFlickable)
} }
} }
Rectangle{ Rectangle{
color: "light grey" color: "light grey"
x: 25*mm; y: 20*mm; width: root.width/2-9*mm; height: 5*mm; x: 4*mm; y: 23.5*mm; width: root.width-14*mm; height: 5*mm;
TextInput { TextInput {
id: username id: username
anchors.fill: parent anchors.fill: parent
selectByMouse: true font.pixelSize:3*mm
selectByMouse: true
onEditingFinished:{ onEditingFinished:{
if (username.text.indexOf('@')>-1){ if (username.text.indexOf('@')>-1){
Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground) Helperjs.showMessage(qsTr("Error"),qsTr("Nicknames containing @ symbol currently not supported"),configBackground)
@ -201,84 +208,40 @@ StackView{
} }
} }
} }
BlueButton { BlueButton {
x: root.width/2+18*mm; y: 20*mm; width:7*mm x: root.width-9*mm; y: 23.5*mm; width:7*mm
text: "\uf234" text: "\uf234"
onClicked: { onClicked: {
configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}}) configStack.push({item:"qrc:/qml/configqml/RegisterPage.qml",properties:{url:servername.text+"/register?nickname="+username.getText(0,username.length)}})
} }
} }
Rectangle{ Rectangle{
color: "light grey" color: "light grey"
x: 25*mm; y: 30*mm; width: root.width/2; height: 5*mm; x: 4*mm; y: 33.5*mm; width: root.width-6*mm; height: 5*mm;
TextInput { TextInput {
id: password id: password
anchors.fill: parent anchors.fill: parent
font.pixelSize:3*mm
selectByMouse: true selectByMouse: true
echoMode: TextInput.PasswordEchoOnEdit echoMode: TextInput.PasswordEchoOnEdit
} }
} }
Rectangle{color: "light grey"; x: 25*mm; y: 40*mm; width: root.width/2-9*mm; height: 5*mm;} Rectangle{color: "light grey"; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;}
Flickable { Flickable {
id: imagestoreFlickable id: imagestoreFlickable
x: 25*mm; y: 40*mm; width: root.width/2-9*mm; height: 5*mm; x: 4*mm; y: 43.5*mm; width: root.width-14*mm; height: 5*mm;
clip: true clip: true
TextInput { TextInput {
id: imagestore id: imagestore
width: imagestoreFlickable.width width: imagestoreFlickable.width
height: imagestoreFlickable.height height: imagestoreFlickable.height
font.pixelSize:3*mm
wrapMode: TextEdit.NoWrap wrapMode: TextEdit.NoWrap
onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable) onCursorRectangleChanged: Layoutjs.ensureVisibility(cursorRectangle,imagestoreFlickable)
} }
} }
Slider{ id: maxNews
x:34*mm; y: 50*mm;width: root.width/3;height:5*mm
minimumValue: 0;maximumValue:2000; stepSize: 100
}
Rectangle{color: "light grey"; x: 25*mm; y: 50*mm; width: 9*mm; height: 5*mm;
TextEdit{id:maxNewsText;
anchors.fill: parent
verticalAlignment:TextEdit.AlignRight
text:maxNews.value
focus: true
selectByMouse: true
}
}
Rectangle{
x: 25*mm; y: 60*mm; width: root.width/2; height: 5*mm;
color:"light grey"
Text{
id: newsTypeField
anchors.fill: parent
text:"Conversations"
}
MouseArea{
anchors.fill:parent
onClicked:newstypemenu.popup()
}
}
Slider{ id: messageIntervalSlider
visible: false
x:37*mm; y: 70*mm;width: root.width/3;height:5*mm
minimumValue: 0;maximumValue:24; stepSize: 0.5
}
Rectangle{
visible:false
x: 25*mm; y: 70*mm; width: 9*mm; height: 5*mm;
TextEdit{
id: messageIntervalField
anchors.fill: parent
verticalAlignment:TextEdit.AlignRight
text:messageIntervalSlider.value
focus: true
selectByMouse: true
}
}
FileDialog { FileDialog {
id: imagestoreDialog id: imagestoreDialog
@ -290,20 +253,71 @@ StackView{
imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/" imagestoreString=imagestoreString.replace(/^(file:\/{2})/,"")+"/"
imagestore.text=imagestoreString imagestore.text=imagestoreString
} }
} }
BlueButton { BlueButton {
x: root.width/2+18*mm; y: 40*mm; width: 7*mm; height: 5*mm; x: root.width-9*mm; y: 43.5*mm; width: 7*mm; height: 5*mm;
text: "..." text: "..."
onClicked: onClicked:
{imagestoreDialog.open()} {imagestoreDialog.open()}
} }
Slider{ id: maxNews
x:19*mm; y: 53.5*mm;width: root.width/2;height:5*mm
minimumValue: 0;maximumValue:2000; stepSize: 100
}
Rectangle{color: "light grey"; x: 4*mm; y: 53.5*mm; width: 9*mm; height: 5*mm;
TextEdit{id:maxNewsText;
anchors.fill: parent
font.pixelSize:3*mm
verticalAlignment:TextEdit.AlignRight
text:maxNews.value
focus: true
selectByMouse: true
}
}
Rectangle{
x: 4*mm; y: 63.5*mm; width: newsTypeField.contentWidth+2*mm; height: 5*mm;
color:"light grey"
Text{
id: newsTypeField
anchors.fill: parent
font.pixelSize:3*mm
text:"Conversations"
}
MouseArea{
anchors.fill:parent
onClicked:newstypemenu.popup()
}
}
Slider{ id: messageIntervalSlider
x:22*mm; y: 73.5*mm;width: root.width/2;height:5*mm
minimumValue: 0;maximumValue:120; stepSize: 15
}
Rectangle{
x: 4*mm; y: 73.5*mm; width: 9*mm; height: 5*mm;
TextEdit{
id: messageIntervalField
anchors.fill: parent
font.pixelSize:3*mm
verticalAlignment:TextEdit.AlignRight
text:messageIntervalSlider.value
focus: true
selectByMouse: true
}
}
Text{x: 14*mm; y: 73.5*mm; width: 5*mm; height: 5*mm;
font.pixelSize:3*mm
text:qsTr("Min.")
}
// CheckBox{ // CheckBox{
// id:showwebsiteCheckbox // id:showwebsiteCheckbox
// x:35*mm;y:70*mm // x:35*mm;y:80*mm
// onClicked:{ // onClicked:{
// if (checked==true){ // if (checked==true){
// Service.updateglobaloptions(root.db,"showWebsiteForLinks","true") // Service.updateglobaloptions(root.db,"showWebsiteForLinks","true")
@ -314,11 +328,10 @@ StackView{
// root.globaloptions.showWebsiteForLinks="false" // root.globaloptions.showWebsiteForLinks="false"
// } // }
// } // }
// } // }
BlueButton { BlueButton {
x: 25*mm; y: 78*mm x: 4*mm; y: 83.5*mm
text: qsTr("Confirm") text: qsTr("Confirm")
onClicked:{ onClicked:{
var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text,maxnews:maxNewsText.text,interval: messageIntervalField.text, newsViewType:newsTypeField.text}; var userconfig={server: servername.text, username: username.text, password:Qt.btoa(password.text), imagestore:imagestore.text,maxnews:maxNewsText.text,interval: messageIntervalField.text, newsViewType:newsTypeField.text};
@ -352,7 +365,10 @@ StackView{
root.login=userconfig; root.login=userconfig;
root.news=[]; root.news=[];
},"isActive",0); },"isActive",0);
Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc}) Service.requestProfile(userconfig,db,root,function(nc){root.newContacts=nc});
if(osSettings.osType=="Android" && userconfig.timerInterval !=0){
alarm.setAlarm(userconfig.timerInterval);
}
Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root) Helperjs.showMessage(qsTr("Success"),qsTr("Name")+": "+credentials.name+"\nScreen Name: "+credentials.screen_name,root)
} }
}); });
@ -382,7 +398,7 @@ StackView{
imagestore.text=""; imagestore.text="";
maxNews.value=0; maxNews.value=0;
newsTypeField.text="Conversations"; newsTypeField.text="Conversations";
messageIntervalSlider.value=0; messageIntervalSlider.value=30;
userButton.text=qsTr("User"); userButton.text=qsTr("User");
Helperjs.readData(db,"config","",function(storedUsers){ Helperjs.readData(db,"config","",function(storedUsers){
storedUsers.sort(function(obj1, obj2) { storedUsers.sort(function(obj1, obj2) {
@ -405,7 +421,7 @@ StackView{
imagestore.text="" imagestore.text=""
maxNews.value=0 maxNews.value=0
newsTypeField.text="Conversations" newsTypeField.text="Conversations"
messageIntervalSlider.value=0 messageIntervalSlider.value=30
userButton.text=qsTr("User") userButton.text=qsTr("User")
} }
} }
@ -449,14 +465,15 @@ StackView{
if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0 if( obj.isActive==0){userButton.fontColor='black'} else {userButton.fontColor='grey'}},"isActive",0
) )
}) })
//Service.readGlobaloptions(db,function(go){ // Service.readGlobaloptions(db,function(go){
// if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true} // if (root.globaloptions.showWebsiteForLinks!="false"){showwebsiteCheckbox.checked=true}
//}) // })
} }
catch (e){ catch (e){print(e)
Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){ Helperjs.friendicaWebRequest("https://dir.friendica.social/servers/surprise",configBackground,function(html){
var baseurl=html.substring(html.indexOf("baseurl")+11,html.indexOf('"',html.indexOf("baseurl")+11)) var bpos=html.indexOf("baseurl");
var baseurl=html.substring(html.indexOf("http",bpos),html.indexOf('"',html.indexOf("http",bpos)));
servername.text=baseurl servername.text=baseurl
})} })}
} }

View File

@ -43,7 +43,7 @@ Rectangle{
textFormat: Text.RichText textFormat: Text.RichText
width: parent.width width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: "<b>Friendiqa v0.3.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+ text: "<b>Friendiqa v0.4 </b><br>Licensed under GPL 3 with the exception of OpenSSL <br> "+
"Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+ "Profile <a href='https://freunde.ma-nic.de/profile/friendiqa'>https://freunde.ma-nic.de/profile/friendiqa</a><br>"+
"Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+ "Sourcecode: <a href='https://git.friendi.ca/LubuWest/Friendiqa'>https://git.friendi.ca/LubuWest/Friendiqa</a><br>"+
"Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+ "Most of C++ code by <a href='https://kirgroup.com/profile/fabrixxm'>Fabio</a><br>"+

View File

@ -36,6 +36,7 @@ QtObject{
property int appHeight: Screen.desktopAvailableHeight property int appHeight: Screen.desktopAvailableHeight
property int backKey: Qt.Key_Back property int backKey: Qt.Key_Back
//property string attachImageDir:filesystem.cameraPath+"/" //property string attachImageDir:filesystem.cameraPath+"/"
property string osType: "Android"
property string imagePickQml: "ImagePicker" property string imagePickQml: "ImagePicker"
property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+ property string imagePicker:'import QtQuick 2.0; import "qrc:/qml/genericqml";'+
imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+ imagePickQml+'{multiple : true;onReady: {attachImageURLs.push(imageUrl);'+

View File

@ -34,6 +34,7 @@ QtObject{
property real appWidth: 500 property real appWidth: 500
property real appHeight: 500 property real appHeight: 500
property int backKey: Qt.Key_Escape property int backKey: Qt.Key_Escape
property string osType: "Android"
//property string attachImageDir:filesystem.homePath+"/Pictures/" //property string attachImageDir:filesystem.homePath+"/Pictures/"
property string imagePickQml: "ImagePickerLinux" property string imagePickQml: "ImagePickerLinux"
} }

View File

@ -100,18 +100,18 @@ TabView{
} }
Connections{ // Connections{
target:xhr // target:xhr
onDownloaded:{ // onDownloaded:{
if(type=="contactlist"){ // if(type=="contactlist"){
var database=LocalStorage.openDatabaseSync(root.db[0],root.db[1],root.db[2],root.db[3]); // var database=LocalStorage.openDatabaseSync(root.db[0],root.db[1],root.db[2],root.db[3]);
var result; // var result;
database.transaction( function(tx) { // database.transaction( function(tx) {
result = tx.executeSql('UPDATE contacts SET profile_image="'+filename+'" where profile_image_url="'+url+'"'); // result = tx.executeSql('UPDATE contacts SET profile_image="'+filename+'" where profile_image_url="'+url+'"');
}) // })
} // }
} // }
} // }
FontLoader{id: fontAwesome; source: "qrc:/images/fontawesome-webfont.ttf"} FontLoader{id: fontAwesome; source: "qrc:/images/fontawesome-webfont.ttf"}
@ -194,8 +194,10 @@ TabView{
Component.onCompleted: { Component.onCompleted: {
Service.readGlobaloptions(db,function(go){globaloptions=go}) Service.readGlobaloptions(db,function(go){globaloptions=go})
//print(xhr.networktype); //print(xhr.networktype);
if(osSettings.imagePickQml=="ImagePicker"){var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml"); if(osSettings.osType=="Android"){
var IntentReceiverQml = component.createObject(root) var component = Qt.createComponent("qrc:/qml/genericqml/IntentReceiver.qml");
var IntentReceiverQml = component.createObject(root);
} }
} }
} }

View File

@ -38,6 +38,10 @@ Item {
Component.onCompleted: { Component.onCompleted: {
SystemDispatcher.setInitialized(); SystemDispatcher.setInitialized();
print("timer " + login.timerInterval)
if (login.timerInterval !=0){
alarm.setAlarm(login.timerInterval);
}
} }
} }

View File

@ -45,8 +45,23 @@ Rectangle{
// WebView {id:htmlview; // WebView {id:htmlview;
// anchors.fill: parent // anchors.fill: parent
// } // }
Component.onCompleted: //Helperjs.friendicaWebRequest(url,parent,function(html){ Component.onCompleted:{
//print(html);
htmlview.text="Text <iframe src='"+url+"' width = '300px' height = '300px'>" // Helperjs.friendicaWebRequest(url,parent,function(document){
//}) // print(document);
//// var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
//// //iterate through them
//// for (i=0; i<metas.length; i++) {
//// if (metas[i].getAttribute("name") == "keywords") {
//// print(metas[i].getAttribute("content"));
//// }
//// else if (metas[i].getAttribute("name") == "description") {
//// console.log(metas[i].getAttribute("content"));
//// }
//// }
// //print(html);
// htmlview.text=""
// })
}
} }

View File

@ -40,6 +40,8 @@ import "qrc:/js/helper.js" as Helperjs
import "qrc:/js/service.js" as Service import "qrc:/js/service.js" as Service
import AndroidNative 1.0
Item { Item {
Connections{ Connections{
target:newstab target:newstab
@ -59,6 +61,25 @@ Item {
} }
} }
// Connections{
// target:xhr
// onError:{
// Helperjs.showMessage(qsTr("Network Error"),"API:\n" +login.server+api+"\n Return: \n"+data,root);
// }
// onSuccess:{
// if (api=="/api/statuses/friends_timeline"){
// // downloadNotice.text=downloadNotice.text+ "\n xhr finished "+Date.now();
// //Service.processNews(api,data);
// if(login.newsViewType=="Timeline"){
// Newsjs.newsfromdb(db,login.username,function(dbnews){showNews(dbnews)})}
// else{Newsjs.chatsfromdb(db,login.username,function(dbnews){
// showNews(dbnews);
// })}
// }
// }
// }
Timer {id:replytimer; interval: 1000; running: false; repeat: false Timer {id:replytimer; interval: 1000; running: false; repeat: false
onTriggered: { onTriggered: {
if(newstab.newstabstatus=="Conversation"){ if(newstab.newstabstatus=="Conversation"){
@ -221,6 +242,14 @@ Item {
Service.updateView("Favorites") Service.updateView("Favorites")
} }
} }
QC2.Action {
text: qsTr("Replies")
onTriggered:{
newsStack.updateMethodNews="refresh";
newstab.newstabstatus="Replies";
Service.updateView("Replies")
}
}
QC2.Action { QC2.Action {
text: qsTr("Public timeline") text: qsTr("Public timeline")
onTriggered:{ onTriggered:{

View File

@ -0,0 +1,100 @@
// This file is part of Friendiqa
// https://git.friendi.ca/lubuwest/Friendiqa
// Copyright (C) 2017 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 "qrc:/js/helper.js" as Helperjs
//import QtWebView 1.1
Rectangle{
color:"transparent"
width:newscolumn.width;
height:newscolumn.width/4*3
property string url:""//htmlview.text
WebView {
id: webView
anchors.fill: parent
opacity: 0
url: "qrc:///content/player.html?" + currentVideo.vId
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:
topInfo.text = "Failed to load the requested video"
break
}
opacity = 0
}
onTitleChanged: {
currentVideo.status = 1 * title
if (title == videoStatus.paused || title == videoStatus.ready)
panel.state = "list"
else if (title == videoStatus.playing)
panel.state = "hidden"
}
}
Text{id:htmlview
textFormat:Text.RichText
}
// WebView {id:htmlview;
// anchors.fill: parent
// }
Component.onCompleted:{
// Helperjs.friendicaWebRequest(url,parent,function(document){
// print(document);
//// var metas = document.getElementsByTagName('meta'); //get all the meta tag elements
//// //iterate through them
//// for (i=0; i<metas.length; i++) {
//// if (metas[i].getAttribute("name") == "keywords") {
//// print(metas[i].getAttribute("content"));
//// }
//// else if (metas[i].getAttribute("name") == "description") {
//// console.log(metas[i].getAttribute("content"));
//// }
//// }
// //print(html);
// htmlview.text=""
// })
}
}

View File

@ -134,11 +134,8 @@ Item {
MouseArea{ MouseArea{
anchors.fill:parent anchors.fill:parent
onClicked: { onClicked: {
conversationsymbol.color="black"; newsStack.push("qrc:/qml/newsqml/Conversation.qml");
newsView.contentY+=newsitem.height; showConversation(index,newsitemobject)
var component = Qt.createComponent("qrc:/qml/newsqml/Conversation.qml");
var conversationItem = component.createObject(friendicaActivities,{"news":newsitemobject.chatArray});
showConversation(index,newsitemobject);
} }
} }
} }
@ -187,10 +184,10 @@ Item {
var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsImage.qml");
var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype}); var imageQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
} }
// else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){ else if(newsitemobject.attachmentList[attachments].mimetype=="text/html"){
// var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsLink.qml");
// var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url}); var linkQml = component.createObject(messageColumn,{"url":newsitemobject.attachmentList[attachments].url});
// } }
else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype) else {//print(newsitemobject.attachmentList[attachments].url+" Type: "+newsitemobject.attachmentList[attachments].mimetype)
var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml"); var component = Qt.createComponent("qrc:/qml/newsqml/NewsVideo.qml");
var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype}); var videoQml = component.createObject(messageColumn,{"source":newsitemobject.attachmentList[attachments].url,"mimetype":newsitemobject.attachmentList[attachments].mimetype});
@ -464,14 +461,6 @@ Item {
}) })
} }
} }
MenuItem {
text: qsTr("Post")
onTriggered: {
Helperjs.friendicaPostRequest(root.login,"/item","preview=1&"+encodeURIComponent(newsitemobject.text),"POST",root,function(reply){
print(reply)
})
}
}
//MenuItem{ //MenuItem{
// text:qsTr("Show on website") // text:qsTr("Show on website")

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
@ -29,38 +29,38 @@
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Kurzname</translation> <translation>Kurzname</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Passwort</translation> <translation>Passwort</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Bildverz.</translation> <translation>Bildverz.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation>Max. Nachr.</translation> <translation>Max. Nachr.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>Anzeige</translation> <translation>Anzeige</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervall (0=keins)</translation> <translation type="vanished">Intervall (0=keins)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Fehler</translation> <translation>Fehler</translation>
</message> </message>
@ -69,22 +69,22 @@
<translation type="vanished">Name auf der Seite nicht registriert!</translation> <translation type="vanished">Name auf der Seite nicht registriert!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Bestätigen</translation> <translation>Bestätigen</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>Kein Server angegeben!</translation> <translation>Kein Server angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>Kein Kurzname angegeben!</translation> <translation>Kein Kurzname angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation>Name auf der Seite nicht registriert!</translation> <translation>Name auf der Seite nicht registriert!</translation>
</message> </message>
@ -93,42 +93,57 @@
<translation type="vanished">Kein Nutzername angegeben!</translation> <translation type="vanished">Kein Nutzername angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation>Akt.-intervall (0=keine)</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation>Kurznamen mit @ Zeichen werden derzeit nicht unterstützt.</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation>Min.</translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>Kein Passwort angegeben!</translation> <translation>Kein Passwort angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>Kein Verzeichnis für Bilder angegeben!</translation> <translation>Kein Verzeichnis für Bilder angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>Maximale News-Anzahl nicht angegeben!</translation> <translation>Maximale News-Anzahl nicht angegeben!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation>Falsches Passwort!</translation> <translation>Falsches Passwort!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>Bestätigt</translation> <translation>Bestätigt</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Chronologisch</translation> <translation>Chronologisch</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Unterhaltungen</translation> <translation>Unterhaltungen</translation>
</message> </message>
@ -182,27 +197,27 @@
<translation>Kontaktanfrage</translation> <translation>Kontaktanfrage</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Beschreibung</translation> <translation>Beschreibung</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Ort</translation> <translation>Ort</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Beiträge</translation> <translation>Beiträge</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>Profilseite</translation> <translation>Profilseite</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Erstellt</translation> <translation>Erstellt</translation>
</message> </message>
@ -309,12 +324,12 @@
<translation type="vanished">Lade Profilbild für </translation> <translation type="vanished">Lade Profilbild für </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Mehr</translation> <translation>Mehr</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Chronologisch</translation> <translation>Chronologisch</translation>
</message> </message>
@ -323,42 +338,47 @@
<translation type="vanished">Fehler</translation> <translation type="vanished">Fehler</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Markierte News</translation> <translation>Markierte News</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Unterhaltungen</translation> <translation>Unterhaltungen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation>Netzwerk-Fehler</translation> <translation>Netzwerk-Fehler</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation>Interaktionen</translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation>Gemeinschaft</translation> <translation>Gemeinschaft</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Direktnachrichten</translation> <translation>Direktnachrichten</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Meldungen</translation> <translation>Meldungen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>News Gruppe</translation> <translation>News Gruppe</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation>Schliessen</translation> <translation>Schliessen</translation>
</message> </message>
@ -391,60 +411,65 @@
<translation> Kommentare</translation> <translation> Kommentare</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Teilnahme: </translation> <translation>Teilnahme: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Antworten</translation> <translation>Antworten</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Direktnachricht</translation> <translation>Direktnachricht</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Teilen</translation> <translation>Teilen</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>Erledigt!</translation> <translation>Erledigt!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Unterhaltung</translation> <translation>Unterhaltung</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Teilnahme</translation> <translation>Teilnahme</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>ja</translation> <translation>ja</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>vielleicht</translation> <translation>vielleicht</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>nein</translation> <translation>nein</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Löschen</translation> <translation>Löschen</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -676,37 +701,37 @@
<translation>Homepage</translation> <translation>Homepage</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation>Aktualisieren</translation> <translation>Aktualisieren</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation>Profil-Nummer</translation> <translation>Profil-Nummer</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation>Beschreibung</translation> <translation>Beschreibung</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation>Ort</translation> <translation>Ort</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation>Beiträge</translation> <translation>Beiträge</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation>Profilseite</translation> <translation>Profilseite</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation>Erstellt</translation> <translation>Erstellt</translation>
</message> </message>
@ -802,66 +827,66 @@
<translation>vielleicht</translation> <translation>vielleicht</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>Sekunden</translation> <translation>Sekunden</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>her</translation> <translation>her</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>Minute</translation> <translation>Minute</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>Minuten</translation> <translation>Minuten</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>Stunde</translation> <translation>Stunde</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>Stunden</translation> <translation>Stunden</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>Tag</translation> <translation>Tag</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>Tage</translation> <translation>Tage</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>Monat</translation> <translation>Monat</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>Monate</translation> <translation>Monate</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation></translation> <translation></translation>
</message> </message>
@ -873,12 +898,12 @@
<translation type="vanished">Fehler</translation> <translation type="vanished">Fehler</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation>Antwort-Array ungültig</translation> <translation>Antwort-Array ungültig</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation>Server-Antwort: Fehler</translation> <translation>Server-Antwort: Fehler</translation>
</message> </message>

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Usuario</translation> <translation>Usuario</translation>
</message> </message>
@ -29,58 +29,58 @@
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Usuario</translation> <translation>Usuario</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Contraseña</translation> <translation>Contraseña</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Dir. de imágenes</translation> <translation>Dir. de imágenes</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation> Max. de noticias.</translation> <translation> Max. de noticias.</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>Noticias como</translation> <translation>Noticias como</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervalo (0=ningún)</translation> <translation type="vanished">Intervalo (0=ningún)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Error</translation> <translation>Error</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Confirmar</translation> <translation>Confirmar</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>¡Servidor no encontrado!</translation> <translation>¡Servidor no encontrado!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>¡Usuario incorrecto!</translation> <translation>¡Usuario incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation>¡Usuario incorrecto!</translation> <translation>¡Usuario incorrecto!</translation>
</message> </message>
@ -89,42 +89,57 @@
<translation type="vanished">¡Usuario incorrecto!</translation> <translation type="vanished">¡Usuario incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>¡Contraseña incorrecta!</translation> <translation>¡Contraseña incorrecta!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>¡No se ha encontrado el directorio de imágenes!</translation> <translation>¡No se ha encontrado el directorio de imágenes!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>¡ máximo de noticias incorrecto!</translation> <translation>¡ máximo de noticias incorrecto!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation>¡Contraseña incorrecta!</translation> <translation>¡Contraseña incorrecta!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>éxito!</translation> <translation>éxito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation>Nombre</translation> <translation>Nombre</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronología</translation> <translation>Cronología</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversaciones</translation> <translation>Conversaciones</translation>
</message> </message>
@ -178,27 +193,27 @@
<translation>Conectar</translation> <translation>Conectar</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Descripción</translation> <translation>Descripción</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Localización</translation> <translation>Localización</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Mensajes</translation> <translation>Mensajes</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>URL</translation> <translation>URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Creado en</translation> <translation>Creado en</translation>
</message> </message>
@ -294,12 +309,12 @@
<translation type="vanished">Descargar la imagen del perfil para </translation> <translation type="vanished">Descargar la imagen del perfil para </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Mas</translation> <translation>Mas</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronología</translation> <translation>Cronología</translation>
</message> </message>
@ -308,42 +323,47 @@
<translation type="obsolete">Error</translation> <translation type="obsolete">Error</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Favoritos</translation> <translation>Favoritos</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversaciones</translation> <translation>Conversaciones</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation>Fallo de red</translation> <translation>Fallo de red</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation>Cronología pública</translation> <translation>Cronología pública</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Mensaje directo</translation> <translation>Mensaje directo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Notificaciones</translation> <translation>Notificaciones</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>Grupos</translation> <translation>Grupos</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation>Salida</translation> <translation>Salida</translation>
</message> </message>
@ -376,60 +396,65 @@
<translation> comentarios</translation> <translation> comentarios</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Asistiendo: </translation> <translation>Asistiendo: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Respuesta</translation> <translation>Respuesta</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Mensaje directo</translation> <translation>Mensaje directo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Volver a publicar</translation> <translation>Volver a publicar</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>éxito!</translation> <translation>éxito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Conversación</translation> <translation>Conversación</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Asistiendo</translation> <translation>Asistiendo</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>si</translation> <translation>si</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>quizás</translation> <translation>quizás</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>no</translation> <translation>no</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Borrar</translation> <translation>Borrar</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -661,37 +686,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished">Descripción</translation> <translation type="unfinished">Descripción</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation type="unfinished">Localización</translation> <translation type="unfinished">Localización</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation type="unfinished">Mensajes</translation> <translation type="unfinished">Mensajes</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished">URL</translation> <translation type="unfinished">URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation type="unfinished">Creado en</translation> <translation type="unfinished">Creado en</translation>
</message> </message>
@ -787,66 +812,66 @@
<translation>quizás</translation> <translation>quizás</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>Segundos</translation> <translation>Segundos</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>hace</translation> <translation>hace</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>Minuto</translation> <translation>Minuto</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>Minutos</translation> <translation>Minutos</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>Hora</translation> <translation>Hora</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>Horas</translation> <translation>Horas</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>Dia</translation> <translation>Dia</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>Dias</translation> <translation>Dias</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>Mes</translation> <translation>Mes</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>Meses</translation> <translation>Meses</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation>Años</translation> <translation>Años</translation>
</message> </message>
@ -858,12 +883,12 @@
<translation type="obsolete">Error</translation> <translation type="obsolete">Error</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation></translation> <translation></translation>
</message> </message>

View File

@ -18,8 +18,8 @@
<name>ConfigTab</name> <name>ConfigTab</name>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="69"/> <location filename="../qml/configqml/ConfigTab.qml" line="69"/>
<location filename="../qml/configqml/ConfigTab.qml" line="351"/> <location filename="../qml/configqml/ConfigTab.qml" line="402"/>
<location filename="../qml/configqml/ConfigTab.qml" line="374"/> <location filename="../qml/configqml/ConfigTab.qml" line="425"/>
<source>User</source> <source>User</source>
<translation>Utente</translation> <translation>Utente</translation>
</message> </message>
@ -29,58 +29,58 @@
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="100"/> <location filename="../qml/configqml/ConfigTab.qml" line="101"/>
<source>Nickname</source> <source>Nickname</source>
<translation>Utente</translation> <translation>Utente</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="105"/> <location filename="../qml/configqml/ConfigTab.qml" line="107"/>
<source>Password</source> <source>Password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="109"/> <location filename="../qml/configqml/ConfigTab.qml" line="112"/>
<source>Image dir.</source> <source>Image dir.</source>
<translation>Directory immagini</translation> <translation>Directory immagini</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="114"/> <location filename="../qml/configqml/ConfigTab.qml" line="118"/>
<source>Max. News</source> <source>Max. News</source>
<translation> Max. di notizie</translation> <translation> Max. di notizie</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="118"/> <location filename="../qml/configqml/ConfigTab.qml" line="123"/>
<source>News as</source> <source>News as</source>
<translation>News come</translation> <translation>News come</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="122"/>
<source>Interval (0=None)</source> <source>Interval (0=None)</source>
<translation>Intervallo (0=nessuno)</translation> <translation type="vanished">Intervallo (0=nessuno)</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<location filename="../qml/configqml/ConfigTab.qml" line="328"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<location filename="../qml/configqml/ConfigTab.qml" line="377"/>
<source>Error</source> <source>Error</source>
<translation>Errore</translation> <translation>Errore</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="289"/> <location filename="../qml/configqml/ConfigTab.qml" line="335"/>
<source>Confirm</source> <source>Confirm</source>
<translation>Conferma</translation> <translation>Conferma</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="293"/> <location filename="../qml/configqml/ConfigTab.qml" line="339"/>
<source>No server given! </source> <source>No server given! </source>
<translation>Nessun server inserito!</translation> <translation>Nessun server inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="294"/> <location filename="../qml/configqml/ConfigTab.qml" line="340"/>
<source>No nickname given! </source> <source>No nickname given! </source>
<translation>Nessun utente inserito!</translation> <translation>Nessun utente inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="295"/> <location filename="../qml/configqml/ConfigTab.qml" line="341"/>
<source>Nickname not registered at given server! </source> <source>Nickname not registered at given server! </source>
<translation></translation> <translation></translation>
</message> </message>
@ -89,42 +89,57 @@
<translation type="vanished">Nessun utente inserito!</translation> <translation type="vanished">Nessun utente inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="296"/> <location filename="../qml/configqml/ConfigTab.qml" line="128"/>
<source>Sync Interval (0=None)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="198"/>
<source>Nicknames containing @ symbol currently not supported</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="315"/>
<source>Min.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/configqml/ConfigTab.qml" line="342"/>
<source>No password given! </source> <source>No password given! </source>
<translation>Nessuna password inserita!</translation> <translation>Nessuna password inserita!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="297"/> <location filename="../qml/configqml/ConfigTab.qml" line="343"/>
<source>No image directory given!</source> <source>No image directory given!</source>
<translation>Nessuna directory immagini inserita!</translation> <translation>Nessuna directory immagini inserita!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="298"/> <location filename="../qml/configqml/ConfigTab.qml" line="344"/>
<source>No maximum news number given!</source> <source>No maximum news number given!</source>
<translation>Nessun numero massimo di news inserito!</translation> <translation>Nessun numero massimo di news inserito!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="304"/> <location filename="../qml/configqml/ConfigTab.qml" line="350"/>
<source>Wrong password!</source> <source>Wrong password!</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Success</source> <source>Success</source>
<translation>Ha funzionato!</translation> <translation>Ha funzionato!</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="323"/> <location filename="../qml/configqml/ConfigTab.qml" line="372"/>
<source>Name</source> <source>Name</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="389"/> <location filename="../qml/configqml/ConfigTab.qml" line="440"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronologia</translation> <translation>Cronologia</translation>
</message> </message>
<message> <message>
<location filename="../qml/configqml/ConfigTab.qml" line="393"/> <location filename="../qml/configqml/ConfigTab.qml" line="444"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversazioni</translation> <translation>Conversazioni</translation>
</message> </message>
@ -178,27 +193,27 @@
<translation>Connetti</translation> <translation>Connetti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Description</source> <source>Description</source>
<translation>Descrizione</translation> <translation>Descrizione</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Location</source> <source>Location</source>
<translation>Località</translation> <translation>Località</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="152"/> <location filename="../qml/newsqml/ContactPage.qml" line="151"/>
<source>Posts</source> <source>Posts</source>
<translation>Messaggi</translation> <translation>Messaggi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="153"/> <location filename="../qml/newsqml/ContactPage.qml" line="152"/>
<source>URL</source> <source>URL</source>
<translation>URL</translation> <translation>URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/ContactPage.qml" line="154"/> <location filename="../qml/newsqml/ContactPage.qml" line="153"/>
<source>Created at</source> <source>Created at</source>
<translation>Creato il</translation> <translation>Creato il</translation>
</message> </message>
@ -294,12 +309,12 @@
<translation type="vanished">Download immagine profilo per </translation> <translation type="vanished">Download immagine profilo per </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="330"/> <location filename="../qml/newsqml/NewsTab.qml" line="359"/>
<source>More</source> <source>More</source>
<translation>Ancora</translation> <translation>Ancora</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="200"/> <location filename="../qml/newsqml/NewsTab.qml" line="221"/>
<source>Timeline</source> <source>Timeline</source>
<translation>Cronologia</translation> <translation>Cronologia</translation>
</message> </message>
@ -308,42 +323,47 @@
<translation type="obsolete">Errore</translation> <translation type="obsolete">Errore</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="217"/> <location filename="../qml/newsqml/NewsTab.qml" line="238"/>
<source>Favorites</source> <source>Favorites</source>
<translation>Favoriti</translation> <translation>Favoriti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="209"/> <location filename="../qml/newsqml/NewsTab.qml" line="230"/>
<source>Conversations</source> <source>Conversations</source>
<translation>Conversazioni</translation> <translation>Conversazioni</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="54"/> <location filename="../qml/newsqml/NewsTab.qml" line="56"/>
<source>Network Error</source> <source>Network Error</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="225"/> <location filename="../qml/newsqml/NewsTab.qml" line="246"/>
<source>Replies</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/newsqml/NewsTab.qml" line="254"/>
<source>Public timeline</source> <source>Public timeline</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="234"/> <location filename="../qml/newsqml/NewsTab.qml" line="263"/>
<source>Direct Messages</source> <source>Direct Messages</source>
<translation>Messaggio diretto</translation> <translation>Messaggio diretto</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="242"/> <location filename="../qml/newsqml/NewsTab.qml" line="271"/>
<source>Notifications</source> <source>Notifications</source>
<translation>Notifiche</translation> <translation>Notifiche</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="251"/> <location filename="../qml/newsqml/NewsTab.qml" line="280"/>
<source>Group news</source> <source>Group news</source>
<translation>Gruppi</translation> <translation>Gruppi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/NewsTab.qml" line="259"/> <location filename="../qml/newsqml/NewsTab.qml" line="288"/>
<source>Quit</source> <source>Quit</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -376,60 +396,65 @@
<translation> commenti</translation> <translation> commenti</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="281"/> <location filename="../qml/newsqml/Newsitem.qml" line="283"/>
<source>Attending: </source> <source>Attending: </source>
<translation>Attendi: </translation> <translation>Attendi: </translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="403"/> <location filename="../qml/newsqml/Newsitem.qml" line="405"/>
<source>Reply</source> <source>Reply</source>
<translation>Risposta</translation> <translation>Risposta</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="411"/> <location filename="../qml/newsqml/Newsitem.qml" line="413"/>
<source>DM</source> <source>DM</source>
<translation>Messaggio diretto</translation> <translation>Messaggio diretto</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="417"/> <location filename="../qml/newsqml/Newsitem.qml" line="419"/>
<source>Repost</source> <source>Repost</source>
<translation>Condividi</translation> <translation>Condividi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="420"/> <location filename="../qml/newsqml/Newsitem.qml" line="422"/>
<source>Success!</source> <source>Success!</source>
<translation>Ha funzionato!</translation> <translation>Ha funzionato!</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="425"/> <location filename="../qml/newsqml/Newsitem.qml" line="427"/>
<source>Conversation</source> <source>Conversation</source>
<translation>Conversazione</translation> <translation>Conversazione</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="435"/> <location filename="../qml/newsqml/Newsitem.qml" line="437"/>
<source>Attending</source> <source>Attending</source>
<translation>Attendi</translation> <translation>Attendi</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="437"/> <location filename="../qml/newsqml/Newsitem.qml" line="439"/>
<source>yes</source> <source>yes</source>
<translation>si</translation> <translation>si</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="442"/> <location filename="../qml/newsqml/Newsitem.qml" line="444"/>
<source>maybe</source> <source>maybe</source>
<translation>potrebbe</translation> <translation>potrebbe</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="447"/> <location filename="../qml/newsqml/Newsitem.qml" line="449"/>
<source>no</source> <source>no</source>
<translation>no</translation> <translation>no</translation>
</message> </message>
<message> <message>
<location filename="../qml/newsqml/Newsitem.qml" line="454"/> <location filename="../qml/newsqml/Newsitem.qml" line="456"/>
<source>Delete</source> <source>Delete</source>
<translation>Cancella</translation> <translation>Cancella</translation>
</message> </message>
<message>
<location filename="../qml/newsqml/Newsitem.qml" line="465"/>
<source>Post</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PermissionDialog</name> <name>PermissionDialog</name>
@ -661,37 +686,37 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="176"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="177"/>
<source>Update</source> <source>Update</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="208"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="209"/>
<source>profile id</source> <source>profile id</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Description</source> <source>Description</source>
<translation type="unfinished">Descrizione</translation> <translation type="unfinished">Descrizione</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Location</source> <source>Location</source>
<translation type="unfinished">Località</translation> <translation type="unfinished">Località</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="232"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="233"/>
<source>Posts</source> <source>Posts</source>
<translation type="unfinished">Messaggi</translation> <translation type="unfinished">Messaggi</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="233"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="234"/>
<source>URL</source> <source>URL</source>
<translation type="unfinished">URL</translation> <translation type="unfinished">URL</translation>
</message> </message>
<message> <message>
<location filename="../qml/contactqml/ProfileComponent.qml" line="234"/> <location filename="../qml/contactqml/ProfileComponent.qml" line="235"/>
<source>Created at</source> <source>Created at</source>
<translation type="unfinished">Creato il</translation> <translation type="unfinished">Creato il</translation>
</message> </message>
@ -787,66 +812,66 @@
<translation>potrebbe</translation> <translation>potrebbe</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<source>seconds</source> <source>seconds</source>
<translation>secondi</translation> <translation>secondi</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="143"/> <location filename="../js/newsworker.js" line="172"/>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>ago</source> <source>ago</source>
<translation>fa</translation> <translation>fa</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="144"/> <location filename="../js/newsworker.js" line="173"/>
<source>minute</source> <source>minute</source>
<translation>minuti</translation> <translation>minuti</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="145"/> <location filename="../js/newsworker.js" line="174"/>
<source>minutes</source> <source>minutes</source>
<translation>minuti</translation> <translation>minuti</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="146"/> <location filename="../js/newsworker.js" line="175"/>
<source>hour</source> <source>hour</source>
<translation>ora</translation> <translation>ora</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="147"/> <location filename="../js/newsworker.js" line="176"/>
<source>hours</source> <source>hours</source>
<translation>ore</translation> <translation>ore</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="148"/> <location filename="../js/newsworker.js" line="177"/>
<source>day</source> <source>day</source>
<translation>giorno</translation> <translation>giorno</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="149"/> <location filename="../js/newsworker.js" line="178"/>
<source>days</source> <source>days</source>
<translation>giorni</translation> <translation>giorni</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="150"/> <location filename="../js/newsworker.js" line="179"/>
<source>month</source> <source>month</source>
<translation>mese</translation> <translation>mese</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="151"/> <location filename="../js/newsworker.js" line="180"/>
<source>months</source> <source>months</source>
<translation>mesi</translation> <translation>mesi</translation>
</message> </message>
<message> <message>
<location filename="../js/newsworker.js" line="152"/> <location filename="../js/newsworker.js" line="181"/>
<source>years</source> <source>years</source>
<translation>anni</translation> <translation>anni</translation>
</message> </message>
@ -858,12 +883,12 @@
<translation type="obsolete">Errore</translation> <translation type="obsolete">Errore</translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="363"/> <location filename="../js/service.js" line="390"/>
<source>Undefined Array Error</source> <source>Undefined Array Error</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location filename="../js/service.js" line="366"/> <location filename="../js/service.js" line="393"/>
<source>JSON status Error</source> <source>JSON status Error</source>
<translation></translation> <translation></translation>
</message> </message>