Izlabots eTimer, lai strādā ar opendendreambox

ChoiceBox.py

@@ -26,8 +26,6 @@ class ChoiceBox2(Screen):
         #self.setTitle(_("Choice Box"))
         if not list: list = []
         if not skin_name: skin_name = []
-
-
         #if isinstance(skin_name, str):
         #	skin_name = [skin_name]
         #self.skinName = skin_name + ["ChoiceBox"]

PlayStream.py

@@ -29,7 +29,6 @@ from Tools import Notifications
 from Screens.LocationBox import LocationBox
 #from Screens.InputBox import InputBox
 from Screens.ChoiceBox import ChoiceBox
-from ChoiceBox import ChoiceBox2
 from Screens.VirtualKeyBoard import VirtualKeyBoard
 from Components.Input import Input
 from Screens.Screen import Screen
@@ -121,7 +120,12 @@ class PSPlayer(MoviePlayer):
             "info":self.service_info
         })
         self.stimer = eTimer()
-        self.stimer.callback.append(self.update_subtitles)
+        if "callback" in dir(self.stimer):
+            self.stimer.callback.append(self.update_subtitles)
+        elif "timeout":
+            self.stimer.timeout.connect(self.update_subtitles)
+        else:
+            self.stimer = None
         self.stimer_step = 500
         if self.cur_stream["subs"]:
             self.subs = self.cur_stream["subs"]
@@ -137,9 +141,10 @@ class PSPlayer(MoviePlayer):
         self.onLayoutFinish.append(self.start_subtitles_timer)
         
     def start_subtitles_timer(self):
-        self.subtitle_window.show()
-        print "start_subtitles_timer"
-        self.stimer.start(self.stimer_step)
+        if self.stimer:
+            self.subtitle_window.show()
+            print "start_subtitles_timer"
+            self.stimer.start(self.stimer_step)
         
     def get_sub_pts(self,pts):
         sc = self.get_sub_ind(self.sind) # current subbtitle
@@ -250,7 +255,7 @@ class PSPlayer(MoviePlayer):
         title = "Select stream"
         for i,s in enumerate(self.streams):
             lst.append(("[%s,%s] %s"%(s["lang"],s["quality"],s["name"]),i))
-        self.session.openWithCallback(self.cb_select_stream, ChoiceBox2, title = title, list = lst,selection = self.selected)
+        self.session.openWithCallback(self.cb_select_stream, ChoiceBox, title = title, list = lst,selection = self.selected)
 
     def cb_select_stream(self,answer):
         #print "item_menu_selected",answer
@@ -280,7 +285,7 @@ class PSPlayer(MoviePlayer):
         else:
             selection = len(lst)
         lst.append(("No captions",-1))
-        self.session.openWithCallback(self.cb_select_captions, ChoiceBox2, title = title, list = lst,selection = selection)
+        self.session.openWithCallback(self.cb_select_captions, ChoiceBox, title = title, list = lst,selection = selection)
 
     def cb_select_captions(self,answer):
         #print "item_menu_selected",answer
@@ -617,7 +622,7 @@ class MainScreen(Screen):
             ("Add submenu","add_list","Add submenu before selected item"), 
             ])
         title = self.current[0]
-        self.session.openWithCallback(self.cb_item_menu, ChoiceBox2, title = title, list = lst) #TODO
+        self.session.openWithCallback(self.cb_item_menu, ChoiceBox, title = title, list = lst) #TODO
 
     def cb_item_menu(self,answer):
         #print "item_menu_selected",answer
@@ -637,7 +642,7 @@ class MainScreen(Screen):
         elif answer[1] == "favorites":
             lists = self.config.get_lists()
             lists2 = [(l,l) for l in lists]            
-            self.session.openWithCallback(self.cb_favorites, ChoiceBox2, title="Selected menu item will be added",list = lists2) 
+            self.session.openWithCallback(self.cb_favorites, ChoiceBox, title="Selected menu item will be added",list = lists2) 
                         
         elif answer[1] == 'download':
             current = self.current
@@ -861,7 +866,7 @@ class OptionsScreen(ConfigListScreen,Screen):
         self.session = session
         Screen.__init__(self, session)
         self.main = args[0]
-        self.setTitle(self.main.cur_menu[0]+" Options")
+        self.setTitle(self.main.cur_menu[0]+" options")
         self.source = self.main.cur_menu[1].split("::")[0]
         self.cfg = config.plugins.playstream
         self.list = []       

