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

Get rid of an obsolete wrapper around show_dialog;

Browse source 
it's been replaced by the message_dialog class.  Cleanup step, no
behavioral changes.
This commit is contained in:
Eric S. Raymond 2007-06-16 06:45:05 +00:00
parent efa40a4d27
commit c4c5d64cfc
4 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/playsingle_controller.cpp
View file

@ -479,7 +479,7 @@ void playsingle_controller::before_human_turn(bool save)
}
if(preferences::turn_dialog()) {
gui::popup_transient(*gui_,"",_("It is now your turn"));
gui::message_dialog(*gui_,"",_("It is now your turn"));
}
const std::string& turn_cmd = preferences::turn_cmd();

11
src/preferences_display.cpp
View file

@ -20,6 +20,7 @@
#include "hotkeys.hpp"
#include "marked-up_text.hpp"
#include "preferences_display.hpp"
#include "construct_dialog.hpp"
#include "show_dialog.hpp"
#include "video.hpp"
#include "wml_separators.hpp"
@ -77,7 +78,7 @@ void set_fullscreen(bool ison)
} else if(video.modePossible(1024,768,16,flags)) {
set_resolution(std::pair<int,int>(1024,768));
} else {
gui::popup_transient(*disp,"",_("The video mode could not be changed. Your window manager must be set to 16 bits per pixel to run the game in windowed mode. Your display must support 1024x768x16 to run the game full screen."));
gui::message_dialog(*disp,"",_("The video mode could not be changed. Your window manager must be set to 16 bits per pixel to run the game in windowed mode. Your display must support 1024x768x16 to run the game full screen."));
}
}
}
@ -108,7 +109,7 @@ void set_resolution(const std::pair<int,int>& resolution)
} else {
write_resolution = false;
gui::popup_transient(*disp,"",_("The video mode could not be changed. Your window manager must be set to 16 bits per pixel to run the game in windowed mode. Your display must support 1024x768x16 to run the game full screen."));
gui::message_dialog(*disp,"",_("The video mode could not be changed. Your window manager must be set to 16 bits per pixel to run the game in windowed mode. Your display must support 1024x768x16 to run the game full screen."));
}
}
@ -1388,7 +1389,7 @@ void show_hotkeys_dialog (display & disp, config *save_config)
hotkey::hotkey_item& newhk = hotkey::get_visible_hotkey(menu_.selection());
if(oldhk.get_id() != newhk.get_id() && !oldhk.null()) {
gui::popup_transient(disp,"",_("This Hotkey is already in use."));
gui::message_dialog(disp,"",_("This Hotkey is already in use."));
} else {
newhk.set_key(character, keycode, (mod & KMOD_SHIFT) != 0,
(mod & KMOD_CTRL) != 0, (mod & KMOD_ALT) != 0, (mod & KMOD_LMETA) != 0);
@ -1427,11 +1428,11 @@ bool show_theme_dialog(display& disp)
preferences::set_theme(options[action]);
//it would be preferable for the new theme to take effect
//immediately, however, this will have to do for now.
gui::popup_transient(disp,"",_("New theme will take effect on next new or loaded game."));
gui::message_dialog(disp,"",_("New theme will take effect on next new or loaded game."));
return(1);
}
}else{
gui::popup_transient(disp,"",_("No known themes. Try changing from within an existing game."));
gui::message_dialog(disp,"",_("No known themes. Try changing from within an existing game."));
}
return(0);
}

7
src/show_dialog.cpp
View file

@ -414,13 +414,6 @@ int show_dialog(display& screen, surface image,
return d.result();
}
void popup_transient(display& screen,
const std::string& caption, const std::string& message)
{
// FIXME: placeholder for a semitransparent window with timeout
gui::show_dialog(screen, NULL, caption, message, gui::MESSAGE);
}
}
namespace gui {

3
src/show_dialog.hpp
View file

@ -183,9 +183,6 @@ int show_dialog(display &screen, surface image,
void show_error_message(display &disp, std::string const &message);
void popup_transient(display& screen,
const std::string& caption, const std::string& message);
network::connection network_send_dialog(display& disp, const std::string& msg, config& cfg, network::connection connection_num=0);
network::connection network_receive_dialog(display& disp, const std::string& msg, config& cfg, network::connection connection_num=0);
network::connection network_connect_dialog(display& disp, const std::string& msg, const std::string& hostname, int port);