[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src dialogs.cpp hotkeys.cpp playturn.cpp
From: |
Jordà Polo |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src dialogs.cpp hotkeys.cpp playturn.cpp |
Date: |
Sun, 19 Sep 2004 10:07:19 -0400 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Jordà Polo <address@hidden> 04/09/19 14:00:51
Modified files:
src : dialogs.cpp hotkeys.cpp playturn.cpp
Log message:
added/fixed some dialog titles
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.268&tr2=1.269&r1=text&r2=text
Patches:
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.53 wesnoth/src/dialogs.cpp:1.54
--- wesnoth/src/dialogs.cpp:1.53 Fri Sep 3 09:20:31 2004
+++ wesnoth/src/dialogs.cpp Sun Sep 19 14:00:51 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.53 2004/09/03 09:20:31 ydirson Exp $ */
+/* $Id: dialogs.cpp,v 1.54 2004/09/19 14:00:51 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -171,7 +171,7 @@
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);
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.58 wesnoth/src/hotkeys.cpp:1.59
--- wesnoth/src/hotkeys.cpp:1.58 Mon Aug 30 01:23:16 2004
+++ wesnoth/src/hotkeys.cpp Sun Sep 19 14:00:51 2004
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.58 2004/08/30 01:23:16 Sirp Exp $ */
+/* $Id: hotkeys.cpp,v 1.59 2004/09/19 14:00:51 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -355,7 +355,7 @@
{
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 @@
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);
}
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.268 wesnoth/src/playturn.cpp:1.269
--- wesnoth/src/playturn.cpp:1.268 Sun Sep 19 03:50:24 2004
+++ wesnoth/src/playturn.cpp Sun Sep 19 14:00:51 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.268 2004/09/19 03:50:24 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.269 2004/09/19 14:00:51 ettin Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1348,7 +1348,7 @@
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 @@
std::vector<gui::preview_pane*> 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 @@
std::vector<gui::preview_pane*> 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 @@
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 @@
}
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Wesnoth-cvs-commits] wesnoth/src dialogs.cpp hotkeys.cpp playturn.cpp,
Jordà Polo <=