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

When trying to define an already used hotkey, now tell where it's used

Browse source 
The dialog message is not perfect, but probably better to improve it to a 
"overwrite yes/no ?"
This commit is contained in:
Ali El Gariani 2008-04-19 14:46:52 +00:00
parent 09d3f500ee
commit 2e545789f4
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -29,6 +29,7 @@ Version 1.5.0-svn:
* smarter pathfinding: if same MP cost, prefer terrains with better defense
and empty hexes (less frequent multi-turn moves blocked by a friend)
* New full map screenshot feature (no default hotkey).
* When trying to define an already used hotkey, now tell where it's used.
* language and i18n:
* new translation: Croatian
* updated translations: Chinese, Czech, Danish, Dutch, Finnish, French,

4
src/preferences_display.cpp
View file

@ -334,7 +334,9 @@ 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::message_dialog(disp,"",_("This Hotkey is already in use.")).show();
std::stringstream msg;
msg << " " << oldhk.get_description() << " : " << oldhk.get_name();
gui::message_dialog(disp,_("This Hotkey is already in use."),msg.str()).show();
} else {
newhk.set_key(character, keycode, (mod & KMOD_SHIFT) != 0,