Merge branch 'bug_713_fix_timerlist_sort' into experimental

diff --combined data/setup.xml
index 20231a0,5f7cbf6..8620709
--- 1/data/setup.xml
--- 2/data/setup.xml
+++ b/data/setup.xml
@@@ -28,11 -28,11 +28,12 @@@
                        <item level="2" text="Load Length of Movies in Movielist">config.usage.load_length_of_movies_in_moviellist</item>
                        <item level="1" text="Show positioner movement">config.usage.showdish</item>
                        <item level="1" text="Enable multiple bouquets">config.usage.multibouquet</item>
 +                      <item level="1" text="Multi-EPG bouquet selection">config.usage.multiepg_ask_bouquet</item>
                        <item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
                        <item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item>
                        <item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item>
                        <item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item>
+                       <item level="1" text="Position of finished Timers in Timerlist">config.usage.timerlist_finished_timer_position</item>
                        <item level="0" text="Infobar timeout">config.usage.infobar_timeout</item>
                        <item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item>
                        <item level="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item>

diff --combined lib/python/Components/UsageConfig.py
index 784b93a,acbc342..ce56f0f
--- 1/lib/python/Components/UsageConfig.py
--- 2/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@@ -9,8 -9,6 +9,8 @@@ def InitUsageConfig()
        config.usage = ConfigSubsection();
        config.usage.showdish = ConfigYesNo(default = True)
        config.usage.multibouquet = ConfigYesNo(default = False)
 +      config.usage.multiepg_ask_bouquet = ConfigYesNo(default = False)
 +
        config.usage.quickzap_bouquet_change = ConfigYesNo(default = False)
        config.usage.e1like_radio_mode = ConfigYesNo(default = False)
        config.usage.infobar_timeout = ConfigSelection(default = "5", choices = [
@@@ -115,6 -113,8 +115,8 @@@
                ("step", _("Singlestep (GOP)")),
                ("last", _("Last speed")) ])
  
+       config.usage.timerlist_finished_timer_position = ConfigSelection(default = "beginning", choices = [("beginning", _("at beginning")), ("end", _("at end"))])
+ 
        def updateEnterForward(configElement):
                if not configElement.value:
                        configElement.value = [2]

diff --combined lib/python/Screens/TimerEdit.py
index 572f14b,6e8859e..2130943
--- 1/lib/python/Screens/TimerEdit.py
--- 2/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@@ -13,6 -13,7 +13,7 @@@ from ServiceReference import ServiceRef
  from TimerEntry import TimerEntry, TimerLog
  from Tools.BoundFunction import boundFunction
  from time import time
+ from timer import TimerEntry
  
  class TimerEditList(Screen):
        EMPTY = 0
@@@ -88,9 -89,7 +89,9 @@@
                                if not timersanitycheck.check():
                                        t.disable()
                                        print "Sanity check failed"
 -                                      self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
 +                                      simulTimerList = timersanitycheck.getSimulTimerList()
 +                                      if simulTimerList is not None:
 +                                              self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, simulTimerList)
                                else:
                                        print "Sanity check passed"
                                        if timersanitycheck.doubleCheck():
@@@ -174,11 -173,20 +175,20 @@@
                        self.key_blue_choice = self.EMPTY
  
        def fillTimerList(self):
+               #helper function to move finished timers to end of list
+               def eol_compare(x, y):
+                       if x[0].state != y[0].state and x[0].state == TimerEntry.StateEnded or y[0].state == TimerEntry.StateEnded:
+                               return cmp(x[0].state, y[0].state)
+                       return cmp(x[0].begin, x[1].begin)
+ 
                list = self.list
                del list[:]
                list.extend([(timer, False) for timer in self.session.nav.RecordTimer.timer_list])
                list.extend([(timer, True) for timer in self.session.nav.RecordTimer.processed_timers])
-               list.sort(key = lambda x: x[0].begin)
+               if config.usage.timerlist_finished_timer_position.index: #end of list
+                       list.sort(cmp = eol_compare)
+               else:
+                       list.sort(key = lambda x: x[0].begin)
  
        def showLog(self):
                cur=self["timerlist"].getCurrent()