[Enigma-cvs] enigma/src menus.cc,1.73,1.74

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv3206/src

Modified Files:
        menus.cc 
Log Message:
- OptionsMenu restores previous caption
- added TimeHuntButton
- help depends on options::TimeHunting



Index: menus.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/menus.cc,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** menus.cc    6 Nov 2003 07:20:27 -0000       1.73
--- menus.cc    9 Nov 2003 12:02:56 -0000       1.74
***************
*** 151,155 ****
  
  void LevelWidget::next_unsolved() {
!     unsigned next = NextLevel(level_pack, iselected, max_available, true, 
false);
  
      if (next)
--- 151,155 ----
  
  void LevelWidget::next_unsolved() {
!     unsigned next = NextLevel(level_pack, iselected, max_available, true, 
options::TimeHunting);
  
      if (next)
***************
*** 163,166 ****
--- 163,168 ----
                          int&             par_time, int& best_user_time, 
string *best_par_name)
      {
+         // get_best_times does not care about revision number!
+ 
          assert(li);
  
***************
*** 404,408 ****
      "Escape:",                  "Skip to main menu",
      "F1:",                      "Show this help",
!     "F5:",                      "Select next unsolved level",
      "Arrows:",                  "Select level",
      "Return:",                  "Play selected level",
--- 406,410 ----
      "Escape:",                  "Skip to main menu",
      "F1:",                      "Show this help",
!     "F5:",                      0, // see below
      "Arrows:",                  "Select level",
      "Return:",                  "Play selected level",
***************
*** 440,444 ****
  
      case SDLK_F1: {
!         px::Screen *screen = video::GetScreen();
          displayHelp(screen, helptext_levelmenu, 200);
          get_menu()->draw_all(screen);
--- 442,451 ----
  
      case SDLK_F1: {
!         px::Screen *screen        = video::GetScreen();
!         if (options::TimeHunting)
!             helptext_levelmenu[5] = "Select next non-par level";
!         else
!             helptext_levelmenu[5] = "Select next unsolved level";
! 
          displayHelp(screen, helptext_levelmenu, 200);
          get_menu()->draw_all(screen);
***************
*** 629,632 ****
--- 636,654 ----
      };
  
+     class TimeHuntButton : public TextButton {
+         void update() {
+             if (TimeHunting)
+                 set_text("Time-Hunt");
+             else
+                 set_text("Normal timing");
+         }
+         void on_action(Widget *) {
+             TimeHunting = ! TimeHunting;
+             update();
+         }
+     public:
+         TimeHuntButton() : TextButton("", this) { update(); }
+     };
+ 
      class VideoModeButton : public TextButton {
          video::VideoModes get_mode() {
***************
*** 699,703 ****
    fullscreen(new FullscreenButton),
    m_restartinfo (new Label("")),
!   background(background_)
  {
      const int spacing     = 5;
--- 721,726 ----
    fullscreen(new FullscreenButton),
    m_restartinfo (new Label("")),
!   background(background_),
!   previous_caption(video::GetCaption())
  {
      const int spacing     = 5;
***************
*** 712,715 ****
--- 735,739 ----
      left.add (new MouseSpeedButton);
      left.add (new SkipSolvedButton);
+     left.add (new TimeHuntButton);
  //    left.add (new DifficultyButton);
      left.add (new VideoModeButton);
***************
*** 734,737 ****
--- 758,765 ----
          add(back, l);
      }
+ }
+ 
+ OptionsMenu::~OptionsMenu() {
+     video::SetCaption(previous_caption.c_str());
  }