The option "Setup/OSD/Sort timers" has been removed

6 files changed, 15 insertions, 52 deletions

diff --git a/HISTORY b/HISTORY
index c250f869..6408f22c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4390,3 +4390,5 @@ Video Disk Recorder Revision History
   the channel a recording was made from.
 - The 'info.vdr' file of a recording now also contains the 'E' and 'V' records of
   the EPG event used when creating it.
+- The option "Setup/OSD/Sort timers" has been removed. Timers are always sorted
+  by their start time and priority.
diff --git a/MANUAL b/MANUAL
index cd86d731..b3d0e158 100644
--- a/MANUAL
+++ b/MANUAL
@@ -20,11 +20,11 @@ Version 1.3
   Ok      Ch display  Select       Switch     Edit       Accept        Play              Progress disp.   Switch & Close
   Menu    Menu on     Menu off     Menu off   Menu off   Menu off      Menu off          Menu off         Menu off
   Back    -           Menu off     VDR menu   VDR menu   Discard       VDR menu          Recordings menu  Close
-  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(2)  Jump             -
+  Red     -           Record       Edit       Edit       ABC/abc       Play/Commands(1)  Jump             -
   Green   -           Audio        New        New        Ins/Ovr       Rewind            Skip -60s        -
   Yellow  -           Pause live   Delete     Delete     Delete        Delete            Skip +60s        -
-  Blue    -           Stop/Resume  Mark       On/Off(1)  -             Info              Stop             -
-  0..9    Ch select   -            Sort(3)    Day(4)     Numeric inp.  Exec cmd(2)       Editing          -
+  Blue    -           Stop/Resume  Mark       On/Off     -             Info              Stop             -
+  0..9    Ch select   -            Sort(2)    Day(3)     Numeric inp.  Exec cmd(1)       Editing          -
 
   In a numerical input field (like the response to a CAM enquiry) the keys 0..9
   are used to enter the data, and the Left key can be used to delete the last
@@ -75,18 +75,15 @@ Version 1.3
   Yellow    Info
   Blue      Timers menu
 
-  (1) The "On/Off" button in the "Timers" menu only works if sorting the timers
-      has been enabled in the "Setup" menu. Otherwise the Blue button is used
-      to "mark" a timer for moving.
-  (2) See "Processing Recordings" below.
-  (3) In the "Channels" menu the '0' key switches the sort mode through "by number",
+  (1) See "Processing Recordings" below.
+  (2) In the "Channels" menu the '0' key switches the sort mode through "by number",
       "by name" and "by provider". Other numeric input positions the cursor to
       the channel with the number entered so far. If there is no channel with that
       number, nothing happens. While entering a channel number, the '0' key will
       be treated as part of that number, not as a sort mode toggle. If no numeric
       key has been pressed for more than one second, the number is reset and '0'
       functions as sort mode toggle again.
-  (4) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
+  (3) In the "Timers" menu, when on the "Day" item, the '0' key toggles between
       a single shot and a repeating timer. If "Day" indicates a repeating timer,
       the keys '1'...'7' can be used to toggle the individual days ('1' is Monday).
 
@@ -539,10 +536,6 @@ Version 1.3
                          closing a temporary display, like, for instance, the channel
                          display.
 
-  Sort timers = yes      Turns sorting the timers in the "Timers" menu on/off.
-                         Timers are sorted by ascending start times, with the
-                         first one being the next timer that will start.
-
   Recording directories = yes
                          Turns displaying the Recordings menu as a hierarchical
                          directory structure on or off.
diff --git a/config.c b/config.c
index 4e469ab9..b829d3a7 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.141 2006/01/13 15:19:37 kls Exp $
+ * $Id: config.c 1.142 2006/02/25 14:12:16 kls Exp $
  */
 
 #include "config.h"
@@ -240,7 +240,6 @@ cSetup::cSetup(void)
   EPGLinger = 0;
   SVDRPTimeout = 300;
   ZapTimeout = 3;
-  SortTimers = 1;
   PrimaryLimit = 0;
   DefaultPriority = 50;
   DefaultLifetime = 99;
@@ -400,7 +399,6 @@ bool cSetup::Parse(const char *Name, const char *Value)
   else if (!strcasecmp(Name, "EPGLinger"))           EPGLinger          = atoi(Value);
   else if (!strcasecmp(Name, "SVDRPTimeout"))        SVDRPTimeout       = atoi(Value);
   else if (!strcasecmp(Name, "ZapTimeout"))          ZapTimeout         = atoi(Value);
