X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Foptions_menu.cpp;h=ccadc447e28f8f158e0cf2415d51747d5aed359e;hb=c13404a6b6a97ad0d5e1c9f905d7a7e37b797c13;hp=9bd765b0bb84e0c163c2c7f56e7d9835ab86c986;hpb=812452cc4293e08876bfa9a67c17d45f365b3df2;p=supertux.git

diff --git a/src/options_menu.cpp b/src/options_menu.cpp
index 9bd765b0b..ccadc447e 100644
--- a/src/options_menu.cpp
+++ b/src/options_menu.cpp
@@ -34,7 +34,7 @@ Menu* options_menu   = 0;
 enum OptionsMenuIDs {
   MNID_FULLSCREEN,
   MNID_FULLSCREEN_RESOLUTION,
-  MNID_MAGINFICATION,
+  MNID_MAGNIFICATION,
   MNID_ASPECTRATIO,
   MNID_PROFILES,
   MNID_SOUND,
@@ -47,7 +47,7 @@ public:
   LanguageMenu() {
     add_label(_("Language"));
     add_hl();
-    add_entry(0, std::string("(")+_("auto-detect language")+")");
+    add_entry(0, std::string("<")+_("auto-detect")+">");
     add_entry(1, "English");
 
     int mnid = 10;    
@@ -71,13 +71,13 @@ public:
       config->locale = "";
       dictionary_manager.set_language(config->locale);
       config->save();
-      Menu::set_current(0);
+      Menu::pop_current();
     }
     else if (item->id == 1) {
       config->locale = "en";
       dictionary_manager.set_language(config->locale);
       config->save();
-      Menu::set_current(0);
+      Menu::pop_current();
     }
     int mnid = 10;    
     std::set<std::string> languages = dictionary_manager.get_languages();
@@ -87,7 +87,7 @@ public:
         config->locale = locale_name;
         dictionary_manager.set_language(config->locale);
         config->save();
-        Menu::set_current(0);
+        Menu::pop_current();
       }
     }
   }
@@ -114,36 +114,38 @@ OptionsMenu::OptionsMenu()
   add_label(_("Options"));
   add_hl();
 
-  // Language change should only be possible in the main menu, since elsewhere it might not always full work
+  // Language change should only be possible in the main menu, since elsewhere it might not always work fully
   // FIXME: Implement me: if (get_parent() == main_menu)
   add_submenu(_("Select Language"), language_menu.get())
-    ->set_help(_("Switch to another language"));
+    ->set_help(_("Select a different language to display text in"));
 
   add_submenu(_("Select Profile"), get_profile_menu())
-    ->set_help(_("Switch between different savegames"));
+    ->set_help(_("Select a profile to play with"));
 
   add_toggle(MNID_PROFILES, _("Profile on Startup"), config->sound_enabled)
-    ->set_help(_("Display the profile menu when the game is newly started"));
+    ->set_help(_("Select your profile immediately after start-up"));
   
   add_toggle(MNID_FULLSCREEN,_("Fullscreen"), config->use_fullscreen)
-    ->set_help(_("Let the game cover the whole screen"));
+    ->set_help(_("Fill the entire screen"));
 
   MenuItem* fullscreen_res = add_string_select(MNID_FULLSCREEN_RESOLUTION, _("Resolution"));
-  fullscreen_res->set_help(_("Change the Resolution to be used in Fullscreen Mode, you have to toggle fullscreen mode to let this change take effect"));
-
-  MenuItem* maginfication = add_string_select(MNID_MAGINFICATION, _("Maginfication"));
-  maginfication->set_help(_("Change the magnification of the game area"));
-
-  // These values go from screen:640/projection:1600 to screen:1600/projection:640
-  maginfication->list.push_back("40%");
-  maginfication->list.push_back("50%");
-  maginfication->list.push_back("62.5%");
-  maginfication->list.push_back("80%");
-  maginfication->list.push_back("100%");
-  maginfication->list.push_back("125%");
-  maginfication->list.push_back("160%");
-  maginfication->list.push_back("200%");
-  maginfication->list.push_back("250%");
+  fullscreen_res->set_help(_("Determine the resolution used in fullscreen mode (you must toggle fullscreen to complete the change)"));
+
+  MenuItem* magnification = add_string_select(MNID_MAGNIFICATION, _("Magnification"));
+  magnification->set_help(_("Change the magnification of the game area"));
+
+  // These values go from screen:640/projection:1600 to
+  // screen:1600/projection:640 (i.e. 640, 800, 1024, 1280, 1600)
+  magnification->list.push_back("auto");
+  magnification->list.push_back("40%");
+  magnification->list.push_back("50%");
+  magnification->list.push_back("62.5%");
+  magnification->list.push_back("80%");
+  magnification->list.push_back("100%");
+  magnification->list.push_back("125%");
+  magnification->list.push_back("160%");
+  magnification->list.push_back("200%");
+  magnification->list.push_back("250%");
 
   SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_OPENGL);
 
@@ -152,7 +154,7 @@ OptionsMenu::OptionsMenu()
 
     }
   else if(modes == (SDL_Rect **)-1) 
