X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.hpp;h=7c6605cb9671a0c41a2b10faf96da96102e8f751;hb=c686b6e6bc389edb08cef2215b0882b2b0ff4b4b;hp=55d97e216e8346c58eec28949ff438cddf58e967;hpb=c62711567861587107d124642db29e2674ee6533;p=supertux.git

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 55d97e216..7c6605cb9 100644
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -51,28 +51,31 @@ enum MenuItemKind {
 };
 
 class Menu;
-
+
 class MenuItem
 {
 public:
   MenuItem(MenuItemKind kind, int id = -1);
   MenuItemKind kind;
-  int id;   // item id      
+  int id;   // item id
   bool toggled;
   std::string text;
   std::string input;
-  
+  std::string help;
+
   std::vector<std::string> list; // list of values for a STRINGSELECT item
   size_t selected; // currently selected item
-  
+
   Menu* target_menu;
-  
+
+  void set_help(const std::string& help_text);
+
   void change_text (const std::string& text);
   void change_input(const std::string& text);
-  
+
   static MenuItem* create(MenuItemKind kind, const std::string& text,
                           int init_toggle, Menu* target_menu, int id, int key);
-  
+
   std::string get_input_with_symbol(bool active_item);   // returns the text with an input symbol
 
 private:
@@ -84,27 +87,28 @@ private:
   /// keyboard key or joystick button
   bool input_flickering;
 };
-
+
 class Menu
 {
 private:
   static std::vector<Menu*> last_menus;
+  static Menu* previous;
   static Menu* current_;
-  
+
   static void pop_current();
-  
+
 public:
   /** Set the current menu, if pmenu is NULL, hide the current menu */
   static void set_current(Menu* pmenu);
 
-  static void push_current(Menu* pmenu); 
-  
+  static void push_current(Menu* pmenu);
+
   /** Return the current active menu or NULL if none is active */
   static Menu* current()
   {
     return current_;
   }
-  
+
 private:
   /* Action done on the menu */
   enum MenuAction {
@@ -118,21 +122,21 @@ private:
     MENU_ACTION_REMOVE,
     MENU_ACTION_BACK
   };
-  
+
   /** Number of the item that got 'hit' (ie. pressed) in the last
       event()/update() call, -1 if none */
   int hit_item;
-  
+
   // position of the menu (ie. center of the menu, not top/left)
   float pos_x;
   float pos_y;
-  
+
   /** input event for the menu (up, down, left, right, etc.) */
   MenuAction menuaction;
-  
+
   /* input implementation variables */
-  int delete_character;
-  char mn_input_char;
+  int   delete_character;
+  char  mn_input_char;
   float menu_repeat_time;
 
 public:
@@ -143,57 +147,62 @@ public:
   static Font* field_font;
 
   std::vector<MenuItem*> items;
-  
+
   Menu();
   virtual ~Menu();
-  
-  void add_hl();
-  void add_label(const std::string& text);
-  void add_entry(int id, const std::string& text);
-  void add_toggle(int id, const std::string& text, bool toggled = false);
-  void add_deactive(int id, const std::string& text);
-  void add_back(const std::string& text);
-  void add_submenu(const std::string& text, Menu* submenu, int id = -1);
-  void add_controlfield(int id, const std::string& text,
-			const std::string& mapping = "");
+
+  MenuItem* add_hl();
+  MenuItem* add_label(const std::string& text);
+  MenuItem* add_entry(int id, const std::string& text);
+  MenuItem* add_toggle(int id, const std::string& text, bool toggled = false);
+  MenuItem* add_deactive(int id, const std::string& text);
+  MenuItem* add_back(const std::string& text);
+  MenuItem* add_submenu(const std::string& text, Menu* submenu, int id = -1);
+  MenuItem* add_controlfield(int id, const std::string& text,
+                             const std::string& mapping = "");
+  MenuItem* add_string_select(int id, const std::string& text);
 
   virtual void menu_action(MenuItem* item);
-  
+
   void update();
-  
+
   /** Remove all entries from the menu */
   void clear();
-  
+
   /** Return the index of the menu item that was 'hit' (ie. the user
       clicked on it) in the last event() call */
   int check ();
-  
+
   MenuItem& get_item(int index)
   {
     return *(items[index]);
   }
   MenuItem& get_item_by_id(int id);
   const MenuItem& get_item_by_id(int id) const;
-  
+
   int get_active_item_id();
   void set_active_item(int id);
-  
-  void draw(DrawingContext& context);  
+
+  void draw(DrawingContext& context);
   void set_pos(float x, float y, float rw = 0, float rh = 0);
-  
+
   void event(const SDL_Event& event);
 
   bool is_toggled(int id) const;
+  void set_toggled(int id, bool toggled);
+
+  Menu* get_parent() const;
 
 protected:
-  void additem(MenuItem* pmenu_item);  
+  void additem(MenuItem* pmenu_item);
   float get_width() const;
   float get_height() const;
 
 private:
-  void check_controlfield_change_event(const SDL_Event& event);  
+  void check_controlfield_change_event(const SDL_Event& event);
   void draw_item(DrawingContext& context, int index);
-  float effect_time;
+  float effect_progress;
+  float effect_start_time;
   int arrange_left;
   int active_item;