Touché

Author: daviddavo

resources/language/English/strings.po

@@ -49,7 +49,7 @@ msgid "Simkl login"
 msgstr ""
 
 msgctxt "#32022"
-msgid "Visit {} on your device and enter this code"
+msgid "Please visit {} on \nyour device and enter this code"
 msgstr ""
 
 msgctxt "#32023"

resources/lib/engine.py

@@ -59,8 +59,8 @@ class Player(xbmc.Player):
   def __init__(self):
     xbmc.Player.__init__(self)
 
-  @classmethod
-  def getMediaType(self):
+  @staticmethod
+  def getMediaType():
     if xbmc.getCondVisibility('Container.Content(tvshows)'):
       return "show"
     elif xbmc.getCondVisibility('Container.Content(seasons)'):
@@ -101,7 +101,7 @@ def onPlayBackStopped(self):
 
       percentage = 100 * self.getTime() / self.getTotalTime()
       pctconfig  = int(self.addon.getSetting("scr-pct"))
-      
+
       if percentage > pctconfig:
         bubble = __addon__.getSetting("bubble")
 

resources/lib/interface.py

@@ -1,7 +1,8 @@
 #!/usr/bin/python
 # -*- coding: UTF-8 -*-
-import xbmc, xbmcgui, xbmcaddon
 import time
+import threading
+import xbmc, xbmcgui, xbmcaddon
 tmp = time.time()
 
 __addon__ = xbmcaddon.Addon("script.simkl")
@@ -33,12 +34,7 @@ def __init__(self, xmlFilename, scriptPath, pin, url, check_login, log,
     self.waiting = True
     self.canceled = False
 
-  def onInit(self):
-    instruction = self.getControl(INSTRUCTION_ID)
-    instruction.setLabel(
-      getstr(32022).format("[COLOR yellow]" + self.url + "[/COLOR]"))
-    self.getControl(PIN_LABEL).setLabel(self.pin)
-
+  def threaded(self):
     cnt = 0
     while self.waiting:
       if cnt % (self.inter+1) == 0 and cnt>1:
@@ -58,21 +54,24 @@ def onInit(self):
     xbmc.log("Simkl: Stop waiting")
     self.close()
 
-  def onAction(self, action):
-    #xbmc.log("Simkl: onaction {}".format(action))
-    if action == True: #TODO
-      self.close()
+  def onInit(self):
+    instruction = self.getControl(INSTRUCTION_ID)
+    instruction.setLabel(
+      getstr(32022).format("[COLOR ffffbf00]" + self.url + "[/COLOR]"))
+    self.getControl(PIN_LABEL).setLabel(self.pin)
+
+    t = threading.Thread(target=self.threaded)
+    t.start()
 
   def onControl(self, controlID):
-    pass
+    xbmc.log("Simkl: oncontrol {}".format(controlID))
   def onFocus(self, controlID):
     pass
 
   def onClick(self, controlID):
     xbmc.log("Simkl: onclick {}".format(controlID))
     if controlID == CANCEL_BUTTON:
       self.canceled = True
-      self.close()
 
 '''
 class loginDialog:

resources/lib/request.py

@@ -12,7 +12,6 @@
 import xbmc
 import interface
 import httplib
-import xbmcgui
 
 __addon__ = interface.__addon__
 def getstr(strid): return interface.getstr(strid)
@@ -140,7 +139,6 @@ def watched(self, filename, mediatype, duration, date=time.strftime('%Y-%m-%d %H
         else:
           xbmc.log("Simkl: Filename - {}".format(filename))
           values = {"file":filename}
-          xbmc.log(values)
           values = json.dumps(values)
           xbmc.log("Simkl: Query: {}".format(values))
           con.request("GET", "/search/file/", body=values, headers=headers)

resources/lib/simklapi.py

@@ -22,14 +22,14 @@
       <control type="label">
         <description>Header</description>
         <posx>0</posx>
-        <posy>30</posy>
+        <posy>20</posy>
         <width>800</width>
         <height>25</height>
         <!-- Structure: $ADDON[script.simkl <STRID>] -->
         <label>SIMKL account authorization</label>
         <align>center</align>
         <aligny>center</aligny>
-        <textcolor>FFAAAAAA</textcolor>
+        <textcolor>FFa7a7a7</textcolor>
       </control>
       <control type="label" id="201">
         <description>PIN</description>
@@ -49,22 +49,27 @@
       <control type="label" id="202">
         <description>Instructions</description>
         <posx>0</posx>
-        <posy>170</posy>
+        <posy>210</posy>
         <width>800</width>
         <height>50</height>
         <label> Instructions </label>
+        <font>font16</font>
         <align>center</align>
         <aligny>center</aligny>
-        <textcolor>FFFFFFFF</textcolor>
+        <textcolor>FFf0f0f0</textcolor>
       </control>
       <control type="button" id="203">
         <description>Cancel</description>
         <align>center</align>
         <posx>325</posx>
-        <posy>320</posy>
+        <posy>340</posy>
         <width>150</width>
         <height>30</height>
         <label>Cancel</label>
+        <textcolor>FFededed</textcolor>
+        <focusedcolor>FFededed</focusedcolor>
+        <texturenofocus>button_nofocus.png</texturenofocus>
+        <texturefocus>button_focus.png</texturefocus>
         <onclick>PreviousMenu</onclick>
         <!-- Not visible if using a remote (press back) -->
         <visible>system.getbool(input.enablemouse)</visible>