[tuxdroid-svn] r4580 - in software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV: resources src/com/kysoh/tvPrograms/gadget

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-04-23 13:50:31 +0200 (Thu, 23 Apr 2009)
New Revision: 4580

Modified:
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
   software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
Log:
* Added tts message when no programs are available for the selected time frame.

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot	2009-04-23 10:43:35 UTC (rev 4579)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/resources/gadget.pot	2009-04-23 11:50:31 UTC (rev 4580)
@@ -94,3 +94,6 @@
 msgid "Please re-configure your gadget to get a TV program list."
 msgstr ""
 
+msgid "I didn't find any TV programs according to your selected time frame."
+msgstr ""
+

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java	2009-04-23 10:43:35 UTC (rev 4579)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java	2009-04-23 11:50:31 UTC (rev 4580)
@@ -49,7 +49,7 @@
 				gadget.throwMessage("No TV program for now");
 			}
 		}
-		
+	
 		//Morning program.
 		if(configuration.getGiveMorning())
 		{
@@ -62,6 +62,11 @@
 			
 			Vector<Program> morning = SimplePrograms.sortMorning(programme);
 			
+			if(morning.size() == 0)
+			{
+			    gadget.throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : morning)
 			{
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))
@@ -86,6 +91,12 @@
 			}
 			
 			Vector<Program> afternoon = SimplePrograms.sortAfternoon(programme);
+			
+			if(afternoon.size() == 0)
+			{
+			    gadget.throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : afternoon)
 			{
 				
@@ -111,6 +122,12 @@
 			}
 			
 			Vector<Program> evening = SimplePrograms.sortEvening(programme);
+			
+			if(evening.size() == 0)
+			{
+			    gadget.throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : evening)
 			{
 				if(!configuration.getGiveProgramDescription() || (oneProgram.getDescription().equalsIgnoreCase("undefined")))

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-23 10:43:35 UTC (rev 4579)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java	2009-04-23 11:50:31 UTC (rev 4580)
@@ -106,13 +106,19 @@
 	 */
 	public void giveProgram(Vector<Program> programme)
 	{
-		throwMessage("On {0}", programme.get(0).getChannel());
 		
 		//Give now playing program.
 		if(this.configuration().getGiveNowPlaying())
 		{
 			Program nowPlaying = SimplePrograms.getNowPlaying(programme);
-			throwMessage("Now playing on {0}, {1}", nowPlaying.getChannel(), nowPlaying.getTitle());
+			if(nowPlaying != null)
+			{
+			    throwMessage("Now playing on {0}, {1}", nowPlaying.getChannel(), nowPlaying.getTitle());
+			}
+			else
+			{
+				throwMessage("No TV program for now");
+			}
 		}
 		
 		//Morning program.
@@ -127,6 +133,11 @@
 			
 			Vector<Program> morning = SimplePrograms.sortMorning(programme);
 			
+			if(morning.size() == 0)
+			{
+			    throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : morning)
 			{
 				if(!this.configuration().getGiveProgramDescription())
@@ -151,6 +162,12 @@
 			}
 			
 			Vector<Program> afternoon = SimplePrograms.sortAfternoon(programme);
+			
+			if(afternoon.size() == 0)
+			{
+			    throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : afternoon)
 			{
 				
@@ -176,6 +193,12 @@
 			}
 			
 			Vector<Program> evening = SimplePrograms.sortEvening(programme);
+			
+			if(evening.size() == 0)
+			{
+			    throwMessage("I didn't find any TV programs according to your selected time frame.");	
+			}
+			
 			for(Program oneProgram : evening)
 			{
 				if(!this.configuration().getGiveProgramDescription())