PlayStream.wpr

@@ -5033,21 +5033,21 @@ edit.bookmarks = {'Ok': (loc('PlayStream.py'),
         ('MainScreen.Ok',
          243)],
                           'first-line': 237,
-                          'sel-line': 482}),
+                          'sel-line': 487}),
                   'cb_item_menu': (loc('PlayStream.py'),
                                    {'attrib-starts': [('MainScreen',
         72),
         ('MainScreen.cb_item_menu',
          349)],
                                     'first-line': 364,
-                                    'sel-line': 619}),
+                                    'sel-line': 624}),
                   'item_menu': (loc('PlayStream.py'),
                                 {'attrib-starts': [('MainScreen',
         69),
         ('MainScreen.item_menu',
          320)],
                                  'first-line': 312,
-                                 'sel-line': 597})}
+                                 'sel-line': 602})}
 edit.file-encoding = {loc('streams.cfg'): 'utf_8'}
 guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                             'windows': [{'name': '47wqn9r4eCm6RV6BSVqCQM73zP'\
@@ -5056,7 +5056,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'type': 'dock',
         'view': {'area': 'tall',
                  'constraint': None,
-                 'current_pages': [0,
+                 'current_pages': [1,
                                    0],
                  'full-screen': False,
                  'notebook_display': 'normal',
@@ -5070,10 +5070,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'tree-states': {'deep': {'expanded-nodes': [(9,),
         (17,),
         (74,),
-        (108,)],
+        (109,)],
                                  'selected-nodes': [(26,)],
-                                 'top-node': (17,
-        20)}},
+                                 'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
                                'tall',
@@ -5110,7 +5109,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
         'current_pages': [1,
-                          4],
+                          1],
         'notebook_display': 'normal',
         'notebook_percent': 0.40625,
         'override_title': None,
@@ -5160,7 +5159,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'self.',
                                        'fReverse': False,
-                                       'fSearchText': u'settil',
+                                       'fSearchText': u'etimer',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5213,16 +5212,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0,
+                       'first-line': 82,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['p'\
-        'rint url\n',
-        'data\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
+        'rl\n',
+        'print url\n',
+        'self\n',
+        'self.api_url\n',
+        'dir(self)\n',
+        '"api_url" in dir(self)\n']},
                        'launch-id': None,
-                       'sel-line': 6,
-                       'sel-line-start': 199,
-                       'selection_end': 199,
-                       'selection_start': 199}),
+                       'sel-line': 93,
+                       'sel-line-start': 1439,
+                       'selection_end': 1439,
+                       'selection_start': 1439}),
                      ('debug-watch',
                       'wide',
                       1,
@@ -5274,115 +5277,134 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
-        ({'bookmarks': ([[loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 24,
+        ({'bookmarks': ([[loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 23,
                            'folded-linenos': [],
-                           'sel-line': 51,
-                           'sel-line-start': 1918,
-                           'selection_end': 1968,
-                           'selection_start': 1959},
-                          1480548131.23],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 36,
+                           'sel-line': 31,
+                           'sel-line-start': 1212,
+                           'selection_end': 1212,
+                           'selection_start': 1212},
+                          1480708440.879],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [],
+                           'first-line': 173,
                            'folded-linenos': [],
-                           'sel-line': 53,
-                           'sel-line-start': 1992,
-                           'selection_end': 2023,
-                           'selection_start': 2017},
-                          1480548131.959],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 44,
+                           'sel-line': 192,
+                           'sel-line-start': 6829,
+                           'selection_end': 6829,
+                           'selection_start': 6829},
+                          1480708448.981],
+                         [loc('sources/ltc.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_streams',
+         401)],
+                           'first-line': 455,
                            'folded-linenos': [],
-                           'sel-line': 55,
-                           'sel-line-start': 2058,
-                           'selection_end': 2085,
-                           'selection_start': 2079},
-                          1480548133.123],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 44,
+                           'sel-line': 460,
+                           'sel-line-start': 26123,
+                           'selection_end': 26123,
+                           'selection_start': 26123},
+                          1480751941.827],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 0,
                            'folded-linenos': [],
-                           'sel-line': 57,
-                           'sel-line-start': 2121,
-                           'selection_end': 2144,
-                           'selection_start': 2138},
-                          1480548133.601],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.autoResize',
-         108)],
-                           'first-line': 98,
+                           'sel-line': 11,
+                           'sel-line-start': 431,
+                           'selection_end': 449,
+                           'selection_start': 449},
+                          1480751956.342],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 2,
                            'folded-linenos': [],
