Add results screen

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.bbclivefootballscores"
        name="BBC Football Scores"
-      version="0.3.1"
+      version="0.4.0"
       provider-name="elParaguayo">
     <requires>
         <import addon="xbmc.addon" version="12.0.0"/>

changelog.txt

@@ -1,3 +1,10 @@
+v0.4.0 Lots of things to test
+- Add notification timeout fix
+- Add option to display goalscorer (experimental)
+- Add option to display bookings (experimental)
+- Add ticker option
+- Fix import error (as reported in forum)
+
 v0.3.0 Release Candidate 2
 - Removes deprecated methods
 - Fixes issue where script fails if installed to different folder

default.py

@@ -209,7 +209,10 @@ def checkMatch(match):
         else:
             yellow = None
 
-        Notify(u"YELLOW!{0}".format(yellow if yellow else u""), str(match), IMG_GOAL, timeout=NOTIFY_TIME)
+        Notify(u"YELLOW!{0}".format(yellow if yellow else u""),
+               str(match),
+               IMG_YELLOW,
+               timeout=NOTIFY_TIME)
         debug(u"Yellow Card: %s" % (unicode(match)))
 
     if match.redcard:
@@ -220,7 +223,10 @@ def checkMatch(match):
         else:
             red = None
 
-        Notify(u"RED!{0}".format(red if red else u""), str(match), IMG_GOAL, timeout=NOTIFY_TIME)
+        Notify(u"RED!{0}".format(red if red else u""),
+               str(match),
+               IMG_RED,
+               timeout=NOTIFY_TIME)
         debug(u"Red Card: %s" % (unicode(match)))
 
     # Has there been a goal?
@@ -234,7 +240,10 @@ def checkMatch(match):
         else:
             scorer = None
 
-        Notify(u"GOAL!{0}".format(scorer if scorer else u""), str(match), IMG_GOAL, timeout=NOTIFY_TIME)
+        Notify(u"GOAL!{0}".format(scorer if scorer else u""),
+               str(match),
+               IMG_GOAL,
+               timeout=NOTIFY_TIME)
         debug(u"GOAL: %s" % (unicode(match)))
 
 

helper.py

@@ -41,6 +41,7 @@
 from resources.lib.settings import selectLeagues, toggleNotification
 from resources.lib.league_tables import XBMCLeagueTable
 from resources.lib.live_scores_detail import XBMCLiveScoresDetail
+from resources.lib.results import XBMCResults
 from resources.lib.utils import closeAddonSettings
 from resources.lib.menu import FootballHelperMenu
 from resources.lib.ticker import TickerOverlay
@@ -148,6 +149,16 @@ def ToggleTicker():
     # and display it!
     xlsd.start()
 
+elif params.get("mode") == "results":
+    # Close addon setting window (if open)
+    closeAddonSettings()
+
+    # Create an instance of the XBMC League Table
+    xr = XBMCResults()
+
+    # and display it!
+    xr.start()
+
 elif params.get("mode") == "toggleticker":
 
     ToggleTicker()

resources/language/English/strings.po

@@ -82,6 +82,13 @@ msgctxt "#32081"
 msgid "Show additional match detail..."
 msgstr ""
 
+msgctxt "#32082"
+msgid "Show results..."
+msgstr ""
+
+msgctxt "#32083"
+msgid "Show fixtures..."
+msgstr ""
 
 ## SETTINGS CATEGORIES
 
@@ -144,3 +151,11 @@ msgstr ""
 msgctxt "#32111"
 msgid "Getting league table data"
 msgstr ""
+
+msgctxt "#32112"
+msgid "Results"
+msgstr ""
+
+msgctxt "#32113"
+msgid "Getting results data"
+msgstr ""

resources/lib/menu.py

@@ -53,6 +53,10 @@ def show(self):
         self.mdbutton = Button("Show Match Detail")
         self.window.placeControl(self.mdbutton, 1, 0, columnspan = 2)
 
+        # ITEM 3 - MATCH DETAIL
+        self.resbutton = Button("Show Results")
+        self.window.placeControl(self.resbutton, 2, 0, columnspan = 2)
+
         # CLOSE BUTTON
 
         self.clbutton = Button("Close")
@@ -64,14 +68,17 @@ def show(self):
         self.window.connect(self.clbutton, lambda: self.window.close())
         self.window.connect(self.ltbutton, lambda: self.open("leaguetable"))
         self.window.connect(self.mdbutton, lambda: self.open("matchdetail"))
+        self.window.connect(self.resbutton, lambda: self.open("results"))
 
         self.window.setFocus(self.ltbutton)
 
         # Handle navigation to make user experience better
         self.ltbutton.controlDown(self.mdbutton)
         self.mdbutton.controlUp(self.ltbutton)
-        self.mdbutton.controlDown(self.clbutton)
-        self.clbutton.controlUp(self.mdbutton)
+        self.mdbutton.controlDown(self.resbutton)
+        self.resbutton.controlDown(self.clbutton)
+        self.resbutton.controlUp(self.mdbutton)
+        self.clbutton.controlUp(self.resbutton)
         # self.leaguelist.controlLeft(self.leaguebutton)
         # self.leaguelist.controlRight(self.closebutton)
         # self.closebutton.controlUp(self.leaguelist)

resources/settings.xml

@@ -12,5 +12,6 @@
 	<category label="32091">
 		<setting id="dummy1" label="32080" type="action" action="RunScript(service.bbclivefootballscores, mode=leaguetable)" />
 		<setting id="dummy2" label="32081" type="action" action="RunScript(service.bbclivefootballscores, mode=matchdetail)" />
+		<setting id="dummy3" label="32082" type="action" action="RunScript(service.bbclivefootballscores, mode=results)" />
 	</category>
 </settings>