X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgui%2Fmenu.hpp;h=b74e931ad91b88b6760625713a85dd6d276909c1;hb=9ea35748100d9feb67a66f8a6656cc60f41bfa8c;hp=2875b1374089223396d40499da4be6ed75ffd6cd;hpb=88044088f138f9f6bdaaaf873f114f34f053c864;p=supertux.git

diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 2875b1374..b74e931ad 100644
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,81 +12,23 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#ifndef SUPERTUX_MENU_H
-#define SUPERTUX_MENU_H
+#ifndef HEADER_SUPERTUX_GUI_MENU_HPP
+#define HEADER_SUPERTUX_GUI_MENU_HPP
 
-#include <vector>
 #include <list>
 #include <memory>
-#include <set>
-#include <string>
-#include <utility>
-#include <assert.h>
-
 #include <SDL.h>
 
-#include "video/surface.hpp"
-#include "video/font.hpp"
-#include "mousecursor.hpp"
-
-bool confirm_dialog(Surface* background, std::string text);
-
-/* Kinds of menu items */
-enum MenuItemKind {
-  MN_ACTION,
-  MN_GOTO,
-  MN_TOGGLE,
-  MN_BACK,
-  MN_INACTIVE,
-  MN_TEXTFIELD,
-  MN_NUMFIELD,
-  MN_CONTROLFIELD,
-  MN_STRINGSELECT,
-  MN_LABEL,
-  MN_HL, /* horizontal line */
-};
-
-class Menu;
-
-class MenuItem
-{
-public:
-  MenuItem(MenuItemKind kind, int id = -1);
-  MenuItemKind kind;
-  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);
+#include "video/color.hpp"
 
-  void change_text (const std::string& text);
-  void change_input(const std::string& text);
+class DrawingContext;
+class MenuItem;
+class Surface;
 
-  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:
-  /// copy-construction not allowed
-  MenuItem(const MenuItem& ) { assert(false); }
-  /// assignment not allowed
-  void operator= (const MenuItem& ) { assert(false); }
+bool confirm_dialog(Surface* background, std::string text);
 
-  /// keyboard key or joystick button
-  bool input_flickering;
-};
-
 class Menu
 {
   static Color default_color;
@@ -112,7 +52,6 @@ public:
   static void push_current(Menu* pmenu);
   static void pop_current();
 
-
   static void recalc_pos();
 
   /** Return the current active menu or NULL if none is active */
@@ -135,27 +74,7 @@ private:
     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;
-  float menu_repeat_time;
-
-  bool close;
-
 public:
-  std::vector<MenuItem*> items;
-
   Menu();
   virtual ~Menu();
 
@@ -185,6 +104,7 @@ public:
   {
     return *(items[index]);
   }
+
   MenuItem& get_item_by_id(int id);
   const MenuItem& get_item_by_id(int id) const;
 
@@ -209,6 +129,30 @@ protected:
 private:
   void check_controlfield_change_event(const SDL_Event& event);
   void draw_item(DrawingContext& context, int index);
+
+private:
+  /** 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;
+  float menu_repeat_time;
+
+  bool close;
+
+public:
+  std::vector<MenuItem*> items;
+
+private:
   float effect_progress;
   float effect_start_time;
   int arrange_left;
@@ -222,3 +166,5 @@ private:
 };
 
 #endif
+
+/* EOF */