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

Made ESC to clear hotkey when changeing hotkey (bug #10783)

Browse source
This commit is contained in:
Pauli Nieminen 2008-01-17 14:17:52 +00:00
parent d7fe5cc9da
commit 22d42d8642
5 changed files with 59 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -7,6 +7,8 @@ Version 1.3.14+svn:
* fixed bug #10779: Rejoining game causes major problems
* Fixed :control command to work
* damage statistics for the current turn also works for observers now
* user interface:
* Made ESC clear hotkey when changing hotkeys
* miscellaneous and bug fixes:
* Fixed boost test compile with 1.34.1
* Make wesnoth work properly again if the datadir contains ../

2
players_changelog
View file

@ -6,6 +6,8 @@ Version 1.3.14+svn:
* Language and translations
* Updated translations: Chinese, Danish, Dutch, French, Italian, Lithuanian,
Spanish.
* user interface:
* Made ESC clear hotkey when changing hotkeys
Version 1.3.14:
* Campaigns

15
src/hotkeys.cpp
View file

@ -252,6 +252,10 @@ void hotkey_item::set_description(const std::string& description)
{
description_ = description;
}
void hotkey_item::clear_hotkey()
{
type_ = UNBOUND;
}
void hotkey_item::set_key(int character, int keycode, bool shift, bool ctrl, bool alt, bool cmd)
{
@ -454,12 +458,9 @@ hotkey_item& get_hotkey(const SDL_KeyboardEvent& event)
#endif
);
}
hotkey_item& get_visible_hotkey(int index)
void _get_visible_hotkey_itor(int index, std::vector<hotkey_item>::iterator& itor)
{
int counter = 0;
std::vector<hotkey_item>::iterator itor;
for (itor = hotkeys_.begin(); itor != hotkeys_.end(); ++itor) {
if (itor->hidden())
continue;
@ -469,7 +470,13 @@ hotkey_item& get_visible_hotkey(int index)
counter++;
}
}
hotkey_item& get_visible_hotkey(int index)
{
std::vector<hotkey_item>::iterator itor;
_get_visible_hotkey_itor(index, itor);
if (itor == hotkeys_.end())
return null_hotkey_;

1
src/hotkeys.hpp
View file

@ -94,6 +94,7 @@ public:
void load_from_config(const config& cfg);
void set_description(const std::string& description);
void clear_hotkey();
void set_key(int character, int keycode, bool shift, bool ctrl, bool alt, bool cmd);
enum type {

55
src/preferences_display.cpp
View file

@ -214,7 +214,8 @@ void show_hotkeys_dialog (display & disp, config *save_config)
const int centerx = disp.w()/2;
const int centery = disp.h()/2;
#ifdef USE_TINY_GUI
const int width = 300; //! @todo FIXME: We should compute this, but using what data ?
const int width = 300; //! @todo FIXME: We should compute this, but using what data ?
//! @todo FIXME: suokko: window width and height could be usefull. min(300,disp.w()*0.9) So it would be either 300 or max 90% of width
const int height = 220;
#else
const int width = 700;
@ -265,8 +266,14 @@ void show_hotkeys_dialog (display & disp, config *save_config)
menu_.set_location(xpos + font::relative_size(20), ypos);
gui::button change_button (disp.video(), _("Change Hotkey"));
change_button.set_location(xpos + width - change_button.width () - font::relative_size(30),ypos + font::relative_size(80));
change_button.set_location(xpos + width - change_button.width () - font::relative_size(30),ypos + font::relative_size(30));
//! @todo FIXME: TODO This have to be added after string freeze
//! @todo Remember to make Clear Hotkey translateable
#if 0
gui::button clear_button (disp.video(), ("Clear Hotkey"));
clear_button.set_location(xpos + width - clear_button.width () - font::relative_size(30),ypos + font::relative_size(80));
#endif
gui::button save_button (disp.video(), _("Save Hotkeys"));
save_button.set_location(xpos + width - save_button.width () - font::relative_size(30),ypos + font::relative_size(130));
@ -277,7 +284,7 @@ void show_hotkeys_dialog (display & disp, config *save_config)
if (close_button.pressed() || esc_hand.escape_pressed())
break;
if (change_button.pressed ()) {
if (change_button.pressed () || menu_.double_clicked()) {
// Lets change this hotkey......
SDL_Rect dlgr = {centerx-text_size.w/2 - 30,
centery-text_size.h/2 - 16,
@ -291,6 +298,7 @@ void show_hotkeys_dialog (display & disp, config *save_config)
text_size.h+12);
mini_frame.draw_background();
mini_frame.draw_border();
//! @todo FIXME: add to text mention about esc clearing hotkey after string freeze is over!
font::draw_text (&disp.video(), clip_rect, font::SIZE_LARGE,font::NORMAL_COLOUR,
_("Press desired Hotkey"),centerx-text_size.w/2-10,
centery-text_size.h/2-3);
@ -314,18 +322,32 @@ void show_hotkeys_dialog (display & disp, config *save_config)
restorer.restore();
disp.update_display();
const hotkey::hotkey_item& oldhk = hotkey::get_hotkey(character, keycode, (mod & KMOD_SHIFT) != 0,
(mod & KMOD_CTRL) != 0, (mod & KMOD_ALT) != 0, (mod & KMOD_LMETA) != 0);
hotkey::hotkey_item& newhk = hotkey::get_visible_hotkey(menu_.selection());
if (keycode == SDLK_ESCAPE && mod == 0)
{
// clear hotkey
hotkey::hotkey_item& newhk = hotkey::get_visible_hotkey(menu_.selection());
newhk.clear_hotkey();
menu_.change_item(menu_.selection(), 1, font::NULL_MARKUP + newhk.get_name());
if(oldhk.get_id() != newhk.get_id() && !oldhk.null()) {
gui::message_dialog(disp,"",_("This Hotkey is already in use.")).show();
} else {
newhk.set_key(character, keycode, (mod & KMOD_SHIFT) != 0,
}
else
{
const hotkey::hotkey_item& oldhk = hotkey::get_hotkey(character, keycode, (mod & KMOD_SHIFT) != 0,
(mod & KMOD_CTRL) != 0, (mod & KMOD_ALT) != 0, (mod & KMOD_LMETA) != 0);
menu_.change_item(menu_.selection(), 1, font::NULL_MARKUP + newhk.get_name());
};
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();
} else {
newhk.set_key(character, keycode, (mod & KMOD_SHIFT) != 0,
(mod & KMOD_CTRL) != 0, (mod & KMOD_ALT) != 0, (mod & KMOD_LMETA) != 0);
menu_.change_item(menu_.selection(), 1, font::NULL_MARKUP + newhk.get_name());
}
}
}
if (save_button.pressed()) {
if (save_config == NULL) {
@ -334,6 +356,15 @@ void show_hotkeys_dialog (display & disp, config *save_config)
hotkey::save_hotkeys(*save_config);
}
}
//! FIXME: remember to uncomment this also after string freeze
#if 0
if (clear_button.pressed()) {
// clear hotkey
hotkey::hotkey_item& newhk = hotkey::clear_hotkey(menu_.selection());
newhk.clear_hotkey();
menu_.change_item(menu_.selection(), 1, font::NULL_MARKUP + newhk.get_name());
}
#endif
menu_.process();