-                           'sel-line': 115,
-                           'sel-line-start': 5129,
-                           'selection_end': 5155,
-                           'selection_start': 5149},
-                          1480548134.631],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.autoResize',
-         108)],
-                           'first-line': 105,
+                           'sel-line': 121,
+                           'sel-line-start': 4996,
+                           'selection_end': 5024,
+                           'selection_start': 5018},
+                          1480756795.819],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.service_info',
+         225)],
+                           'first-line': 215,
                            'folded-linenos': [],
-                           'sel-line': 122,
-                           'sel-line-start': 5406,
-                           'selection_end': 5440,
-                           'selection_start': 5434},
-                          1480548135.011],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.autoResize',
-         108)],
-                           'first-line': 114,
+                           'sel-line': 232,
+                           'sel-line-start': 9024,
+                           'selection_end': 9077,
+                           'selection_start': 9072},
+                          1480756796.863],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        318)],
+                           'first-line': 311,
                            'folded-linenos': [],
-                           'sel-line': 131,
-                           'sel-line-start': 5806,
-                           'selection_end': 5829,
-                           'selection_start': 5823},
-                          1480548135.487],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.autoResize',
-         108)],
-                           'first-line': 121,
+                           'sel-line': 328,
+                           'sel-line-start': 12826,
+                           'selection_end': 12897,
+                           'selection_start': 12892},
+                          1480756797.782],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        318),
+        ('MainScreen.Ok',
+         491)],
+                           'first-line': 526,
                            'folded-linenos': [],
-                           'sel-line': 132,
-                           'sel-line-start': 5872,
-                           'selection_end': 5895,
-                           'selection_start': 5889},
-                          1480548135.971],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 6,
+                           'sel-line': 532,
+                           'sel-line-start': 22660,
+                           'selection_end': 22728,
+                           'selection_start': 22728},
+                          1480756800.912],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        318),
+        ('MainScreen.Ok',
+         491)],
+                           'first-line': 526,
+                           'folded-linenos': [],
+                           'sel-line': 534,
+                           'sel-line-start': 22746,
+                           'selection_end': 22766,
+                           'selection_start': 22765},
+                          1480756802.509],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 9,
                            'folded-linenos': [],
-                           'sel-line': 24,
-                           'sel-line-start': 909,
-                           'selection_end': 930,
-                           'selection_start': 922},
-                          1480621196.918],
-                         [loc('../python/Components/GUISkin.py'),
+                           'sel-line': 14,
+                           'sel-line-start': 466,
+                           'selection_end': 513,
+                           'selection_start': 513},
+                          1480756808.806],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 9,
+                           'folded-linenos': [],
+                           'sel-line': 14,
+                           'sel-line-start': 466,
+                           'selection_end': 520,
+                           'selection_start': 514},
+                          1480756809.501],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 104,
+                           'folded-linenos': [],
+                           'sel-line': 121,
+                           'sel-line-start': 4996,
+                           'selection_end': 5024,
+                           'selection_start': 5018},
+                          1480758158.263],
+                         [loc('sniplets.py'),
                           {'attrib-starts': [],
                            'first-line': 0,
                            'folded-linenos': [],
@@ -5390,111 +5412,81 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 0,
                            'selection_end': 0,
                            'selection_start': 0},
-                          1480621197.042],
-                         [loc('../python/Components/GUISkin.py'),
-                          {'attrib-starts': [('GUISkin',
-        5),
-        ('GUISkin.setTitle',
-         65)],
-                           'first-line': 53,
-                           'folded-linenos': [],
-                           'sel-line': 68,
-                           'sel-line-start': 1840,
-                           'selection_end': 1857,
-                           'selection_start': 1849},
-                          1480621306.861],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8)],
-                           'first-line': 6,
-                           'folded-linenos': [],
-                           'sel-line': 20,
-                           'sel-line-start': 763,
-                           'selection_end': 785,
-                           'selection_start': 785},
-                          1480621623.9],
-                         [loc('PlayStream.py'),
+                          1480758171.285],
+                         [loc('sniplets.py'),
                           {'attrib-starts': [],
-                           'first-line': 25,
+                           'first-line': 0,
                            'folded-linenos': [],
-                           'sel-line': 30,
-                           'sel-line-start': 1172,
-                           'selection_end': 1208,
-                           'selection_start': 1202},
-                          1480621629.137],
-                         [loc('PlayStream.py'),
+                           'sel-line': 4,
+                           'sel-line-start': 124,
+                           'selection_end': 143,
+                           'selection_start': 135},
+                          1480758572.581],
+                         [loc('ContentSources.py'),
                           {'attrib-starts': [],
-                           'first-line': 20,
+                           'first-line': 173,
                            'folded-linenos': [],
-                           'sel-line': 31,
-                           'sel-line-start': 1212,
-                           'selection_end': 1223,
-                           'selection_start': 1217},
-                          1480621630.754],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('make_service',
-        55)],
-                           'first-line': 38,
+                           'sel-line': 192,
+                           'sel-line-start': 6829,
+                           'selection_end': 6829,
+                           'selection_start': 6829},
+                          1480758581.095],
+                         [loc('sources/ltc.py'),
+                          {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         71)],
+                           'first-line': 67,
                            'folded-linenos': [],
