upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-08 21:50:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transform more show_dialog() calls into basic_dialog instantiations.

Browse Source
This commit is contained in:
Eric S. Raymond 2007-06-30 23:50:24 +00:00
parent 111426c293
commit 9a924b7bbe
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dialogs.cpp
View File

@ -113,9 +113,16 @@ void advance_unit(const game_data& info,
std::vector<gui::preview_pane*> preview_panes;
preview_panes.push_back(&unit_preview);
res = gui::show_dialog(gui,NULL,_("Advance Unit"),
_("What should our victorious unit become?"),
gui::OK_ONLY, &lang_options, &preview_panes);
gui::basic_dialog advances = gui::basic_dialog(gui,
_("Advance Unit"),
_("What should our victorious unit become?"),
gui::OK_ONLY);
advances.set_menu(lang_options);
std::vector<gui::preview_pane*>::const_iterator itor;
for(itor = preview_panes.begin(); itor != preview_panes.end(); ++itor)
advances.add_pane(*itor);
res = advances.show();
}
recorder.choose_option(res);

12
src/hotkeys.cpp
View File

@ -16,7 +16,7 @@
#define GETTEXT_DOMAIN "wesnoth-lib"
#include "config.hpp"
#include "construct_dialog.hpp"
#include "basic_dialog.hpp"
#include "display.hpp"
#include "events.hpp"
#include "hotkeys.hpp"
@ -478,7 +478,7 @@ void key_event(display& disp, const SDL_KeyboardEvent& event, command_executor*
{
if(event.keysym.sym == SDLK_ESCAPE && disp.in_game()) {
std::cerr << "escape pressed..showing quit\n";
const int res = gui::show_dialog(disp,NULL,_("Quit"),_("Do you really want to quit?"),gui::YES_NO);
const int res = gui::basic_dialog(disp,_("Quit"),_("Do you really want to quit?"),gui::YES_NO).show();
if(res == 0) {
throw end_level_exception(QUIT);
} else {
@ -779,7 +779,7 @@ void execute_command(display& disp, HOTKEY_COMMAND command, command_executor* ex
case HOTKEY_QUIT_GAME: {
if(disp.in_game()) {
std::cerr << "is in game -- showing quit message\n";
const int res = gui::show_dialog(disp,NULL,_("Quit"),_("Do you really want to quit?"),gui::YES_NO);
const int res = gui::basic_dialog(disp,_("Quit"),_("Do you really want to quit?"),gui::YES_NO).show();
if(res == 0) {
throw end_level_exception(QUIT);
}
@ -805,8 +805,10 @@ void command_executor::show_menu(const std::vector<std::string>& items_arg, int
std::vector<std::string> menu = get_menu_images(items);
const int res = gui::show_dialog(gui,NULL,"","",
gui::MESSAGE,&menu,NULL,"",NULL,-1,NULL,xloc,yloc,&gui::dialog::hotkeys_style);
gui::basic_dialog mmenu = gui::basic_dialog(gui,"","",
gui::MESSAGE, &gui::basic_dialog::hotkeys_style);
mmenu.set_menu(menu);
const int res = mmenu.show(xloc, yloc);
if (size_t(res) >= items.size())
return;