0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preferences: Remove Paths button, superseded by titlescreen version button

Browse source
This commit is contained in:
Ignacio R. Morelle 2015-07-14 17:28:37 -03:00
parent 6a5adc30b7
commit b548d6946b
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/game_preferences_display.cpp
View file

@ -23,7 +23,6 @@
#include "gettext.hpp"
#include "gui/dialogs/advanced_graphics_options.hpp"
#include "gui/dialogs/game_cache_options.hpp"
#include "gui/dialogs/game_version.hpp"
#include "gui/dialogs/mp_alerts_options.hpp"
#include "gui/dialogs/simple_item_selector.hpp"
#include "gui/dialogs/theme_list.hpp"
@ -132,7 +131,7 @@ private:
hide_whiteboard_button_, turn_bell_button_, show_team_colors_button_,
show_haloing_button_, video_mode_button_,
theme_button_,
hotkeys_button_, paths_button_, colors_button_,
hotkeys_button_, colors_button_,
cache_button_,
advanced_button_, sound_button_,
music_button_, chat_timestamp_button_,
@ -228,7 +227,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
video_mode_button_(disp.video(), _("Change Resolution")),
theme_button_(disp.video(), _("Theme")),
hotkeys_button_(disp.video(), _("Hotkeys")),
paths_button_(disp.video(), _("Paths")),
colors_button_(disp.video(), _("Colors")),
cache_button_(disp.video(), _("Cache")),
advanced_button_(disp.video(), "", gui::button::TYPE_CHECK),
@ -519,7 +517,6 @@ preferences_dialog::preferences_dialog(display& disp, const config& game_cfg)
show_haloing_button_.set_help_string(_("Use graphical special effects (may be slower)"));
hotkeys_button_.set_help_string(_("View and configure keyboard shortcuts"));
paths_button_.set_help_string(_("View game file paths"));
colors_button_.set_help_string(_("Adjust orb colors"));
cache_button_.set_help_string(_("Manage the game WML cache"));
@ -582,7 +579,6 @@ sdl_handler_vector preferences_dialog::handler_members()
h.push_back(&video_mode_button_);
h.push_back(&theme_button_);
h.push_back(&hotkeys_button_);
h.push_back(&paths_button_);
h.push_back(&colors_button_);
h.push_back(&cache_button_);
h.push_back(&advanced_button_);
@ -682,8 +678,7 @@ void preferences_dialog::update_location(SDL_Rect const &rect)
autosavemax_slider_.set_location(autosavemax_rect);
hotkeys_button_.set_location(rect.x, bottom_row_y - hotkeys_button_.height());
paths_button_.set_location(rect.x + hotkeys_button_.width() + 10, bottom_row_y - paths_button_.height());
cache_button_.set_location(paths_button_.location().x + paths_button_.width() + 10, bottom_row_y - cache_button_.height());
cache_button_.set_location(rect.x + hotkeys_button_.width() + 10, bottom_row_y - cache_button_.height());
// Display tab
ypos = rect.y + top_border;
@ -943,10 +938,6 @@ void preferences_dialog::process_event()
show_hotkeys_preferences_dialog(disp_);
parent->clear_buttons();
}
if (paths_button_.pressed()) {
show_paths_dialog(disp_);
parent->clear_buttons();
}
if (cache_button_.pressed()) {
gui2::tgame_cache_options::display(disp_.video());
parent->clear_buttons();
@ -1589,7 +1580,6 @@ void preferences_dialog::set_selection(int index)
hide_whiteboard_button_.hide(hide_general);
interrupt_when_ally_sighted_button_.hide(hide_general);
hotkeys_button_.hide(hide_general);
paths_button_.hide(hide_general);
cache_button_.hide(hide_general);
save_replays_button_.hide(hide_general);
delete_saves_button_.hide(hide_general);
@ -1773,11 +1763,6 @@ bool show_theme_dialog(display& disp)
return 0;
}
void show_paths_dialog(display& disp)
{
gui2::tgame_version::display(disp.video());
}
void show_mp_alerts_dialog(display & disp)
{
gui2::tmp_alerts_options::display(disp.video());