Author: jerome
Date: 2009-04-16 11:32:23 +0200 (Thu, 16 Apr 2009)
New Revision: 4532
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvGe.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
Log:
* TTS warning in case of no selected parameters.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -54,6 +54,8 @@
{
this.description = "UNDEFINED";
}
+
+ this.description = this.description.replace("&", "");
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -41,8 +41,17 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
- duPrograms = new SimplePrograms(SimplePrograms.BEDU,
this.configuration().getChannel());
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
+ duPrograms = new SimplePrograms(SimplePrograms.BEDU,
this.configuration().getChannel());
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -38,8 +38,17 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
- frPrograms = new SimplePrograms(SimplePrograms.BEFR,
this.configuration().getChannel());
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
+ frPrograms = new SimplePrograms(SimplePrograms.BEFR,
this.configuration().getChannel());
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvEs.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -38,8 +38,17 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
- spPrograms = new SimplePrograms(SimplePrograms.SP,
this.configuration().getChannel());
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
+ spPrograms = new SimplePrograms(SimplePrograms.SP,
this.configuration().getChannel());
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -38,18 +38,27 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
- //Make use of standard french channels.
- if(this.configuration().getUseStandard())
- {
- french = new SimplePrograms(SimplePrograms.FR,
this.configuration().getChannel());
+ //Make use of standard french channels.
+ if(this.configuration().getUseStandard())
+ {
+ french = new SimplePrograms(SimplePrograms.FR,
this.configuration().getChannel());
+ }
+ //Make use of digital programs
+ else if(this.configuration().getUseDigital())
+ {
+ this.configuration().setUseDigital(false);
+ french = new
SimplePrograms(SimplePrograms.DIGITAL_FRENCH,
this.configuration().getDigitalChannel());
+ }
}
- //Make use of digital programs
- else if(this.configuration().getUseDigital())
+ else
{
- this.configuration().setUseDigital(false);
- french = new
SimplePrograms(SimplePrograms.DIGITAL_FRENCH,
this.configuration().getDigitalChannel());
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
}
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvGe.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvGe.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvGe.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -35,8 +35,17 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
- gePrograms = new SimplePrograms(SimplePrograms.GE,
this.configuration().getChannel());
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
+ gePrograms = new SimplePrograms(SimplePrograms.GE,
this.configuration().getChannel());
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvNl.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -39,8 +39,17 @@
@Override
public void loadError(String url)
{
- throwMessage("Error while loading the TV program");
- GadgetProgramTV.quitGadget();
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ throwMessage("Error while loading the TV program");
+ GadgetProgramTV.quitGadget();
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
2009-04-16 09:16:45 UTC (rev 4531)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvUk.java
2009-04-16 09:32:23 UTC (rev 4532)
@@ -38,8 +38,17 @@
@Override
protected void start() throws Throwable
{
- SimplePrograms.addProgramLoadListener(this);
- ukPrograms = new SimplePrograms(SimplePrograms.UK,
this.configuration().getChannel());
+ if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
+ configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
+ {
+ SimplePrograms.addProgramLoadListener(this);
+ ukPrograms = new SimplePrograms(SimplePrograms.UK,
this.configuration().getChannel());
+ }
+ else
+ {
+ throwMessage("Please re-configure your gadget to get a
TV program list.");
+ GadgetProgramTV.quitGadget();
+ }
}
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