-  else if (!strcasecmp(Name, "SortTimers"))          SortTimers         = atoi(Value);
   else if (!strcasecmp(Name, "PrimaryLimit"))        PrimaryLimit       = atoi(Value);
   else if (!strcasecmp(Name, "DefaultPriority"))     DefaultPriority    = atoi(Value);
   else if (!strcasecmp(Name, "DefaultLifetime"))     DefaultLifetime    = atoi(Value);
@@ -467,7 +465,6 @@ bool cSetup::Save(void)
   Store("EPGLinger",          EPGLinger);
   Store("SVDRPTimeout",       SVDRPTimeout);
   Store("ZapTimeout",         ZapTimeout);
-  Store("SortTimers",         SortTimers);
   Store("PrimaryLimit",       PrimaryLimit);
   Store("DefaultPriority",    DefaultPriority);
   Store("DefaultLifetime",    DefaultLifetime);
diff --git a/config.h b/config.h
index 105fe630..ff532d27 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.245 2006/02/24 14:11:19 kls Exp $
+ * $Id: config.h 1.246 2006/02/25 14:12:20 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -212,7 +212,6 @@ public:
   int EPGLinger;
   int SVDRPTimeout;
   int ZapTimeout;
-  int SortTimers;
   int PrimaryLimit;
   int DefaultPriority, DefaultLifetime;
   int PausePriority, PauseLifetime;
diff --git a/i18n.c b/i18n.c
index 2a3551ab..ba3a091a 100644
--- a/i18n.c
+++ b/i18n.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: i18n.c 1.248 2006/02/25 12:07:27 kls Exp $
+ * $Id: i18n.c 1.249 2006/02/25 14:13:41 kls Exp $
  *
  * Translations provided by:
  *
@@ -3282,28 +3282,6 @@ const tI18nPhrase Phrases[] = {
     "Menu taste lukker",
     "Klávesa Menu zavírá",
   },
-  { "Setup.OSD$Sort timers",
-    "Timer sortieren",
-    "Sortiraj termine",
-    "Ordinamento timer",
-    "Timers sorteren",
-    "Ordenar os timers",
-    "Trier les programmations",
-    "Sorter timere",
-    "Järjestä ajastimet",
-    "Sortuj timery",
-    "Ordenar programas de grabación",
-    "ÏñãÜíùóç ÷ñïíïðñïãñáììáôéóìþí",
-    "Sortera timers",
-    "Sortare timer-e",
-    "A beprogramozott felvételek elrendezése",
-    "Ordenar gravacions programades",
-    "ÁÞàâØàÞÒÚÐ âÐÙÜÕàÞÒ",
-    "Sortiraj termine",
-    "Taimeri sorteerimine",
-    "Sorter timere",
-    "Tøídìní èasovaèù",
-  },
   { "Setup.OSD$Recording directories",
     "Aufnahmeverzeichnisse",
     "Direktoriji za posnetke",
diff --git a/menu.c b/menu.c
index daa97d4f..9ae788c6 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.418 2006/02/25 12:16:34 kls Exp $
+ * $Id: menu.c 1.419 2006/02/25 14:13:29 kls Exp $
  */
 
 #include "menu.h"
@@ -785,9 +785,8 @@ cMenuTimers::cMenuTimers(void)
 {
   for (cTimer *timer = Timers.First(); timer; timer = Timers.Next(timer))
       Add(new cMenuTimerItem(timer));
-  if (Setup.SortTimers)
-     Sort();
-  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), Setup.SortTimers ? tr("Button$On/Off") : tr("Button$Mark"));
+  Sort();
+  SetHelp(tr("Button$Edit"), tr("Button$New"), tr("Button$Delete"), tr("Button$On/Off"));
   Timers.IncBeingEdited();
 }
 
@@ -877,11 +876,7 @@ eOSState cMenuTimers::ProcessKey(eKeys Key)
        case kRed:    return Edit();//XXX
        case kGreen:  return New();
        case kYellow: return Delete();
-       case kBlue:   if (Setup.SortTimers)
-                        OnOff();
-                     else
-                        Mark();
-                     break;
+       case kBlue:   return OnOff();
        default: break;
        }
      }
@@ -2128,7 +2123,6 @@ void cMenuSetupOSD::Set(void)
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll pages"),           &data.MenuScrollPage));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Scroll wraps"),           &data.MenuScrollWrap));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Menu button closes"),     &data.MenuButtonCloses));
-  Add(new cMenuEditBoolItem(tr("Setup.OSD$Sort timers"),            &data.SortTimers));
   Add(new cMenuEditBoolItem(tr("Setup.OSD$Recording directories"),  &data.RecordingDirs));
   SetCurrent(Get(current));
   Display();