MNID_FULLSCREEN_RESOLUTION,
MNID_MAGNIFICATION,
MNID_ASPECTRATIO,
- MNID_PROFILES,
MNID_SOUND,
- MNID_MUSIC
+ MNID_MUSIC,
+ MNID_DEVELOPER_MODE
};
-OptionsMenu::OptionsMenu() :
- language_menu()
+OptionsMenu::OptionsMenu(bool complete)
{
- language_menu.reset(new LanguageMenu());
-
add_label(_("Options"));
add_hl();
- // 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(_("Select a different language to display text in"));
+ if (complete)
+ {
+ // Language and profile changes are only be possible in the
+ // main menu, since elsewhere it might not always work fully
+ add_submenu(_("Select Language"), MenuStorage::LANGUAGE_MENU)
+ ->set_help(_("Select a different language to display text in"));
- add_submenu(_("Select Profile"), MenuStorage::instance().get_profile_menu())
- ->set_help(_("Select a profile to play with"));
+ add_submenu(_("Select Profile"), MenuStorage::PROFILE_MENU)
+ ->set_help(_("Select a profile to play with"));
+ }
- add_toggle(MNID_PROFILES, _("Profile on Startup"), g_config->sound_enabled)
- ->set_help(_("Select your profile immediately after start-up"));
-
add_toggle(MNID_FULLSCREEN,_("Fullscreen"), g_config->use_fullscreen)
->set_help(_("Fill the entire screen"));
magn.clear();
break;
}
-
+
++count;
}
if (!magn.empty()) //magnification not in our list but accept anyway
magnification->list.push_back(magn);
}
}
-
+
int display_mode_count = SDL_GetNumDisplayModes(0);
+ std::string last_display_mode;
for(int i = 0; i < display_mode_count; ++i)
{
SDL_DisplayMode mode;
{
std::ostringstream out;
out << mode.w << "x" << mode.h << "@" << mode.refresh_rate;
+ if(last_display_mode == out.str())
+ continue;
+ last_display_mode = out.str();
fullscreen_res->list.push_back(out.str());
}
}
fullscreen_res->list.push_back("Desktop");
- std::ostringstream out;
std::string fullscreen_size_str = "Desktop";
- if (g_config->fullscreen_size != Size(0, 0))
{
- out << g_config->fullscreen_size.width << "x" << g_config->fullscreen_size.height << "@" << g_config->fullscreen_refresh_rate;
- fullscreen_size_str = out.str();
+ std::ostringstream out;
+ if (g_config->fullscreen_size != Size(0, 0))
+ {
+ out << g_config->fullscreen_size.width << "x" << g_config->fullscreen_size.height << "@" << g_config->fullscreen_refresh_rate;
+ fullscreen_size_str = out.str();
+ }
}
+
size_t cnt = 0;
- for (std::vector<std::string>::iterator i = fullscreen_res->list.begin(); i != fullscreen_res->list.end(); ++i)
+ for (std::vector<std::string>::iterator i = fullscreen_res->list.begin(); i != fullscreen_res->list.end(); ++i)
{
if (*i == fullscreen_size_str)
{
MenuItem* aspect = add_string_select(MNID_ASPECTRATIO, _("Aspect Ratio"));
aspect->set_help(_("Adjust the aspect ratio"));
-
+
aspect->list.push_back(_("auto"));
aspect->list.push_back("5:4");
aspect->list.push_back("4:3");
std::ostringstream out;
out << g_config->aspect_size.width << ":" << g_config->aspect_size.height;
std::string aspect_ratio = out.str();
- size_t cnt = 0;
+ size_t cnt_ = 0;
for(std::vector<std::string>::iterator i = aspect->list.begin(); i != aspect->list.end(); ++i)
{
if(*i == aspect_ratio)
{
aspect_ratio.clear();
- aspect->selected = cnt;
+ aspect->selected = cnt_;
break;
}
- ++cnt;
+ ++cnt_;
}
if (!aspect_ratio.empty())
aspect->list.push_back(aspect_ratio);
}
}
-
- if (sound_manager->is_audio_enabled()) {
+
+ if (SoundManager::current()->is_audio_enabled()) {
add_toggle(MNID_SOUND, _("Sound"), g_config->sound_enabled)
->set_help(_("Disable all sound effects"));
add_toggle(MNID_MUSIC, _("Music"), g_config->music_enabled)
add_inactive(MNID_SOUND, _("Sound (disabled)"));
add_inactive(MNID_MUSIC, _("Music (disabled)"));
}
-
- add_submenu(_("Setup Keyboard"), MenuStorage::instance().get_key_options_menu())
+
+ add_submenu(_("Setup Keyboard"), MenuStorage::KEYBOARD_MENU)
->set_help(_("Configure key-action mappings"));
- add_submenu(_("Setup Joystick"), MenuStorage::instance().get_joystick_options_menu())
+ add_submenu(_("Setup Joystick"), MenuStorage::JOYSTICK_MENU)
->set_help(_("Configure joystick control-action mappings"));
+
+ if (g_config->developer_mode)
+ {
+ add_toggle(MNID_DEVELOPER_MODE, _("Developer Mode"), g_config->developer_mode);
+ }
+
add_hl();
add_back(_("Back"));
}
if (item->list[item->selected] == _("auto"))
{
g_config->aspect_size = Size(0, 0); // Magic values
- Renderer::instance()->apply_config();
- MenuManager::instance().recalc_pos();
+ VideoSystem::current()->get_renderer().apply_config();
+ MenuManager::instance().on_window_resize();
}
else if (sscanf(item->list[item->selected].c_str(), "%d:%d",
&g_config->aspect_size.width, &g_config->aspect_size.height) == 2)
{
- Renderer::instance()->apply_config();
- MenuManager::instance().recalc_pos();
+ VideoSystem::current()->get_renderer().apply_config();
+ MenuManager::instance().on_window_resize();
}
else
{
case MNID_MAGNIFICATION:
if (item->list[item->selected] == _("auto"))
{
- g_config->magnification = 0.0f; // Magic value
+ g_config->magnification = 0.0f; // Magic value
}
else if(sscanf(item->list[item->selected].c_str(), "%f", &g_config->magnification) == 1)
{
g_config->magnification /= 100.0f;
}
- Renderer::instance()->apply_config();
- MenuManager::instance().recalc_pos();
+ VideoSystem::current()->get_renderer().apply_config();
+ MenuManager::instance().on_window_resize();
break;
case MNID_FULLSCREEN_RESOLUTION:
g_config->fullscreen_size.height = height;
g_config->fullscreen_refresh_rate = refresh_rate;
}
- }
+ }
break;
case MNID_FULLSCREEN:
if(g_config->use_fullscreen != is_toggled(MNID_FULLSCREEN)) {
g_config->use_fullscreen = !g_config->use_fullscreen;
- Renderer::instance()->apply_config();
- MenuManager::instance().recalc_pos();
+ VideoSystem::current()->get_renderer().apply_config();
+ MenuManager::instance().on_window_resize();
g_config->save();
}
break;
case MNID_SOUND:
if(g_config->sound_enabled != is_toggled(MNID_SOUND)) {
g_config->sound_enabled = !g_config->sound_enabled;
- sound_manager->enable_sound(g_config->sound_enabled);
+ SoundManager::current()->enable_sound(g_config->sound_enabled);
g_config->save();
}
break;
case MNID_MUSIC:
if(g_config->music_enabled != is_toggled(MNID_MUSIC)) {
g_config->music_enabled = !g_config->music_enabled;
- sound_manager->enable_music(g_config->music_enabled);
+ SoundManager::current()->enable_music(g_config->music_enabled);
g_config->save();
}
break;
+ case MNID_DEVELOPER_MODE:
+ g_config->developer_mode = is_toggled(MNID_DEVELOPER_MODE);
+ log_info << "developer mode: " << g_config->developer_mode << std::endl;
+ break;
+
default:
break;
}
}
-void
-OptionsMenu::check_menu()
-{
-}
-
/* EOF */
projects / supertux.git / blobdiff