X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2FguiKeyChangeMenu.h;h=1ff3d40451b4227754796ce77fb78d63ab51ff84;hb=13159c1a48690d4ede3dbabc7699ea3d49072860;hp=db86ab2d175f01c0b382c25a55951ec9d97df968;hpb=4ab4e3345040f8543f2a54c04dceeb899680ad5d;p=dragonfireclient.git

diff --git a/src/guiKeyChangeMenu.h b/src/guiKeyChangeMenu.h
index db86ab2d1..1ff3d4045 100644
--- a/src/guiKeyChangeMenu.h
+++ b/src/guiKeyChangeMenu.h
@@ -27,54 +27,9 @@
 #include "modalMenu.h"
 #include "client.h"
 #include "gettext.h"
+#include "keycode.h"
 #include <string>
 
-static const char *KeyNames[] =
-	{ "-", N_("Left Button"), N_("Right Button"), N_("Cancel"), N_("Middle Button"), N_("X Button 1"),
-			N_("X Button 2"), "-", N_("Back"), N_("Tab"), "-", "-", N_("Clear"), N_("Return"), "-",
-			"-", N_("Shift"), N_("Control"), N_("Menu"), N_("Pause"), N_("Capital"), N_("Kana"), "-",
-			N_("Junja"), N_("Final"), N_("Kanji"), "-", N_("Escape"), N_("Convert"), N_("Nonconvert"),
-			N_("Accept"), N_("Mode Change"), N_("Space"), N_("Priot"), N_("Next"), N_("End"), N_("Home"),
-			N_("Left"), N_("Up"), N_("Right"), N_("Down"), N_("Select"), N_("Print"), N_("Execute"),
-			N_("Snapshot"), N_("Insert"), N_("Delete"), N_("Help"), "0", "1", "2", "3", "4", "5",
-			"6", "7", "8", "9", "-", "-", "-", "-", "-", "-", "-", "A", "B", "C",
-			"D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q",
-			"R", "S", "T", "U", "V", "W", "X", "Y", "Z", N_("Left Windows"),
-			N_("Right Windows"), N_("Apps"), "-", N_("Sleep"), N_("Numpad 0"), N_("Numpad 1"),
-			N_("Numpad 2"), N_("Numpad 3"), N_("Numpad 4"), N_("Numpad 5"), N_("Numpad 6"), N_("Numpad 7"),
-			N_("Numpad 8"), N_("Numpad 9"), N_("Numpad *"), N_("Numpad +"), N_("Numpad /"), N_("Numpad -"),
-			"Numpad .", "Numpad /", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8",
-			"F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16", "F17", "F18",
-			"F19", "F20", "F21", "F22", "F23", "F24", "-", "-", "-", "-", "-", "-",
-			"-", "-", N_("Num Lock"), N_("Scroll Lock"), "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", N_("Left Shift"), N_("Right Shight"),
-			N_("Left Control"), N_("Right Control"), N_("Left Menu"), N_("Right Menu"), "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", N_("Plus"), N_("Comma"), N_("Minus"), N_("Period"), "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-",
-			"-", "-", "-", "-", "-", "-", "-", "-", "-", "-", "-", N_("Attn"), N_("CrSel"),
-			N_("ExSel"), N_("Erase OEF"), N_("Play"), N_("Zoom"), N_("PA1"), N_("OEM Clear"), "-" };
-	enum
-	{
-		GUI_ID_BACK_BUTTON = 101, GUI_ID_ABORT_BUTTON, GUI_ID_SCROLL_BAR,
-		//buttons
-		GUI_ID_KEY_FORWARD_BUTTON,
-		GUI_ID_KEY_BACKWARD_BUTTON,
-		GUI_ID_KEY_LEFT_BUTTON,
-		GUI_ID_KEY_RIGHT_BUTTON,
-		GUI_ID_KEY_USE_BUTTON,
-		GUI_ID_KEY_FLY_BUTTON,
-		GUI_ID_KEY_FAST_BUTTON,
-		GUI_ID_KEY_JUMP_BUTTON,
-		GUI_ID_KEY_CHAT_BUTTON,
-		GUI_ID_KEY_SNEAK_BUTTON,
-		GUI_ID_KEY_INVENTORY_BUTTON,
-		GUI_ID_KEY_DUMP_BUTTON,
-		GUI_ID_KEY_RANGE_BUTTON
-	};
-
 class GUIKeyChangeMenu: public GUIModalMenu
 {
 public:
@@ -107,27 +62,33 @@ class GUIKeyChangeMenu: public GUIModalMenu
 	gui::IGUIButton *use;
 	gui::IGUIButton *sneak;
 	gui::IGUIButton *jump;
+	gui::IGUIButton *dropbtn;
 	gui::IGUIButton *inventory;
 	gui::IGUIButton *fly;
 	gui::IGUIButton *fast;
 	gui::IGUIButton *range;
 	gui::IGUIButton *dump;
 	gui::IGUIButton *chat;
-
-	u32 activeKey;
-	u32 key_forward;
-	u32 key_backward;
-	u32 key_left;
-	u32 key_right;
-	u32 key_use;
-	u32 key_sneak;
-	u32 key_jump;
-	u32 key_inventory;
-	u32 key_fly;
-	u32 key_fast;
-	u32 key_range;
-	u32 key_chat;
-	u32 key_dump;
+	gui::IGUIButton *cmd;
+	gui::IGUIButton *console;
+
+	s32 activeKey;
+	KeyPress key_forward;
+	KeyPress key_backward;
+	KeyPress key_left;
+	KeyPress key_right;
+	KeyPress key_use;
+	KeyPress key_sneak;
+	KeyPress key_jump;
+	KeyPress key_drop;
+	KeyPress key_inventory;
+	KeyPress key_fly;
+	KeyPress key_fast;
+	KeyPress key_range;
+	KeyPress key_chat;
+	KeyPress key_cmd;
+	KeyPress key_console;
+	KeyPress key_dump;
 };
 
 #endif