-                           'sel-line': 55,
-                           'sel-line-start': 2207,
-                           'selection_end': 2219,
-                           'selection_start': 2216},
-                          1480621630.892],
+                           'sel-line': 72,
+                           'sel-line-start': 2705,
+                           'selection_end': 2705,
+                           'selection_start': 2705},
+                          1480758647.62],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 29,
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 109,
                            'folded-linenos': [],
-                           'sel-line': 40,
-                           'sel-line-start': 1611,
-                           'selection_end': 1660,
-                           'selection_start': 1658},
-                          1480621631.54],
-                         [loc('PlayStream.py'),
+                           'sel-line': 124,
+                           'sel-line-start': 5133,
+                           'selection_end': 5147,
+                           'selection_start': 5147},
+                          1480758789.926],
+                         [loc('sniplets.py'),
                           {'attrib-starts': [],
-                           'first-line': 29,
+                           'first-line': 0,
                            'folded-linenos': [],
-                           'sel-line': 40,
-                           'sel-line-start': 1611,
-                           'selection_end': 1737,
-                           'selection_start': 1734},
-                          1480621633.911],
+                           'sel-line': 1,
+                           'sel-line-start': 28,
+                           'selection_end': 74,
+                           'selection_start': 67},
+                          1480758809.125],
                          [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        319),
-        ('MainScreen.__init__',
-         349)],
-                           'first-line': 334,
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 109,
                            'folded-linenos': [],
-                           'sel-line': 351,
-                           'sel-line-start': 14819,
-                           'selection_end': 14838,
-                           'selection_start': 14833},
-                          1480621927.754],
-                         [loc('ChoiceBox.py'),
-                          {'attrib-starts': [('ChoiceBox2',
-        8),
-        ('ChoiceBox2.__init__',
-         23)],
-                           'first-line': 4,
-                           'folded-linenos': [],
-                           'sel-line': 43,
-                           'sel-line-start': 1528,
-                           'selection_end': 1563,
-                           'selection_start': 1555},
-                          1480622087.775],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        319)],
-                           'first-line': 313,
+                           'sel-line': 125,
+                           'sel-line-start': 5157,
+                           'selection_end': 5219,
+                           'selection_start': 5219},
+                          1480758825.135],
+                         [loc('sniplets.py'),
+                          {'attrib-starts': [],
+                           'first-line': 0,
                            'folded-linenos': [],
-                           'sel-line': 321,
-                           'sel-line-start': 12372,
-                           'selection_end': 12440,
-                           'selection_start': 12421},
-                          1480622113.43]],
+                           'sel-line': 1,
+                           'sel-line-start': 28,
+                           'selection_end': 82,
+                           'selection_start': 51},
+                          1480758835.647]],
                         20),
-          'current-loc': loc('ChoiceBox.py'),
+          'current-loc': loc('PlayStream.py'),
           'editor-state-list': [(loc('plugin.py'),
                                  {'attrib-starts': [('main',
         4)],
@@ -5505,14 +5497,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 208,
                                   'selection_start': 199}),
                                 (loc('PlayStream.py'),
-                                 {'attrib-starts': [('MainScreen',
-        319)],
-                                  'first-line': 313,
+                                 {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.start_subtitles_timer',
+         217)],
+                                  'first-line': 131,
                                   'folded-linenos': [],
-                                  'sel-line': 321,
-                                  'sel-line-start': 12372,
-                                  'selection_end': 12440,
-                                  'selection_start': 12421}),
+                                  'sel-line': 142,
+                                  'sel-line-start': 5807,
+                                  'selection_end': 5836,
+                                  'selection_start': 5815}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('play_video',
         49)],
