tux-droid-svn Mailing List for Tux Droid CE (Page 12)
Status: Beta
Brought to you by:
ks156
Menu
▾
▴
tux-droid-svn — Subversion commit reports.
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(32) |
Mar
(108) |
Apr
(71) |
May
(38) |
Jun
(128) |
Jul
(1) |
Aug
(14) |
Sep
(77) |
Oct
(104) |
Nov
(90) |
Dec
(71) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(81) |
Feb
(18) |
Mar
(40) |
Apr
(102) |
May
(151) |
Jun
(74) |
Jul
(151) |
Aug
(257) |
Sep
(447) |
Oct
(379) |
Nov
(404) |
Dec
(430) |
| 2009 |
Jan
(173) |
Feb
(236) |
Mar
(519) |
Apr
(300) |
May
(112) |
Jun
(232) |
Jul
(314) |
Aug
(58) |
Sep
(203) |
Oct
(293) |
Nov
(26) |
Dec
(109) |
| 2010 |
Jan
(19) |
Feb
(25) |
Mar
(33) |
Apr
(1) |
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: jerome <c2m...@c2...> - 2009-10-20 15:42:57
|
Author: jerome
Date: 2009-10-20 17:42:29 +0200 (Tue, 20 Oct 2009)
New Revision: 5755
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Updated promptAuthorizations function.
* Removed two unused constants.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 15:29:04 UTC (rev 5754)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 15:42:29 UTC (rev 5755)
@@ -23,6 +23,7 @@
package com.kysoh.plugins.facebook;
import java.io.IOException;
+import java.util.List;
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
@@ -33,7 +34,11 @@
private FacebookJsonRestClient client;
+ //Auth options.
+ public static final byte AUTH_PUBLISH_FEEDS = 0;
+ public static final byte AUTH_READ_MAILBOX = 1;
+
public boolean Connect(String username, String password)
{
FacebookSessionUtils.setMail(username);
@@ -103,15 +108,28 @@
/**
* Prompt for plugin facebook authorizations.
*/
- public static void promptAuthorizations()
+ public static void promptAuthorizations(List<Byte> options)
{
+ //Adding default.
+ String rights = "read_stream,offline_access";
+
+ if(options.contains(FacebookConnection.AUTH_PUBLISH_FEEDS))
+ {
+ rights += "," + "read_mailbox";
+ }
+
+ if(options.contains(FacebookConnection.AUTH_READ_MAILBOX))
+ {
+ rights += "," + "publish_stream";
+ }
+
String url = "http://www.facebook.com/login.php?api_key=+" +
FacebookSessionUtils.api_key +
"&connect_display=popup&v=1.0" +
"&next=http://www.facebook.com/connect/login_success.html" +
"&cancel_url=http://www.facebook.com/connect/login_failure.html" +
"&fbconnect=true&return_session=true" +
- "&req_perms=read_stream,publish_stream,offline_access,read_mailbox";
+ "&req_perms=" + rights;
BareBonesBrowserLaunch.openURL(url);
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 15:29:04 UTC (rev 5754)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 15:42:29 UTC (rev 5755)
@@ -37,10 +37,6 @@
public class FacebookFunctions {
-
- //Messages constants.
- public static final byte MESSAGE = 0;
- public static final byte RESPONSE = 1;
private FacebookJsonRestClient client;
private JSONObject notifications = null;
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 15:29:04 UTC (rev 5754)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 15:42:29 UTC (rev 5755)
@@ -23,7 +23,9 @@
package com.kysoh.plugins.facebook;
+import java.util.ArrayList;
import java.util.Hashtable;
+import java.util.List;
import java.util.Vector;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
@@ -71,8 +73,22 @@
*/
public void doConfigure()
{
+ List<Byte> options = new ArrayList<Byte>();
+
+ //Adding publish stream auth if needed.
+ if(this.configuration().getUpdateStatus())
+ {
+ options.add(FacebookConnection.AUTH_PUBLISH_FEEDS);
+ }
+
+ //Adding read mailbox auth if needed.
+ if(this.configuration().getNotifyEmail())
+ {
+ options.add(FacebookConnection.AUTH_READ_MAILBOX);
+ }
+
//Prompt web browser for facebook permissions.
- FacebookConnection.promptAuthorizations();
+ FacebookConnection.promptAuthorizations(options);
//TODO check actual permissions.
}
|
|
From: jerome <c2m...@c2...> - 2009-10-20 15:29:22
|
Author: jerome
Date: 2009-10-20 17:29:04 +0200 (Tue, 20 Oct 2009)
New Revision: 5754
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
Log:
* Throwing emails by sender ( cf: Twitter Plugin).
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 15:16:34 UTC (rev 5753)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 15:29:04 UTC (rev 5754)
@@ -57,9 +57,7 @@
{
if (this.getCommand().equalsIgnoreCase("configure"))
{
- //Prompt web browser for facebook permissions.
- FacebookConnection.promptAuthorizations();
- //TODO check actual permissions.
+ this.doConfigure();
}
else
{
@@ -69,6 +67,17 @@
/**
+ * Configure facebook account access rights.
+ */
+ public void doConfigure()
+ {
+ //Prompt web browser for facebook permissions.
+ FacebookConnection.promptAuthorizations();
+ //TODO check actual permissions.
+ }
+
+
+ /**
* Start run or check command.
*/
public void RunOrCheck()
@@ -165,7 +174,27 @@
this.throwMessage("You don't have any messages");
}
}
- //TODO throwing emails by sender.
+
+ if(inbox.size() > 0)
+ {
+ //Throwing emails by sender.
+ Hashtable<String, Integer> emailsBySender = new Hashtable<String, Integer>();
+ emailsBySender = functions.getByNames(inbox);
+
+ Vector<String> senders = new Vector<String>(emailsBySender.keySet());
+
+ for(String sender : senders)
+ {
+ if (emailsBySender.get(sender).intValue() == 1)
+ {
+ this.throwMessage("One from {0}", functions.getFacebookName(sender));
+ }
+ else
+ {
+ this.throwMessage("{0} messages from {1}", functions.getFacebookName(sender), emailsBySender.get(sender));
+ }
+ }
+ }
}
|
|
From: jerome <c2m...@c2...> - 2009-10-20 15:16:47
|
Author: jerome
Date: 2009-10-20 17:16:34 +0200 (Tue, 20 Oct 2009)
New Revision: 5753
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
Log:
* Added an option.
* Refactored plugin main entry point.
* Make use of the new functions.
* Renamed two functions.
* Cleanup.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 14:14:38 UTC (rev 5752)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 15:16:34 UTC (rev 5753)
@@ -103,7 +103,7 @@
/**
* Prompt for plugin facebook authorizations.
*/
- public void promptAuthorizations()
+ public static void promptAuthorizations()
{
String url = "http://www.facebook.com/login.php?api_key=+" +
FacebookSessionUtils.api_key +
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 14:14:38 UTC (rev 5752)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 15:16:34 UTC (rev 5753)
@@ -191,7 +191,7 @@
* Return availables group invites names.
* @return
*/
- public Vector<String> getGroupsInvites()
+ public Vector<String> getGroupInvites()
{
Vector<String> result = new Vector<String>();
@@ -237,7 +237,7 @@
* Return event invites names.
* @return
*/
- public Vector<String> getEventsInvites()
+ public Vector<String> getEventInvites()
{
Vector<String> result = new Vector<String>();
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 14:14:38 UTC (rev 5752)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookPlugin.java 2009-10-20 15:16:34 UTC (rev 5753)
@@ -23,171 +23,256 @@
package com.kysoh.plugins.facebook;
+import java.util.Hashtable;
+import java.util.Vector;
+
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import com.kysoh.plugins.facebook.configuration.PluginFacebookConfiguration;
+import com.kysoh.plugins.facebook.FacebookConnection;
public class FacebookPlugin extends SimplePlugin<PluginFacebookConfiguration>{
private boolean check = false;
+ private boolean throwed = false;
+ private FacebookFunctions functions;
/**
+ * Throws the result in case of Check mode.
+ */
+ private void throwRes()
+ {
+ if(this.check && (!throwed))
+ {
+ throwed = true;
+ this.throwResult(true);
+ }
+ }
+
+ /**
* Gadget start method.
*/
@Override
protected void start() throws Throwable
- {
- boolean throwNotif = false;
- boolean news = false;
-
- if(getCommand().equals("check"))
+ {
+ if (this.getCommand().equalsIgnoreCase("configure"))
{
- this.check = true;
+ //Prompt web browser for facebook permissions.
+ FacebookConnection.promptAuthorizations();
+ //TODO check actual permissions.
}
+ else
+ {
+ this.RunOrCheck();
+ }
+ }
+
+
+ /**
+ * Start run or check command.
+ */
+ public void RunOrCheck()
+ {
FacebookConnection facebook = new FacebookConnection();
+
if ( facebook.Connect(this.configuration().getLogin(), this.configuration().getPassword()) )
{
- FacebookFunctions functions = new FacebookFunctions(facebook);
+ functions = new FacebookFunctions(facebook.getClient());
- //Get email informations.
+ //Updating user status.
+ if(this.configuration().getUpdateStatus())
+ {
+ this.updateStatus();
+ }
+
+ //Fetching email informations.
if(this.configuration().getNotifyEmail())
{
- if(functions.getEmailNotifications().intValue() > 0)
- {
- news = true;
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
-
- if(functions.getEmailNotifications().intValue() == 1)
- {
- throwMessage("You have one new message");
- }
- else
- {
- throwMessage("You have {0} new messages", functions.getEmailNotifications().intValue());
- }
- }
+ this.throwEMails();
}
- //Get friend requests notification.
+ //Fetching friend requests notification.
if(this.configuration().getShowFriendRequests())
{
- if(functions.getFriendRequestsCount().intValue() > 0)
- {
- news = true;
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
-
- if(functions.getFriendRequestsCount().intValue() == 1)
- {
- throwMessage("You have one friend request");
- }
- else
- {
- throwMessage("You have {0} friend requests", functions.getFriendRequestsCount());
- }
-
- for(String friendName : functions.getFriendRequestNames())
- {
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
- throwMessage("From {0}", friendName);
- }
- }
+ this.throwFriendRequests();
}
//Get group invites notifications.
if(this.configuration().getShowGroupsInvites())
{
- news = true;
- if(functions.getGroupsInvitesCount().intValue() > 0)
- {
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
-
- if(functions.getGroupsInvitesCount().intValue() == 1)
- {
- throwMessage("You have one group invite");
- }
- else
- {
- throwMessage("You have {0} group invites", functions.getGroupsInvitesCount().intValue());
- }
-
- for(String group : functions.getGroupInvitesNames())
- {
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
- throwMessage("to {0}", group);
- }
- }
+ this.throwGroupInvites();
}
//Get pokes notification.
if(this.configuration().getShowEventsInvites())
{
- if(functions.getEventsInvitesCount().intValue() > 0)
- {
- news = true;
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
-
- if(functions.getEventsInvitesCount().intValue() == 1)
- {
- throwMessage("You have one event invite");
- }
- else
- {
- throwMessage("You have {0} event invites", functions.getEventsInvitesCount().intValue());
- }
-
- for(String event : functions.getEventInvitesNames())
- {
- if(this.check && (!throwNotif))
- {
- throwNotif = true;
- this.throwResult(true);
- }
- throwMessage("to {0}", event);
- }
- }
+ this.throwEventInvites();
}
- if((!throwNotif) && this.check )
+ if(( !this.throwed ) && this.getCommand().equalsIgnoreCase("check") )
{
this.throwResult(false);
}
- else if((!this.check) && (!news))
+ }
+ else
+ {
+ this.throwMessage("I cannot get connected to your facebook account.");
+ }
+ }
+
+
+ /**
+ * Update user status.
+ */
+ private void updateStatus()
+ {
+ //Updating user status.
+ if(functions.publishFeed(this.configuration().getStatusText()))
+ {
+ this.throwMessage("Your new status was published");
+ }
+ else
+ {
+ this.throwMessage("An error occured trying to set your new status, please, try again later");
+ }
+ }
+
+
+ /**
+ * Throw all incommin emails.
+ */
+ private void throwEMails()
+ {
+ //Fetching mails.
+ Hashtable<String, Vector<String>> inbox = new Hashtable<String, Vector<String>>();
+ inbox = functions.getEmailNotifications();
+
+ if(functions.getEmailNotifications().size() == 1)
+ {
+ throwRes();
+ throwMessage("You have one new message");
+ }
+
+ else if(inbox.size() > 1)
+ {
+ throwRes();
+ this.throwMessage("You have {0} messages", inbox.size());
+ }
+ else
+ {
+ if (!this.getCommand().equalsIgnoreCase("check"))
{
- this.throwMessage("Nothing new on your account");
+ this.throwMessage("You don't have any messages");
}
}
+ //TODO throwing emails by sender.
+ }
+
+
+ /**
+ * Throw all friend requests.
+ */
+ private void throwFriendRequests()
+ {
+ Vector<String> f_requests = new Vector<String>();
+ f_requests = functions.getFriendRequests();
+
+ if (f_requests.size() > 1)
+ {
+ throwRes();
+ this.throwMessage("You have {0} friend requests", f_requests.size());
+ for(String request : f_requests)
+ {
+ this.throwMessage("From {0}", request);
+ }
+ }
+ else if(f_requests.size() == 1)
+ {
+ throwRes();
+ throwMessage("You have one friend request");
+ this.throwMessage("From {0}", f_requests.get(0));
+ }
else
{
- this.throwMessage("I cannot get connected to your facebook account.");
+ if (! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("You don't have any friend requests");
+ }
}
}
+
/**
+ * Throw all group invites.
+ */
+ private void throwGroupInvites()
+ {
+ //Fetching group invites.
+ Vector<String> g_invites = new Vector<String>();
+ g_invites = functions.getGroupInvites();
+
+ if (g_invites.size() > 1)
+ {
+ throwRes();
+ this.throwMessage("You have {0} group invites", g_invites.size());
+ for(String group : g_invites)
+ {
+ this.throwMessage("From {0}", group);
+ }
+ }
+ else if(g_invites.size() == 1)
+ {
+ throwRes();
+ throwMessage("You have one group invite");
+ this.throwMessage("From {0}", g_invites.get(0));
+ }
+ else
+ {
+ if (! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("You don't have any group invites");
+ }
+ }
+ }
+
+
+ /**
+ * Throw all event invites.
+ */
+ private void throwEventInvites()
+ {
+ //Fetching event invites.
+ Vector<String> e_invites = new Vector<String>();
+ e_invites = functions.getEventInvites();
+
+ if (e_invites.size() > 1)
+ {
+ throwRes();
+ this.throwMessage("You have {0} event invites", e_invites.size());
+ for(String group : e_invites)
+ {
+ this.throwMessage("To {0}", group);
+ }
+ }
+ else if(e_invites.size() == 1)
+ {
+ throwRes();
+ throwMessage("You have one event invite");
+ this.throwMessage("To {0}", e_invites.get(0));
+ }
+ else
+ {
+ if (! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("You don't have any event invites");
+ }
+ }
+ }
+
+
+
+ /**
* Main entry point.
* @param args
*/
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java 2009-10-20 14:14:38 UTC (rev 5752)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java 2009-10-20 15:16:34 UTC (rev 5753)
@@ -35,9 +35,30 @@
private boolean notifyEmail = true;
private String statusText = "Hello all from my Tux Droid Facebook gadget";
+ private boolean updateStatus = false;
/**
+ * Return true if user want update his status.
+ * @return
+ */
+ public boolean getUpdateStatus()
+ {
+ return this.updateStatus;
+ }
+
+
+ /**
+ * Set the user feed update.
+ * @param aLogin
+ */
+ public void setUpdateStatus(boolean aUpdateStatus)
+ {
+ this.updateStatus = aUpdateStatus;
+ }
+
+
+ /**
* Return the user feed to update.
* @return
*/
|
|
From: jerome <c2m...@c2...> - 2009-10-20 14:15:00
|
Author: jerome
Date: 2009-10-20 16:14:38 +0200 (Tue, 20 Oct 2009)
New Revision: 5752
Added:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
Log:
* Updated facebook functions.
* Big code cleanup.
* Added some new functions.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 13:30:31 UTC (rev 5751)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookConnection.java 2009-10-20 14:14:38 UTC (rev 5752)
@@ -26,6 +26,7 @@
import com.google.code.facebookapi.FacebookException;
import com.google.code.facebookapi.FacebookJsonRestClient;
+import com.kysoh.plugins.facebook.connection.BareBonesBrowserLaunch;
import com.kysoh.plugins.facebook.connection.FacebookSessionUtils;
public class FacebookConnection {
@@ -42,14 +43,12 @@
try
{
+
String sessionKey = FacebookSessionUtils.getValidSessionID( true );
//Generate session secret, ready to pass to desktop app client
String sessionSecret = FacebookSessionUtils.lastClientUsed.getCacheSessionSecret();
- //TODO remove this one.
- System.out.println("Session secret: " + String.valueOf(sessionSecret));
-
client = new FacebookJsonRestClient(FacebookSessionUtils.api_key, sessionSecret, sessionKey);
if((sessionSecret == null) || (client == null))
@@ -61,11 +60,11 @@
}
catch (FacebookException e)
{
- ;
+ e.printStackTrace();
}
catch (IOException e)
{
- ;
+ e.printStackTrace();
}
return false;
@@ -99,4 +98,21 @@
{
return client;
}
+
+
+ /**
+ * Prompt for plugin facebook authorizations.
+ */
+ public void promptAuthorizations()
+ {
+ String url = "http://www.facebook.com/login.php?api_key=+" +
+ FacebookSessionUtils.api_key +
+ "&connect_display=popup&v=1.0" +
+ "&next=http://www.facebook.com/connect/login_success.html" +
+ "&cancel_url=http://www.facebook.com/connect/login_failure.html" +
+ "&fbconnect=true&return_session=true" +
+ "&req_perms=read_stream,publish_stream,offline_access,read_mailbox";
+
+ BareBonesBrowserLaunch.openURL(url);
+ }
}
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 13:30:31 UTC (rev 5751)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/FacebookFunctions.java 2009-10-20 14:14:38 UTC (rev 5752)
@@ -23,383 +23,347 @@
package com.kysoh.plugins.facebook;
-import java.util.EnumSet;
+import java.util.Collections;
import java.util.Hashtable;
-import java.util.List;
+import java.util.Iterator;
import java.util.Vector;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
import com.google.code.facebookapi.FacebookException;
-import com.google.code.facebookapi.ProfileField;
-import com.google.code.facebookapi.schema.User;
-import com.google.code.facebookapi.schema.UsersGetInfoResponse;
+import com.google.code.facebookapi.FacebookJsonRestClient;
public class FacebookFunctions {
- private FacebookConnection connection;
- private Hashtable<String, Vector<String>> notifications = new Hashtable<String, Vector<String>>();
+ //Messages constants.
+ public static final byte MESSAGE = 0;
+ public static final byte RESPONSE = 1;
+ private FacebookJsonRestClient client;
+ private JSONObject notifications = null;
+
/**
* Class constructor.
* @param connection
*/
- public FacebookFunctions(FacebookConnection connection)
+ public FacebookFunctions(FacebookJsonRestClient aClient)
{
- this.connection = connection;
- this.notifications = this.getUserNotification();
+ this.client = aClient;
+
+ //Getting standard notifications.
+ try
+ {
+ notifications = (JSONObject) client.notifications_get();
+ }
+ catch (FacebookException e)
+ {
+ notifications = null;
+ }
}
/**
- * Gets all notifications.
+ * Add requested feed to the user wall.
*/
- private Hashtable<String, Vector<String>> getUserNotification()
+ public boolean publishFeed(String aFeed)
{
- //Will contain all availables notifications.
- //availables notifications : messages, pokes, shares, friends_requests, group_invites, event_invites
- Hashtable<String, Vector<String>> notifications = new Hashtable<String, Vector<String>>();
-
- try
+ try
{
- connection.getClient().notifications_get();
- String notifs = connection.getClient().getRawResponse();
-
- /**
- * Getting messages notifications.
- */
- if(notifs.contains("<messages"))
- {
- String messagesString = notifs.substring(
- notifs.indexOf("<messages"),
- notifs.indexOf("</messages>"));
-
- Vector<String> msDatas = new Vector<String>();
-
- String unreaded = messagesString.substring(
- messagesString.indexOf("<unread>") + "<unread>".length(),
- messagesString.indexOf("</unread>"));
-
- msDatas.add(unreaded);
-
-
- if(Integer.valueOf(unreaded).intValue() > 0)
- {
- notifications.put("messages", msDatas);
- }
- }
-
- /**
- * Get the friend_requests notifications.
- */
- if(notifs.contains("<friend_requests"))
- {
-
- String friendsString = "";
- try
- {
- friendsString = notifs.substring(notifs.indexOf("<friend_requests"), notifs.indexOf("</friend_requests>"));
- }
- catch(StringIndexOutOfBoundsException no)
- {
- friendsString = notifs.substring(notifs.indexOf("<friend_requests"), notifs.indexOf("/>", notifs.indexOf("<friend_requests")));
- }
-
- Vector<String> friendsDatas = new Vector<String>();
- Vector<Long> friendsDatasAsLong = new Vector<Long>();
-
- //Getting friends uid that ask for friends.
- if(friendsString.contains("<uid>"))
- {
- while(friendsString.contains("<uid>"))
- {
- String friend = friendsString.substring(
- friendsString.indexOf("<uid>") + "<uid>".length(),
- friendsString.indexOf("</uid>"));
-
- friendsString = friendsString.replace("<uid>" + friend + "</uid>", "");
-
- friendsDatasAsLong.add(Long.valueOf(friend).longValue());
- }
-
-
- // Go fetch the information for the user list of user ids
- connection.getClient().users_getInfo(friendsDatasAsLong, EnumSet.of(ProfileField.NAME));
-
- UsersGetInfoResponse userResponse = (UsersGetInfoResponse) connection.getClient().getResponsePOJO();
-
- // Print out the user information
- List<User> users = userResponse.getUser();
- for (User user : users)
- {
- friendsDatas.add(user.getName());
- }
-
- notifications.put("friend_requests", friendsDatas);
- }
- }
-
- /**
- * Getting new groups invitations.
- */
- if(notifs.contains("<group_invites"))
- {
- String groupString;
-
- try
- {
- groupString = notifs.substring(notifs.indexOf("<group_invites"), notifs.indexOf("</group_invites>"));
- }
- catch(IndexOutOfBoundsException indexError)
- {
- groupString = notifs.substring(notifs.indexOf("<group_invites"), notifs.indexOf("/>", notifs.indexOf("<group_invites")));
- }
-
- Vector<Long> groupsDatasAsLong = new Vector<Long>();
- Vector<String> groupsDatas = new Vector<String>();
-
- //Getting friends uid that ask for friends.
- if(groupString.contains("<gid>"))
- {
- while(groupString.contains("<gid>"))
- {
- String friend = groupString.substring(
- groupString.indexOf("<gid>") + "<gid>".length(),
- groupString.indexOf("</gid>"));
-
- groupString = groupString.replace("<gid>" + friend + "</gid>", "");
-
- groupsDatasAsLong.add(Long.valueOf(friend).longValue());
- }
-
- groupsDatas.add(String.valueOf(groupsDatasAsLong.size()));
-
- for(Long gid : groupsDatasAsLong)
- {
- try
- {
- Thread.sleep(200);
- connection.getClient().fql_query("Select name from group WHERE gid=" + gid.longValue());
- String response = connection.getClient().getRawResponse();
- if(response.contains("<group>") && response.contains("<name>"))
- {
- String groupName = response.substring(
- response.indexOf("<name>") + "<name>".length(),
- response.indexOf("</name>", response.indexOf("<name>")));
- groupsDatas.add(groupName);
- }
- }
- catch(Exception fqlError)
- {
- groupsDatas.add("Unknown group");
- }
- }
-
- //Only if they have some group invites.
- if(groupsDatasAsLong.size() > 0)
- {
- notifications.put("group_invites", groupsDatas);
- }
- }
- }
-
- /**
- * Getting new events invitations.
- */
- if(notifs.contains("<event_invites"))
- {
- String eventString = "";
- try
- {
- eventString = notifs.substring(notifs.indexOf("<event_invites"), notifs.indexOf("/>", notifs.indexOf("<event_invites")));
- }
- catch(IndexOutOfBoundsException indexError)
- {
- eventString = notifs.substring(notifs.indexOf("<event_invites"), notifs.indexOf("</event_invites>"));
- }
-
- Vector<Long> eventsDatasAsLong = new Vector<Long>();
- Vector<String> eventsDatas = new Vector<String>();
-
- //Getting friends uid that ask for friends.
- if(eventString.contains("<eid>") || (eventString.contains("<event_invites_elt>")))
- {
- while(eventString.contains("<eid>"))
- {
- String event = eventString.substring(
- eventString.indexOf("<eid>") + "<eid>".length(),
- eventString.indexOf("</eid>"));
-
- eventString = eventString.replace("<eid>" + event + "</eid>", "");
-
- eventsDatasAsLong.add(Long.valueOf(event).longValue());
- }
-
-
- while(eventString.contains("<event_invites_elt>"))
- {
- String event = eventString.substring(
- eventString.indexOf("<event_invites_elt>") + "<event_invites_elt>".length(),
- eventString.indexOf("</event_invites_elt>"));
-
- eventString = eventString.replace("<event_invites_elt>" + event + "</event_invites_elt>", "");
- eventsDatasAsLong.add(Long.valueOf(event).longValue());
- }
-
- //Adding the number of event invites.
- eventsDatas.add(String.valueOf(eventsDatasAsLong.size()));
-
- for(Long eid : eventsDatasAsLong)
- {
- try
- {
- Thread.sleep(200);
- connection.getClient().fql_query("Select name from event WHERE eid=" + eid.longValue());
- String response = connection.getClient().getRawResponse();
- if(response.contains("<event>") && response.contains("<name>"))
- {
- String groupName = response.substring(
- response.indexOf("<name>") + "<name>".length(),
- response.indexOf("</name>", response.indexOf("<name>")));
- eventsDatas.add(groupName);
- }
- }
- catch(Exception fqlError)
- {
- eventsDatas.add("Unknown event");
- }
-
- }
-
- if(eventsDatasAsLong.size() > 0)
- {
- notifications.put("event_invites", eventsDatas);
- }
- }
- }
- }
+ client.users_setStatus(aFeed);
+ return true;
+ }
catch (FacebookException e)
{
;
- }
-
- return notifications;
+ }
+ return false;
}
/**
* Return email notifications.
*/
- public Integer getEmailNotifications()
+ public Hashtable<String, Vector<String>> getEmailNotifications()
{
- if(this.notifications.containsKey("messages"))
+ Hashtable<String, Vector<String>> result = new Hashtable<String, Vector<String>>();
+
+ String query = "SELECT thread_id, subject, recipients, viewer_id FROM " +
+ "thread WHERE folder_id = 0 AND unread != 0";
+ String userQuery = "SELECT name from user WHERE uid=";
+
+ try
{
- return Integer.valueOf(this.notifications.get("messages").get(0));
+ JSONArray emails = (JSONArray) client.fql_query(query);
+
+ for(int x = 0; x < emails.length(); x++)
+ {
+ String thread = (String) emails.getJSONObject( x ).get("thread_id");
+ String subject = (String) emails.getJSONObject( x ).get("subject");
+ JSONArray recipients = (JSONArray) emails.getJSONObject( x ).get("recipients");
+ String viewer = (String) emails.getJSONObject( x ).get("viewer_id");
+
+ String senderID = viewer;
+ String sender = "Undefined";
+
+ for(int y = 0 ; y < recipients.length(); y++)
+ {
+ senderID = recipients.getString( y );
+ if( ! senderID.equalsIgnoreCase(viewer))
+ {
+ JSONArray username = (JSONArray) client.fql_query(userQuery + senderID);
+ sender = username.getJSONObject( 0 ).getString("name");
+ }
+ }
+
+ Vector<String> threadDatas = new Vector<String>();
+ threadDatas.add(subject);
+ threadDatas.add(sender);
+
+ result.put(thread, threadDatas);
+ }
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+ catch (JSONException e)
+ {
+ ;
}
- else
+ catch (ClassCastException e)
{
- return 0;
+ ;
}
+
+ return sortHash(result);
}
/**
- * Return the number of friend requests.
+ * Return friend names of friend requests.
* @return
*/
- public Integer getFriendRequestsCount()
+ public Vector<String> getFriendRequests()
{
- if(this.notifications.containsKey("friend_requests"))
+ Vector<String> result = new Vector<String>();
+
+ if (notifications == null )
+ return result;
+
+ String query_name = "SELECT name FROM user WHERE uid=";
+ String name = "";
+
+ try
{
- return Integer.valueOf(this.notifications.get("friend_requests").size());
+ String user_id = String.valueOf(client.users_getLoggedInUser());
+ JSONArray friends = (JSONArray)notifications.get("friend_requests");
+ //Getting friend requests user ID.
+
+ for(int x = 0; x < friends.length(); x++)
+ {
+ user_id = String.valueOf(friends.get( x ));
+ name = ((JSONArray) client.fql_query(query_name + user_id)).getJSONObject( 0 ).getString("name");
+
+ result.add(name);
+ }
+
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+ catch (JSONException e)
+ {
+ ;
}
- else
+ catch (ClassCastException e)
{
- return 0;
+ ;
}
+ return result;
}
/**
- * Return the name of people that ask to be a friend of user.
+ * Return availables group invites names.
* @return
*/
- public Vector<String> getFriendRequestNames()
+ public Vector<String> getGroupsInvites()
{
- Vector<String> friends = new Vector<String>();
+ Vector<String> result = new Vector<String>();
- if(this.notifications.containsKey("friend_requests"))
+ if (notifications == null )
+ return result;
+
+ String query_name = "SELECT name FROM group WHERE gid=";
+ String name = "";
+
+ try
{
- Vector<String> dat = this.notifications.get("friend_requests");
- friends = dat;
+ String group_id = String.valueOf(client.users_getLoggedInUser());
+ JSONArray groups = (JSONArray)notifications.get("group_invites");
+ //Getting friend requests user ID.
+
+ for(int x = 0; x < groups.length(); x++)
+ {
+ group_id = String.valueOf(groups.get( x ));
+ name = ((JSONArray) client.fql_query(query_name + group_id)).getJSONObject( 0 ).getString("name");
+
+ result.add(name);
+ }
+
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+ catch (JSONException e)
+ {
+ ;
}
- return friends;
+ catch (ClassCastException e)
+ {
+ ;
+ }
+ return result;
+
}
/**
- * Return the number of availables groups invites.
+ * Return event invites names.
* @return
*/
- public Integer getGroupsInvitesCount()
+ public Vector<String> getEventsInvites()
{
- if(this.notifications.containsKey("group_invites"))
+ Vector<String> result = new Vector<String>();
+
+ if (notifications == null )
+ return result;
+
+ String query_name = "SELECT name FROM event WHERE eid=";
+ String name = "";
+
+ try
{
- return Integer.valueOf(this.notifications.get("group_invites").get(0));
+ String event_id = String.valueOf(client.users_getLoggedInUser());
+ JSONArray events = (JSONArray)notifications.get("event_invites");
+ //Getting friend requests user ID.
+
+ for(int x = 0; x < events.length(); x++)
+ {
+ event_id = String.valueOf(events.get( x ));
+ name = ((JSONArray) client.fql_query(query_name + event_id)).getJSONObject( 0 ).getString("name");
+
+ result.add(name);
+ }
+
+ }
+ catch (FacebookException e)
+ {
+ ;
+ }
+ catch (JSONException e)
+ {
+ ;
}
- else
+ catch (ClassCastException e)
{
- return 0;
+ ;
}
+ return result;
}
+
/**
- * Return the name of groups invites.
+ * Return a Facebook name for the given uid.
+ * @param uid
* @return
*/
- public Vector<String> getGroupInvitesNames()
+ public String getFacebookName(String uid)
{
- Vector<String> groups = new Vector<String>();
+ String result = "Unknown";
+ String query = "SELECT name from user WHERE uid=";
- if(this.notifications.containsKey("group_invites"))
+ try
{
- Vector<String> dat = this.notifications.get("group_invites");
- dat.remove(0);
- groups = dat;
+ JSONArray username = (JSONArray) client.fql_query(query + uid);
+
+ result = username.getJSONObject( 0 ).getString("name");
+ }
+ catch (FacebookException e)
+ {
+ ;
}
- return groups;
+ catch (ClassCastException e)
+ {
+ ;
+ }
+ catch (JSONException e)
+ {
+ ;
+ }
+
+ return result;
}
+
/**
- * Return the number of events invites.
+ * Sort an hashtable by names.
+ * @param aHashtable
* @return
*/
- public Integer getEventsInvitesCount()
+ private Hashtable<String, Vector<String>> sortHash(Hashtable<String, Vector<String>> aHashtable)
{
- if(this.notifications.containsKey("event_invites"))
- {
- return Integer.valueOf(this.notifications.get("event_invites").get(0));
- }
- else
- {
- return 0;
- }
+ Hashtable<String, Vector<String>> result = new Hashtable<String, Vector<String>>();
+ Vector<String> v = new Vector<String>(aHashtable.keySet());
+ Collections.sort(v);
+ Iterator<String> it = v.iterator();
+
+ while (it.hasNext())
+ {
+ String element = (String)it.next();
+ result.put(element, aHashtable.get(element));
+ }
+ return result;
}
- /**
- * Return the name of events invites.
- * @return
+
+
+ /***
+ * Concat user messages.
+ * @param list
*/
- public Vector<String> getEventInvitesNames()
+ public Hashtable<String, Integer> getByNames(Hashtable<String, Vector<String>> baseHash)
{
- Vector<String> events = new Vector<String>();
+ Hashtable<String, Integer> result = new Hashtable<String, Integer>();
+ Vector<String> v = new Vector<String>(baseHash.keySet());
- if(this.notifications.containsKey("event_invites"))
+ //Handling no datas into hashtable.
+ if ( v.size() == 0)
{
- Vector<String> dat = this.notifications.get("event_invites");
- dat.remove(0);
- events = dat;
+ return null;
}
- return events;
+
+ //Counting by names.
+ for( int i = 0 ; i != v.size() ; i ++)
+ {
+ if (result.containsKey(v.get(i)))
+ {
+ Integer value = Integer.valueOf(result.get(v.get(i)) + 1);
+ result.remove(v.get(i));
+ result.put(v.get(i), value);
+ }
+ else
+ {
+ result.put(v.get(i), Integer.valueOf(1));
+ }
+ }
+
+ return result;
}
}
Added: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java (rev 0)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/connection/BareBonesBrowserLaunch.java 2009-10-20 14:14:38 UTC (rev 5752)
@@ -0,0 +1,54 @@
+package com.kysoh.plugins.facebook.connection;
+
+/////////////////////////////////////////////////////////
+// Bare Bones Browser Launch //
+// Version 1.5 //
+// December 10, 2005 //
+// Supports: Mac OS X, GNU/Linux, Unix, Windows XP //
+// Example Usage: //
+// String url = "http://www.centerkey.com/"; //
+// BareBonesBrowserLaunch.openURL(url); //
+// Public Domain Software -- Free to Use as You Like //
+/////////////////////////////////////////////////////////
+
+import java.lang.reflect.Method;
+
+public class BareBonesBrowserLaunch
+{
+
+ @SuppressWarnings("unchecked")
+ public static void openURL(String url)
+ {
+ String osName = System.getProperty("os.name");
+ try
+ {
+ if (osName.startsWith("Mac OS"))
+ {
+ Class fileMgr = Class.forName("com.apple.eio.FileManager");
+ Method openURL = fileMgr.getDeclaredMethod("openURL",
+ new Class[] {String.class});
+ openURL.invoke(null, new Object[] {url});
+ }
+ else if (osName.startsWith("Windows"))
+ Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
+ else
+ { //assume Unix or Linux
+ String[] browsers = {
+ "firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" };
+ String browser = null;
+ for (int count = 0; count < browsers.length && browser == null; count++)
+ if (Runtime.getRuntime().exec(
+ new String[] {"which", browsers[count]}).waitFor() == 0)
+ browser = browsers[count];
+ if (browser == null)
+ throw new Exception("Could not find web browser");
+ else
+ Runtime.getRuntime().exec(new String[] {browser, url});
+ }
+ }
+ catch (Exception e)
+ {
+ }
+ }
+}
+
|
|
From: jerome <c2m...@c2...> - 2009-10-20 13:51:50
|
Author: jerome
Date: 2009-10-20 15:30:31 +0200 (Tue, 20 Oct 2009)
New Revision: 5751
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
Log:
* Updated plugin configuration to match new FB plugin options.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java 2009-10-20 13:28:30 UTC (rev 5750)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/src/com/kysoh/plugins/facebook/configuration/PluginFacebookConfiguration.java 2009-10-20 13:30:31 UTC (rev 5751)
@@ -34,7 +34,30 @@
private boolean showEventsInvites = true;
private boolean notifyEmail = true;
+ private String statusText = "Hello all from my Tux Droid Facebook gadget";
+
+
/**
+ * Return the user feed to update.
+ * @return
+ */
+ public String getStatusText()
+ {
+ return this.statusText;
+ }
+
+
+ /**
+ * Set the user feed.
+ * @param aLogin
+ */
+ public void setStatusText(String aStatusText)
+ {
+ this.statusText = aStatusText;
+ }
+
+
+ /**
* Return the user login.
* @return
*/
|
|
From: jerome <c2m...@c2...> - 2009-10-20 13:28:45
|
Author: jerome
Date: 2009-10-20 15:28:30 +0200 (Tue, 20 Oct 2009)
New Revision: 5750
Modified:
software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
Log:
* Updated plugin description to match new Facebook plugin options.
Modified: software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml
===================================================================
--- software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-20 07:03:26 UTC (rev 5749)
+++ software_suite_v3/software/plugin/plugin-facebook/branches/october_release/resources/plugin.xml 2009-10-20 13:28:30 UTC (rev 5750)
@@ -51,6 +51,18 @@
description="Check event invites"
type="boolean"
defaultValue="true" />
+ <parameter
+ category="Gadget parameters"
+ name="updateStatus"
+ description="Update user status"
+ type="boolean"
+ defaultValue="false" />
+ <parameter
+ category="Gadget parameters"
+ name="statusText"
+ description="Feed to add"
+ type="string"
+ defaultValue="Hello all from my Tux Droid Facebook gadget" />
</parameters>
<commands>
<command
@@ -59,6 +71,9 @@
<command
name="check"
description="Check your facebook account" />
+ <command
+ name="configure"
+ description="Configure Tux Droid facebook application permissions" />
</commands>
<tasks>
<task
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 07:03:38
|
Author: ks156
Date: 2009-10-20 09:03:26 +0200 (Tue, 20 Oct 2009)
New Revision: 5749
Modified:
firmware/tuxcore/trunk/main.c
Log:
* Restore the statuses when quitting the sleep mode.
This should prevent the wings inversion.
Modified: firmware/tuxcore/trunk/main.c
===================================================================
--- firmware/tuxcore/trunk/main.c 2009-10-20 06:51:55 UTC (rev 5748)
+++ firmware/tuxcore/trunk/main.c 2009-10-20 07:03:26 UTC (rev 5749)
@@ -309,8 +309,9 @@
static void sleep(void)
{
uint8_t PRR_bak;
+ uint8_t status_bak;
+ /* Set power savings configuration. */
- /* Set power savings configuration. */
cli();
closeIO();
sensors_disable();
@@ -329,6 +330,7 @@
PCIFR = _BV(PCIE0);
PCICR |= _BV(PCIE0);
+ status_bak = gStatus.pos;
set_sleep_mode(SLEEP_MODE_PWR_DOWN);
sleep_enable();
sei();
@@ -345,6 +347,7 @@
led_init();
communication_init();
irGetRC5();
+ gStatus.pos = status_bak;
/* Wait 200ms for the pull-up to rise before next standalone behavior
* otherwise position switches signals are wrong */
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:52:07
|
Author: ks156
Date: 2009-10-20 08:51:55 +0200 (Tue, 20 Oct 2009)
New Revision: 5748
Modified:
firmware/fuxusb/branches/auto_reset_rf/src/usb_task.c
Log:
* Reset RF when the connexion is lost
Modified: firmware/fuxusb/branches/auto_reset_rf/src/usb_task.c
===================================================================
--- firmware/fuxusb/branches/auto_reset_rf/src/usb_task.c 2009-10-20 06:49:49 UTC (rev 5747)
+++ firmware/fuxusb/branches/auto_reset_rf/src/usb_task.c 2009-10-20 06:51:55 UTC (rev 5748)
@@ -35,6 +35,7 @@
#include "misc.h"
#include "fifo_mic.h"
#include "usb_ep.h"
+#include "rf.h"
#include "lib_mcu\usb\usb_drv.h"
/**
@@ -87,6 +88,15 @@
*/
if (Usb_sof())
{
+ static uint16_t reset_rf_ctr = 0;
+ if (!RF_ONLINE)
+ {
+ if (++reset_rf_ctr > 1000)
+ {
+ reset_rf_ctr = 0;
+ reset_rf();
+ }
+ }
Usb_clear_sof();
led_behavior();
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:50:03
|
Author: ks156
Date: 2009-10-20 08:49:49 +0200 (Tue, 20 Oct 2009)
New Revision: 5747
Modified:
firmware/fuxusb/trunk/src/usb_task.c
Log:
* Reverted previous commit.
Modified: firmware/fuxusb/trunk/src/usb_task.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_task.c 2009-10-20 06:45:22 UTC (rev 5746)
+++ firmware/fuxusb/trunk/src/usb_task.c 2009-10-20 06:49:49 UTC (rev 5747)
@@ -35,7 +35,6 @@
#include "misc.h"
#include "fifo_mic.h"
#include "usb_ep.h"
-#include "rf.h"
#include "lib_mcu\usb\usb_drv.h"
/**
@@ -88,15 +87,6 @@
*/
if (Usb_sof())
{
- static uint16_t reset_rf_ctr = 0;
- if (!RF_ONLINE)
- {
- if (++reset_rf_ctr > 1000)
- {
- reset_rf_ctr = 0;
- reset_rf();
- }
- }
Usb_clear_sof();
led_behavior();
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:45:33
|
Author: ks156
Date: 2009-10-20 08:45:22 +0200 (Tue, 20 Oct 2009)
New Revision: 5746
Modified:
firmware/fuxusb/trunk/src/usb_task.c
Log:
* Reset the RF when the connexion is lost.
Modified: firmware/fuxusb/trunk/src/usb_task.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_task.c 2009-10-20 06:36:56 UTC (rev 5745)
+++ firmware/fuxusb/trunk/src/usb_task.c 2009-10-20 06:45:22 UTC (rev 5746)
@@ -35,6 +35,7 @@
#include "misc.h"
#include "fifo_mic.h"
#include "usb_ep.h"
+#include "rf.h"
#include "lib_mcu\usb\usb_drv.h"
/**
@@ -87,6 +88,15 @@
*/
if (Usb_sof())
{
+ static uint16_t reset_rf_ctr = 0;
+ if (!RF_ONLINE)
+ {
+ if (++reset_rf_ctr > 1000)
+ {
+ reset_rf_ctr = 0;
+ reset_rf();
+ }
+ }
Usb_clear_sof();
led_behavior();
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:37:09
|
Author: ks156
Date: 2009-10-20 08:36:56 +0200 (Tue, 20 Oct 2009)
New Revision: 5745
Modified:
firmware/tuxaudio/branches/auto_reset_rf/main.c
Log:
* Reset the RF each second when the RF connexion is lost.
Modified: firmware/tuxaudio/branches/auto_reset_rf/main.c
===================================================================
--- firmware/tuxaudio/branches/auto_reset_rf/main.c 2009-10-20 06:35:28 UTC (rev 5744)
+++ firmware/tuxaudio/branches/auto_reset_rf/main.c 2009-10-20 06:36:56 UTC (rev 5745)
@@ -91,6 +91,32 @@
* interrupt vector initialized will loop infinitely. */
}
+
+volatile uint8_t rf_counter = 0;
+void monitor_rf(void)
+{
+ if (rf_counter > 30)
+ {
+ rf_counter = 0;
+
+ /* Deconnection detected : Reset the RF ! */
+ if (!(RF_ONLINE_PIN & RF_ONLINE_MK))
+ {
+ uint16_t i = 0;
+
+ /* Active the reset */
+ PORTB &= ~_BV(PB7);
+
+ /* Keep the state for a while (1/8MHz * 4000) ~ 500us */
+ while (i < 4000)
+ i++;
+
+ /* Restart the RF */
+ PORTB |= _BV(PB7);
+ }
+ }
+}
+
void sleep(void)
{
uint8_t PRR_bak;
@@ -255,6 +281,7 @@
{
sei(); /* XXX can we remove this? */
+ monitor_rf();
/* Check for stack overflow. */
if (!check_stack())
while(1)
@@ -307,6 +334,7 @@
* ISR each 256*1024/8e6 = 33ms */
ISR(SIG_OVERFLOW2)
{
+ rf_counter++;
send_sensors_flag = true;
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:35:41
|
Author: ks156 Date: 2009-10-20 08:35:28 +0200 (Tue, 20 Oct 2009) New Revision: 5744 Added: firmware/tuxaudio/branches/auto_reset_rf/ Log: * Added a branch to automatically reset the RF board when the connexion is lost. Copied: firmware/tuxaudio/branches/auto_reset_rf (from rev 5742, firmware/tuxaudio/trunk) |
|
From: ks156 <c2m...@c2...> - 2009-10-20 06:35:17
|
Author: ks156 Date: 2009-10-20 08:34:47 +0200 (Tue, 20 Oct 2009) New Revision: 5743 Added: firmware/fuxusb/branches/auto_reset_rf/ Log: * Added a branch with a small hack to auto reset the RF board when the connexion is lost. Copied: firmware/fuxusb/branches/auto_reset_rf (from rev 5742, firmware/fuxusb/trunk) |
|
From: ks156 <c2m...@c2...> - 2009-10-19 15:00:31
|
Author: ks156 Date: 2009-10-19 17:00:18 +0200 (Mon, 19 Oct 2009) New Revision: 5742 Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/en.po software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/fr.po software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po Log: * Merged r5741 from trunk to this branch Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po 2009-10-19 14:59:26 UTC (rev 5741) +++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/de.po 2009-10-19 15:00:18 UTC (rev 5742) @@ -123,7 +123,7 @@ msgstr "Sorry, Bei der Verbindung mit dem Mailserver gab es einen Fehler. Prüfen Sie Ihre Email-Konfiguration." msgid "Start every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Hinweise" msgid "Start me every x" msgstr "Prüfen Sie mein Email-Konto automatisch" Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/en.po 2009-10-19 14:59:26 UTC (rev 5741) +++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/en.po 2009-10-19 15:00:18 UTC (rev 5742) @@ -123,7 +123,7 @@ msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." msgid "Start every x" -msgstr "Check my E-mail account automatically" +msgstr "Alerts" msgid "Start me every x" msgstr "Check my E-mail account automatically" Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/fr.po 2009-10-19 14:59:26 UTC (rev 5741) +++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/fr.po 2009-10-19 15:00:18 UTC (rev 5742) @@ -123,7 +123,7 @@ msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du gadget." msgid "Start every x" -msgstr "Rapporter en temps réel" +msgstr "Alertes" msgid "Start me every x" msgstr "M'avertir des nouveaux messages en temps réel" Modified: software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po 2009-10-19 14:59:26 UTC (rev 5741) +++ software_suite_v3/software/plugin/plugin-email/branches/random_sentences/plugin-email/resources/nl.po 2009-10-19 15:00:18 UTC (rev 5742) @@ -123,7 +123,7 @@ msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." msgid "Start every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Alarmen" msgid "Start me every x" msgstr "Check mijn E-mail account automatisch" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:59:38
|
Author: ks156 Date: 2009-10-19 16:59:26 +0200 (Mon, 19 Oct 2009) New Revision: 5741 Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po Log: * Changed the alert name : Check my mail automatically -> Alerts Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po 2009-10-19 14:58:15 UTC (rev 5740) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/de.po 2009-10-19 14:59:26 UTC (rev 5741) @@ -81,7 +81,7 @@ msgstr "Sorry, Bei der Verbindung mit dem Mailserver gab es einen Fehler. Prüfen Sie Ihre Email-Konfiguration." msgid "Start every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Hinweise" msgid "Start me every x" msgstr "Prüfen Sie mein Email-Konto automatisch" Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po 2009-10-19 14:58:15 UTC (rev 5740) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/en.po 2009-10-19 14:59:26 UTC (rev 5741) @@ -81,7 +81,7 @@ msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." msgid "Start every x" -msgstr "Check my E-mail account automatically" +msgstr "Alerts" msgid "Start me every x" msgstr "Check my E-mail account automatically" Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po 2009-10-19 14:58:15 UTC (rev 5740) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/fr.po 2009-10-19 14:59:26 UTC (rev 5741) @@ -81,7 +81,7 @@ msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du gadget." msgid "Start every x" -msgstr "Rapporter en temps réel" +msgstr "Alertes" msgid "Start me every x" msgstr "M'avertir des nouveaux messages en temps réel" Modified: software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po 2009-10-19 14:58:15 UTC (rev 5740) +++ software_suite_v3/software/plugin/plugin-email/trunk/plugin-email/resources/nl.po 2009-10-19 14:59:26 UTC (rev 5741) @@ -81,7 +81,7 @@ msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." msgid "Start every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Alarmen" msgid "Start me every x" msgstr "Check mijn E-mail account automatisch" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:58:27
|
Author: ks156 Date: 2009-10-19 16:58:15 +0200 (Mon, 19 Oct 2009) New Revision: 5740 Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po Log: * Merged r5739 from trunk to this branch Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po 2009-10-19 14:56:53 UTC (rev 5739) +++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po 2009-10-19 14:58:15 UTC (rev 5740) @@ -126,10 +126,10 @@ msgstr "Sorry, Bei der Verbindung mit dem Mailserver gab es einen Fehler. Prüfen Sie Ihre Email-Konfiguration." msgid "Start every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Hinweise" msgid "Start me every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Prüfen Sie mein Gmail-Konto automatisch" msgid "Start every x from full hour" msgstr "Prüfen Sie meine Mailbox häufig" Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po 2009-10-19 14:56:53 UTC (rev 5739) +++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po 2009-10-19 14:58:15 UTC (rev 5740) @@ -126,10 +126,10 @@ msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." msgid "Start every x" -msgstr "Check my E-mail account automatically" +msgstr "Alerts" msgid "Start me every x" -msgstr "Check my E-mail account automatically" +msgstr "Check my Gmail account automatically" msgid "Start every x from full hour" msgstr "Check my mail box frequently" Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po 2009-10-19 14:56:53 UTC (rev 5739) +++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po 2009-10-19 14:58:15 UTC (rev 5740) @@ -126,10 +126,10 @@ msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du gadget." msgid "Start every x" -msgstr "Rapporter en temps réel" +msgstr "Alertes" msgid "Start me every x" -msgstr "M'avertir des nouveaux messages en temps réel" +msgstr "Contrôler mon compte Gmail automatiquement" msgid "Start every x from full hour" msgstr "Rapport régulier" Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-19 14:56:53 UTC (rev 5739) +++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-19 14:58:15 UTC (rev 5740) @@ -126,10 +126,10 @@ msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." msgid "Start every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Alarmen" msgid "Start me every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Check mijn Gmail account automatisch" msgid "Start every x from full hour" msgstr "Check mijn E-mail op regelmatige tijdstippen" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:57:06
|
Author: ks156 Date: 2009-10-19 16:56:53 +0200 (Mon, 19 Oct 2009) New Revision: 5739 Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po Log: * Changed the alerts section : Check my mail automatically -> Alerts * Fixed EMail -> GMail Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po 2009-10-19 14:55:17 UTC (rev 5738) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/de.po 2009-10-19 14:56:53 UTC (rev 5739) @@ -84,10 +84,10 @@ msgstr "Sorry, Bei der Verbindung mit dem Mailserver gab es einen Fehler. Prüfen Sie Ihre Email-Konfiguration." msgid "Start every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Hinweise" msgid "Start me every x" -msgstr "Prüfen Sie mein Email-Konto automatisch" +msgstr "Prüfen Sie mein Gmail-Konto automatisch" msgid "Start every x from full hour" msgstr "Prüfen Sie meine Mailbox häufig" Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po 2009-10-19 14:55:17 UTC (rev 5738) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/en.po 2009-10-19 14:56:53 UTC (rev 5739) @@ -84,10 +84,10 @@ msgstr "Sorry, there was an error when connecting to the mail server. Please check your email configuration." msgid "Start every x" -msgstr "Check my E-mail account automatically" +msgstr "Alerts" msgid "Start me every x" -msgstr "Check my E-mail account automatically" +msgstr "Check my Gmail account automatically" msgid "Start every x from full hour" msgstr "Check my mail box frequently" Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po 2009-10-19 14:55:17 UTC (rev 5738) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/fr.po 2009-10-19 14:56:53 UTC (rev 5739) @@ -84,10 +84,10 @@ msgstr "Désolé, il y a eu une erreur lors de la connexion au serveur de messagerie. Merci de controler les paramètres du plugin." msgid "Start every x" -msgstr "Rapporter en temps réel" +msgstr "Alertes" msgid "Start me every x" -msgstr "M'avertir des nouveaux messages en temps réel" +msgstr "Contrôler mon compte Gmail automatiquement" msgid "Start every x from full hour" msgstr "Rapport régulier" Modified: software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po 2009-10-19 14:55:17 UTC (rev 5738) +++ software_suite_v3/software/plugin/plugin-gmail/trunk/plugin-gmail/resources/nl.po 2009-10-19 14:56:53 UTC (rev 5739) @@ -84,10 +84,10 @@ msgstr "Sorry, ik kan niet inloggen op de mailserver. Controleer of je email configuratie correct is." msgid "Start every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Alarmen" msgid "Start me every x" -msgstr "Check mijn E-mail account automatisch" +msgstr "Check mijn Gmail account automatisch" msgid "Start every x from full hour" msgstr "Check mijn E-mail op regelmatige tijdstippen" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:55:28
|
Author: ks156
Date: 2009-10-19 16:55:17 +0200 (Mon, 19 Oct 2009)
New Revision: 5738
Modified:
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/plugin.pot
software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
Log:
* Added new strings for the timeout.
Notes : The timeout function must be implemented soon.
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/de.po 2009-10-19 14:55:17 UTC (rev 5738)
@@ -136,3 +136,15 @@
msgid "Start me every x (From full hour)"
msgstr "Prüfen Sie meine Mailbox häufig"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail is busy right now. Please try again later."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "The Google mail website has a lot of traffic at the moment. Better to try again later."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "I'm having difficulties to connect to Google mail. Please try again later."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/en.po 2009-10-19 14:55:17 UTC (rev 5738)
@@ -136,3 +136,15 @@
msgid "Start me every x (From full hour)"
msgstr "Check my mail box frequently"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail is busy right now. Please try again later."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "The Google mail website has a lot of traffic at the moment. Better to try again later."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "I'm having difficulties to connect to Google mail. Please try again later."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/fr.po 2009-10-19 14:55:17 UTC (rev 5738)
@@ -136,3 +136,15 @@
msgid "Start me every x (From full hour)"
msgstr "Me faire un rapport régulièrement"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail est occupé pour l'instant. Merci de réessayer plus tard."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "Le site d'email de Google a beaucoup de traffic pour le moment. Il est préférable de réessayer plus tard."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "J'ai des difficultés à me connecter à Google mail. Merci de réessayer plus tard."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "Le temps de réponse est trop long pour vérifier votre compte GMail. Le site Google mail est trop occupé pour l'instant."
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/nl.po 2009-10-19 14:55:17 UTC (rev 5738)
@@ -136,3 +136,15 @@
msgid "Start me every x (From full hour)"
msgstr "Check mijn E-mail op regelmatige tijdstippen"
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr "G-mail is busy right now. Please try again later."
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr "The Google mail website has a lot of traffic at the moment. Better to try again later."
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr "I'm having difficulties to connect to Google mail. Please try again later."
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/plugin.pot 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/resources/plugin.pot 2009-10-19 14:55:17 UTC (rev 5738)
@@ -133,3 +133,15 @@
msgid "Start me every x (From full hour)"
msgstr ""
+
+msgid "G-mail is busy right now. Please try again later."
+msgstr ""
+
+msgid "The Google mail website has a lot of traffic at the moment. Better to try again later."
+msgstr ""
+
+msgid "I'm having difficulties to connect to Google mail. Please try again later."
+msgstr ""
+
+msgid "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+msgstr ""
Modified: software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-19 14:26:25 UTC (rev 5737)
+++ software_suite_v3/software/plugin/plugin-gmail/branches/random_sentences/plugin-gmail/src/net/karmaLab/tuxDroid/plugins/MailPlugin.java 2009-10-19 14:55:17 UTC (rev 5738)
@@ -74,6 +74,13 @@
"Your mailbox is empty."
};
+ String[] timeoutSentences = {
+ "G-mail is busy right now. Please try again later.",
+ "The Google mail website has a lot of traffic at the moment. Better to try again later.",
+ "I'm having difficulties to connect to Google mail. Please try again later.",
+ "I got a time-out while checking your G-mail account. The Google mail website is too busy right now."
+ };
+
/**
* @param args
* @throws Exception
|
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:26:36
|
Author: ks156
Date: 2009-10-19 16:26:25 +0200 (Mon, 19 Oct 2009)
New Revision: 5737
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/plugin.pot
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
Log:
* Added more sentences
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/de.po 2009-10-19 14:26:25 UTC (rev 5737)
@@ -138,3 +138,15 @@
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr "Sorry, Bei der Verbindung mit Twitter gab es einen Fehler. Prüfen Sie Ihre Twitter-Konfiguration."
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "I could not connect to your Twitter. Make sure you entered your login and password correctly."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/en.po 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/en.po 2009-10-19 14:26:25 UTC (rev 5737)
@@ -138,3 +138,15 @@
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "I could not connect to your Twitter. Make sure you entered your login and password correctly."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/fr.po 2009-10-19 14:26:25 UTC (rev 5737)
@@ -138,3 +138,15 @@
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr "Désolé, il y a eu une erreur lors de la connexion avec Twitter. Vérifiez votre login et votre mot de passe"
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr "Je ne peux pas me connecter à votre compte Twitter. Veuillez vérifier que le gadget Twitter soit configuré correctement."
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "Il semble que vous ayez entré un mauvais nom d'utilisateur ou mot de passe Twitter. Veuillez vérifier la configuration du gadget Twitter."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "J'ai eu une erreur en essayant de me connecter à votre compte Twitter. Veuillez vérifier votre nom d'utilisateur et mode de passe dans la configuration du gadget Twitter."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "Je n'ai pas pu le connecter à votre Twitter. Assurez-vous que vous avez entré un nom d'utilisateur et un mot de passe correct."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/nl.po 2009-10-19 14:26:25 UTC (rev 5737)
@@ -138,3 +138,15 @@
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr "Sorry, ik kan geen connectie maken met Twitter. Controleer je configuratie of probeer later opnieuw."
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr"I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr "I could not connect to your Twitter. Make sure you entered your login and password correctly."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/plugin.pot 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/resources/plugin.pot 2009-10-19 14:26:25 UTC (rev 5737)
@@ -138,3 +138,15 @@
msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
msgstr ""
+
+msgid "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly."
+msgstr ""
+
+msgid "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration."
+msgstr ""
+
+msgid "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration."
+msgstr ""
+
+msgid "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+msgstr ""
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-19 14:04:31 UTC (rev 5736)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-19 14:26:25 UTC (rev 5737)
@@ -84,6 +84,14 @@
"There are no new replies detected"
};
+ String[] errorSentences = {
+ "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.",
+ "I could not connect to your Twitter account. Please check if the Twitter gadget is configured correctly.",
+ "It seems you entered a wrong Twitter login or password. Please verify the Twitter gadget configuration.",
+ "I got an error when connecting to your Twitter account. Please verify your login and password in the Twitter gadget configuration.",
+ "I could not connect to your Twitter. Make sure you entered your login and password correctly."
+ };
+
/***
This function set the new user status.
Préconditions :
@@ -263,7 +271,7 @@
{
if( ! this.getCommand().equalsIgnoreCase("check"))
{
- this.throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
+ this.throwMessage(pickSentence(errorSentences));
}
this.quitGadget();
}
@@ -384,7 +392,7 @@
{
if (badRequest.getMessage().contains("401"))
{
- throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
+ throwMessage(pickSentence(errorSentences));
}
else
{
|
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:04:45
|
Author: ks156 Date: 2009-10-19 16:04:31 +0200 (Mon, 19 Oct 2009) New Revision: 5736 Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/en.po software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/fr.po software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po Log: * Merged r5735 from trunk to this branch Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po 2009-10-19 14:01:31 UTC (rev 5735) +++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/de.po 2009-10-19 14:04:31 UTC (rev 5736) @@ -99,10 +99,10 @@ msgstr "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name." msgid "Start every x from full hour" -msgstr "Regelmäßiger Bericht" +msgstr "Hinweise" msgid "Start me every x (From full hour)" -msgstr "Ich möchte einen regelmäßigen Bericht" +msgstr "Überprüfen Sie das Wetter automatisch." msgid "Start daily at" msgstr "Täglicher Bericht" Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/en.po 2009-10-19 14:01:31 UTC (rev 5735) +++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/en.po 2009-10-19 14:04:31 UTC (rev 5736) @@ -99,10 +99,10 @@ msgstr "I'm sorry, but I cannot give you the weather for the specified location; Please try another close by city name." msgid "Start every x from full hour" -msgstr "Regular report" +msgstr "Alerts" msgid "Start me every x (From full hour)" -msgstr "Give me a report regularly" +msgstr "Check the weather automatically" msgid "Start daily at" msgstr "Daily report" Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/fr.po 2009-10-19 14:01:31 UTC (rev 5735) +++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/fr.po 2009-10-19 14:04:31 UTC (rev 5736) @@ -99,10 +99,10 @@ msgstr "Je suis désolé, mais je ne peux pas vous donner la météo pour cette localité. Veuillez essayer une localité proche de celle-ci." msgid "Start every x from full hour" -msgstr "Rapport régulier" +msgstr "Alertes" msgid "Start me every x (From full hour)" -msgstr "Me faire un rapport régulièrement" +msgstr "Contrôler la météo automatiquement" msgid "Start daily at" msgstr "Rapport quotidien" Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po 2009-10-19 14:01:31 UTC (rev 5735) +++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/resources/nl.po 2009-10-19 14:04:31 UTC (rev 5736) @@ -99,10 +99,10 @@ msgstr "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name." msgid "Start every x from full hour" -msgstr "Start op vaste tijdstippen" +msgstr "Alarmen" msgid "Start me every x (From full hour)" -msgstr "Start mij op vaste tijdstippen" +msgstr "Check het weerbericht automatisch." msgid "Start daily at" msgstr "Start dagelijks" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:01:43
|
Author: ks156 Date: 2009-10-19 16:01:31 +0200 (Mon, 19 Oct 2009) New Revision: 5735 Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po Log: * Renamed an alert section and label : - regular report -> Alerts - give me a report regularly -> Check the weather automatically. Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po 2009-10-19 14:00:26 UTC (rev 5734) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/de.po 2009-10-19 14:01:31 UTC (rev 5735) @@ -33,10 +33,10 @@ msgstr "http://www.google.com/ig/api?hl=de&weather=%s" msgid "Start every x from full hour" -msgstr "Regelmäßiger Bericht" +msgstr "Hinweise" msgid "Start me every x (From full hour)" -msgstr "Ich möchte einen regelmäßigen Bericht" +msgstr "Überprüfen Sie das Wetter automatisch." msgid "Start daily at" msgstr "Täglicher Bericht" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po 2009-10-19 14:00:26 UTC (rev 5734) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/en.po 2009-10-19 14:01:31 UTC (rev 5735) @@ -33,10 +33,10 @@ msgstr "http://www.google.com/ig/api?hl=en&weather=%s" msgid "Start every x from full hour" -msgstr "Regular report" +msgstr "Alerts" msgid "Start me every x (From full hour)" -msgstr "Give me a report regularly" +msgstr "Check the weather automatically" msgid "Start daily at" msgstr "Daily report" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-10-19 14:00:26 UTC (rev 5734) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/fr.po 2009-10-19 14:01:31 UTC (rev 5735) @@ -33,10 +33,10 @@ msgstr "http://www.google.com/ig/api?hl=fr&weather=%s" msgid "Start every x from full hour" -msgstr "Rapport régulier" +msgstr "Alertes" msgid "Start me every x (From full hour)" -msgstr "Me faire un rapport régulièrement" +msgstr "Contrôler la météo automatiquement" msgid "Start daily at" msgstr "Rapport quotidien" Modified: software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po 2009-10-19 14:00:26 UTC (rev 5734) +++ software_suite_v3/software/plugin/plugin-weather/trunk/plugin-weather/resources/nl.po 2009-10-19 14:01:31 UTC (rev 5735) @@ -33,10 +33,10 @@ msgstr "http://www.google.com/ig/api?hl=nl&weather=%s" msgid "Start every x from full hour" -msgstr "Start op vaste tijdstippen" +msgstr "Alarmen" msgid "Start me every x (From full hour)" -msgstr "Start mij op vaste tijdstippen" +msgstr "Check het weerbericht automatisch." msgid "Start daily at" msgstr "Start dagelijks" |
|
From: ks156 <c2m...@c2...> - 2009-10-19 14:00:32
|
Author: ks156
Date: 2009-10-19 16:00:26 +0200 (Mon, 19 Oct 2009)
New Revision: 5734
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
Log:
* Merged r5733 from the trunk to this branch
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-19 13:59:10 UTC (rev 5733)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-19 14:00:26 UTC (rev 5734)
@@ -59,7 +59,7 @@
msgstr "It's half past {0}"
msgid "Start every x from full hour"
-msgstr "Frequenz"
+msgstr "Hinweise"
msgid "Start me every x (From full hour)"
msgstr "Sage die Zeit häufig an"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-19 13:59:10 UTC (rev 5733)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-19 14:00:26 UTC (rev 5734)
@@ -59,7 +59,7 @@
msgstr "It's half past {0}"
msgid "Start every x from full hour"
-msgstr "Frequency"
+msgstr "Alerts"
msgid "Start me every x (From full hour)"
msgstr "Give the time frequently"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-19 13:59:10 UTC (rev 5733)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-19 14:00:26 UTC (rev 5734)
@@ -59,7 +59,7 @@
msgstr "Il est {0} heures et demi"
msgid "Start every x from full hour"
-msgstr "Fréquence"
+msgstr "Alertes"
msgid "Start me every x (From full hour)"
msgstr "Donner l'heure régulièrement"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-19 13:59:10 UTC (rev 5733)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-19 14:00:26 UTC (rev 5734)
@@ -59,7 +59,7 @@
msgstr "It's half past {0}"
msgid "Start every x from full hour"
-msgstr "Geef de tijd weer op vaste tijdstippen"
+msgstr "Alarmen"
msgid "Start me every x (From full hour)"
msgstr "Geef de tijd weer op vaste tijdstippen"
|
|
From: ks156 <c2m...@c2...> - 2009-10-19 13:59:22
|
Author: ks156
Date: 2009-10-19 15:59:10 +0200 (Mon, 19 Oct 2009)
New Revision: 5733
Modified:
software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po
software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po
software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po
Log:
* Renamed an alert section (Frequency -> Alerts)
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po 2009-10-19 13:58:20 UTC (rev 5732)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/de.po 2009-10-19 13:59:10 UTC (rev 5733)
@@ -14,7 +14,7 @@
msgstr "Jetzt ist es {0} Uhr."
msgid "Start every x from full hour"
-msgstr "Frequenz"
+msgstr "Hinweise"
msgid "Start me every x (From full hour)"
msgstr "Sage die Zeit häufig an"
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po 2009-10-19 13:58:20 UTC (rev 5732)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/en.po 2009-10-19 13:59:10 UTC (rev 5733)
@@ -14,7 +14,7 @@
msgstr "Current time is {0} hours."
msgid "Start every x from full hour"
-msgstr "Frequency"
+msgstr "Alerts"
msgid "Start me every x (From full hour)"
msgstr "Give the time frequently"
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po 2009-10-19 13:58:20 UTC (rev 5732)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/fr.po 2009-10-19 13:59:10 UTC (rev 5733)
@@ -14,7 +14,7 @@
msgstr "Il est {0} heures."
msgid "Start every x from full hour"
-msgstr "Fréquence"
+msgstr "Alertes"
msgid "Start me every x (From full hour)"
msgstr "Donner l'heure régulièrement"
Modified: software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po 2009-10-19 13:58:20 UTC (rev 5732)
+++ software_suite_v3/software/plugin/plugin-clock/trunk/resources/nl.po 2009-10-19 13:59:10 UTC (rev 5733)
@@ -14,7 +14,7 @@
msgstr "Het is nu {0} uur."
msgid "Start every x from full hour"
-msgstr "Geef de tijd weer op vaste tijdstippen"
+msgstr "Alarmen"
msgid "Start me every x (From full hour)"
msgstr "Geef de tijd weer op vaste tijdstippen"
|
|
From: ks156 <c2m...@c2...> - 2009-10-19 13:58:35
|
Author: ks156
Date: 2009-10-19 15:58:20 +0200 (Mon, 19 Oct 2009)
New Revision: 5732
Modified:
software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/de.wiki
software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/en.wiki
software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/fr.wiki
software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/nl.wiki
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/de.wiki
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/en.wiki
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/fr.wiki
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/nl.wiki
Log:
* Clock gadget (0a58d901-309a-dd6a-e6e7-be691858f9f0) :
Updated the help files
* Weather gadget (59cce412-9224-639c-d64d-9d25de84b960) :
Updated the help files
Removed an alert section
Modified: software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/de.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/de.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/de.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,6 +1,10 @@
-= Hilfe =
+= Beschreibung =
Diese Funktion meldet Ihnen die aktuelle Uhrzeit.
-In der Konfiguration können Sie:
-* Ein Zeitintervall einstellen, in dem Tux Droid Ihnen die Zeit automatisch meldet
-* Bestimmen Sie einen Jingle zur einleitenden Bewegung des Tux Droid bei der Zeitansage
+= Funktionseinstellungen =
+* '''Funktionsname :''' Damit können Sie den Gadget-Namen ändern.
+* '''Dieses Gadget wird in die Favoritenliste aufgenommen :''' Diese Option aktivieren, um die Funktion in Ihre Favoriten-Liste hinzuzufügen.
+
+= Hinweise =
+* '''Sage die Zeit häufig an :''' Ein Zeitintervall einstellen, in dem Tux Droid Ihnen die Zeit automatisch meldet.
+* '''Ankündigungsmeldungen :''' Geben sie einen Attitune für die automatische Uhr-Prüfung durch Ihren Tux Droid an.
Modified: software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/en.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/en.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/en.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,6 +1,10 @@
-= Help =
-This gadget will notify you of the current time.
-
-In the configuration you can :
-* Set an interval to make Tux Droid tell you the time automatically
-* Specify an attitune to add introduction behavior for when Tux Droid will give the time
\ No newline at end of file
+= Description =
+This gadget will notify you of the current time.
+
+= Settings =
+* '''Gadget name :''' Let's you modify the gadget name.
+* '''Add this gadget to my Favorites list :''' To make the gadget accessible with the remote control and Tux Droid.
+
+= Alerts =
+* '''Give the time frequently :''' Enable to start this gadget automatically and select a frequency.
+* '''Introduction attitune :''' Specify an introduction attitune for when the gadget is started automatically.
\ No newline at end of file
Modified: software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/fr.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/fr.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/fr.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,6 +1,10 @@
-= Aide =
-Ce gadget vous notifie l'heure.
-
-Dans la configuration vous pouvez:
-* Indiquer un interval pour que Tux Droid vous donne l'heure automatiquement
-* Spécifier une attitune pour introduire un comportement lorsque Tux Droid vous donne l'heure automatiquement.
\ No newline at end of file
+= Description =
+Ce gadget vous notifie l'heure.
+
+= Configurations =
+* '''Nom du gadget :''' Vous permet de modifier le nom du gadget.
+* '''Ajouter ce gadget dans ma liste de favoris :''' Rend le gadget accessible par la télécommande ainsi que par Tux Droid.
+
+= Alertes =
+* '''Donner l'''''''heure régulièrement :''' Activez cette option pour démarrer ce gadget ponctuellement.
+* '''Attitune d'''''''introduction :''' Spécifie une Attitune d'introduction lorsque que le gadget est démarré automatiquement.
Modified: software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/nl.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/nl.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_0a58d901-309a-dd6a-e6e7-be691858f9f0/nl.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,6 +1,10 @@
-= Help =
+= Beschrijving =
De klok gadget geeft de tijd weer.
-In de configuratie kan je aanpassen :
-* Hoe vaak Tux Droid de tijd weergeeft
-* Welke attitune de klokfunctie introduceert
\ No newline at end of file
+= Configuratie =
+* '''Gadget naam :''' Hier kan je de naam van de gadget wijzigen.
+* '''Plaats deze gadget in mijn Favorieten :''' Om de gadget met de afstandsbediening of via Tux Droid te starten.
+
+= Alarmen =
+* '''Geef de tijd weer op vaste tijdstippen: ''' Activeer deze optie en selecteer hoe vaak Tux Droid zelf de tijd weergeeft.
+* '''Introductie attitune :''' Selecteer een introductie attitune voor wanneer de gadget automatisch gestart wordt.
\ No newline at end of file
Modified: software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/de.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/de.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/de.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,11 +1,13 @@
-= Hilfe =
-Mit dieser Funktion liest Tux Droid Wetterinformationen aus dem Internet vor.
+= Beschreibung =
+Immer über das Wetter informiert mit der Google-Wetterfunktion.
-Sie können die Einstellung der Funktion verändern:
-* Ihren aktuellen Standort einstellen
-* Auswahl zwischen Fahrenheit und Celsius
-* Funktion Wettervorhersage für den folgenden Tag aktivieren oder deaktivieren
-* Bestimmen Sie einen Jingle für den automatischen Start der Wetterfunktion
-* Stellen Sie einen bestimmten Zeitpunkt für den täglichen Wetterbericht ein
-* Stellen Sie den Zeitabstand für die regelmäßige Aktualisierung ein
+= Funktionseinstellungen =
+* '''Funktionsname :''' Damit können Sie den Gadget-Namen ändern.
+* '''Wetter Ort :''' Ihren aktuellen Standort einstellen.
+* '''Temperatur-Einheit :''' Auswahl zwischen Fahrenheit und Celsius.
+* '''Auch das Wetter von morgen :''' Funktion Wettervorhersage für den folgenden Tag aktivieren oder deaktivieren.
+* '''Dieses Gadget wird in die Favoritenliste aufgenommen :''' Diese Option aktivieren, um die Funktion in Ihre Favoriten-Liste hinzuzufügen.
+= Hinweise =
+* '''Überprüfen Sie das Wetter automatisch :''' Geben Sie an, dass das Wetter automatisch geprüft werden soll.
+* '''Ankündigungsmeldungen :''' Geben sie einen Attitune für die automatische Wetter-Prüfung durch Ihren Tux Droid an.
Modified: software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/en.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/en.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/en.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,11 +1,13 @@
-= Help =
-This gadget lets Tux Droid read weather information from the web.
+= Description =
+This gadget lets Tux Droid read weather information from the internet.
-You can modify the gadget configuration to :
-* Set your current location
-* Choose between Fahrenheit and Celsius
-* Enable or disable the function to get tomorrow's forecast
-* Select the introduction attitune for when the weather gadget is started automatically
-* Set a specific time to get the weather report daily
-* Set the interval to be updated regularly
+= Settings =
+* '''Gadget name :''' Let's you modify the gadget name.
+* '''Weather location :''' Specify your current location.
+* '''Temperature unit :''' Choose between Fahrenheit and Celsius.
+* '''Give tomorrow'''''''s weather too :''' Enable to get tomorrow's forecast.
+* '''Add this gadget to My Favorites list :''' To make the gadget accessible with the remote control and Tux Droid.
+= Alerts =
+* '''Check the weather automatically :''' Tux Droid will check for weather updates by himself.
+* '''Introduction attitune :''' Specify an introduction attitune for when the gadget is started automatically.
\ No newline at end of file
Modified: software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/fr.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/fr.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/fr.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,10 +1,13 @@
-= Aide =
-Ce gadget donne à Tux Droid la faculté de vous lire la météo.
-
-Vous pouvez modifier la configuration du gadget pour :
-* Indiquer votre ville
-* Choisir entre les formats Fahrenheit et Celsius
-* Activer ou désactiver la lecture des prévisions pour le lendemain
-* Configurer le gadget pour vous donner la météo tout les jours à une heure spécifique
-* Indiquer un interval de lecture automatique de la météo
-* Sélectionner une attitune pour introduire la météo lors d'une lecture automatique
+= Description =
+Restez informé de la météo avec le gadget Google météo.
+
+= Configurations =
+* '''Nom du gadget :''' Vous permet de modifier le nom du gadget.
+* '''Ville :''' Indiquer votre ville.
+* '''Unité de température :''' Choisir entre les formats Fahrenheit et Celsius.
+* '''Donner les prévisions du lendemain :''' Activer ou désactiver la lecture des prévisions pour le lendemain.
+* '''Ajouter ce gadget dans ma liste de favoris :''' Rend le gadget accessible par la télécommande ainsi que par Tux Droid.
+
+= Alertes =
+* '''Contrôler la météo automatiquement :''' Tux Droid contrôlera s'il y a eu des changements dans les prévisions météo tout seul.
+* '''Attitune d'''''''introduction :''' Spécifie une Attitune d'introduction lorsque que le gadget est démarré automatiquement.
Modified: software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml 2009-10-19 13:58:20 UTC (rev 5732)
@@ -49,14 +49,5 @@
<name>Start every x from full hour</name>
<weekMask>true,true,true,true,true,true,true</weekMask>
</task_00>
- <task_01>
- <activated>false</activated>
- <date>0000/00/00</date>
- <delay>00:01:00</delay>
- <hoursBegin>07:00:00</hoursBegin>
- <hoursEnd>23:59:59</hoursEnd>
- <name>Start daily at</name>
- <weekMask>true,true,true,true,true,true,true</weekMask>
- </task_01>
</tasks>
</gadget>
Modified: software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/nl.wiki
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/nl.wiki 2009-10-19 12:53:04 UTC (rev 5731)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/nl.wiki 2009-10-19 13:58:20 UTC (rev 5732)
@@ -1,11 +1,13 @@
-= Help =
-Met deze gadget zal Tux Droid weersinformatie opvragen via het web.
+= Beschrijving =
+Blijf op de hoogte van het weer met Google Weer gadget.
-Je kan de configuratie aanpassen om :
-* De stad waar je woont in te geven
-* Te kiezen tussen Fahrenheit en Celsius
-* De weersvoorspelling te activeren of desactiveren
-* Kies de introductie attitune wanneer de weer gadget automatisch gestart wordt
-* Een specifiek tijdstip in te stellen om het weerbericht dagelijks weer te geven
-* De frequentie te bepalen hoe vaak je het weerbericht te horen krijgt
+= Configuratie =
+* '''Gadget naam :''' Hier kan je de naam van de gadget wijzigen.
+* '''Locatie :''' Geef de stad in waar je woont.
+* '''Temperatuur eenheid :''' Maak een keuze tussen Celsius of Fahrenheit.
+* '''Geef de weersverwachtingen :''' Activeer of desactiveer de weersvoorspelling voor morgen.
+* '''Plaats deze gadget in mijn Favorieten :''' Om de gadget met de afstandsbediening of via Tux Droid te starten.
+= Alarmen =
+* '''Check het weerbericht automatisch :''' Tux Droid zal zelf het weerbericht checken.
+* '''Introductie attitune :''' Selecteer een introductie attitune voor wanneer de gadget automatisch gestart wordt.
\ No newline at end of file
|
|
From: ks156 <c2m...@c2...> - 2009-10-19 12:53:19
|
Author: ks156
Date: 2009-10-19 14:53:04 +0200 (Mon, 19 Oct 2009)
New Revision: 5731
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
Log:
* Applied changes made in the trunk.
The trunk has not been merged, because too many conflicts appeared.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-19 12:47:35 UTC (rev 5730)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/random_sentences/plugin-twitter/src/TwitterPlugin.java 2009-10-19 12:53:04 UTC (rev 5731)
@@ -382,7 +382,14 @@
{
if ( ! this.getCommand().equalsIgnoreCase("check") )
{
- throwMessage("Twitter is busy for now, please, try again later.");
+ if (badRequest.getMessage().contains("401"))
+ {
+ throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
+ }
+ else
+ {
+ throwMessage("Twitter is busy for now, please, try later.");
+ }
}
this.quitGadget();
|
1 message has been excluded from this view by a project administrator.
