Author: jerome
Date: 2009-04-16 18:47:26 +0200 (Thu, 16 Apr 2009)
New Revision: 4543
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/fr/resources/gadget.xml
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
Log:
* Updated french programs to work with enum (morning, afternoon, evening).
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/fr/resources/gadget.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/fr/resources/gadget.xml
2009-04-16 16:40:34 UTC (rev 4542)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/fr/resources/gadget.xml
2009-04-16 16:47:26 UTC (rev 4543)
@@ -42,33 +42,21 @@
Encyclopedia, Escales, France 4, Gulli, ITV, LCI,
Mangas, Mezzo, NRJ 12, NT1, RTL 9, Série Club,
TF6, TMC, Toute l'histoire, TPS STAR, Virgin 17,
Voyage,
W9, )"
- defaultValue="LCI" />
+ defaultValue="LCI" />
<parameter
category="Options"
+ name="tHour"
+ description="Select time frame"
+ type="enum(Morning, Afternoon, Evening)"
+ defaultValue="Evening" />
+ <parameter
+ category="Options"
name="giveProgramDescription"
description="Give program description"
type="boolean"
- defaultValue="true" />
- <parameter
- category="Options"
- name="giveMorning"
- description="Give morning program"
- type="boolean"
defaultValue="true" />
<parameter
category="Options"
- name="giveAfternoon"
- description="Give afternoon program"
- type="boolean"
- defaultValue="true" />
- <parameter
- category="Options"
- name="giveEvening"
- description="Give evening program"
- type="boolean"
- defaultValue="true" />
- <parameter
- category="Options"
name="giveNowPlaying"
description="Give current played program"
type="boolean"
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
2009-04-16 16:40:34 UTC (rev 4542)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/FrenchConfiguration.java
2009-04-16 16:47:26 UTC (rev 4543)
@@ -30,11 +30,13 @@
private boolean useStandard = true;
private String channel = "ARTE";
private boolean giveProgramDescription = true;
- private boolean giveMorning = true;
- private boolean giveAfternoon = true;
- private boolean giveEvening = true;
- private boolean giveNowPlaying = true;
+ private boolean giveMorning = false;
+ private boolean giveAfternoon = false;
+ private boolean giveEvening = false;
+ private boolean giveNowPlaying = false;
+ private String tHour = "Morning";
+
/**
* Return the selected digital channel.
* @return
@@ -54,8 +56,39 @@
this.digitalChannel = aDigitalChannel;
}
+ /**
+ * Sets 'morning' 'evening' or 'afternoon'
+ * @return
+ */
+ public String getTHour()
+ {
+ return this.tHour;
+ }
/**
+ * Sets the parameter value.
+ * @param aTHour
+ */
+ public void setTHour(String aTHour)
+ {
+ this.tHour = aTHour;
+
+ if(this.tHour.equalsIgnoreCase("morning"))
+ {
+ this.setGiveMorning(true);
+ }
+ else if(this.tHour.equalsIgnoreCase("afternoon"))
+ {
+ this.setGiveAfternoon(true);
+ }
+ else if(this.tHour.equalsIgnoreCase("evening"))
+ {
+ this.setGiveEvening(true);
+ }
+ }
+
+
+ /**
* Return true if user wants to hear digitals channels.
* @return
*/
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 16:40:34 UTC (rev 4542)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-16 16:47:26 UTC (rev 4543)
@@ -38,6 +38,8 @@
@Override
protected void start() throws Throwable
{
+ configuration().setTHour(configuration().getTHour());
+
if(configuration().getGiveAfternoon() ||
configuration().getGiveEvening() ||
configuration().getGiveMorning() ||
configuration().getGiveNowPlaying())
{
------------------------------------------------------------------------------
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
