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

A bit of last minute pre-1.1.5 tidying as suggested by friem:

Browse source 
Sapient's menu changes.

Give tooltip for mysterious W button in corner.

Remove Get Campaigns option from campaign list now it's in main menu.

Restore _"Help Wesnoth" string even though not displayed: we want
string in for 1.1.5 translations because we may need it on button
somehow.

Clean up language a little: we can download more than campaigns.
This commit is contained in:
Rusty Russell 2006-06-09 13:18:13 +00:00
parent 8f44dafc05
commit 7b777fd676
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game.cpp
View file

@ -755,9 +755,6 @@ bool game_controller::new_campaign()
campaign_desc.push_back(std::pair<std::string,std::string>(desc,image));
}
campaign_names.push_back(std::string(1, COLUMN_SEPARATOR) + _("Get More Campaigns..."));
campaign_desc.push_back(std::pair<std::string,std::string>(_("Download more campaigns from an Internet server."),game_config::download_campaign_image));
int res = 0;
dialogs::campaign_preview_pane campaign_preview(disp().video(),&campaign_desc);
@ -773,11 +770,6 @@ bool game_controller::new_campaign()
return false;
}
//get more campaigns from server
if(res == int(campaign_names.size()-1)) {
download_campaigns();
return new_campaign();
}
const config& campaign = *campaigns[res];
state_.campaign = campaign["id"];
@ -854,7 +846,7 @@ void game_controller::download_campaigns()
std::string host = preferences::campaign_server();
const int res = gui::show_dialog(disp(),NULL,_("Connect to Server"),
_("You will now connect to a campaign server to download campaigns."),
_("You will now connect to a server to download add-ons."),
gui::OK_CANCEL,NULL,NULL,_("Server: "),&host);
if(res != 0) {
return;

4
src/titlescreen.cpp
View file

@ -247,7 +247,9 @@ TITLE_RESULT show_title(display& screen, config& tips_of_day, int* ntip)
gui::button next_tip_button(screen.video(),_("More"),button::TYPE_PRESS,"lite_small");
gui::button help_tip_button(screen.video(),_("Help"),button::TYPE_PRESS,"lite_small");
gui::button beg_button(screen.video(),"",button::TYPE_IMAGE,"menu-button",button::MINIMUM_SPACE);
// FIXME: Translatable string is here because we WILL put text in before 1.2!
gui::button beg_button(screen.video(),("Help Wesnoth"),button::TYPE_IMAGE,"menu-button",button::MINIMUM_SPACE);
beg_button.set_help_string(_("Help Wesnoth by sending us information"));
if(tips_of_day.empty()) {
tips_of_day = get_tips_of_day();