-    { // All resolutions sould work, so we fall back to hardcoded defaults
+    { // All resolutions should work, so we fall back to hardcoded defaults
       fullscreen_res->list.push_back("640x480");
       fullscreen_res->list.push_back("800x600");
       fullscreen_res->list.push_back("1024x768");
@@ -178,44 +180,49 @@ OptionsMenu::OptionsMenu()
   MenuItem* aspect = add_string_select(MNID_ASPECTRATIO, _("Aspect Ratio"));
   aspect->set_help(_("Adjust the aspect ratio"));
   
-  aspect->list.push_back("4:3");
+  aspect->list.push_back("auto");
   aspect->list.push_back("5:4");
+  aspect->list.push_back("4:3");
   aspect->list.push_back("16:10");
   aspect->list.push_back("16:9");
+  aspect->list.push_back("1368:768");
 
-  std::ostringstream out;
-  out << config->aspect_width << ":" << config->aspect_height;
-  std::string aspect_ratio = out.str();
-  for(std::vector<std::string>::iterator i = aspect->list.begin(); i != aspect->list.end(); ++i)
+  if (config->aspect_width != 0 && config->aspect_height != 0)
     {
-      if(*i == aspect_ratio)
+      std::ostringstream out;
+      out << config->aspect_width << ":" << config->aspect_height;
+      std::string aspect_ratio = out.str();
+      for(std::vector<std::string>::iterator i = aspect->list.begin(); i != aspect->list.end(); ++i)
         {
-          aspect_ratio.clear();
-          break;
+          if(*i == aspect_ratio)
+            {
+              aspect_ratio.clear();
+              break;
+            }
         }
-    }
 
-  if (!aspect_ratio.empty())
-    {
-      aspect->selected = aspect->list.size();
-      aspect->list.push_back(aspect_ratio);
+      if (!aspect_ratio.empty())
+        {
+          aspect->selected = aspect->list.size();
+          aspect->list.push_back(aspect_ratio);
+        }
     }
   
   if (sound_manager->is_audio_enabled()) {
     add_toggle(MNID_SOUND, _("Sound"), config->sound_enabled)
-      ->set_help(_("Disable all sound effects in the game"));
+      ->set_help(_("Disable all sound effects"));
     add_toggle(MNID_MUSIC, _("Music"), config->music_enabled)
-      ->set_help(_("Disable all music in the game"));
+      ->set_help(_("Disable all music"));
   } else {
-    add_deactive(MNID_SOUND, _("Sound (disabled)"));
-    add_deactive(MNID_MUSIC, _("Music (disabled)"));
+    add_inactive(MNID_SOUND, _("Sound (disabled)"));
+    add_inactive(MNID_MUSIC, _("Music (disabled)"));
   }
   
   add_submenu(_("Setup Keyboard"), main_controller->get_key_options_menu())
-    ->set_help(_("Configure how your keyboard maps to the game"));
+    ->set_help(_("Configure key-action mappings"));
 
   add_submenu(_("Setup Joystick"),main_controller->get_joystick_options_menu())
-    ->set_help(_("Configure how your joystick maps to the game"));
+    ->set_help(_("Configure joystick control-action mappings"));
   add_hl();
   add_back(_("Back"));
 }
@@ -230,21 +237,36 @@ OptionsMenu::menu_action(MenuItem* item)
   switch (item->id) {
     case MNID_ASPECTRATIO:
       { 
-        if(sscanf(item->list[item->selected].c_str(), "%d:%d", &config->aspect_width, &config->aspect_height) == 2)
+        if (item->list[item->selected] == "auto")
+          {
+            config->aspect_width  = 0; // Magic values
+            config->aspect_height = 0;
+            Renderer::instance()->apply_config();
+            Menu::recalc_pos();
+          }
+        else if(sscanf(item->list[item->selected].c_str(), "%d:%d", &config->aspect_width, &config->aspect_height) == 2)
           {
             Renderer::instance()->apply_config();
             Menu::recalc_pos();
           }
+        else
+          {
+            assert(!"This must not be reached");
+          }
       }
       break;
 
-    case MNID_MAGINFICATION:
-      if(sscanf(item->list[item->selected].c_str(), "%f", &config->magnification) == 1)
+    case MNID_MAGNIFICATION:
+      if (item->list[item->selected] == "auto")
+        {
+          config->magnification = 0.0f; // Magic value 
+        }
+      else if(sscanf(item->list[item->selected].c_str(), "%f", &config->magnification) == 1)
         {
           config->magnification /= 100.0f;
-          Renderer::instance()->apply_config();
-          Menu::recalc_pos();
         }
+      Renderer::instance()->apply_config();
+      Menu::recalc_pos();
       break;
 
     case MNID_FULLSCREEN_RESOLUTION:
@@ -257,7 +279,8 @@ OptionsMenu::menu_action(MenuItem* item)
     case MNID_FULLSCREEN:
       if(config->use_fullscreen != options_menu->is_toggled(MNID_FULLSCREEN)) {
         config->use_fullscreen = !config->use_fullscreen;
-        init_video();
+        init_video(); // FIXME: Should call apply_config instead
+        Menu::recalc_pos();
         config->save();
       }
       break;