tux-droid-svn Mailing List for Tux Droid CE (Page 16)
Status: Beta
Brought to you by:
ks156
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: ks156 <c2m...@c2...> - 2009-10-14 11:36:12
|
Author: ks156
Date: 2009-10-14 13:36:01 +0200 (Wed, 14 Oct 2009)
New Revision: 5655
Modified:
software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
Log:
* Retab
* Removed trailing spaces
* Recoded with the std java style
Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java 2009-10-14 11:25:47 UTC (rev 5654)
+++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java 2009-10-14 11:36:01 UTC (rev 5655)
@@ -44,238 +44,238 @@
import net.karmaLab.xml.parser.XMLParser;
public class WeatherPlugin extends SimplePlugin<WeatherPlugin.Configuration> {
- public static class Configuration extends SimplePluginConfiguration {
- private String location = "Paris";
- private boolean tomorrow = true;
- private Unit unit = Unit.celsius;
- private String googleURL;
+ public static class Configuration extends SimplePluginConfiguration {
+ private String location = "Paris";
+ private boolean tomorrow = true;
+ private Unit unit = Unit.celsius;
+ private String googleURL;
- /**
- * get googleURL property value.
- *
- * @return googleURL value
- */
- public String getGoogleURL() {
- return googleURL;
- }
+ /**
+ * get googleURL property value.
+ *
+ * @return googleURL value
+ */
+ public String getGoogleURL() {
+ return googleURL;
+ }
- /**
- * set googleURL property value.
- *
- * @param googleURL
- * new value
- */
- public void setGoogleURL(String googleURL) {
- this.googleURL = googleURL;
- }
+ /**
+ * set googleURL property value.
+ *
+ * @param googleURL
+ * new value
+ */
+ public void setGoogleURL(String googleURL) {
+ this.googleURL = googleURL;
+ }
- public String getLocation() {
- return location;
- }
+ public String getLocation() {
+ return location;
+ }
- public Unit getUnit() {
- return unit;
- }
+ public Unit getUnit() {
+ return unit;
+ }
- public boolean isTomorrow() {
- return tomorrow;
- }
+ public boolean isTomorrow() {
+ return tomorrow;
+ }
- public void setLocation(String location) {
- this.location = location;
- }
+ public void setLocation(String location) {
+ this.location = location;
+ }
- public void setTomorrow(boolean tomorrow) {
- this.tomorrow = tomorrow;
+ public void setTomorrow(boolean tomorrow) {
+ this.tomorrow = tomorrow;
- }
+ }
- public void setUnit(Unit unit) {
- this.unit = unit;
- }
+ public void setUnit(Unit unit) {
+ this.unit = unit;
+ }
- }
+ }
- String[] todayWeatherSentences = {
- "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
- "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent.",
- "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}.",
- "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
- };
+ String[] todayWeatherSentences = {
+ "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
+ "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent.",
+ "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}.",
+ "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+ };
- String[] todayUnknownWeatherSentences = {
- "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.",
- "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent.",
- "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}.",
- "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
- };
+ String[] todayUnknownWeatherSentences = {
+ "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.",
+ "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent.",
+ "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}.",
+ "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+ };
- String[] tomorrowWeatherSentences = {
- "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.",
- "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees.",
- "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}.",
- "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees.",
- "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
- };
+ String[] tomorrowWeatherSentences = {
+ "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.",
+ "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees.",
+ "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}.",
+ "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees.",
+ "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+ };
- String[] errorSentences = {
- "Location could not be found. Please check the city name or enter another close by location.",
- "Impossible to find the specified city name. Are you sure this city really exists ?",
- "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name.",
- "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
- };
+ String[] errorSentences = {
+ "Location could not be found. Please check the city name or enter another close by location.",
+ "Impossible to find the specified city name. Are you sure this city really exists ?",
+ "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name.",
+ "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+ };
- private String pickSentence(String[] list) {
- Random rand = new Random();
- return list[rand.nextInt(list.length)];
- }
+ private String pickSentence(String[] list) {
+ Random rand = new Random();
+ return list[rand.nextInt(list.length)];
+ }
- public static enum Unit {
- celsius, fahrenheit
- }
+ public static enum Unit {
+ celsius, fahrenheit
+ }
- public static void main(String[] args) throws Exception {
- new WeatherPlugin().boot(args, new Configuration());
- }
+ public static void main(String[] args) throws Exception {
+ new WeatherPlugin().boot(args, new Configuration());
+ }
- private String getData(Element node, String label) {
- return node.getElement(label).getAttribute("data"); //$NON-NLS-1$
- }
+ private String getData(Element node, String label) {
+ return node.getElement(label).getAttribute("data"); //$NON-NLS-1$
+ }
- @Override
- public void start() throws SimplePluginException {
- File outputFile;
- File file;
- String inputLine;
- Writer streamOutput = null;
- XMLParser parser = new XMLParser();
- Element xmlReply;
+ @Override
+ public void start() throws SimplePluginException {
+ File outputFile;
+ File file;
+ String inputLine;
+ Writer streamOutput = null;
+ XMLParser parser = new XMLParser();
+ Element xmlReply;
- try {
- // Replace the space by %20 (HTML code)
- configuration().setLocation(configuration().getLocation().replace(" ", "%20"));
- /* create a new URL object */
- URL xml = new URL(String.format(configuration().getGoogleURL(), configuration().getLocation()));
- /* Open the connection */
- HttpURLConnection.setDefaultRequestProperty("User-Agent", "Mozilla/4.0 ( compatible ) ");
- HttpURLConnection yc = (HttpURLConnection) xml.openConnection();
- yc.setRequestProperty ("User-Agent", "Mozilla/4.0 ( compatible ) ");
+ try {
+ // Replace the space by %20 (HTML code)
+ configuration().setLocation(configuration().getLocation().replace(" ", "%20"));
+ /* create a new URL object */
+ URL xml = new URL(String.format(configuration().getGoogleURL(), configuration().getLocation()));
+ /* Open the connection */
+ HttpURLConnection.setDefaultRequestProperty("User-Agent", "Mozilla/4.0 ( compatible ) ");
+ HttpURLConnection yc = (HttpURLConnection) xml.openConnection();
+ yc.setRequestProperty ("User-Agent", "Mozilla/4.0 ( compatible ) ");
- /* And read the stream input */
- BufferedReader streamInput = new BufferedReader(new InputStreamReader(yc.getInputStream()));
+ /* And read the stream input */
+ BufferedReader streamInput = new BufferedReader(new InputStreamReader(yc.getInputStream()));
- /* Create a new file */
- file = new File("unknowEncoding"); //$NON-NLS-1$
- /* Connect the writer with the file */
- streamOutput = new BufferedWriter(new FileWriter(file));
- /* ... and write the file content */
- while ((inputLine = streamInput.readLine()) != null) {
- streamOutput.write(inputLine);
- }
- /* Close the streams */
- streamInput.close();
- streamOutput.close();
+ /* Create a new file */
+ file = new File("unknowEncoding"); //$NON-NLS-1$
+ /* Connect the writer with the file */
+ streamOutput = new BufferedWriter(new FileWriter(file));
+ /* ... and write the file content */
+ while ((inputLine = streamInput.readLine()) != null) {
+ streamOutput.write(inputLine);
+ }
+ /* Close the streams */
+ streamInput.close();
+ streamOutput.close();
- int c;
- /* Create a new file to convert the first file */
- outputFile = new File("recoding");
- /*
- * Create a stream reader and a stream writer, and connect them with
- * the two files
- */
- InputStreamReader inputStream = new InputStreamReader(new FileInputStream(file));
- /* Specify the codage for the output file */
- OutputStreamWriter outputStream = new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"); //$NON-NLS-1$
- /* Then, write the file char by char */
- while ((c = inputStream.read()) != -1)
- outputStream.write(c);
- /* And close the streams */
- outputStream.close();
- inputStream.close();
+ int c;
+ /* Create a new file to convert the first file */
+ outputFile = new File("recoding");
+ /*
+ * Create a stream reader and a stream writer, and connect them with
+ * the two files
+ */
+ InputStreamReader inputStream = new InputStreamReader(new FileInputStream(file));
+ /* Specify the codage for the output file */
+ OutputStreamWriter outputStream = new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"); //$NON-NLS-1$
+ /* Then, write the file char by char */
+ while ((c = inputStream.read()) != -1)
+ outputStream.write(c);
+ /* And close the streams */
+ outputStream.close();
+ inputStream.close();
- /* Parse the XML file, with an UTF-8 codage */
- xmlReply = parser.parse(outputFile).getRootElement().getElementAt(0);
+ /* Parse the XML file, with an UTF-8 codage */
+ xmlReply = parser.parse(outputFile).getRootElement().getElementAt(0);
- } catch (Exception e) {
- throw new SimplePluginException(e);
- }
+ } catch (Exception e) {
+ throw new SimplePluginException(e);
+ }
- try {
- Element current = xmlReply.getElementAt(1);
- String weather = getData(current, "condition");
- String temperature = getData(current, configuration().getUnit() == Unit.celsius ? "temp_c" : "temp_f");
- String humidity = getData(current, "humidity"); //$NON-NLS-1$
- humidity = humidity.split(":")[1]; //$NON-NLS-1$
- humidity = ((String) humidity.subSequence(0, humidity.length() - 1)).trim();
- humidity = humidity.replaceAll("[^a-zA-Z0-9]", "");
- if (weather.length() == 0) {
- throwMessage(this.pickSentence(todayUnknownWeatherSentences), configuration().getLocation().replace("%20", " "), temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
- humidity);
- } else {
- throwMessage(this.pickSentence(todayWeatherSentences), configuration().getLocation().replace("%20", " "), weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
- humidity);
- }
+ try {
+ Element current = xmlReply.getElementAt(1);
+ String weather = getData(current, "condition");
+ String temperature = getData(current, configuration().getUnit() == Unit.celsius ? "temp_c" : "temp_f");
+ String humidity = getData(current, "humidity"); //$NON-NLS-1$
+ humidity = humidity.split(":")[1]; //$NON-NLS-1$
+ humidity = ((String) humidity.subSequence(0, humidity.length() - 1)).trim();
+ humidity = humidity.replaceAll("[^a-zA-Z0-9]", "");
+ if (weather.length() == 0) {
+ throwMessage(this.pickSentence(todayUnknownWeatherSentences), configuration().getLocation().replace("%20", " "),
+ temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit", humidity);
+ } else {
+ throwMessage(this.pickSentence(todayWeatherSentences), configuration().getLocation().replace("%20", " "),
+ weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit", humidity);
+ }
- if (configuration().isTomorrow()) {
- String temperatureHigh;
- current = xmlReply.getElementAt(3);
- weather = getData(current, "condition");
+ if (configuration().isTomorrow()) {
+ String temperatureHigh;
+ current = xmlReply.getElementAt(3);
+ weather = getData(current, "condition");
- /*
- * There is an annoying difference between google FR and EN. EN :
- * Temperatures on the forecast are in Fahrenheit FR : Temperatures
- * on the forecast are in Celsius Depending of the control center
- * language, the temperature must be converted to respect the CC
- * configuration.
- */
- if (configuration().getLanguage().equals("en") && configuration().getUnit() == Unit.celsius) {
- temperature = fahrenheitToCelsius(getData(current, "low"));
- temperatureHigh = fahrenheitToCelsius(getData(current, "high"));
- } else if (!(configuration().getLanguage().equals("en")) && configuration().getUnit() == Unit.fahrenheit) {
- temperature = celsiusToFahrenheit(getData(current, "low"));
- temperatureHigh = celsiusToFahrenheit(getData(current, "high"));
- } else {
- temperature = getData(current, "low");
- temperatureHigh = getData(current, "high");
- }
+ /*
+ * There is an annoying difference between google FR and EN. EN :
+ * Temperatures on the forecast are in Fahrenheit FR : Temperatures
+ * on the forecast are in Celsius Depending of the control center
+ * language, the temperature must be converted to respect the CC
+ * configuration.
+ */
+ if (configuration().getLanguage().equals("en") && configuration().getUnit() == Unit.celsius) {
+ temperature = fahrenheitToCelsius(getData(current, "low"));
+ temperatureHigh = fahrenheitToCelsius(getData(current, "high"));
+ } else if (!(configuration().getLanguage().equals("en")) && configuration().getUnit() == Unit.fahrenheit) {
+ temperature = celsiusToFahrenheit(getData(current, "low"));
+ temperatureHigh = celsiusToFahrenheit(getData(current, "high"));
+ } else {
+ temperature = getData(current, "low");
+ temperatureHigh = getData(current, "high");
+ }
- throwMessage(this.pickSentence(tomorrowWeatherSentences), weather, temperature, temperatureHigh);
- }
- outputFile.deleteOnExit();
- file.deleteOnExit();
- } catch (Exception e) {
- // When a location is unknown, the Google API send back a XML content without data.
- throwMessage(this.pickSentence(errorSentences));
- }
- }
+ throwMessage(this.pickSentence(tomorrowWeatherSentences), weather, temperature, temperatureHigh);
+ }
+ outputFile.deleteOnExit();
+ file.deleteOnExit();
+ } catch (Exception e) {
+ // When a location is unknown, the Google API send back a XML content without data.
+ throwMessage(this.pickSentence(errorSentences));
+ }
+ }
- private String celsiusToFahrenheit(String temp) {
- float celsiusValue = Float.valueOf(temp).floatValue();
- float farhenheitValue = (float) ((celsiusValue * 1.8) + 32);
- return String.valueOf((int) farhenheitValue);
- }
+ private String celsiusToFahrenheit(String temp) {
+ float celsiusValue = Float.valueOf(temp).floatValue();
+ float farhenheitValue = (float) ((celsiusValue * 1.8) + 32);
+ return String.valueOf((int) farhenheitValue);
+ }
- private String fahrenheitToCelsius(String temp) {
- float farhenheitValue = Float.valueOf(temp).floatValue();
- float celsiusValue = (float) ((farhenheitValue - 32) / 1.8);
- return String.valueOf((int) celsiusValue);
- }
+ private String fahrenheitToCelsius(String temp) {
+ float farhenheitValue = Float.valueOf(temp).floatValue();
+ float celsiusValue = (float) ((farhenheitValue - 32) / 1.8);
+ return String.valueOf((int) celsiusValue);
+ }
-
- public void onGadgetStop()
+
+ public void onGadgetStop()
{
- ;
+ ;
}
- @Override
- protected void onPluginEvent(String arg0, String[] arg1) throws Throwable {
- // TODO Auto-generated method stub
- ;
- }
+ @Override
+ protected void onPluginEvent(String arg0, String[] arg1) throws Throwable {
+ // TODO Auto-generated method stub
+ ;
+ }
- @Override
- protected void onPluginStop() throws Throwable {
- // TODO Auto-generated method stub
- ;
- }
+ @Override
+ protected void onPluginStop() throws Throwable {
+ // TODO Auto-generated method stub
+ ;
+ }
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 11:26:04
|
Author: ks156
Date: 2009-10-14 13:25:47 +0200 (Wed, 14 Oct 2009)
New Revision: 5654
Modified:
software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
Log:
* Updated the gadget to return a sentence from a list
Modified: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java 2009-10-14 11:05:24 UTC (rev 5653)
+++ software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/plugin-weather/src/net/karmaLab/tuxDroid/plugins/WeatherPlugin.java 2009-10-14 11:25:47 UTC (rev 5654)
@@ -34,6 +34,8 @@
import java.net.URL;
import java.net.HttpURLConnection;
+import java.util.Random;
+
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginException;
@@ -94,6 +96,40 @@
}
+ String[] todayWeatherSentences = {
+ "Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
+ "In {0}, the weather is {1} with a temperature of {2} degrees {3}. The humidity level is {4} per cent.",
+ "The weather is currently {1} in {0} with a humidity of {4} per cent. The temperature is around {2} degrees {3}.",
+ "With a temperature of {2} degrees {3}, the weather in {0} is {1}, and the humidity level is {4} per cent."
+ };
+
+ String[] todayUnknownWeatherSentences = {
+ "Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.",
+ "In {0}, the weather is unknown with a temperature of {1} degrees {2}. The humidity level is {3} per cent.",
+ "The weather is currently unknown in {0} with a humidity of {3} per cent. The temperature is around {1} degrees {2}.",
+ "With a temperature of {1} degrees {2}, the weather in {0} is unknown, and the humidity level is {3} per cent."
+ };
+
+ String[] tomorrowWeatherSentences = {
+ "Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.",
+ "Tomorrow, the weather will be {0} with temperatures between {1} and {2} degrees.",
+ "With temperatures between {1} and {2} degrees, tomorrow's forecast is expected to be {0}.",
+ "Tomorrow's weather will be {0} with temperatures between {1} and {2} degrees.",
+ "Tomorrow, the weather will be {0} with temperatures from {1} up to {2} degrees."
+ };
+
+ String[] errorSentences = {
+ "Location could not be found. Please check the city name or enter another close by location.",
+ "Impossible to find the specified city name. Are you sure this city really exists ?",
+ "The city you specified could not be found in my database. Make sure the city name exists, or specify another close by city name.",
+ "I'm sorry, but I cannot give you the weather for the specified location. Please try another close by city name."
+ };
+
+ private String pickSentence(String[] list) {
+ Random rand = new Random();
+ return list[rand.nextInt(list.length)];
+ }
+
public static enum Unit {
celsius, fahrenheit
}
@@ -173,10 +209,10 @@
humidity = ((String) humidity.subSequence(0, humidity.length() - 1)).trim();
humidity = humidity.replaceAll("[^a-zA-Z0-9]", "");
if (weather.length() == 0) {
- throwMessage("Current weather at {0} is \"unknown\" with a temperature of {1} degrees {2}; Humidity level is {3} percent.", configuration().getLocation().replace("%20", " "), temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
+ throwMessage(this.pickSentence(todayUnknownWeatherSentences), configuration().getLocation().replace("%20", " "), temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
humidity);
} else {
- throwMessage("Current weather at {0} is \"{1}\" with a temperature of {2} degrees {3}; Humidity level is {4} percent.", configuration().getLocation().replace("%20", " "), weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
+ throwMessage(this.pickSentence(todayWeatherSentences), configuration().getLocation().replace("%20", " "), weather, temperature, configuration().getUnit() == Unit.celsius ? "celsius" : "fahrenheit",
humidity);
}
@@ -203,13 +239,13 @@
temperatureHigh = getData(current, "high");
}
- throwMessage("Tomorrow's forecast. \"{0}\" temperatures from {1} to {2} degrees.", weather, temperature, temperatureHigh);
+ throwMessage(this.pickSentence(tomorrowWeatherSentences), weather, temperature, temperatureHigh);
}
outputFile.deleteOnExit();
file.deleteOnExit();
} catch (Exception e) {
// When a location is unknown, the Google API send back a XML content without data.
- throwMessage("Location could not be found. Please check the city name or enter another close by location.");
+ throwMessage(this.pickSentence(errorSentences));
}
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 11:05:35
|
Author: ks156 Date: 2009-10-14 13:05:24 +0200 (Wed, 14 Oct 2009) New Revision: 5653 Added: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences/ Log: * Added a new branch for the random sentences. The purpose it to add variations in the way of giving the information. Copied: software_suite_v3/software/plugin/plugin-weather/branches/random_sentences (from rev 5652, software_suite_v3/software/plugin/plugin-weather/trunk) |
|
From: ks156 <c2m...@c2...> - 2009-10-14 10:42:10
|
Author: ks156
Date: 2009-10-14 12:41:58 +0200 (Wed, 14 Oct 2009)
New Revision: 5652
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
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
Log:
* Fixed a colon ...
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-14 10:34:00 UTC (rev 5651)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-14 10:41:58 UTC (rev 5652)
@@ -10,8 +10,8 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Es ist {0} Uhr und {1} Minuten."
-msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep it will be exactly {0} hours {1} ... BEEP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
@@ -19,8 +19,8 @@
msgid "Current time is {0} o'clock"
msgstr "Jetzt ist es {0} Uhr."
-msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
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-14 10:34:00 UTC (rev 5651)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-14 10:41:58 UTC (rev 5652)
@@ -10,8 +10,8 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Current time is {0} hours and {1} minutes."
-msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep it will be exactly {0} hours {1} ... BEEP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
@@ -19,8 +19,8 @@
msgid "Current time is {0} o'clock"
msgstr "Current time is {0} o'clock"
-msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
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-14 10:34:00 UTC (rev 5651)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-14 10:41:58 UTC (rev 5652)
@@ -10,7 +10,7 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Il est {0} heures et {1} minutes."
-msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
msgstr "Au prochain top, il sera exactement {0} heures {1} ... TOP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
@@ -19,7 +19,7 @@
msgid "Current time is {0} o'clock"
msgstr "Il est {0} heures."
-msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgstr "Au procain top, il sera exactement {0} heures ... TOP !"
msgid "It's midnight"
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-14 10:34:00 UTC (rev 5651)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-14 10:41:58 UTC (rev 5652)
@@ -10,8 +10,8 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
-msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep it will be exactly {0} hours {1} ... BEEP !"
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
@@ -19,8 +19,8 @@
msgid "Current time is {0} o'clock"
msgstr "Het is nu {0} uur."
-msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
-msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 10:34:00 UTC (rev 5651)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 10:41:58 UTC (rev 5652)
@@ -10,7 +10,7 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr ""
-msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgid "At the next beep it will be exactly {0} hours {1} ... BEEP !"
msgstr ""
msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
@@ -19,7 +19,7 @@
msgid "Current time is {0} o'clock"
msgstr ""
-msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgid "At the next beep it will be exactly {0} o'clock ... BEEP !"
msgstr ""
msgid "It's midnight"
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 10:34:18
|
Author: ks156
Date: 2009-10-14 12:34:00 +0200 (Wed, 14 Oct 2009)
New Revision: 5651
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
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Updated the strings
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-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-14 10:34:00 UTC (rev 5651)
@@ -10,17 +10,17 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Es ist {0} Uhr und {1} Minuten."
-msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
-msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgid "Current time is {0} o'clock"
msgstr "Jetzt ist es {0} Uhr."
-msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
-msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
@@ -31,7 +31,7 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's quarter to {0}"
+msgid "It's a quarter to {0}"
msgstr "It's quarter to {0}"
msgid "It's half past {0}"
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-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-14 10:34:00 UTC (rev 5651)
@@ -10,17 +10,17 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Current time is {0} hours and {1} minutes."
-msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
-msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgid "Current time is {0} o'clock"
msgstr "Current time is {0} o'clock"
-msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
-msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
@@ -31,7 +31,7 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's quarter to {0}"
+msgid "It's a quarter to {0}"
msgstr "It's quarter to {0}"
msgid "It's half past {0}"
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-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-14 10:34:00 UTC (rev 5651)
@@ -10,16 +10,16 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Il est {0} heures et {1} minutes."
-msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
msgstr "Au prochain top, il sera exactement {0} heures {1} ... TOP !"
-msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgstr "Il est {1} heures et {0} minutes ... oups, {0} heures et {1} minutes"
msgid "Current time is {0} o'clock"
msgstr "Il est {0} heures."
-msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
msgstr "Au procain top, il sera exactement {0} heures ... TOP !"
msgid "It's midnight"
@@ -31,7 +31,7 @@
msgid "It's quarter past {0}"
msgstr "Il est {0} heures et quart"
-msgid "It's quarter to {0}"
+msgid "It's a quarter to {0}"
msgstr "Il est {0} heures moins quart"
msgid "It's half past {0}"
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-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-14 10:34:00 UTC (rev 5651)
@@ -10,17 +10,17 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
-msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
-msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
-msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
-msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgid "Current time is {0} o'clock"
msgstr "Het is nu {0} uur."
-msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
-msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
+msgstr "At the next beep, it will be exactly {0} o'clock ... BEEP !"
msgid "It's midnight"
msgstr "It's midnight"
@@ -31,7 +31,7 @@
msgid "It's quarter past {0}"
msgstr "It's quarter past {0}"
-msgid "It's quarter to {0}"
+msgid "It's a quarter to {0}"
msgstr "It's quarter to {0}"
msgid "It's half past {0}"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 10:34:00 UTC (rev 5651)
@@ -10,16 +10,16 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr ""
-msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "At the next beep, it will be exactly {0} hours {1} ... BEEP !"
msgstr ""
-msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgid "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
msgstr ""
msgid "Current time is {0} o'clock"
msgstr ""
-msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgid "At the next beep, it will be exactly {0} o'clock ... BEEP !"
msgstr ""
msgid "It's midnight"
@@ -31,7 +31,7 @@
msgid "It's quarter past {0}"
msgstr ""
-msgid "It's quarter to {0}"
+msgid "It's a quarter to {0}"
msgstr ""
msgid "It's half past {0}"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 09:09:05 UTC (rev 5650)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 10:34:00 UTC (rev 5651)
@@ -43,12 +43,12 @@
String[] normalSentences = {
"Current time is {0} hours and {1} minutes.",
- "At the next top, it will be exactly {0} hours {1} ... TOP !",
- "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+ "At the next beep it will be exactly {0} hours {1} ... BEEP !",
+ "It's {1} hours and {0} minutes ... oops, I mean {0} hours {1} minutes"
};
String[] sharpSentences = {
"Current time is {0} o'clock",
- "At the next top, it will be exactly {0} o'clock ... TOP !",
+ "At the next beep it will be exactly {0} o'clock ... BEEP !",
};
public static void main(String[] args) throws Exception {
@@ -104,7 +104,7 @@
}
else if (m == 45) {
if (random) {
- throwMessage("It's quarter to {0}", (h + 1));
+ throwMessage("It's a quarter to {0}", (h + 1));
}
else {
throwMessage(this.pickSentence(normalSentences), h, m);
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 09:09:18
|
Author: ks156
Date: 2009-10-14 11:09:05 +0200 (Wed, 14 Oct 2009)
New Revision: 5650
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Renamed a function
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 08:16:50 UTC (rev 5649)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 09:09:05 UTC (rev 5650)
@@ -83,7 +83,7 @@
throwMessage("It's noon");
}
else {
- throwMessage(this.pickupSentence(sharpSentences), h);
+ throwMessage(this.pickSentence(sharpSentences), h);
}
}
else if (m == 15) {
@@ -91,7 +91,7 @@
throwMessage("It's quarter past {0}", h);
}
else {
- throwMessage(this.pickupSentence(normalSentences), h, m);
+ throwMessage(this.pickSentence(normalSentences), h, m);
}
}
else if (m == 30) {
@@ -99,7 +99,7 @@
throwMessage("It's half past {0}", h);
}
else {
- throwMessage(this.pickupSentence(normalSentences), h, m);
+ throwMessage(this.pickSentence(normalSentences), h, m);
}
}
else if (m == 45) {
@@ -107,15 +107,15 @@
throwMessage("It's quarter to {0}", (h + 1));
}
else {
- throwMessage(this.pickupSentence(normalSentences), h, m);
+ throwMessage(this.pickSentence(normalSentences), h, m);
}
}
else {
- throwMessage(this.pickupSentence(normalSentences), h, m);
+ throwMessage(this.pickSentence(normalSentences), h, m);
}
}
- private String pickupSentence(String[] list) {
+ private String pickSentence(String[] list) {
Random rand = new Random();
return list[rand.nextInt(list.length)];
}
|
|
From: remi <c2m...@c2...> - 2009-10-14 08:17:01
|
Author: remi
Date: 2009-10-14 10:16:50 +0200 (Wed, 14 Oct 2009)
New Revision: 5649
Modified:
software_suite_v3/software/gadget/webradio_variations/trunk/build.py
Log:
* Added 4 radios genres.
Modified: software_suite_v3/software/gadget/webradio_variations/trunk/build.py
===================================================================
--- software_suite_v3/software/gadget/webradio_variations/trunk/build.py 2009-10-14 08:01:39 UTC (rev 5648)
+++ software_suite_v3/software/gadget/webradio_variations/trunk/build.py 2009-10-14 08:16:50 UTC (rev 5649)
@@ -46,6 +46,50 @@
'name_de' : 'Classic Hits',
'icon_file' : 'default.png',
},
+ # Electronic & house
+ {
+ 'uuid' : '3c65eb46-dd67-404d-84b6-f24ff18b4775',
+ 'radios_list' : 'BlitzRadio FM,DI - Electro House,DI - House,DI - EuroDance,DI - Drum and Bass,French Kiss FM,FriskyRadio,Hardcore Radio,PulsRadio,Technobase FM',
+ 'default_radio' : 'BlitzRadio FM',
+ 'name_fr' : 'Electronic & house',
+ 'name_en' : 'Electronic & house',
+ 'name_nl' : 'Electronic & house',
+ 'name_de' : 'Electronic & house',
+ 'icon_file' : 'default.png',
+ },
+ # Rock & Alternative
+ {
+ 'uuid' : '0b3e82ee-e4a9-4b6b-a1b5-4955bbf16fc1',
+ 'radios_list' : '1080.FM - The Planet,Hot Rocks Radio,Idobi Radio,K94 Rocks,Rockwebstation,TotalRock,181.FM - The Buzz,ChroniX Aggression,RockRadio1.com,.977 Alternative Channel,Radio.wazee',
+ 'default_radio' : '1080.FM - The Planet',
+ 'name_fr' : 'Rock & Alternative ',
+ 'name_en' : 'Rock & Alternative ',
+ 'name_nl' : 'Rock & Alternative ',
+ 'name_de' : 'Rock & Alternative ',
+ 'icon_file' : 'default.png',
+ },
+ # Pop & Tophits
+ {
+ 'uuid' : '4bf3a5a7-22c2-4046-8038-58529dfad89a',
+ 'radios_list' : '.977 Hitz Channel,QMR FM,Summer Radio,181 FM,SKY.fm,POP-Radio,MAXXHITS,FTV Hit Radio,ENJOY Station,M1LIVE.com',
+ 'default_radio' : '.977 Hitz Channel',
+ 'name_fr' : 'Pop & Tophits',
+ 'name_en' : 'Pop & Tophits',
+ 'name_nl' : 'Pop & Tophits',
+ 'name_de' : 'Pop & Tophits',
+ 'icon_file' : 'default.png',
+ },
+ # Hip-hop & Rap
+ {
+ 'uuid' : 'c7cdbe3b-d446-4c17-9ee4-602f5063f91e',
+ 'radios_list' : 'Smoothbeats,RapClassix.com,Hot 108 Jamz,Musik.Jam,DEFJAY.COM,Jelly Radio,Beatbasement,TrueHipHop.FM,Pure Party,FLOW 103',
+ 'default_radio' : 'Smoothbeats',
+ 'name_fr' : 'Hip-hop & Rap',
+ 'name_en' : 'Hip-hop & Rap',
+ 'name_nl' : 'Hip-hop & Rap',
+ 'name_de' : 'Hip-hop & Rap',
+ 'icon_file' : 'default.png',
+ },
]
# ==============================================================================
|
|
From: remi <c2m...@c2...> - 2009-10-14 08:01:56
|
Author: remi
Date: 2009-10-14 10:01:39 +0200 (Wed, 14 Oct 2009)
New Revision: 5648
Modified:
software_suite_v3/software/gadget/webradio_variations/trunk/build.py
Log:
* Added condition to skip svn files from tokens replacement
Modified: software_suite_v3/software/gadget/webradio_variations/trunk/build.py
===================================================================
--- software_suite_v3/software/gadget/webradio_variations/trunk/build.py 2009-10-14 07:54:09 UTC (rev 5647)
+++ software_suite_v3/software/gadget/webradio_variations/trunk/build.py 2009-10-14 08:01:39 UTC (rev 5648)
@@ -77,6 +77,9 @@
# Replace tokens in files
for fileName in os.listdir(tmpGadgetPath):
filePath = os.path.join(tmpGadgetPath, fileName)
+ # Skip svn files
+ if filePath.find(".svn") != -1:
+ continue
# Read original content
f = open(filePath, "rb")
content = f.read()
|
|
From: remi <c2m...@c2...> - 2009-10-14 07:54:18
|
Author: remi Date: 2009-10-14 09:54:09 +0200 (Wed, 14 Oct 2009) New Revision: 5647 Added: software_suite_v3/software/gadget/webradio_variations/ software_suite_v3/software/gadget/webradio_variations/branches/ software_suite_v3/software/gadget/webradio_variations/tags/ software_suite_v3/software/gadget/webradio_variations/trunk/ software_suite_v3/software/gadget/webradio_variations/trunk/build.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/ software_suite_v3/software/gadget/webradio_variations/trunk/builder/GadgetPackager.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/__init__.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/ software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/__init__.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/ software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/DirectoriesAndFilesTools.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/__init__.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/version.py software_suite_v3/software/gadget/webradio_variations/trunk/builder/version.py software_suite_v3/software/gadget/webradio_variations/trunk/icons/ software_suite_v3/software/gadget/webradio_variations/trunk/icons/default.png software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.po software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.wiki software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.po software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.wiki software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.po software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.wiki software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.pot software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.xml software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/help.wiki software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.po software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.wiki Log: * Added project to serialize the creation of webradio gadget variations. Added: software_suite_v3/software/gadget/webradio_variations/trunk/build.py =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/build.py (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/build.py 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,118 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2009 KYSOH Sa +# Remi Jocaille <rem...@ky...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +import os +import shutil + +from builder.util.misc.DirectoriesAndFilesTools import * +from builder.GadgetPackager import GadgetPackager + +# Webradio gadgets defining +RADIOS_DATA = [ + # French radio's + { + 'uuid' : '3e597dc2-d199-416e-83da-3e5bb3ad8683', + 'radios_list' : 'France Inter,RMC Info,France Info,France Culture,Le Mouv,France Musique,France Bleu,Fun Radio,Skyrock', + 'default_radio' : 'France Inter', + 'name_fr' : 'Radios françaises', + 'name_en' : 'Radios françaises', + 'name_nl' : 'Radios françaises', + 'name_de' : 'Radios françaises', + 'icon_file' : 'default.png', + }, + # German radio's + { + 'uuid' : 'a54963a8-500c-4b2b-83c3-38cdf9b6622b', + 'radios_list' : 'WDR1 Live,WDR2,Radio2Day,Rockland Digital,Hit Radio FFH,Antenne Bayern,N-JOY,HR3,Radio ffn,Radio Charivari,BR 3', + 'default_radio' : 'WDR1 Live', + 'name_fr' : 'Radios allemandes', + 'name_en' : 'Radios allemandes', + 'name_nl' : 'Radios allemandes', + 'name_de' : 'Radios allemandes', + 'icon_file' : 'default.png', + }, + # Classic Hits + { + 'uuid' : '1c0e3414-e75e-4ad2-a7b3-6d475ac82195', + 'radios_list' : '977 The 80s Channel,80s Sky FM,Cafe 80s FM,Radio Nigel,Star 107.9,181.FM,1.FM,KickRadio,EYE97', + 'default_radio' : '977 The 80s Channel', + 'name_fr' : 'Classic Hits', + 'name_en' : 'Classic Hits', + 'name_nl' : 'Classic Hits', + 'name_de' : 'Classic Hits', + 'icon_file' : 'default.png', + }, +] + +# ============================================================================== +# Class to retrieve the py file path. +# ============================================================================== +class localFilePath(object): + """Class to retrieve the local file path. + """ + def getPath(self): + """Get the local file path. + """ + mPath, mFile = os.path.split(__file__) + return mPath + +def createRadio(data): + """ + """ + # Define some paths + basePath = localFilePath().getPath() + buildPath = os.path.join(basePath, "BUILD") + tmpGadgetPath = os.path.join(basePath, "tmp", "gadget_%s" % data["uuid"]) + skeletonPath = os.path.join(basePath, "skeleton") + iconSrcPath = os.path.join(basePath, "icons", data["icon_file"]) + iconDestPath = os.path.join(tmpGadgetPath, "gadget.png") + scgGadgetSrcPath = tmpGadgetPath + ".scg" + scgGadgetDestPath = os.path.join(buildPath, "gadget_%s.scg" % data["uuid"]) + # Copy skeleton files + CPDir(skeletonPath, tmpGadgetPath) + # Replace tokens in files + for fileName in os.listdir(tmpGadgetPath): + filePath = os.path.join(tmpGadgetPath, fileName) + # Read original content + f = open(filePath, "rb") + content = f.read() + f.close() + # Replace tokens + content = content.replace("###UUID###", data["uuid"]) + content = content.replace("###RADIOSLIST###", data["radios_list"]) + content = content.replace("###DEFAULTRADIO###", data["default_radio"]) + content = content.replace("###GADGETNAMEFR###", data["name_fr"]) + content = content.replace("###GADGETNAMEEN###", data["name_en"]) + content = content.replace("###GADGETNAMENL###", data["name_nl"]) + content = content.replace("###GADGETNAMEDE###", data["name_de"]) + # Write fixed content + f = open(filePath, "wb") + f.write(content) + f.close() + # Copy gadget icon + shutil.copy(iconSrcPath, iconDestPath) + # Create packed gadget + GadgetPackager().createScg(tmpGadgetPath) + # Copy packed gadget to final directory + shutil.copy(scgGadgetSrcPath, scgGadgetDestPath) + +def createRadios(): + """ + """ + # Clear temp gadgets directory + basePath = localFilePath().getPath() + tmpGadgetsPath = os.path.join(basePath, "tmp") + MKDirsF(tmpGadgetsPath) + # Clear build directory + buildPath = os.path.join(basePath, "BUILD") + MKDirsF(buildPath) + for data in RADIOS_DATA: + createRadio(data) + # Remove temp gadgets directory + RMDirs(tmpGadgetsPath) + +createRadios() Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/GadgetPackager.py =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/builder/GadgetPackager.py (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/builder/GadgetPackager.py 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- + +import version +__author__ = version.author +__date__ = version.date +__version__ = version.version +__licence__ = version.licence +del version + +# Copyleft (C) 2009 C2ME Sa +# Remi Jocaille <rem...@c2...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +import os +from zipfile import * + +from util.misc.DirectoriesAndFilesTools import * + +# ------------------------------------------------------------------------------ +# Class to create a SCG file from the directory of a smart-core gadget. +# ------------------------------------------------------------------------------ +class GadgetPackager(object): + """Class to create a SCG file from the directory of a smart-core gadget. + """ + + # -------------------------------------------------------------------------- + # Create a scg file. + # -------------------------------------------------------------------------- + def createScg(self, scgDirectory): + """Create a scg file. + @param scgDirectory: Smart-Core gadget directory path. + @return: The success of the file creation. + """ + self.__sourcePath = os.path.realpath(scgDirectory) + if not os.path.isdir(self.__sourcePath): + return False + # Get some paths + TMP_BUILD_PATH = os.path.join(self.__sourcePath, "tmp") + DEST_SCG_FILENAME = self.__sourcePath + ".scg" + # Create the temporary build path + MKDirsF(TMP_BUILD_PATH) + # Copy the directory + CPDir(self.__sourcePath, TMP_BUILD_PATH) + # Filtering the content of temporary path + RMWithFilters(TMP_BUILD_PATH, filters = ['.svn',]) + # Create a zip file + directory = TMP_BUILD_PATH + last_cwd = os.getcwd() + os.chdir(TMP_BUILD_PATH) + zf = ZipFile(DEST_SCG_FILENAME, 'w', compression = ZIP_DEFLATED) + def walker(zip, directory, files, root = directory): + for file in files: + file = os.path.join(directory, file) + name = file[len(TMP_BUILD_PATH) + 1:] + if os.path.isfile(file): + zip.write(file, name, ZIP_DEFLATED) + elif os.path.isdir(file): + file = os.path.join(file, "") + name = os.path.join(name, "") + zip.writestr(name, name) + os.path.walk(TMP_BUILD_PATH, walker, zf) + zf.close() + os.chdir(os.path.abspath(last_cwd)) + # Remove the temporary directory + RMDirs(TMP_BUILD_PATH) + return True Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/__init__.py =================================================================== Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/__init__.py =================================================================== Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/DirectoriesAndFilesTools.py =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/DirectoriesAndFilesTools.py (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/DirectoriesAndFilesTools.py 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,161 @@ +# -*- coding: utf-8 -*- + +import version +__author__ = version.author +__date__ = version.date +__version__ = version.version +__licence__ = version.licence +del version + +# Copyleft (C) 2008 Acness World +# Remi Jocaille <rem...@c2...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +import os +import shutil + +if os.name == 'nt': + import win32con + import win32file + +# ============================================================================== +# Public functions +# ============================================================================== + +# ------------------------------------------------------------------------------ +# Force to create a directories tree if not exists. +# ------------------------------------------------------------------------------ +def MKDirs(path): + """Force to create a directories tree if not exists. + @param path: Directory path. + """ + if not os.path.isdir(path): + try: + os.makedirs(path) + except: + pass + +# ------------------------------------------------------------------------------ +# Force to create a directories tree after having deleted the old one. +# ------------------------------------------------------------------------------ +def MKDirsF(path): + """Force to create a directories tree after having deleted the old one. + @param path: Directory path. + """ + if os.path.isdir(path): + RMDirs(path) + os.makedirs(path) + +# ------------------------------------------------------------------------------ +# Remove directories and files recursively. +# ------------------------------------------------------------------------------ +def RMDirs(path): + """Remove directories and files recursively. + @param path: Path of the base directory. + """ + if not os.path.isdir(path): + return + for root, dirs, files in os.walk(path, topdown = False): + for d in dirs: + try: + os.removedirs(os.path.join(root, d)) + except: + pass + for f in files: + try: + if os.name == 'nt': + win32file.SetFileAttributesW(os.path.join(root, f), + win32con.FILE_ATTRIBUTE_NORMAL) + os.remove(os.path.join(root, f)) + except: + pass + if os.path.isdir(path): + try: + os.removedirs(path) + except: + pass + +# ------------------------------------------------------------------------------ +# Remove directories and files recursively with filters. +# ------------------------------------------------------------------------------ +def RMWithFilters(path, filters = ['.pyc', '.pyo']): + """Remove directories and files recursively with filters. + @param path: Path of the base directory. + @param filters: Filters as list. + """ + def checkFilter(name): + for filter in filters: + if name.lower().find(filter.lower()) == (len(name) - len(filter)): + return True + return False + + if not os.path.isdir(path): + return + + for root, dirs, files in os.walk(path, topdown = False): + for d in dirs: + if checkFilter(os.path.join(root, d)): + try: + RMDirs(os.path.join(root, d)) + except: + pass + for f in files: + if checkFilter(os.path.join(root, f)): + try: + if os.name == 'nt': + win32file.SetFileAttributesW(os.path.join(root, f), + win32con.FILE_ATTRIBUTE_NORMAL) + os.remove(os.path.join(root, f)) + except: + pass + +# ------------------------------------------------------------------------------ +# Remove a file. +# ------------------------------------------------------------------------------ +def RMFile(path): + """Remove a file. + @param path: File path. + """ + if os.path.isfile(path): + try: + if os.name == 'nt': + win32file.SetFileAttributesW(path, + win32con.FILE_ATTRIBUTE_NORMAL) + os.remove(path) + except: + pass + +# ------------------------------------------------------------------------------ +# Copy a directories tree to another directory. +# ------------------------------------------------------------------------------ +def CPDir(src, dest): + """Copy a directories tree to another directory. + @param src: Source path. + @param dest: Destination path. + """ + if not os.path.isdir(src): + return + if os.path.isdir(dest): + RMDirs(dest) + shutil.copytree(src, dest) + +# ------------------------------------------------------------------------------ +# Retrieve the OS temporary directory. +# ------------------------------------------------------------------------------ +def GetOSTMPDir(): + """Retrieve the OS temporary directory. + @return: The OS temporary directory. + """ + result = None + # On Windows + if os.name == 'nt': + result = os.environ.get('tmp') + if result == None: + result = os.environ.get('temp') + if result == None: + result = "c:\\windows\\temp" + # On linux + else: + result = "/tmp" + return result Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/__init__.py =================================================================== Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/version.py =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/version.py (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/builder/util/misc/version.py 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- + +"""Version data for tuxisalive.lib.Util""" + +__author__ = "Remi Jocaille (rem...@c2...)" + +# Copyleft (C) 2008 C2ME Sa +# Remi Jocaille <rem...@c2...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +name = 'util.misc' +version = '0.0.1' +author = "Remi Jocaille (rem...@c2...)" + +description = "Utilities libraries." + +licence = "GPL" +date = "December 2008" Added: software_suite_v3/software/gadget/webradio_variations/trunk/builder/version.py =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/builder/version.py (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/builder/version.py 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,9 @@ +# Copyleft (C) 2009 C2ME Sa +# Remi Jocaille <rem...@c2...> +# Distributed under the terms of the GNU General Public License +# http://www.gnu.org/copyleft/gpl.html + +version = '0.0.1' +author = "Remi Jocaille (rem...@c2...)" +licence = "GPL" +date = "2009" Added: software_suite_v3/software/gadget/webradio_variations/trunk/icons/default.png =================================================================== (Binary files differ) Property changes on: software_suite_v3/software/gadget/webradio_variations/trunk/icons/default.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.po =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.po (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.po 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,11 @@ +msgid "Webradio" +msgstr "###GADGETNAMEDE###" + +msgid "Webradio." +msgstr "###GADGETNAMEDE###." + +msgid "This gadget will turn Tux Droid into a webradio." +msgstr "Diese Funktion macht aus Ihrem Tux Droid ein Webradio." + +msgid "enum_radios_list" +msgstr "###RADIOSLIST###" Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.wiki =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.wiki (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/de.wiki 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,14 @@ += Hilfe = +Diese Funktion verwandelt Tux Droid in ein Webradio. + +Mehrere Einstellungen können in der Konfiguration geändert werden: +* Sie können das Webradio aus der Webradio-Liste auswählen, das Sie hören möchten +* Sie können auch die URL Ihres Lieblingswebradios eingeben +* Achten Sie darauf die Option "URL-Adresse verwenden" freizugeben, um die o.g. URL Ihres Lieblingswebradios zu aktivieren +* Webradio als Wecker konfigurieren + +Verwendung: +* Im Listen-Modus: Die Flügel von Tux Droid anstoßen, um zum vorhergehenden/nächsten Webradio zu wechseln +* Im Listen-Modus: Sie können das vorherige oder nächste Webradio auch über die Tasten "zurück" und "weiter" auf der Fernbedienung auswählen +* Über die "Start"-Taste der Fernbedienung können Sie das Hintergrundspiel des Webradios unterbrechen/fortsetzen +* Über die "Power"-Taste der Fernbedienung melden Sie die Webradio-Funktion ab Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.po =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.po (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.po 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,11 @@ +msgid "Webradio" +msgstr "###GADGETNAMEEN###" + +msgid "Webradio." +msgstr "###GADGETNAMEEN###." + +msgid "This gadget will turn Tux Droid into a webradio." +msgstr "This gadget will turn Tux Droid into a webradio." + +msgid "enum_radios_list" +msgstr "###RADIOSLIST###" Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.wiki =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.wiki (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/en.wiki 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,14 @@ += Help = +This gadget will turn Tux Droid into a webradio. + +Several settings can be changed in the configuration : +* You can select the webradio you want to listen to from the webradio list +* You can also enter your favorite webradio url +* Make sure you enable "Use address url" to activate the above url of your favorite webradio +* Configure the webradio as an alarm clock + +Usage : +* When in list mode : Push Tux Droid wings to switch to the previous/next webradio +* When in list mode : The "previous" and "next" buttons on the remote control also allow you to select the previous/next webradio +* The "play" button on the remote control will pause/continue webradio playback +* The "power" button on the remote control will quit the webradio gadget \ No newline at end of file Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.po =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.po (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.po 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,11 @@ +msgid "Webradio" +msgstr "###GADGETNAMEFR###" + +msgid "Webradio." +msgstr "###GADGETNAMEFR###." + +msgid "This gadget will turn Tux Droid into a webradio." +msgstr "Ce gadget transforme votre Tux Droid en lecteur de radios internet." + +msgid "enum_radios_list" +msgstr "###RADIOSLIST###" Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.wiki =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.wiki (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/fr.wiki 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,14 @@ += Aide = +Ce gadget transforme votre Tux Droid en lecteur de radios internet. + +Voici les options que vous trouverez dans la configuration : +* Sélectionner la radio internet que vous voulez écouter parmi une liste de radios +* Sélectionner une radio internet en indiquant directement son url +* Passer du mode "liste" au mode "url" en activant l'option "Utiliser en mode adresse" +* Utiliser Tux Droid en tant que radio réveil. + +Utilisation du gadget : +* Appuyez sur le bouton "play" de la télécommande pour mettre en pause/continuer l'écoute d'une radio +* Appuyer sur le bouton "Ok" de la télécommande ou le bouton de tête de Tux Droid pour quitter le gadget et l'écoute de la radio. +* Appuyez sur les ailes de Tux Droid pour passer en revue les radios internet (uniquement en mode "liste") +* Appuyez sur les boutons précédant/suivant de la télécommande pour passer en revue les radios internet (uniquement en mode "liste") Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.pot =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.pot (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.pot 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,11 @@ +msgid "Webradio" +msgstr "" + +msgid "Webradio." +msgstr "" + +msgid "This gadget will turn Tux Droid into a webradio." +msgstr "" + +msgid "enum_radios_list" +msgstr "" Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.xml =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.xml (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/gadget.xml 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,53 @@ +<gadget> + <description> + <author>Kysoh</author> + <category>Misc</category> + <defaultLanguage>all</defaultLanguage> + <description>This gadget will turn Tux Droid into a webradio.</description> + <iconFile>gadget.png</iconFile> + <name>Webradio</name> + <onDemandIsAble>true</onDemandIsAble> + <platform>all</platform> + <ttsName>Webradio.</ttsName> + <uuid>###UUID###</uuid> + <version>0.0.10</version> + </description> + <parameters> + <param_00> + <defaultValue>null</defaultValue> + <name>url</name> + <visible>false</visible> + </param_00> + <param_01> + <defaultValue>false</defaultValue> + <name>modeUrl</name> + <visible>false</visible> + </param_01> + <param_02> + <defaultValue>###DEFAULTRADIO###</defaultValue> + <name>radio</name> + <visible>true</visible> + </param_02> + <param_03> + <defaultValue>Ryan</defaultValue> + <name>locutor</name> + <visible>false</visible> + </param_03> + </parameters> + <parentPlugin> + <url>http://ftp.kysoh.com/</url> + <uuid>8349ed52-572d-4c3f-a7b8-05c2a8aec2c6</uuid> + <version>0.0.10</version> + </parentPlugin> + <tasks> + <task_00> + <activated>false</activated> + <date>2009/10/10</date> + <delay>00:01:00</delay> + <hoursBegin>07:00:00</hoursBegin> + <hoursEnd>07:15:00</hoursEnd> + <name>Clock radio</name> + <weekMask>true,true,true,true,true,true,true</weekMask> + </task_00> + </tasks> +</gadget> Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/help.wiki =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/help.wiki (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/help.wiki 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,14 @@ += Help = +This gadget will turn Tux Droid into a webradio. + +Several settings can be changed in the configuration : +* You can select the webradio you want to listen to from the webradio list +* You can also enter your favorite webradio url +* Make sure you enable "Use address url" to activate the above url of your favorite webradio +* Configure the webradio as an alarm clock + +Usage : +* When in list mode : Push Tux Droid wings to switch to the previous/next webradio +* When in list mode : The "previous" and "next" buttons on the remote control also allow you to select the previous/next webradio +* The "play" button on the remote control will pause/continue webradio playback +* The "power" button on the remote control will quit the webradio gadget \ No newline at end of file Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.po =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.po (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.po 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,11 @@ +msgid "Webradio" +msgstr "###GADGETNAMENL###" + +msgid "Webradio." +msgstr "###GADGETNAMENL###." + +msgid "This gadget will turn Tux Droid into a webradio." +msgstr "Deze gadget verandert je Tux Droid in een webradio." + +msgid "enum_radios_list" +msgstr "###RADIOSLIST###" Added: software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.wiki =================================================================== --- software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.wiki (rev 0) +++ software_suite_v3/software/gadget/webradio_variations/trunk/skeleton/nl.wiki 2009-10-14 07:54:09 UTC (rev 5647) @@ -0,0 +1,14 @@ += Help = +Deze gadget verandert je Tux Droid in een webradio. + +Verschillende opties kunnen aangepast worden in de configuratie : +* Kies de webradio in de lijst van beschikbare webradio's +* Je kan ook de url ingeven van je favoriete webradio +* Activeer "Gebruik adres url" als je naar de webradio wil luisteren van de hierboven ingegeven url +* Configureer de webradio gadget als een alarm klok + +Gebruik : +* Indien in lijst modus : druk op de vleugels van Tux Droid om naar de vorige/volgende webradio te luisteren +* Indien in lijst modus : druk op de "vorige" en "volgende" knoppen op de afstandsbediening om naar de vorige/volgende webradio te luisteren +* De "play" knop op de afstandsbediening zal de webradio pauzeren/afspelen +* De "power" knop op de afstandsbediening zal de webradio gadget afsluiten \ No newline at end of file |
|
From: ks156 <c2m...@c2...> - 2009-10-14 07:39:25
|
Author: ks156
Date: 2009-10-14 09:39:09 +0200 (Wed, 14 Oct 2009)
New Revision: 5646
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Retab
* Removed trailing spaces
* Recoded with the std java style
* Renamed pickUpWeatherSentence to pickupSentence
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 07:31:02 UTC (rev 5645)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 07:39:09 UTC (rev 5646)
@@ -32,94 +32,98 @@
public class ClockPlugin extends SimplePlugin<SimplePluginConfiguration> {
- /**
- * Main gadget access point.
- *
- * @param args
- * commands
- * @throws Exception
- * errors
- */
-
- String[] normalSentences = {
- "Current time is {0} hours and {1} minutes.",
- "At the next top, it will be exactly {0} hours {1} ... TOP !",
- "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
- };
- String[] sharpSentences = {
- "Current time is {0} o'clock",
- "At the next top, it will be exactly {0} o'clock ... TOP !",
- };
-
- public static void main(String[] args) throws Exception {
- new ClockPlugin().boot(args, new SimplePluginConfiguration());
- }
+ /**
+ * Main gadget access point.
+ *
+ * @param args
+ * commands
+ * @throws Exception
+ * errors
+ */
- private final Calendar calendar = new GregorianCalendar();
+ String[] normalSentences = {
+ "Current time is {0} hours and {1} minutes.",
+ "At the next top, it will be exactly {0} hours {1} ... TOP !",
+ "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+ };
+ String[] sharpSentences = {
+ "Current time is {0} o'clock",
+ "At the next top, it will be exactly {0} o'clock ... TOP !",
+ };
- @Override
- public void start() {
- if (getCommand().equals("run")) {
- run();
- }
- else {
- run();
- }
- }
+ public static void main(String[] args) throws Exception {
+ new ClockPlugin().boot(args, new SimplePluginConfiguration());
+ }
- private void run() {
- calendar.setTime(new Date());
- int h = calendar.get(Calendar.HOUR_OF_DAY);
- int m = calendar.get(Calendar.MINUTE);
-
- Random rand = new Random();
- Boolean random = rand.nextBoolean();
-
- if (m == 0)
- {
- if (h == 0)
- throwMessage("It's midnight");
- else if (h == 12)
- throwMessage("It's noon");
- else
- throwMessage(this.pickUpWeatherSentence(sharpSentences), h);
- }
- else if (m == 15)
- {
- if (random)
- throwMessage("It's quarter past {0}", h);
- else
- throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
- }
- else if (m == 30)
- {
- if (random)
- throwMessage("It's half past {0}", h);
- else
- throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
- }
- else if (m == 45)
- {
- if (random)
- throwMessage("It's quarter to {0}", (h + 1));
- else
- throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
- }
- else
- {
- throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
- }
- }
-
- private String pickUpWeatherSentence(String[] list) {
- Random rand = new Random();
- return list[rand.nextInt(list.length)];
- }
+ private final Calendar calendar = new GregorianCalendar();
@Override
+ public void start() {
+ if (getCommand().equals("run")) {
+ run();
+ }
+ else {
+ run();
+ }
+ }
+
+ private void run() {
+ calendar.setTime(new Date());
+ int h = calendar.get(Calendar.HOUR_OF_DAY);
+ int m = calendar.get(Calendar.MINUTE);
+
+ Random rand = new Random();
+ Boolean random = rand.nextBoolean();
+
+ if (m == 0) {
+ if (h == 0) {
+ throwMessage("It's midnight");
+ }
+ else if (h == 12) {
+ throwMessage("It's noon");
+ }
+ else {
+ throwMessage(this.pickupSentence(sharpSentences), h);
+ }
+ }
+ else if (m == 15) {
+ if (random) {
+ throwMessage("It's quarter past {0}", h);
+ }
+ else {
+ throwMessage(this.pickupSentence(normalSentences), h, m);
+ }
+ }
+ else if (m == 30) {
+ if (random) {
+ throwMessage("It's half past {0}", h);
+ }
+ else {
+ throwMessage(this.pickupSentence(normalSentences), h, m);
+ }
+ }
+ else if (m == 45) {
+ if (random) {
+ throwMessage("It's quarter to {0}", (h + 1));
+ }
+ else {
+ throwMessage(this.pickupSentence(normalSentences), h, m);
+ }
+ }
+ else {
+ throwMessage(this.pickupSentence(normalSentences), h, m);
+ }
+ }
+
+ private String pickupSentence(String[] list) {
+ Random rand = new Random();
+ return list[rand.nextInt(list.length)];
+ }
+
+ @Override
public void onPluginStop() {
}
-
+
@Override
public void onPluginEvent(String eventName, String[] eventValues) {
}
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 07:31:18
|
Author: ks156
Date: 2009-10-14 09:31:02 +0200 (Wed, 14 Oct 2009)
New Revision: 5645
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
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
Log:
* Updated the translation files :
- plugin.pot : Added the new strings and formated to unix style (removed ^M)
- All languages : Added the new strings
- en.po / fr.po : Translated the strings. Translations are needed for nl.po
and de.po.
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-14 07:27:43 UTC (rev 5644)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/de.po 2009-10-14 07:31:02 UTC (rev 5645)
@@ -10,12 +10,35 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Es ist {0} Uhr und {1} Minuten."
-msgid "Current time is {0} hours."
+msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+
+msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+
+msgid "Current time is {0} o'clock"
msgstr "Jetzt ist es {0} Uhr."
+msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+
+msgid "It's midnight"
+msgstr "It's midnight"
+
+msgid "It's noon"
+msgstr "It's noon"
+
+msgid "It's quarter past {0}"
+msgstr "It's quarter past {0}"
+
+msgid "It's quarter to {0}"
+msgstr "It's quarter to {0}"
+
+msgid "It's half past {0}"
+msgstr "It's half past {0}"
+
msgid "Start every x from full hour"
msgstr "Frequenz"
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-14 07:27:43 UTC (rev 5644)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/en.po 2009-10-14 07:31:02 UTC (rev 5645)
@@ -10,9 +10,33 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Current time is {0} hours and {1} minutes."
-msgid "Current time is {0} hours."
-msgstr "Current time is {0} hours."
+msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+
+msgid "Current time is {0} o'clock"
+msgstr "Current time is {0} o'clock"
+
+msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+
+msgid "It's midnight"
+msgstr "It's midnight"
+
+msgid "It's noon"
+msgstr "It's noon"
+
+msgid "It's quarter past {0}"
+msgstr "It's quarter past {0}"
+
+msgid "It's quarter to {0}"
+msgstr "It's quarter to {0}"
+
+msgid "It's half past {0}"
+msgstr "It's half past {0}"
+
msgid "Start every x from full hour"
msgstr "Frequency"
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-14 07:27:43 UTC (rev 5644)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/fr.po 2009-10-14 07:31:02 UTC (rev 5645)
@@ -10,9 +10,33 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Il est {0} heures et {1} minutes."
-msgid "Current time is {0} hours."
+msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgstr "Au prochain top, il sera exactement {0} heures {1} ... TOP !"
+
+msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgstr "Il est {1} heures et {0} minutes ... oups, {0} heures et {1} minutes"
+
+msgid "Current time is {0} o'clock"
msgstr "Il est {0} heures."
+msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgstr "Au procain top, il sera exactement {0} heures ... TOP !"
+
+msgid "It's midnight"
+msgstr "Il est minuit"
+
+msgid "It's noon"
+msgstr "Il est midi"
+
+msgid "It's quarter past {0}"
+msgstr "Il est {0} heures et quart"
+
+msgid "It's quarter to {0}"
+msgstr "Il est {0} heures moins quart"
+
+msgid "It's half past {0}"
+msgstr "Il est {0} heures et demi"
+
msgid "Start every x from full hour"
msgstr "Fréquence"
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-14 07:27:43 UTC (rev 5644)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/nl.po 2009-10-14 07:31:02 UTC (rev 5645)
@@ -10,9 +10,33 @@
msgid "Current time is {0} hours and {1} minutes."
msgstr "Het is nu {0} uur en {1} minuten."
-msgid "Current time is {0} hours."
+msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgstr "At the next top, it will be exactly {0} hours {1} ... TOP !"
+
+msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgstr "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+
+msgid "Current time is {0} o'clock"
msgstr "Het is nu {0} uur."
+msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgstr "At the next top, it will be exactly {0} o'clock ... TOP !"
+
+msgid "It's midnight"
+msgstr "It's midnight"
+
+msgid "It's noon"
+msgstr "It's noon"
+
+msgid "It's quarter past {0}"
+msgstr "It's quarter past {0}"
+
+msgid "It's quarter to {0}"
+msgstr "It's quarter to {0}"
+
+msgid "It's half past {0}"
+msgstr "It's half past {0}"
+
msgid "Start every x from full hour"
msgstr "Geef de tijd weer op vaste tijdstippen"
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 07:27:43 UTC (rev 5644)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/resources/plugin.pot 2009-10-14 07:31:02 UTC (rev 5645)
@@ -1,20 +1,44 @@
-msgid "Clock"
-msgstr ""
-
-msgid "Clock."
-msgstr ""
-
-msgid "This plugin gives you the time."
-msgstr ""
-
-msgid "Current time is {0} hours and {1} minutes."
-msgstr ""
-
-msgid "Current time is {0} hours."
-msgstr ""
-
-msgid "Start every x from full hour"
-msgstr ""
-
-msgid "Start me every x (From full hour)"
+msgid "Clock"
msgstr ""
+
+msgid "Clock."
+msgstr ""
+
+msgid "This plugin gives you the time."
+msgstr ""
+
+msgid "Current time is {0} hours and {1} minutes."
+msgstr ""
+
+msgid "At the next top, it will be exactly {0} hours {1} ... TOP !"
+msgstr ""
+
+msgid "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+msgstr ""
+
+msgid "Current time is {0} o'clock"
+msgstr ""
+
+msgid "At the next top, it will be exactly {0} o'clock ... TOP !"
+msgstr ""
+
+msgid "It's midnight"
+msgstr ""
+
+msgid "It's noon"
+msgstr ""
+
+msgid "It's quarter past {0}"
+msgstr ""
+
+msgid "It's quarter to {0}"
+msgstr ""
+
+msgid "It's half past {0}"
+msgstr ""
+
+msgid "Start every x from full hour"
+msgstr ""
+
+msgid "Start me every x (From full hour)"
+msgstr ""
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 07:27:57
|
Author: ks156
Date: 2009-10-14 09:27:43 +0200 (Wed, 14 Oct 2009)
New Revision: 5644
Modified:
software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
Log:
* Improved the code with :
- Special sentences for xh15, xh30, xh45
- Special sentences for noon and midnight
- Added variations sentences for all other hours
Modified: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 07:24:12 UTC (rev 5643)
+++ software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/sources/net/karmaLab/tuxDroid/plugins/ClockPlugin.java 2009-10-14 07:27:43 UTC (rev 5644)
@@ -25,6 +25,7 @@
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.Random;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePlugin;
import com.kysoh.tuxdroid.plugin.framework.plugin.SimplePluginConfiguration;
@@ -39,6 +40,17 @@
* @throws Exception
* errors
*/
+
+ String[] normalSentences = {
+ "Current time is {0} hours and {1} minutes.",
+ "At the next top, it will be exactly {0} hours {1} ... TOP !",
+ "It's {1} hours and {0} minutes ... oops, {0} hours and {1} minutes"
+ };
+ String[] sharpSentences = {
+ "Current time is {0} o'clock",
+ "At the next top, it will be exactly {0} o'clock ... TOP !",
+ };
+
public static void main(String[] args) throws Exception {
new ClockPlugin().boot(args, new SimplePluginConfiguration());
}
@@ -59,12 +71,50 @@
calendar.setTime(new Date());
int h = calendar.get(Calendar.HOUR_OF_DAY);
int m = calendar.get(Calendar.MINUTE);
- if (m != 0) {
- throwMessage("Current time is {0} hours and {1} minutes.", h, m);
- } else {
- throwMessage("Current time is {0} hours.", h);
+
+ Random rand = new Random();
+ Boolean random = rand.nextBoolean();
+
+ if (m == 0)
+ {
+ if (h == 0)
+ throwMessage("It's midnight");
+ else if (h == 12)
+ throwMessage("It's noon");
+ else
+ throwMessage(this.pickUpWeatherSentence(sharpSentences), h);
+ }
+ else if (m == 15)
+ {
+ if (random)
+ throwMessage("It's quarter past {0}", h);
+ else
+ throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
}
+ else if (m == 30)
+ {
+ if (random)
+ throwMessage("It's half past {0}", h);
+ else
+ throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
+ }
+ else if (m == 45)
+ {
+ if (random)
+ throwMessage("It's quarter to {0}", (h + 1));
+ else
+ throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
+ }
+ else
+ {
+ throwMessage(this.pickUpWeatherSentence(normalSentences), h, m);
+ }
}
+
+ private String pickUpWeatherSentence(String[] list) {
+ Random rand = new Random();
+ return list[rand.nextInt(list.length)];
+ }
@Override
public void onPluginStop() {
|
|
From: ks156 <c2m...@c2...> - 2009-10-14 07:24:27
|
Author: ks156 Date: 2009-10-14 09:24:12 +0200 (Wed, 14 Oct 2009) New Revision: 5643 Added: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences/ Log: * Added a new branch for the random sentences. The purpose it to add variations in the way of giving the information. Copied: software_suite_v3/software/plugin/plugin-clock/branches/random_sentences (from rev 5642, software_suite_v3/software/plugin/plugin-clock/trunk) |
|
From: jerome <c2m...@c2...> - 2009-10-13 12:58:29
|
Author: jerome Date: 2009-10-13 14:58:17 +0200 (Tue, 13 Oct 2009) New Revision: 5642 Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po Log: * ?\195?\156berPr?\195?\188fen ==> ?\195?\156berpr?\195?\188fen. Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 09:50:14 UTC (rev 5641) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 12:58:17 UTC (rev 5642) @@ -29,10 +29,10 @@ msgstr "Mein Twitter-Konto überprüfen." msgid "Check your tweets from your Twitter account." -msgstr "ÜberPrüfen Sie Ihre Tweets." +msgstr "Überprüfen Sie Ihre Tweets." msgid "Start me every x" -msgstr "ÜberPrüfen Sie mein Twitter-Konto automatisch" +msgstr "Überprüfen Sie mein Twitter-Konto automatisch" msgid "You do not seem to be connected. Please, verify you username and password, then try again." msgstr "Anscheinend sind Sie nicht mit dem Internet verbunden. Prüfen Sie Benutzername und Passwort und versuchen Sie es danach wieder." |
|
From: jerome <c2m...@c2...> - 2009-10-13 09:50:28
|
Author: jerome
Date: 2009-10-13 11:50:14 +0200 (Tue, 13 Oct 2009)
New Revision: 5641
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Changed quit method.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 09:41:48 UTC (rev 5640)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 09:50:14 UTC (rev 5641)
@@ -224,7 +224,7 @@
{
this.throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
}
- this.stop();
+ this.quitGadget();
}
//Creating / getting sav context.
|
|
From: jerome <c2m...@c2...> - 2009-10-13 09:42:04
|
Author: jerome
Date: 2009-10-13 11:41:48 +0200 (Tue, 13 Oct 2009)
New Revision: 5640
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Added a protection in case of default password set.
* Updated de.po.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -2,13 +2,13 @@
msgstr "Twitter Plugin"
msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr ""
+msgstr "Dieses Twitter-Plugin weist Sie auf alle Aktualisierungen Ihres Twitter-Kontos hin."
msgid "Username"
msgstr "Benutzername"
msgid "Password"
-msgstr "Kennwort"
+msgstr "Passwort"
msgid "Tweet your new status"
msgstr "Tweeten Sie Ihren neuen Status"
@@ -17,59 +17,61 @@
msgstr "Tweeten Sie entsprechend dem Statustext"
msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo an Alle von meinem Twitter - Tux Droid"
+msgstr "Hallo an alle von meinem Twitter - Tux Droid"
msgid "Check Friends updates"
-msgstr ""
+msgstr "Freund Updates prüfen"
msgid "Check my messages/replies"
-msgstr ""
+msgstr "Nachrichten/Antworten überprüfen"
msgid "Check your Twitter account."
-msgstr ""
+msgstr "Mein Twitter-Konto überprüfen."
msgid "Check your tweets from your Twitter account."
-msgstr ""
+msgstr "ÜberPrüfen Sie Ihre Tweets."
msgid "Start me every x"
-msgstr "Alert"
+msgstr "ÜberPrüfen Sie mein Twitter-Konto automatisch"
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Anscheinend sind Sie nicht verbunden. Prüfen Sie Benutzername und Kennwort und versuchen Sie es wieder."
+msgstr "Anscheinend sind Sie nicht mit dem Internet verbunden. Prüfen Sie Benutzername und Passwort und versuchen Sie es danach wieder."
msgid "You have a new friend update"
-msgstr ""
+msgstr "Sie haben eine neue Freund Aktualisierung."
msgid "You have {0} friend updates"
-msgstr ""
+msgstr "Sie haben {0} Freund Aktualisierungen."
msgid "You don't have any friend updates."
-msgstr ""
+msgstr "Sie haben keine Freund Aktualisierungen."
msgid "You don't have any messages"
-msgstr ""
+msgstr "Sie haben keine Nachrichten."
msgid "You don't have any replies"
-msgstr ""
+msgstr "Sie haben keine Antworten."
msgid "Your new Tweet was not set, please, try again later"
-msgstr ""
+msgstr "Ihre neue Tweet wurde nicht hinzugefügt, versuchen Sie es später."
msgid "Your Tweet was added"
-msgstr ""
+msgstr "Ihre neue Tweet wurde hinzugefügt."
msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter ist ausgelastet, versuchen Sie es später."
+msgstr "Twitter ist ausgelastet, versuchen Sie es später wieder."
msgid "One reply from {0}"
-msgstr ""
+msgstr "Sie haben eine Antwort von {0}."
msgid "{0} replies from {1}"
-msgstr ""
+msgstr "Sie haben {0} Antworten von {1}."
msgid "One message from {0}"
-msgstr ""
+msgstr "Sie haben eine Nachricht von {0}."
msgid "{0} messages from {1}"
-msgstr ""
+msgstr "Sie haben {0} Nachrichten von {1}."
+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."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -17,10 +17,10 @@
msgstr "Tweet following status text"
msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hello all from my Tux Droid twitter gadget"
+msgstr "Hello all from my Tux Droid Twitter gadget."
msgid "Check Friends updates"
-msgstr "Check Friends updates"
+msgstr "Check friends updates"
msgid "Check my messages/replies"
msgstr "Check my messages/replies"
@@ -29,47 +29,50 @@
msgstr "Check my Twitter account."
msgid "Check your tweets from your Twitter account."
-msgstr "Check my tweets from your Twitter account."
+msgstr "Check my Tweets from my Twitter account."
msgid "Start me every x"
-msgstr "Alert"
+msgstr "Check my Twitter account automatically"
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
msgstr "You do not seem to be connected. Please, verify you username and password, then try again."
msgid "You have a new friend update"
-msgstr "You have a new friend update"
+msgstr "You have a new friends update."
msgid "You have {0} friend updates"
-msgstr "You have {0} friend updates"
+msgstr "You have {0} friends updates."
msgid "You don't have any friend updates."
-msgstr "You don't have any friend updates."
+msgstr "You don't have any friends updates."
msgid "You don't have any messages"
-msgstr "You don't have any messages"
+msgstr "You don't have any messages."
msgid "You don't have any replies"
-msgstr "You don't have any replies"
+msgstr "You don't have any replies."
msgid "Your new Tweet was not set, please, try again later"
-msgstr "Your new Tweet was not set, please, try again later"
+msgstr "Your new Tweet was not set, please, try again later."
msgid "Your Tweet was added"
-msgstr "Your Tweet was added"
+msgstr "Your Tweet was added."
msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is busy for now, please, try later."
+msgstr "Twitter is busy for now, please, try again later."
msgid "One reply from {0}"
-msgstr "One reply from {0}"
+msgstr "One reply from {0}."
msgid "{0} replies from {1}"
-msgstr "{0} replies from {1}"
+msgstr "{0} replies from {1}."
msgid "One message from {0}"
-msgstr "One message from {0}"
+msgstr "One message from {0}."
msgid "{0} messages from {1}"
-msgstr "{0} messages from {1}"
+msgstr "{0} messages from {1}."
+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."
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -32,7 +32,7 @@
msgstr "Vérifier vos Tweets"
msgid "Start me every x"
-msgstr "Alerte"
+msgstr "Vérifier automatiquement mon compte Twitter."
msgid "You do not seem to be connected. Please, verify you username and password, then try again."
msgstr "Il semble que vous ne soyez pas connecté. Vérifiez votre login et votre mot de passe et essayez à nouveau."
@@ -73,3 +73,7 @@
msgid "{0} messages from {1}"
msgstr "{0} messages de {1}"
+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"
+
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/nl.po 2009-10-13 09:41:48 UTC (rev 5640)
@@ -1,74 +1,77 @@
-msgid "Twitter Plugin"
-msgstr "Twitter Plugin"
-
-msgid "The Twitter plugin will make Tux Droid check your Twitter account."
-msgstr "De Twitter plugin zal Tux Droid je tweets doen lezen op je Twitter account."
-
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-msgid "Password"
-msgstr "Wachtwoord"
-
-msgid "Tweet your new status"
-msgstr "Tweet je nieuwe status"
-
-msgid "Tweet following status text"
-msgstr "Tweet volgende status tekst"
-
-msgid "Hello all from my Tux Droid twitter gadget"
-msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
-
-msgid "Check Friends updates"
-msgstr "Check voor vriend updates"
-
-msgid "Check my messages/replies"
-msgstr "Check mijn berichten/antwoorden"
-
-msgid "Check your Twitter account."
-msgstr "Check je Twitter account."
-
-msgid "Check your tweets from your Twitter account."
-msgstr "Check je tweets van je Twitter account."
-
-msgid "Start me every x"
-msgstr "Start me elke x"
-
-msgid "You do not seem to be connected. Please, verify you username and password, then try again."
-msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
-
-msgid "You have a new friend update"
-msgstr "Je hebt een nieuwe vriend update"
-
-msgid "You have {0} friend updates"
-msgstr "Je hebt {0} vriend updates"
-
-msgid "You don't have any friend updates."
-msgstr "Je hebt geen vriend updates."
-
-msgid "You don't have any messages"
-msgstr "Je hebt geen berichten"
-
-msgid "You don't have any replies"
-msgstr "Je hebt geen antwoorden"
-
-msgid "Your new Tweet was not set, please, try again later"
-msgstr "Je nieuwe Tweet werd niet toegevoegd, probeer later opnieuw"
-
-msgid "Your Tweet was added"
-msgstr "Je Tweet werd toegevoegd"
-
-msgid "Twitter is busy for now, please, try later."
-msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
-
-msgid "One reply from {0}"
-msgstr "1 antwoord van {0}"
-
-msgid "{0} replies from {1}"
-msgstr "{0} antwoorden van {1}"
-
-msgid "One message from {0}"
-msgstr "1 bericht van {0}"
-
-msgid "{0} messages from {1}"
-msgstr "{0} berichten van {1}"
\ No newline at end of file
+msgid "Twitter Plugin"
+msgstr "Twitter Plugin"
+
+msgid "The Twitter plugin will make Tux Droid check your Twitter account."
+msgstr "De Twitter plugin zal Tux Droid je Twitter account laten checken."
+
+msgid "Username"
+msgstr "Gebruikersnaam"
+
+msgid "Password"
+msgstr "Wachtwoord"
+
+msgid "Tweet your new status"
+msgstr "Tweet je nieuwe status"
+
+msgid "Tweet following status text"
+msgstr "Tweet volgende status tekst"
+
+msgid "Hello all from my Tux Droid twitter gadget"
+msgstr "Hallo allemaal van mijn Tux Droid Twitter gadget"
+
+msgid "Check Friends updates"
+msgstr "Check wijzigingen van vrienden"
+
+msgid "Check my messages/replies"
+msgstr "Check mijn berichten/ antwoorden"
+
+msgid "Check your Twitter account."
+msgstr "Check mijn Twitter account."
+
+msgid "Check your tweets from your Twitter account."
+msgstr "Check mijn Tweets op mijn Twitter account."
+
+msgid "Start me every x"
+msgstr "Check mijn Twitter account automatisch"
+
+msgid "You do not seem to be connected. Please, verify you username and password, then try again."
+msgstr "Ik kan geen verbinding maken. Controleer of je gebruikersnaam en wachtwoord correct zijn ingegeven."
+
+msgid "You have a new friend update"
+msgstr "je hebt een nieuwe vriend status wijziging"
+
+msgid "You have {0} friend updates"
+msgstr "Je hebt {0} vrienden status wijzigingen."
+
+msgid "You don't have any friend updates."
+msgstr "Je hebt geen vrienden status wijzigingen."
+
+msgid "You don't have any messages"
+msgstr "Je hebt geen nieuwe berichten."
+
+msgid "You don't have any replies"
+msgstr "Je hebt geen nieuwe antwoorden."
+
+msgid "Your new Tweet was not set, please, try again later"
+msgstr "Je nieuwe Tweet werd niet geplaatst, probeer later opnieuw."
+
+msgid "Your Tweet was added"
+msgstr "Je nieuwe Tweet werd toegevoegd."
+
+msgid "Twitter is busy for now, please, try later."
+msgstr "Twitter is bezet op het ogenblik, probeer later opnieuw."
+
+msgid "One reply from {0}"
+msgstr "Je hebt 1 antwoord van {0}."
+
+msgid "{0} replies from {1}"
+msgstr "{0} antwoorden van {1}."
+
+msgid "One message from {0}"
+msgstr "1 bericht van {0}."
+
+msgid "{0} messages from {1}"
+msgstr "{0} berichten van {1}."
+
+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."
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/plugin.pot 2009-10-13 09:41:48 UTC (rev 5640)
@@ -73,3 +73,6 @@
msgid "{0} messages from {1}"
msgstr ""
+msgid "Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration."
+msgstr ""
+
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/Configuration.java 2009-10-13 09:41:48 UTC (rev 5640)
@@ -34,7 +34,10 @@
private boolean checkFriends = true;
private boolean checkMessages = true;
+ private String defaultUser = "your_user_name";
+ private String defaultPassword = "_secret_";
+
/**
* Sets the username.
* @param username
@@ -51,6 +54,11 @@
*/
public String getUsername()
{
+ if (this.username.equalsIgnoreCase(this.defaultUser))
+ {
+ return null;
+ }
+
return this.username;
}
@@ -71,6 +79,10 @@
*/
public String getPassword()
{
+ if (this.password.equalsIgnoreCase(this.defaultPassword))
+ {
+ return null;
+ }
return this.password;
}
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 08:23:47 UTC (rev 5639)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-13 09:41:48 UTC (rev 5640)
@@ -217,6 +217,16 @@
@Override
protected void start() throws Throwable
{
+
+ if(( this.configuration().getPassword() == null) || (this.configuration().getUsername() == null))
+ {
+ if( ! this.getCommand().equalsIgnoreCase("check"))
+ {
+ this.throwMessage("Sorry, there was an error when connecting to Twitter. Please check your Twitter configuration.");
+ }
+ this.stop();
+ }
+
//Creating / getting sav context.
savedStruct = new TwitterDatasStruct(this.configuration().getUsername());
|
|
From: remi <c2m...@c2...> - 2009-10-13 08:23:59
|
Author: remi
Date: 2009-10-13 10:23:47 +0200 (Tue, 13 Oct 2009)
New Revision: 5639
Modified:
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/de.po
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/en.po
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/fr.po
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.pot
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.xml
software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/nl.po
Log:
* Updated gadget according to the recent changes of the webradio plugin
* Defined french radios list
* Defined german radios list
* Other languages uses french radios
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/de.po
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/de.po 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/de.po 2009-10-13 08:23:47 UTC (rev 5639)
@@ -6,3 +6,6 @@
msgid "This gadget will turn Tux Droid into a webradio."
msgstr "Diese Funktion macht aus Ihrem Tux Droid ein Webradio."
+
+msgid "enum_radios_list"
+msgstr "WDR1 Live,WDR2,Radio2Day,Rockland Digital,Hit Radio FFH,Antenne Bayern,N-JOY,HR3,Radio ffn,Radio Charivari,BR 3"
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/en.po
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/en.po 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/en.po 2009-10-13 08:23:47 UTC (rev 5639)
@@ -6,3 +6,6 @@
msgid "This gadget will turn Tux Droid into a webradio."
msgstr "This gadget will turn Tux Droid into a webradio."
+
+msgid "enum_radios_list"
+msgstr "France Inter,RMC Info,France Info,France Culture,Le Mouv,France Musique,France Bleu,Fun Radio,Skyrock"
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/fr.po
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/fr.po 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/fr.po 2009-10-13 08:23:47 UTC (rev 5639)
@@ -6,3 +6,6 @@
msgid "This gadget will turn Tux Droid into a webradio."
msgstr "Ce gadget transforme votre Tux Droid en lecteur de radios internet."
+
+msgid "enum_radios_list"
+msgstr "France Inter,RMC Info,France Info,France Culture,Le Mouv,France Musique,France Bleu,Fun Radio,Skyrock"
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.pot
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.pot 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.pot 2009-10-13 08:23:47 UTC (rev 5639)
@@ -6,3 +6,6 @@
msgid "This gadget will turn Tux Droid into a webradio."
msgstr ""
+
+msgid "enum_radios_list"
+msgstr ""
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.xml
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.xml 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/gadget.xml 2009-10-13 08:23:47 UTC (rev 5639)
@@ -10,11 +10,11 @@
<platform>all</platform>
<ttsName>Webradio.</ttsName>
<uuid>5c5e7e0d-89c5-8799-3175-df2bddf5653c</uuid>
- <version>0.0.8</version>
+ <version>0.0.10</version>
</description>
<parameters>
<param_00>
- <defaultValue>http://viphttp.yacast.net/V4/radiofrance/franceinter_hd.m3u</defaultValue>
+ <defaultValue>http://players.tv-radio.com/metafichiers/france_inter_mp3-128k.m3u</defaultValue>
<name>url</name>
<visible>true</visible>
</param_00>
@@ -24,7 +24,7 @@
<visible>true</visible>
</param_01>
<param_02>
- <defaultValue>France-Inter</defaultValue>
+ <defaultValue>France Inter</defaultValue>
<name>radio</name>
<visible>true</visible>
</param_02>
@@ -37,7 +37,7 @@
<parentPlugin>
<url>http://ftp.kysoh.com/</url>
<uuid>8349ed52-572d-4c3f-a7b8-05c2a8aec2c6</uuid>
- <version>0.0.8</version>
+ <version>0.0.10</version>
</parentPlugin>
<tasks>
<task_00>
Modified: software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/nl.po
===================================================================
--- software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/nl.po 2009-10-13 08:21:11 UTC (rev 5638)
+++ software_suite_v3/software/gadget/default/trunk/gadget_5c5e7e0d-89c5-8799-3175-df2bddf5653c/nl.po 2009-10-13 08:23:47 UTC (rev 5639)
@@ -6,3 +6,6 @@
msgid "This gadget will turn Tux Droid into a webradio."
msgstr "Deze gadget verandert je Tux Droid in een webradio."
+
+msgid "enum_radios_list"
+msgstr "France Inter,RMC Info,France Info,France Culture,Le Mouv,France Musique,France Bleu,Fun Radio,Skyrock"
|
|
From: remi <c2m...@c2...> - 2009-10-13 08:21:22
|
Author: remi
Date: 2009-10-13 10:21:11 +0200 (Tue, 13 Oct 2009)
New Revision: 5638
Modified:
software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml
Log:
* Disabled locutor selection from configuration
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-13 08:17:00 UTC (rev 5637)
+++ software_suite_v3/software/gadget/default/trunk/gadget_59cce412-9224-639c-d64d-9d25de84b960/gadget.xml 2009-10-13 08:21:11 UTC (rev 5638)
@@ -16,7 +16,7 @@
<param_00>
<defaultValue> </defaultValue>
<name>locutor</name>
- <visible>true</visible>
+ <visible>false</visible>
</param_00>
<param_01>
<defaultValue>Brussels</defaultValue>
|
|
From: remi <c2m...@c2...> - 2009-10-13 08:17:10
|
Author: remi
Date: 2009-10-13 10:17:00 +0200 (Tue, 13 Oct 2009)
New Revision: 5637
Modified:
software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py
Log:
* Fixed date of the changes
Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py
===================================================================
--- software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py 2009-10-13 08:16:01 UTC (rev 5636)
+++ software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py 2009-10-13 08:17:00 UTC (rev 5637)
@@ -58,7 +58,7 @@
2009/08/31 - version 0.0.9:
- Added method to clean mplayer instances at plugin exit (Windows)
-2009/08/31 - version 0.0.10:
+2009/10/13 - version 0.0.10:
- Get radio urls from kysoh ftp
- Avoiding radios with url marked as "DISABLED" (Configured in the ftp file)
- Added message about internet connection error (radios list not retrieved from ftp)
|
|
From: remi <c2m...@c2...> - 2009-10-13 08:16:13
|
Author: remi Date: 2009-10-13 10:16:01 +0200 (Tue, 13 Oct 2009) New Revision: 5636 Removed: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py software_suite_v3/software/plugin/plugin-webradio/trunk/resources/de.po software_suite_v3/software/plugin/plugin-webradio/trunk/resources/en.po software_suite_v3/software/plugin/plugin-webradio/trunk/resources/fr.po software_suite_v3/software/plugin/plugin-webradio/trunk/resources/nl.po software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.pot software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml Log: * Get radio urls from kysoh ftp * Avoiding radios with url marked as "DISABLED" (Configured in the ftp file) * Added message about internet connection error (radios list not retrieved from ftp) * Radios list defined by gadgets * Radios list can be specific to a language * Radio name can be != than radio tts name (Configured in the ftp file) * Not compatible with the previous version ! Deleted: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/executables/WebRadioList.py 2009-10-13 08:16:01 UTC (rev 5636) @@ -1,12 +0,0 @@ -# Web radios dictionary -WEBRADIO = [ - ["France-Inter", "http://viphttp.yacast.net/V4/radiofrance/franceinter_hd.m3u"], - ["RMC-Info", "http://cache.yacast.fr/V4/rmc/rmc.m3u"], - ["France-Info", "http://viphttp.yacast.net/V4/radiofrance/franceinfo_bd.m3u"], - ["France-Culture", "http://viphttp.yacast.net/V4/radiofrance/franceculture_hd.m3u"], - ["Le-Mouv", "http://viphttp.yacast.net/V4/radiofrance/lemouv_hd.m3u"], - ["France-Musique", "http://viphttp.yacast.net/V4/radiofrance/francemusique_hd.m3u"], - ["France-Bleu-Ile-de-France", "http://viphttp.yacast.net/V4/radiofrance/francebleu_idf_hd.m3u"], - ["Fun-Radio", "http://92.61.164.12:80/fun-1-44-96"], - ["Skyrock", "mms://vipmms9.yacast.net/encoderskyrock"], -] Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/executables/plugin-webradio.py 2009-10-13 08:16:01 UTC (rev 5636) @@ -55,9 +55,17 @@ 2009/06/29 - version 0.0.8: - Added support of webradio address - + 2009/08/31 - version 0.0.9: - Added method to clean mplayer instances at plugin exit (Windows) +2009/08/31 - version 0.0.10: + - Get radio urls from kysoh ftp + - Avoiding radios with url marked as "DISABLED" (Configured in the ftp file) + - Added message about internet connection error (radios list not retrieved from ftp) + - Radios list defined by gadgets + - Radios list can be specific to a language + - Radio name can be != than radio tts name (Configured in the ftp file) + - Not compatible with the previous version ! """ __author__ = "Eric Lescaudron AKA Gwadavel" @@ -76,7 +84,8 @@ from util.SimplePlugin.SimplePluginConfiguration import SimplePluginConfiguration from util.SimplePlugin.SimplePlugin import SimplePlugin from util.player.mplayer.Mplayer import Mplayer -from WebRadioList import WEBRADIO +from util.misc.URLTools import * +from util.misc.DirectoriesAndFilesTools import * class Configuration(SimplePluginConfiguration): @@ -85,6 +94,7 @@ self.__radio = "France-Inter" self.__url = "http://viphttp.yacast.net/V4/radiofrance/franceinter_hd.m3u" self.__modeUrl = False + self.__radios = "NRJ,Skyrock,Fun radio,France-Inter,RFM,France-Info,France-Culture" def getRadio(self): return self.__radio @@ -92,6 +102,12 @@ def setRadio(self, radio): self.__radio = radio + def getRadios(self): + return self.__radios + + def setRadios(self, radios): + self.__radios = radios + def getUrl(self): return self.__url @@ -110,8 +126,12 @@ SimplePlugin.__init__(self) self.__player = Mplayer() self.__currentRadioIndex = -1 + self.__onlineRadiosList = None + self.__radiosList = [] + self.__getRadioListFromFtp() def start(self): + self.__buildRadiosList() if self.getCommand() == "run": self.run() else: @@ -120,6 +140,42 @@ def run(self): self.__doExecute() + def __getRadioListFromFtp(self): + if self.__onlineRadiosList == None: + # Download radios list + RMFile("radiosList") + URLDownloadToFile("http://ftp.kysoh.com/misc/other/web_radios/radiosList", "radiosList") + if not os.path.isfile("radiosList"): + return + # Load radios list + try: + f = open("radiosList", "r") + try: + self.__onlineRadiosList = eval(f.read()) + + finally: + f.close() + except: + return + + def __buildRadiosList(self): + self.__radiosList = [] + if self.__onlineRadiosList != None: + radios = self.configuration().getRadios().split(",") + for radio in radios: + for oradio in self.__onlineRadiosList: + oradioName = oradio[0] + oradioUrl = oradio[1] + oradioTts = oradio[2] + if oradioUrl == "DISABLED": + continue + if oradioName == radio: + if oradioTts == "": + oradioTts = oradioName + self.__radiosList.append([oradioName, oradioUrl, oradioTts]) + else: + self.throwMessage("Sorry, I could not connect to the webradio. Please check your internet connection or try again later.") + def __doExecute(self): self.__defaultWebRadio() @@ -135,21 +191,28 @@ self.__currentRadioIndex = 0 myRadio = self.configuration().getRadio() radioUrl = myRadio - for i, radio in enumerate(WEBRADIO): + for i, radio in enumerate(self.__radiosList): if radio[0] == myRadio: self.__currentRadioIndex = i radioUrl = radio[1] + if radioUrl == myRadio: + if len(self.__radiosList) > 0: + myRadio = self.__radiosList[0][2] + radioUrl = self.__radiosList[0][1] + self.__currentRadioIndex = 0 + else: + return self.__speakRadioName(myRadio) self.__player.start(radioUrl, True) def __nextWebRadio(self): # Get next webradio url nextIndex = self.__currentRadioIndex + 1 - if nextIndex >= len(WEBRADIO): + if nextIndex >= len(self.__radiosList): nextIndex = 0 self.__currentRadioIndex = nextIndex - radioUrl = WEBRADIO[self.__currentRadioIndex][1] - radioName = WEBRADIO[self.__currentRadioIndex][0] + radioUrl = self.__radiosList[self.__currentRadioIndex][1] + radioName = self.__radiosList[self.__currentRadioIndex][2] # Stop current web radio self.__player.stop() self.__speakRadioName(radioName) @@ -159,10 +222,10 @@ # Get next webradio url nextIndex = self.__currentRadioIndex - 1 if nextIndex < 0: - nextIndex = len(WEBRADIO) - 1 + nextIndex = len(self.__radiosList) - 1 self.__currentRadioIndex = nextIndex - radioUrl = WEBRADIO[self.__currentRadioIndex][1] - radioName = WEBRADIO[self.__currentRadioIndex][0] + radioUrl = self.__radiosList[self.__currentRadioIndex][1] + radioName = self.__radiosList[self.__currentRadioIndex][2] # Stop current web radio self.__player.stop() self.__speakRadioName(radioName) Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/de.po 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/de.po 2009-10-13 08:16:01 UTC (rev 5636) @@ -21,3 +21,9 @@ msgid "Uses webradio as alarm" msgstr "Nutzt das Webradio als Radiowecker" + +msgid "enum_radios_list" +msgstr "NRJ,Skyrock,Fun radio,France-Inter,RFM,France-Info,France-Culture" + +msgid "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." +msgstr "Sorry, Verbindung zum Webradio nicht möglich. Prüfen Sie die Internet-Verbindung oder versuchen Sie es später." Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/en.po 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/en.po 2009-10-13 08:16:01 UTC (rev 5636) @@ -14,10 +14,16 @@ msgstr "Webradio address url" msgid "Using the webradio URL" -msgstr "Use address url" +msgstr "Use address url" msgid "Clock radio" msgstr "Clock radio" msgid "Uses webradio as alarm" msgstr "Use the webradio as a clock radio" + +msgid "enum_radios_list" +msgstr "NRJ,Skyrock,Fun radio,France-Inter,RFM,France-Info,France-Culture" + +msgid "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." +msgstr "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/fr.po 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/fr.po 2009-10-13 08:16:01 UTC (rev 5636) @@ -21,3 +21,9 @@ msgid "Uses webradio as alarm" msgstr "Utiliser une webradio en tant que réveil" + +msgid "enum_radios_list" +msgstr "NRJ,Skyrock,Fun radio,France-Inter,RFM,France-Info,France-Culture" + +msgid "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." +msgstr "Désolé, je ne peux pas me connecter à la radio internet. Merci de controler votre connexion internet ou de réessayer plus tard." Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/nl.po =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/nl.po 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/nl.po 2009-10-13 08:16:01 UTC (rev 5636) @@ -14,10 +14,16 @@ msgstr "Webradio adres url" msgid "Using the webradio URL" -msgstr "Gebruik adres url" +msgstr "Gebruik adres url" msgid "Clock radio" msgstr "Klok radio" msgid "Uses webradio as alarm" msgstr "Gebruik de webradio als alarm klok" + +msgid "enum_radios_list" +msgstr "NRJ,Skyrock,Fun radio,France-Inter,RFM,France-Info,France-Culture" + +msgid "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." +msgstr "Sorry, ik kan geen connectie maken met de webradio. Controleer je internet connectie of probeer later opnieuw." Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.pot =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.pot 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.pot 2009-10-13 08:16:01 UTC (rev 5636) @@ -14,10 +14,16 @@ msgstr "" msgid "Using the webradio URL" -msgstr "" +msgstr "" msgid "Clock radio" msgstr "" msgid "Uses webradio as alarm" msgstr "" + +msgid "enum_radios_list" +msgstr "" + +msgid "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." +msgstr "Sorry, I could not connect to the webradio. Please check your internet connection or try again later." Modified: software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml =================================================================== --- software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml 2009-10-12 13:33:20 UTC (rev 5635) +++ software_suite_v3/software/plugin/plugin-webradio/trunk/resources/plugin.xml 2009-10-13 08:16:01 UTC (rev 5636) @@ -17,7 +17,7 @@ <parameter name="radio" description="Select a webradio" - type="enum(France-Bleu-Ile-de-France,France-Culture,France-Info,France-Inter,France-Musique,Le-Mouv,RMC-Info,Fun-Radio,Skyrock)" + type="enum(enum_radios_list)" defaultValue="France-Inter" /> <parameter name="url" @@ -29,6 +29,12 @@ description="Using the webradio URL" type="boolean" defaultValue="false" /> + <parameter + name="radios" + description="Internal" + type="string" + defaultValue="enum_radios_list" + visible="false" /> </parameters> <commands> <command |
|
From: jerome <c2m...@c2...> - 2009-10-12 14:06:33
|
Author: jerome
Date: 2009-10-12 15:33:20 +0200 (Mon, 12 Oct 2009)
New Revision: 5635
Modified:
software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
Log:
* Added tts exception for first check cycle.
Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java
===================================================================
--- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-12 11:42:51 UTC (rev 5634)
+++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/src/TwitterPlugin.java 2009-10-12 13:33:20 UTC (rev 5635)
@@ -21,8 +21,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.List;
import java.util.Vector;
@@ -211,8 +209,8 @@
{
this.throwed = true;
this.throwResult(true);
+ this.throwMessage("Twitter");
}
- this.throwMessage("Twitter");
}
@@ -222,6 +220,8 @@
//Creating / getting sav context.
savedStruct = new TwitterDatasStruct(this.configuration().getUsername());
+ boolean secondCycle = ( this.getCommand().equalsIgnoreCase("check") && savedStruct.isFirstCycle() ) ? false : true;
+
/***
* Getting connected to twitter and setting update source ( here TuxDroid ).
***/
@@ -240,23 +240,28 @@
if(this.configuration().getCheckFriends())
{
int updateCount = getNewFriendStatusesCount(twitter);
-
- if ( updateCount == 1 )
+
+ //First check insilent mode.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
{
- throwRes();
- throwMessage("You have a new friend update");
- }
- else if ( updateCount > 1 )
- {
- throwRes();
- throwMessage("You have {0} friend updates", String.valueOf(updateCount));
- }
- else
- {
- if ( ! this.getCommand().equalsIgnoreCase("check") )
+
+ if ( updateCount == 1 )
{
- throwMessage("You don't have any friend updates.");
+ throwRes();
+ throwMessage("You have a new friend update");
}
+ else if ( updateCount > 1 )
+ {
+ throwRes();
+ throwMessage("You have {0} friend updates", String.valueOf(updateCount));
+ }
+ else
+ {
+ if ( ! this.getCommand().equalsIgnoreCase("check") )
+ {
+ throwMessage("You don't have any friend updates.");
+ }
+ }
}
}
@@ -269,10 +274,13 @@
{
if ( getPrivateMessagesCount(twitter) > 0 )
{
-
- this.sort(this.messagesList);
- //Counting by name and throwing messages.
- this.getByNames(this.messagesList, MESSAGE);
+ //First check insilent mode.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
+ {
+ this.sort(this.messagesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.messagesList, MESSAGE);
+ }
}
else
{
@@ -285,9 +293,13 @@
//Getting and sorting new user replies.
if ( getPublicMessagesCount(twitter) > 0 )
{
- this.sort(this.repliesList);
- //Counting by name and throwing messages.
- this.getByNames(this.repliesList, REPLY);
+ //First check insilent mode.
+ if(this.getCommand().equalsIgnoreCase("run") || secondCycle)
+ {
+ this.sort(this.repliesList);
+ //Counting by name and throwing messages.
+ this.getByNames(this.repliesList, REPLY);
+ }
}
else
{
|
|
From: remi <c2m...@c2...> - 2009-10-12 11:43:04
|
Author: remi Date: 2009-10-12 13:42:51 +0200 (Mon, 12 Oct 2009) New Revision: 5634 Modified: software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/de.wiki software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/en.wiki software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/fr.wiki software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/help.wiki software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/nl.wiki Log: * Updated help files Modified: software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/de.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/de.wiki 2009-10-12 11:27:30 UTC (rev 5633) +++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/de.wiki 2009-10-12 11:42:51 UTC (rev 5634) @@ -1,8 +1,13 @@ -= Hilfe = -Mit dieser Funktion liest Tux Droid Absender und Gegenstand der für Sie eingehenden E-Mail vor. += Beschreibung = +Mit der Gmail-Funktion kann Tux Droid Ihre E-Mails prüfen. -Mehrere Einstellungen können in der Konfiguration geändert werden: -* Login Ihres E-Mail-Kontos -* Kennwort Ihres E-Mail-Kontos -* Geben Sie einen Jingle für die automatische E-Mail-Prüfung durch Ihren Tux Droid an -* Geben Sie an, dass Ihre Mailbox automatisch geprüft werden soll und an welchen Tagen += Funktionseinstellungen = +* '''Funktionsname :''' Damit können Sie die Gadget-Namen zu ändern. +* '''Benutzername :''' Login Ihres Gmail-Kontos. +* '''Kennwort :''' Kennwort Ihres Gmail-Kontos. +* '''Diese Gadget wird in die Favoritenliste aufgenommen :''' Diese Option aktivieren, um die Funktion in Ihrer Favoriten- +Liste hinzufügen. + += Hinweise = +* '''Prüfen Sie mein Gmail-Konto automatisch :''' Geben Sie an, dass Ihre Mailbox automatisch geprüft werden soll. +* '''Ankündigungsmeldungen :''' Geben sie einen Attitune für die automatische Gmail-Prüfung durch Ihren Tux Droid an. \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/en.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/en.wiki 2009-10-12 11:27:30 UTC (rev 5633) +++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/en.wiki 2009-10-12 11:42:51 UTC (rev 5634) @@ -1,8 +1,12 @@ -= Help = += Description = This gadget makes Tux Droid read the sender and the subject of your incoming E-mail. -Several settings can be changed in the configuration : -* Your E-mail account login -* Your E-mail account password -* Specify an introduction attitune for when Tux Droid is checking your E-mail automatically -* Specify to check your mail box automaticaly and on which days \ No newline at end of file += Settings = +* '''Gadget name :''' Let's you modify the gadget name. +* '''Username :''' Enter your Gmail account login. +* '''Password :''' Enter your Gmail account password. +* '''Add this gadget to My Favorites list :''' To make the gadget accessible with the remote control and Tux Droid. + += Alerts = +* '''Check my Gmail account automatically :''' Tux Droid will check for new E-mail 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_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/fr.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/fr.wiki 2009-10-12 11:27:30 UTC (rev 5633) +++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/fr.wiki 2009-10-12 11:42:51 UTC (rev 5634) @@ -1,8 +1,12 @@ -= Aide = += Description = Ce gadget permet à Tux droid de lire l'expéditeur et le sujet de votre courrier entrant. -Voici les options que vous pouvez configurer : -* Votre login de connexion -* Votre mot de passe de connexion -* Une vérification automatique de vos E-mails -* Une attitune d'introduction lorsque Tux Droid vérifie automatiquement vos E-mails += Paramètres = +* '''Nom du gadget :''' Modifier le nom du gadget. +* '''Nom de l´utilisateur :''' Entrer votre login de connexion. +* '''Mot de passe :''' Entrer votre mot de passe de connexion. +* '''Ce gadget sera placé dans la liste des favoris :''' Pour rendre le gadget accessible avec la télécommande et Tux Droid. + += Alertes = +* '''M´avertir des nouveux messages en temps réel :''' Tux Droid va vérifier l'arrivé de vos nouveaux messages. +* '''Introdution des alertes :''' Spécifie une attitune en introduction des messages d'alerte du gadget. \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/help.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/help.wiki 2009-10-12 11:27:30 UTC (rev 5633) +++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/help.wiki 2009-10-12 11:42:51 UTC (rev 5634) @@ -1,8 +1,12 @@ -= Help = += Description = This gadget makes Tux Droid read the sender and the subject of your incoming E-mail. -Several settings can be changed in the configuration : -* Your E-mail account login -* Your E-mail account password -* Specify an introduction attitune for when Tux Droid is checking your E-mail automatically -* Specify to check your mail box automaticaly and on which days \ No newline at end of file += Settings = +* '''Gadget name :''' Let's you modify the gadget name. +* '''Username :''' Enter your Gmail account login. +* '''Password :''' Enter your Gmail account password. +* '''Add this gadget to My Favorites list :''' To make the gadget accessible with the remote control and Tux Droid. + += Alerts = +* '''Check my Gmail account automatically :''' Tux Droid will check for new E-mail 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_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/nl.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/nl.wiki 2009-10-12 11:27:30 UTC (rev 5633) +++ software_suite_v3/software/gadget/default/trunk/gadget_06d0b3ba-7781-4d2d-bd48-520cfa18e0c9/nl.wiki 2009-10-12 11:42:51 UTC (rev 5634) @@ -1,8 +1,12 @@ -= Help = -Met deze gadget kan Tux Droid de afzender en het onderwerp van jouw E-mails lezen. += Beschrijving = +Met deze gadget kan Tux Droid de afzender en het onderwerp van je E-mails lezen. -Verschillende instellingen kunnen aangepast worden in de configuratie : -* Jouw E-mail account login -* Jouw E-mail account wachtwoord -* Kies een introductie attitune voor wanneer Tux Droid je mail automatisch checkt -* Kies of je jouw E-mail automatisch wil laten checken en op welke dagen \ No newline at end of file += Configuratie = +* '''Gadget naam :''' Hier kan je de naam van de gadget wijzigen. +* '''Gebruikersnaam :''' Geef je Gmail account login in. +* '''Wachtwoord :''' Geef je Gmail account wachtwoord in. +* '''Plaats deze gadget in mijn Favorieten :''' Om de gadget met de afstandsbediening of via Tux Droid te starten. + += Alarmen = +* '''Check mijn Gmail account automatisch :''' Tux Droid zal je E-mail automatisch te checken. +* '''Introductie attitune :''' Selecteer een introductie attitune voor wanneer de gadget automatisch gestart wordt. \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-10-12 11:27:47
|
Author: remi Date: 2009-10-12 13:27:30 +0200 (Mon, 12 Oct 2009) New Revision: 5633 Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki Log: * Updated 'en' help file Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki 2009-10-12 11:22:08 UTC (rev 5632) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/en.wiki 2009-10-12 11:27:30 UTC (rev 5633) @@ -1,9 +1,13 @@ -= Help = += Description = This gadget makes Tux Droid read the sender and the subject of your incoming E-mail. -Several settings can be changed in the configuration : -* The address of your E-mail server -* Your E-mail account login -* Your E-mail account password -* Specify an introduction attitune for when Tux Droid is checking your E-mail automatically -* Specify to check your mail box automaticaly and on which days \ No newline at end of file += Settings = +* '''Gadget name :''' Let's you modify the gadget name. +* '''Server host :''' Enter the address of your E-mail server. +* '''Username :''' Enter your E-mail account login. +* '''Password :''' Enter your E-mail account password. +* '''Add this gadget to My Favorites list :''' To make the gadget accessible with the remote control and Tux Droid. + += Alerts = +* '''Check my E-mail account automatically :''' Tux Droid will check for new E-mail by himself. +* '''Introduction attitune :''' Specify an introduction attitune for when the gadget is started automatically. \ No newline at end of file |
|
From: remi <c2m...@c2...> - 2009-10-12 11:22:23
|
Author: remi Date: 2009-10-12 13:22:08 +0200 (Mon, 12 Oct 2009) New Revision: 5632 Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki Log: * Updated help files Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki 2009-10-12 09:31:57 UTC (rev 5631) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/de.wiki 2009-10-12 11:22:08 UTC (rev 5632) @@ -1,9 +1,14 @@ -= Hilfe = -Mit dieser Funktion liest Tux Droid Absender und Gegenstand der für Sie eingehenden E-Mail vor. += Beschreibung = +Mit der E-Mail-Funktion kann Tux Droid Ihre E-Mails prüfen. -Mehrere Einstellungen können in der Konfiguration geändert werden: -* Adresse Ihres E-Mail-Servers -* Login Ihres E-Mail-Kontos -* Kennwort Ihres E-Mail-Kontos -* Geben Sie einen Jingle für die automatische E-Mail-Prüfung durch Ihren Tux Droid an -* Geben Sie an, dass Ihre Mailbox automatisch geprüft werden soll und an welchen Tagen += Funktionseinstellungen = +* '''Funktionsname :''' Damit können Sie die Gadget-Namen zu ändern. +* '''Server Host :''' Adresse Ihres E-Mail-Servers. +* '''Benutzername :''' Login Ihres E-Mail-Kontos. +* '''Kennwort :''' Kennwort Ihres E-Mail-Kontos. +* '''Diese Gadget wird in die Favoritenliste aufgenommen :''' Diese Option aktivieren, um die Funktion in Ihrer Favoriten- +Liste hinzufügen. + += Hinweise = +* '''Prüfen Sie mein Email-Konto automatisch :''' Geben Sie an, dass Ihre Mailbox automatisch geprüft werden soll. +* '''Ankündigungsmeldungen :''' Geben sie einen Attitune für die automatische E-Mail-Prüfung durch Ihren Tux Droid an. \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki 2009-10-12 09:31:57 UTC (rev 5631) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/fr.wiki 2009-10-12 11:22:08 UTC (rev 5632) @@ -1,9 +1,13 @@ -= Aide = += Description = Ce gadget permet à Tux droid de lire l'expéditeur et le sujet de votre courrier entrant. -Voici les options que vous pouvez configurer : -* L'adresse de votre serveur E-mail -* Votre login de connexion -* Votre mot de passe de connexion -* Une vérification automatique de vos E-mails -* Une attitune d'introduction lorsque Tux Droid vérifie automatiquement vos E-mails += Paramètres = +* '''Nom du gadget :''' Modifier le nom du gadget. +* '''Adresse du serveur :''' Entrer l'adresse de votre serveur E-mail. +* '''Nom de l´utilisateur :''' Entrer votre login de connexion. +* '''Mot de passe :''' Entrer votre mot de passe de connexion. +* '''Ce gadget sera placé dans la liste des favoris :''' Pour rendre le gadget accessible avec la télécommande et Tux Droid. + += Alertes = +* '''M´avertir des nouveux messages en temps réel :''' Tux Droid va vérifier l'arrivé de vos nouveaux messages. +* '''Introdution des alertes :''' Spécifie une attitune en introduction des messages d'alerte du gadget. \ No newline at end of file Modified: software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki 2009-10-12 09:31:57 UTC (rev 5631) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/help.wiki 2009-10-12 11:22:08 UTC (rev 5632) @@ -1,9 +1,13 @@ -= Help = += Description = This gadget makes Tux Droid read the sender and the subject of your incoming E-mail. -Several settings can be changed in the configuration : -* The address of your E-mail server -* Your E-mail account login -* Your E-mail account password -* Specify an introduction attitune for when Tux Droid is checking your E-mail automatically -* Specify to check your mail box automaticaly and on which days \ No newline at end of file += Settings = +* '''Gadget name :''' Let's you modify the gadget name. +* '''Server host :''' Enter the address of your E-mail server. +* '''Username :''' Enter your E-mail account login. +* '''Password :''' Enter your E-mail account password. +* '''Add this gadget to My Favorites list :''' To make the gadget accessible with the remote control and Tux Droid. + += Alerts = +* '''Check my E-mail account automatically :''' Tux Droid will check for new E-mail 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_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki =================================================================== --- software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki 2009-10-12 09:31:57 UTC (rev 5631) +++ software_suite_v3/software/gadget/default/trunk/gadget_84628d00-1e17-62dd-eaa4-7b11436f3211/nl.wiki 2009-10-12 11:22:08 UTC (rev 5632) @@ -1,9 +1,13 @@ -= Help = -Met deze gadget kan Tux Droid de afzender en het onderwerp van jouw E-mails lezen. += Beschrijving = +Met deze gadget kan Tux Droid de afzender en het onderwerp van je E-mails lezen. -Verschillende instellingen kunnen aangepast worden in de configuratie : -* Het adres van jouw E-mail server -* Jouw E-mail account login -* Jouw E-mail account wachtwoord -* Kies een introductie attitune voor wanneer Tux Droid je mail automatisch checkt -* Kies of je jouw E-mail automatisch wil laten checken en op welke dagen \ No newline at end of file += Configuratie = +* '''Gadget naam :''' Hier kan je de naam van de gadget wijzigen. +* '''Server host :''' Geef het adres van je E-mail server in. +* '''Gebruikersnaam :''' Geef je E-mail account login in. +* '''Wachtwoord :''' Geef je E-mail account wachtwoord in. +* '''Plaats deze gadget in mijn Favorieten :''' Om de gadget met de afstandsbediening of via Tux Droid te starten. + += Alarmen = +* '''Check mijn E-mail account automatisch :''' Tux Droid zal je E-mail automatisch te checken. +* '''Introductie attitune :''' Selecteer een introductie attitune voor wanneer de gadget automatisch gestart wordt. \ No newline at end of file |
|
From: jerome <c2m...@c2...> - 2009-10-12 09:32:14
|
Author: jerome Date: 2009-10-12 11:31:57 +0200 (Mon, 12 Oct 2009) New Revision: 5631 Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.wiki software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.wiki Log: * Updated fr and en po files. * Updated fr and en wiki files. Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-12 08:59:26 UTC (rev 5630) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/de.po 2009-10-12 09:31:57 UTC (rev 5631) @@ -32,7 +32,7 @@ msgstr "" msgid "Start me every x" -msgstr "" +msgstr "Alert" msgid "You do not seem to be connected. Please, verify you username and password, then try again." msgstr "Anscheinend sind Sie nicht verbunden. Prüfen Sie Benutzername und Kennwort und versuchen Sie es wieder." Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-12 08:59:26 UTC (rev 5630) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.po 2009-10-12 09:31:57 UTC (rev 5631) @@ -11,7 +11,7 @@ msgstr "Password" msgid "Tweet your new status" -msgstr "Tweet your new status" +msgstr "Tweet my new status" msgid "Tweet following status text" msgstr "Tweet following status text" Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.wiki 2009-10-12 08:59:26 UTC (rev 5630) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/en.wiki 2009-10-12 09:31:57 UTC (rev 5631) @@ -1,9 +1,8 @@ = Synopsis = -This plugin will read your Twitter messages.Not familiar with Twitter? Have a look at http://www.twitter.com +This plugin will check your Twitter account.Not familiar with Twitter? Have a look at http://www.twitter.com After entering your Twitter login and password you can customize several options : -* Tweet your new status : Every time the gadget is started it will make a new tweet on your twitter page. +* Tweet my new status : Every time the gadget is started it will make a new tweet on your twitter page. * Tweet following status text : Here you can specify the text of the tweet for the above option. -* Maximum tweets to read : Select the number of most recent tweets Tux Droid has to read. -* Give replies sent between followers : Will make Tux Droid read the replies between followers. -* Give my messages/replies : Will make Tux Droid read your own messages and replies on twitter. +* Check Friends updates : Will make Tux Droid check for new friends Tweets. +* Check my messages/replies : Will make Tux Droid check your own messages and replies on twitter. Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-12 08:59:26 UTC (rev 5630) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.po 2009-10-12 09:31:57 UTC (rev 5631) @@ -11,10 +11,10 @@ msgstr "Mot de passe" msgid "Tweet your new status" -msgstr "Publier un nouveau tweet" +msgstr "Publier un nouveau Tweet" msgid "Tweet following status text" -msgstr "Tweet à ajouter" +msgstr "Tweet à publier" msgid "Hello all from my Tux Droid twitter gadget" msgstr "Bonjour à tous à partir du gadget Twitter de mon Tux Droid" Modified: software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.wiki =================================================================== --- software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.wiki 2009-10-12 08:59:26 UTC (rev 5630) +++ software_suite_v3/software/plugin/plugin-twitter/branches/october_release/plugin-twitter/resources/fr.wiki 2009-10-12 09:31:57 UTC (rev 5631) @@ -1,9 +1,9 @@ = Synopsis = -Ce plugin va lire vos messages sur Twitter. Pas familier avec Twitter? Rendez-vous sur http://www.twitter.com +Ce plugin vous notifie des mises à jour sur votre compte Twitter. +Pas familier avec Twitter? Rendez-vous sur http://www.twitter.com Après avoir entré votre login Twitter et votre mot de passe, vous pourrez personnaliser quelques options : -* Publier un nouveau tweet : Chaque fois que le gadget est lancé, il ajoutera un nouveau tweet sur votre page. -* Tweet à ajouter : Ici, vous pouvez spécifier le texte du nouveau tweet à ajouter dans le cas ou l'option précédante est activée. -* Tweets maximum à lire : Selectionnez le nombre maximum de tweets que Tux Droid doit lire. -* Donner les réponses entre followers : Va autoriser Tux Droid à lire les réponses envoyées entre vos followers. -* Donnes mes messages/réponses : Tux Droid lira vos messages et réponse sur Twitter. +* Publier un nouveau Tweet : Chaque fois que le gadget est lancé, il ajoutera un nouveau tweet sur votre page. +* Tweet à publier : Ici, vous pouvez spécifier le texte du nouveau tweet à ajouter dans le cas ou l'option précédante est activée. +* Vérifier les Tweets de mes amis : Tux Droid vérifiera si vos amis ont publié de nouveaux tweets +* Vérifier mes messages / réponses : Tux Droid lira vos messages et réponse sur Twitter. |