@@ -5577,14 +5571,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 (loc('sources/ltc.py'),
                                  {'attrib-starts': [('Source',
         24),
-        ('Source.call2',
-         610)],
-                                  'first-line': 610,
+        ('Source.get_content',
+         71)],
+                                  'first-line': 67,
                                   'folded-linenos': [],
-                                  'sel-line': 616,
-                                  'sel-line-start': 31793,
-                                  'selection_end': 31793,
-                                  'selection_start': 31793}),
+                                  'sel-line': 72,
+                                  'sel-line-start': 2705,
+                                  'selection_end': 2705,
+                                  'selection_start': 2705}),
                                 (loc('resolvers/hdgo.py'),
                                  {'attrib-starts': [('supports',
         37)],
@@ -5596,24 +5590,34 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_start': 1163}),
                                 (loc('ChoiceBox.py'),
                                  {'attrib-starts': [('ChoiceBox2',
-        8)],
-                                  'first-line': 49,
+        8),
+        ('ChoiceBox2.__init__',
+         23)],
+                                  'first-line': 0,
                                   'folded-linenos': [],
-                                  'sel-line': 10,
-                                  'sel-line-start': 332,
-                                  'selection_end': 414,
-                                  'selection_start': 414}),
+                                  'sel-line': 44,
+                                  'sel-line-start': 1664,
+                                  'selection_end': 1702,
+                                  'selection_start': 1694}),
                                 (loc('../python/Components/GUISkin.py'),
                                  {'attrib-starts': [('GUISkin',
         5),
-        ('GUISkin.setTitle',
-         65)],
-                                  'first-line': 53,
+        ('GUISkin.__init__',
+         8)],
+                                  'first-line': 17,
                                   'folded-linenos': [],
-                                  'sel-line': 68,
-                                  'sel-line-start': 1840,
-                                  'selection_end': 1857,
-                                  'selection_start': 1849})],
+                                  'sel-line': 9,
+                                  'sel-line-start': 207,
+                                  'selection_end': 235,
+                                  'selection_start': 225}),
+                                (loc('sniplets.py'),
+                                 {'attrib-starts': [],
+                                  'first-line': 0,
+                                  'folded-linenos': [],
+                                  'sel-line': 1,
+                                  'sel-line-start': 28,
+                                  'selection_end': 82,
+                                  'selection_start': 51})],
           'has-focus': True,
           'locked': False},
          [loc('plugin.py'),
@@ -5627,7 +5631,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('sources/ltc.py'),
           loc('resolvers/hdgo.py'),
           loc('ChoiceBox.py'),
-          loc('../python/Components/GUISkin.py')]),
+          loc('../python/Components/GUISkin.py'),
+          loc('sniplets.py')]),
         ({'bookmarks': ([[loc('sources/viaplay.py'),
                           {'attrib-starts': [('Source',
         19),
@@ -5869,8 +5874,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_start': 2626}),
                                 (loc('sources/euronews.py'),
                                  {}),
-                                (loc('../python/Components/GUISkin.py'),
-                                 {}),
                                 (loc('resolvers/hdgo.py'),
                                  {'attrib-starts': [],
                                   'first-line': 74,
@@ -5919,6 +5922,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 108,
                                   'selection_end': 118,
                                   'selection_start': 112}),
+                                (loc('sniplets.py'),
+                                 {}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('player',
         86)],
@@ -5938,32 +5943,37 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line': 119,
                                   'sel-line-start': 5450,
                                   'selection_end': 5488,
-                                  'selection_start': 5476})],
+                                  'selection_start': 5476}),
+                                (loc('../python/Components/GUISkin.py'),
+                                 {})],
           'has-focus': False,
           'locked': False},
          [loc('ChoiceBox.py'),
           loc('ContentSources.py'),
           loc('sources/euronews.py'),
-          loc('../python/Components/GUISkin.py'),
           loc('resolvers/hdgo.py'),
           loc('sources/iplayer.py'),
           loc('sources/kinofilmnet.py'),
           loc('sources/ltc.py'),
           loc('PlayStream.py'),
           loc('plugin.py'),
+          loc('sniplets.py'),
           loc('util.py'),
-          loc('sources/viaplay.py')])),
-                               'open_files': [u'ContentSources.py',
+          loc('sources/viaplay.py'),
+          loc('../python/Components/GUISkin.py')])),
+                               'open_files': [u'ChoiceBox.py',
         u'plugin.py',
         u'resolvers/hdgo.py',
         u'sources/euronews.py',
         u'sources/iplayer.py',
         u'sources/kinofilmnet.py',
-        u'sources/ltc.py',
         u'sources/viaplay.py',
+        u'../python/Components/GUISkin.py',
         u'util.py',
-        u'PlayStream.py',
-        u'ChoiceBox.py']},
+        u'ContentSources.py',
+        u'sources/ltc.py',
+        u'sniplets.py',
+        u'PlayStream.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.2603027754415475},
         'splits': 2,
