From f26a4ee11c9cc8561e53d695b147178e2aad60c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jord=C3=A0=20Polo?= Date: Sun, 19 Sep 2004 14:00:51 +0000 Subject: [PATCH] added/fixed some dialog titles --- src/dialogs.cpp | 2 +- src/hotkeys.cpp | 4 ++-- src/playturn.cpp | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dialogs.cpp b/src/dialogs.cpp index 839bc465548..dbb8f2b63df 100644 --- a/src/dialogs.cpp +++ b/src/dialogs.cpp @@ -171,7 +171,7 @@ int get_save_name(display & disp,const std::string& caption, const std::string& int overwrite=0; int res=0; do { - res = gui::show_dialog(disp,NULL,_("Save"),caption,dialog_type,NULL,NULL,message,name); + res = gui::show_dialog(disp,NULL,_("Save Game"),caption,dialog_type,NULL,NULL,message,name); if (res == 0 && save_game_exists(*name)) overwrite = gui::show_dialog(disp,NULL,_("Overwrite?"), _("Save already exists. Do you want to overwrite it ?"),gui::YES_NO); diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp index 32ec637eddb..ed9e78ad15a 100644 --- a/src/hotkeys.cpp +++ b/src/hotkeys.cpp @@ -355,7 +355,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::show_dialog(disp,NULL,_("Quit"),_("Do you really want to quit?"),gui::YES_NO); if(res == 0) { throw end_level_exception(QUIT); } else { @@ -539,7 +539,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::show_dialog(disp,NULL,_("Quit"),_("Do you really want to quit?"),gui::YES_NO); if(res == 0) { throw end_level_exception(QUIT); } diff --git a/src/playturn.cpp b/src/playturn.cpp index 6b6bc0d3910..8ea91d8d2c4 100644 --- a/src/playturn.cpp +++ b/src/playturn.cpp @@ -1348,7 +1348,7 @@ void turn_info::rename_unit() return; std::string name = un->second.description(); - const int res = gui::show_dialog(gui_,NULL,"",_("Rename Unit"), gui::OK_CANCEL,NULL,NULL,"",&name); + const int res = gui::show_dialog(gui_,NULL,_("Rename Unit"),"", gui::OK_CANCEL,NULL,NULL,"",&name); if(res == 0) { un->second.rename(name); gui_.invalidate_unit(); @@ -1631,8 +1631,8 @@ void turn_info::recruit() std::vector preview_panes; preview_panes.push_back(&unit_preview); - recruit_res = gui::show_dialog(gui_,NULL,"", - _("Recruit unit") + std::string(":\n"), + recruit_res = gui::show_dialog(gui_,NULL,_("Recruit"), + _("Select unit") + std::string(":\n"), gui::OK_CANCEL,&items,&preview_panes,"",NULL,NULL,NULL,-1,-1, NULL,NULL,"recruit_and_recall"); } @@ -1808,7 +1808,7 @@ void turn_info::recall() std::vector preview_panes; preview_panes.push_back(&unit_preview); - res = gui::show_dialog(gui_,NULL,"", + res = gui::show_dialog(gui_,NULL,_("Recall"), _("Select unit") + std::string(":\n"), gui::OK_CANCEL,&options, &preview_panes,"",NULL, @@ -2083,7 +2083,7 @@ void turn_info::show_statistics() items.push_back(str.str()); } - const int res = gui::show_dialog(gui_,NULL,"",_("Statistics"),gui::MESSAGE,&items); + const int res = gui::show_dialog(gui_,NULL,_("Statistics"),"",gui::MESSAGE,&items); std::string title; items.clear(); switch(res) { @@ -2283,7 +2283,7 @@ void turn_info::label_terrain() } std::string label = gui_.labels().get_label(last_hex_); - const int res = gui::show_dialog(gui_,NULL,"",_("Place Label"),gui::OK_CANCEL, + const int res = gui::show_dialog(gui_,NULL,_("Place Label"),"",gui::OK_CANCEL, NULL,NULL,_("Label") + std::string(":"),&label); if(res == 0) { gui_.labels().set_label(last_hex_,label);