make round-robining optional

Author: pannal

lib/windows/dropdown.py

@@ -21,6 +21,7 @@ def __init__(self, *args, **kwargs):
         self.options = kwargs.get('options')
         self.pos = kwargs.get('pos')
         self.lastSelectedItem = 0
+        self.roundRobin = kwargs.get('round_robin', True)
         self.posIsBottom = kwargs.get('pos_is_bottom')
         self.closeDirection = kwargs.get('close_direction')
         self.setDropdownProp = kwargs.get('set_dropdown_prop', False)
@@ -68,7 +69,8 @@ def onAction(self, action):
         except:
             util.ERROR()
 
-        if action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and self.getFocusId() == self.OPTIONS_LIST_ID:
+        if self.roundRobin and action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and \
+                self.getFocusId() == self.OPTIONS_LIST_ID:
             to_pos = None
             last_index = self.optionsList.size() - 1
 

lib/windows/playersettings.py

@@ -24,6 +24,7 @@ def __init__(self, *args, **kwargs):
         self.video = kwargs.get('video')
         self.viaOSD = kwargs.get('via_osd')
         self.nonPlayback = kwargs.get('non_playback')
+        self.roundRobin = kwargs.get('round_robin', True)
         self.lastSelectedItem = 0
 
         if not self.video.mediaChoice:
@@ -46,7 +47,8 @@ def onAction(self, action):
         except:
             util.ERROR()
 
-        if action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and self.getFocusId() == self.SETTINGS_LIST_ID:
+        if self.roundRobin and action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and \
+                self.getFocusId() == self.SETTINGS_LIST_ID:
             to_pos = None
             last_index = self.settingsList.size() - 1
             if action == xbmcgui.ACTION_MOVE_UP and self.lastSelectedItem == 0 and self.settingsList.topHasFocus():
@@ -179,6 +181,7 @@ def __init__(self, *args, **kwargs):
         self.choice = None
         self.nonPlayback = kwargs.get('non_playback')
         self.lastSelectedItem = self.selectedIdx if self.selectedIdx is not None else 0
+        self.roundRobin = kwargs.get('round_robin', True)
 
     def onFirstInit(self):
         self.optionsList = kodigui.ManagedControlList(self, self.OPTIONS_LIST_ID, 8)
@@ -194,7 +197,8 @@ def onAction(self, action):
         except:
             util.ERROR()
 
-        if action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and self.getFocusId() == self.OPTIONS_LIST_ID:
+        if self.roundRobin and action in (xbmcgui.ACTION_MOVE_UP, xbmcgui.ACTION_MOVE_DOWN) and \
+                self.getFocusId() == self.OPTIONS_LIST_ID:
             to_pos = None
             last_index = self.optionsList.size() - 1