@@ -5978,12 +5988,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2405,
                          1376)}]}
-guimgr.recent-documents = [loc('ChoiceBox.py'),
-                           loc('PlayStream.py'),
-                           loc('../python/Components/GUISkin.py'),
-                           loc('util.py'),
-                           loc('ContentSources.py'),
+guimgr.recent-documents = [loc('PlayStream.py'),
+                           loc('sniplets.py'),
                            loc('sources/ltc.py'),
+                           loc('ContentSources.py'),
+                           loc('util.py'),
+                           loc('ChoiceBox.py'),
                            loc('resolvers/hdgo.py'),
                            loc('sources/viaplay.py'),
                            loc('sources/iplayer.py'),
@@ -6642,25 +6652,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 4043,
         'selection_end': 4043,
         'selection_start': 4043},
-                       loc('../../../../Python27/Lib/site-packages/gi/__init__.py'): {'a'\
-        'ttrib-starts': [],
-        'first-line': 24,
-        'folded-linenos': [],
-        'sel-line': 41,
-        'sel-line-start': 1595,
-        'selection_end': 1595,
-        'selection_start': 1595},
-                       loc('../../../../Python27/Lib/site-packages/gi/module.py'): {'a'\
-        'ttrib-starts': [('IntrospectionModule',
-                          110),
-                         ('IntrospectionModule.__getattr__',
-                          132)],
-        'first-line': 121,
-        'folded-linenos': [],
-        'sel-line': 136,
-        'sel-line-start': 4187,
-        'selection_end': 4187,
-        'selection_start': 4187},
                        loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 0,
@@ -6669,6 +6660,15 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
+                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
+        's': [('findall',
+               172)],
+        'first-line': 162,
+        'folded-linenos': [],
+        'sel-line': 180,
+        'sel-line-start': 8708,
+        'selection_end': 8708,
+        'selection_start': 8708},
                        loc('../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
         'ttrib-starts': [('HTTPAdapter',
                           77),
@@ -6709,15 +6709,25 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
-                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
-        's': [('findall',
-               172)],
-        'first-line': 162,
+                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
+        'ttrib-starts': [],
+        'first-line': 24,
         'folded-linenos': [],
-        'sel-line': 180,
-        'sel-line-start': 8708,
-        'selection_end': 8708,
-        'selection_start': 8708},
+        'sel-line': 41,
+        'sel-line-start': 1595,
+        'selection_end': 1595,
+        'selection_start': 1595},
+                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
+        'ttrib-starts': [('IntrospectionModule',
+                          110),
+                         ('IntrospectionModule.__getattr__',
+                          132)],
+        'first-line': 121,
+        'folded-linenos': [],
+        'sel-line': 136,
+        'sel-line-start': 4187,
+        'selection_end': 4187,
+        'selection_start': 4187},
                        loc('../../../../Python27/lib/site.py'): {'attrib-sta'\
         'rts': [('setquit',
                  333),
@@ -6742,7 +6752,12 @@ proj.pypath = {None: ('custom',
                       u'c:\\Data\\Programming\\enigma2\\python;')}
 search.replace-history = [u'self',
                           u'current']
-search.search-history = [u'settil',
+search.search-history = [u'etimer',
+                         u'text=',
+                         u'OptionsScreen',
+                         u'title=',
+                         u'ChoiceBox',
+                         u'settil',
                          u'"text"',
                          u'choice',
                          u'ch',
@@ -6756,12 +6771,7 @@ search.search-history = [u'settil',
                          u'content',
                          u'autoResize',
                          u'font',
-                         u'choicebox',
-                         u'skin',
-                         u'ChoiceBox',
-                         u'skin_name',
-                         u'skin_choice_box',
-                         u'backgrou']
+                         u'choicebox']
 testing.stored-results = (1,
                           [],
                           {})