upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 22:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

restore the old functionality,

Browse Source 
...you can scroll to the leader from the status table again; add a
'Back' button to switch from the scenario settings back to the status
table; the button alignment is still not solved, but this has to wait
until after 1.3.7
This commit is contained in:
uso 2007-08-23 18:57:10 +00:00
parent eb6e77f30a
commit 579145f405
3 changed files with 41 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/menu_events.cpp
View File

@ -528,27 +528,39 @@ namespace events{
items.push_back(str.str());
}
gui::dialog slist(*gui_, _("Current Status"), "", gui::NULL_DIALOG);
slist.add_button(new gui::standard_dialog_button(gui_->video(), _("More"), 0, false),
gui::dialog::BUTTON_STANDARD);
slist.add_button(new gui::standard_dialog_button(gui_->video(), _("Close"), 1, true),
gui::dialog::BUTTON_STANDARD);
slist.set_menu(items, &sorter);
int selected = 0;
{
gui::dialog slist(*gui_, _("Current Status"), "", gui::NULL_DIALOG);
slist.add_button(new gui::dialog_button(gui_->video(), _("More"),
gui::button::TYPE_PRESS, gui::DIALOG_FORWARD),
gui::dialog::BUTTON_STANDARD);
slist.add_button(new gui::standard_dialog_button(gui_->video(),
_("Scroll To"), 0, false),
gui::dialog::BUTTON_STANDARD);
slist.add_button(new gui::standard_dialog_button(gui_->video(),
_("Close"), 1, true),
gui::dialog::BUTTON_STANDARD);
slist.set_menu(items, &sorter);
selected = slist.show();
} // this will kill the dialog before scrolling
if (slist.show() >= 0) game_settings_table();
if (selected >= 0)
gui_->scroll_to_leader(units_, selected+1);
else if (selected == gui::DIALOG_FORWARD)
scenario_settings_table();
}
void menu_handler::game_settings_table()
void menu_handler::scenario_settings_table()
{
std::stringstream heading;
heading << HEADING_PREFIX << _("game settings^Leader") << COLUMN_SEPARATOR
heading << HEADING_PREFIX << _("scenario settings^Leader") << COLUMN_SEPARATOR
<< COLUMN_SEPARATOR
<< _("game settings^Side") << COLUMN_SEPARATOR
<< _("game settings^Start\nGold") << COLUMN_SEPARATOR
<< _("game settings^Base\nIncome") << COLUMN_SEPARATOR
<< _("game settings^Gold Per\nVillage") << COLUMN_SEPARATOR
<< _("game settings^Fog") << COLUMN_SEPARATOR
<< _("game settings^Shroud");
<< _("scenario settings^Side") << COLUMN_SEPARATOR
<< _("scenario settings^Start\nGold") << COLUMN_SEPARATOR
<< _("scenario settings^Base\nIncome") << COLUMN_SEPARATOR
<< _("scenario settings^Gold Per\nVillage") << COLUMN_SEPARATOR
<< _("scenario settings^Fog") << COLUMN_SEPARATOR
<< _("scenario settings^Shroud");
gui::menu::basic_sorter sorter;
sorter.set_redirect_sort(0,1).set_alpha_sort(1).set_numeric_sort(2)
@ -598,14 +610,22 @@ namespace events{
{
gui::dialog slist(*gui_, _("Scenario Settings"), "", gui::NULL_DIALOG);
slist.set_menu(items, &sorter);
slist.add_button(new gui::standard_dialog_button(gui_->video(), _("Scroll To"), 0, false),
slist.add_button(new gui::dialog_button(gui_->video(), _("Back"),
gui::button::TYPE_PRESS, gui::DIALOG_BACK),
gui::dialog::BUTTON_STANDARD);
slist.add_button(new gui::standard_dialog_button(gui_->video(), _("Close"), 1, true),
slist.add_button(new gui::standard_dialog_button(gui_->video(),
_("Scroll To"), 0, false),
gui::dialog::BUTTON_STANDARD);
slist.add_button(new gui::standard_dialog_button(gui_->video(),
_("Close"), 1, true),
gui::dialog::BUTTON_STANDARD);
selected = slist.show();
} // this will kill the dialog before scrolling
if (selected >= 0) gui_->scroll_to_leader(units_, selected+1);
if (selected >= 0)
gui_->scroll_to_leader(units_, selected+1);
else if (selected == gui::DIALOG_BACK)
status_table();
}
void menu_handler::save_game(const std::string& message, gui::DIALOG_TYPE dialog_type,

2
src/menu_events.hpp
View File

@ -133,7 +133,7 @@ private:
bool has_friends() const;
bool clear_shroud(const unsigned int team_num);
static void change_side_controller(const std::string& side, const std::string& player, bool own_side=false);
void game_settings_table();
void scenario_settings_table();
game_display* gui_;
unit_map& units_;

2
src/show_dialog.hpp
View File

@ -37,6 +37,8 @@ namespace gui
extern const int ButtonHPadding;
extern const int ButtonVPadding;
enum DIALOG_RESULT {
DIALOG_BACK=-7,
DIALOG_FORWARD=-6,
CREATE_ITEM =-5,
DELETE_ITEM=-4,
ESCAPE_DIALOG=-3, //special return used by WML event dialogs