[Supertux-Commit] r5421 - in trunk/supertux/src: . gui

grumbel at millhouse.dreamhost.com grumbel at millhouse.dreamhost.com
Mon May 5 22:41:19 PDT 2008


Author: grumbel
Date: 2008-05-05 22:41:18 -0700 (Mon, 05 May 2008)
New Revision: 5421

Modified:
   trunk/supertux/src/gui/menu.cpp
   trunk/supertux/src/gui/menu.hpp
   trunk/supertux/src/options_menu.cpp
Log:
Return pointer to MenuItem when creating one
Added set_help() to MenuItem (rendering code will follow)

Modified: trunk/supertux/src/gui/menu.cpp
===================================================================
--- trunk/supertux/src/gui/menu.cpp	2008-05-05 20:08:41 UTC (rev 5420)
+++ trunk/supertux/src/gui/menu.cpp	2008-05-06 05:41:18 UTC (rev 5421)
@@ -182,6 +182,12 @@
   input = text_;
 }
 
+void
+MenuItem::set_help(const std::string& help_text)
+{
+  help = help_text;
+}
+
 std::string MenuItem::get_input_with_symbol(bool active_item)
 {
   if(!active_item) {
@@ -261,21 +267,24 @@
   }
 }
 
-void
+MenuItem*
 Menu::add_hl()
 {
-  additem(new MenuItem(MN_HL));
+  MenuItem* item = new MenuItem(MN_HL);
+  additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_label(const std::string& text)
 {
   MenuItem* item = new MenuItem(MN_LABEL);
   item->text = text;
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_controlfield(int id, const std::string& text,
 		const std::string& mapping)
 {
@@ -283,48 +292,54 @@
   item->change_text(text);
 	item->change_input(mapping);
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_entry(int id, const std::string& text)
 {
   MenuItem* item = new MenuItem(MN_ACTION, id);
   item->text = text;
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_deactive(int id, const std::string& text)
 {
   MenuItem* item = new MenuItem(MN_DEACTIVE, id);
   item->text = text;
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_toggle(int id, const std::string& text, bool toogled)
 {
   MenuItem* item = new MenuItem(MN_TOGGLE, id);
   item->text = text;
   item->toggled = toogled;
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_back(const std::string& text)
 {
   MenuItem* item = new MenuItem(MN_BACK);
   item->text = text;
   additem(item);
+  return item;
 }
 
-void
+MenuItem*
 Menu::add_submenu(const std::string& text, Menu* submenu, int id)
 {
   MenuItem* item = new MenuItem(MN_GOTO, id);
   item->text = text;
   item->target_menu = submenu;
   additem(item);
+  return item;
 }
 
 void

Modified: trunk/supertux/src/gui/menu.hpp
===================================================================
--- trunk/supertux/src/gui/menu.hpp	2008-05-05 20:08:41 UTC (rev 5420)
+++ trunk/supertux/src/gui/menu.hpp	2008-05-06 05:41:18 UTC (rev 5421)
@@ -61,12 +61,15 @@
   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);
 
@@ -132,8 +135,8 @@
   MenuAction menuaction;
 
   /* input implementation variables */
-  int delete_character;
-  char mn_input_char;
+  int   delete_character;
+  char  mn_input_char;
   float menu_repeat_time;
 
 public:
@@ -148,15 +151,15 @@
   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 = "");
 
   virtual void menu_action(MenuItem* item);
 

Modified: trunk/supertux/src/options_menu.cpp
===================================================================
--- trunk/supertux/src/options_menu.cpp	2008-05-05 20:08:41 UTC (rev 5420)
+++ trunk/supertux/src/options_menu.cpp	2008-05-06 05:41:18 UTC (rev 5421)
@@ -114,6 +114,7 @@
 
   add_submenu(_("Select Language"), language_menu.get());
   add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen);
+    add_toggle(MNID_SOUND, _("Profile Select on Startup"), config->sound_enabled);
   if (sound_manager->is_audio_enabled()) {
     add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled);
     add_toggle(MNID_MUSIC, _("Music"), config->music_enabled);




More information about the Supertux-Commit mailing list