Split setup keyboard texts and actions.

2 files changed, 733 insertions, 24 deletions

diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index e9ce1b704..40604737a 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -41,6 +41,676 @@
 
 #include "debug.h"
 
+struct SetupActionData
+{
+    std::string name;
+    int actionId;
+};
+
+static SetupActionData const setupActionData[] = {
+    {
+        N_("Basic Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Move Up"),
+        KeyboardConfig::KEY_MOVE_UP
+    },
+    {
+        N_("Move Down"),
+        KeyboardConfig::KEY_MOVE_DOWN
+    },
+    {
+        N_("Move Left"),
+        KeyboardConfig::KEY_MOVE_LEFT
+    },
+    {
+        N_("Move Right"),
+        KeyboardConfig::KEY_MOVE_RIGHT
+    },
+    {
+        N_("Attack"),
+        KeyboardConfig::KEY_ATTACK
+    },
+    {
+        N_("Target & Attack"),
+        KeyboardConfig::KEY_TARGET_ATTACK
+    },
+    {
+        N_("Move to Target"),
+        KeyboardConfig::KEY_MOVE_TO_TARGET
+    },
+    {
+        N_("Change Move to Target type"),
+        KeyboardConfig::KEY_CHANGE_MOVE_TO_TARGET
+    },
+    {
+        N_("Move to Home location"),
+        KeyboardConfig::KEY_MOVE_TO_HOME
+    },
+    {
+        N_("Set home location"),
+        KeyboardConfig::KEY_SET_HOME
+    },
+    {
+        N_("Move to navigation point"),
+        KeyboardConfig::KEY_MOVE_TO_POINT
+    },
+    {
+        N_("Talk"),
+        KeyboardConfig::KEY_TALK
+    },
+    {
+        N_("Stop Attack"),
+        KeyboardConfig::KEY_TARGET
+    },
+    {
+        N_("Untarget"),
+        KeyboardConfig::KEY_UNTARGET
+    },
+    {
+        N_("Target Closest"),
+        KeyboardConfig::KEY_TARGET_CLOSEST
+    },
+    {
+        N_("Target NPC"),
+        KeyboardConfig::KEY_TARGET_NPC
+    },
+    {
+        N_("Target Player"),
+        KeyboardConfig::KEY_TARGET_PLAYER
+    },
+    {
+        N_("Pickup"),
+        KeyboardConfig::KEY_PICKUP
+    },
+    {
+        N_("Change Pickup Type"),
+        KeyboardConfig::KEY_CHANGE_PICKUP_TYPE
+    },
+    {
+        N_("Hide Windows"),
+        KeyboardConfig::KEY_HIDE_WINDOWS
+    },
+    {
+        N_("Sit"),
+        KeyboardConfig::KEY_SIT
+    },
+    {
+        N_("Screenshot"),
+        KeyboardConfig::KEY_SCREENSHOT
+    },
+    {
+        N_("Enable/Disable Trading"),
+        KeyboardConfig::KEY_TRADE
+    },
+    {
+        N_("Change Map View Mode"),
+        KeyboardConfig::KEY_PATHFIND
+    },
+    {
+        N_("Select OK"),
+        KeyboardConfig::KEY_OK
+    },
+    {
+        N_("Quit"),
+        KeyboardConfig::KEY_QUIT
+    },
+    {
+        N_("Shortcuts Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Item Shortcuts Key"),
+        KeyboardConfig::KEY_SHORTCUTS_KEY
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 1),
+        KeyboardConfig::KEY_SHORTCUT_1
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 2),
+        KeyboardConfig::KEY_SHORTCUT_2
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 3),
+        KeyboardConfig::KEY_SHORTCUT_3
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 4),
+        KeyboardConfig::KEY_SHORTCUT_4
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 5),
+        KeyboardConfig::KEY_SHORTCUT_5
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 6),
+        KeyboardConfig::KEY_SHORTCUT_6
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 7),
+        KeyboardConfig::KEY_SHORTCUT_7
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 8),
+        KeyboardConfig::KEY_SHORTCUT_8
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 9),
+        KeyboardConfig::KEY_SHORTCUT_9
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 10),
+        KeyboardConfig::KEY_SHORTCUT_10
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 11),
+        KeyboardConfig::KEY_SHORTCUT_11
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 12),
+        KeyboardConfig::KEY_SHORTCUT_12
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 13),
+        KeyboardConfig::KEY_SHORTCUT_13
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 14),
+        KeyboardConfig::KEY_SHORTCUT_14
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 15),
+        KeyboardConfig::KEY_SHORTCUT_15
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 16),
+        KeyboardConfig::KEY_SHORTCUT_16
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 17),
+        KeyboardConfig::KEY_SHORTCUT_17
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 18),
+        KeyboardConfig::KEY_SHORTCUT_18
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 19),
+        KeyboardConfig::KEY_SHORTCUT_19
+    },
+    {
+        strprintf(N_("Item Shortcut %d"), 20),
+        KeyboardConfig::KEY_SHORTCUT_20
+    },
+    {
+        N_("Windows Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Help Window"),
+        KeyboardConfig::KEY_WINDOW_HELP
+    },
+    {
+        N_("Status Window"),
+        KeyboardConfig::KEY_WINDOW_STATUS
+    },
+    {
+        N_("Inventory Window"),
+        KeyboardConfig::KEY_WINDOW_INVENTORY
+    },
+    {
+        N_("Equipment Window"),
+        KeyboardConfig::KEY_WINDOW_EQUIPMENT
+    },
+    {
+        N_("Skill Window"),
+        KeyboardConfig::KEY_WINDOW_SKILL
+    },
+    {
+        N_("Minimap Window"),
+        KeyboardConfig::KEY_WINDOW_MINIMAP
+    },
+    {
+        N_("Chat Window"),
+        KeyboardConfig::KEY_WINDOW_CHAT
+    },
+    {
+        N_("Item Shortcut Window"),
+        KeyboardConfig::KEY_WINDOW_SHORTCUT
+    },
+    {
+        N_("Setup Window"),
+        KeyboardConfig::KEY_WINDOW_SETUP
+    },
+    {
+        N_("Debug Window"),
+        KeyboardConfig::KEY_WINDOW_DEBUG
+    },
+    {
+        N_("Social Window"),
+        KeyboardConfig::KEY_WINDOW_SOCIAL
+    },
+    {
+        N_("Emote Shortcut Window"),
+        KeyboardConfig::KEY_WINDOW_EMOTE_SHORTCUT
+    },
+    {
+        N_("Outfits Window"),
+        KeyboardConfig::KEY_WINDOW_OUTFIT
+    },
+    {
+        N_("Shop Window"),
+        KeyboardConfig::KEY_WINDOW_SHOP
+    },
+    {
+        N_("Quick drop Window"),
+        KeyboardConfig::KEY_WINDOW_DROP
+    },
+    {
+        N_("Kill Stats Window"),
+        KeyboardConfig::KEY_WINDOW_KILLS
+    },
+    {
+        N_("Commands Window"),
+        KeyboardConfig::KEY_WINDOW_SPELLS
+    },
+    {
+        N_("Bot Checker Window"),
+        KeyboardConfig::KEY_WINDOW_BOT_CHECKER
+    },
+    {
+        N_("Who Is Online Window"),
+        KeyboardConfig::KEY_WINDOW_ONLINE
+    },
+    {
+        N_("Did you know Window"),
+        KeyboardConfig::KEY_WINDOW_DIDYOUKNOW
+    },
+    {
+        N_("Previous Social Tab"),
+        KeyboardConfig::KEY_PREV_SOCIAL_TAB
+    },
+    {
+        N_("Next Social Tab"),
+        KeyboardConfig::KEY_NEXT_SOCIAL_TAB
+    },
+    {
+        N_("Emotes Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Smilie"),
+        KeyboardConfig::KEY_EMOTE
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 1),
+        KeyboardConfig::KEY_EMOTE_1
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 2),
+        KeyboardConfig::KEY_EMOTE_2
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 3),
+        KeyboardConfig::KEY_EMOTE_3
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 4),
+        KeyboardConfig::KEY_EMOTE_4
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 5),
+        KeyboardConfig::KEY_EMOTE_5
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 6),
+        KeyboardConfig::KEY_EMOTE_6
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 7),
+        KeyboardConfig::KEY_EMOTE_7
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 8),
+        KeyboardConfig::KEY_EMOTE_8
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 9),
+        KeyboardConfig::KEY_EMOTE_9
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 10),
+        KeyboardConfig::KEY_EMOTE_10
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 11),
+        KeyboardConfig::KEY_EMOTE_11
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 12),
+        KeyboardConfig::KEY_EMOTE_12
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 13),
+        KeyboardConfig::KEY_EMOTE_13
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 14),
+        KeyboardConfig::KEY_EMOTE_14
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 15),
+        KeyboardConfig::KEY_EMOTE_15
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 16),
+        KeyboardConfig::KEY_EMOTE_16
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 17),
+        KeyboardConfig::KEY_EMOTE_17
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 18),
+        KeyboardConfig::KEY_EMOTE_18
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 19),
+        KeyboardConfig::KEY_EMOTE_19
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 20),
+        KeyboardConfig::KEY_EMOTE_20
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 21),
+        KeyboardConfig::KEY_EMOTE_21
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 22),
+        KeyboardConfig::KEY_EMOTE_22
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 23),
+        KeyboardConfig::KEY_EMOTE_23
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 24),
+        KeyboardConfig::KEY_EMOTE_24
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 25),
+        KeyboardConfig::KEY_EMOTE_25
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 26),
+        KeyboardConfig::KEY_EMOTE_26
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 27),
+        KeyboardConfig::KEY_EMOTE_27
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 28),
+        KeyboardConfig::KEY_EMOTE_28
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 29),
+        KeyboardConfig::KEY_EMOTE_29
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 30),
+        KeyboardConfig::KEY_EMOTE_30
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 31),
+        KeyboardConfig::KEY_EMOTE_31
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 32),
+        KeyboardConfig::KEY_EMOTE_32
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 33),
+        KeyboardConfig::KEY_EMOTE_33
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 34),
+        KeyboardConfig::KEY_EMOTE_34
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 35),
+        KeyboardConfig::KEY_EMOTE_35
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 36),
+        KeyboardConfig::KEY_EMOTE_36
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 37),
+        KeyboardConfig::KEY_EMOTE_37
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 38),
+        KeyboardConfig::KEY_EMOTE_38
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 39),
+        KeyboardConfig::KEY_EMOTE_39
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 40),
+        KeyboardConfig::KEY_EMOTE_40
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 41),
+        KeyboardConfig::KEY_EMOTE_41
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 42),
+        KeyboardConfig::KEY_EMOTE_42
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 43),
+        KeyboardConfig::KEY_EMOTE_43
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 44),
+        KeyboardConfig::KEY_EMOTE_44
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 45),
+        KeyboardConfig::KEY_EMOTE_45
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 46),
+        KeyboardConfig::KEY_EMOTE_46
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 47),
+        KeyboardConfig::KEY_EMOTE_47
+    },
+    {
+        strprintf(N_("Emote Shortcut %d"), 48),
+        KeyboardConfig::KEY_EMOTE_48
+    },
+    {
+        N_("Outfits Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Wear Outfit"),
+        KeyboardConfig::KEY_WEAR_OUTFIT
+    },
+    {
+        N_("Copy Outfit"),
+        KeyboardConfig::KEY_COPY_OUTFIT
+    },
+    {
+        N_("Copy equipped to Outfit"),
+        KeyboardConfig::KEY_COPY_EQUIPED_OUTFIT
+    },
+    {
+        N_("Chat Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Toggle Chat"),
+        KeyboardConfig::KEY_TOGGLE_CHAT
+    },
+    {
+        N_("Scroll Chat Up"),
+        KeyboardConfig::KEY_SCROLL_CHAT_UP
+    },
+    {
+        N_("Scroll Chat Down"),
+        KeyboardConfig::KEY_SCROLL_CHAT_DOWN
+    },
+    {
+        N_("Previous Chat Tab"),
+        KeyboardConfig::KEY_PREV_CHAT_TAB
+    },
+    {
+        N_("Next Chat Tab"),
+        KeyboardConfig::KEY_NEXT_CHAT_TAB
+    },
+    {
+        N_("Close current Chat Tab"),
+        KeyboardConfig::KEY_CLOSE_CHAT_TAB
+    },
+    {
+        N_("Previous chat line"),
+        KeyboardConfig::KEY_CHAT_PREV_HISTORY
+    },
+    {
+        N_("Next chat line"),
+        KeyboardConfig::KEY_CHAT_NEXT_HISTORY
+    },
+    {
+        N_("Chat Auto Complete"),
+        KeyboardConfig::KEY_AUTOCOMPLETE_CHAT
+    },
+    {
+        N_("Deactivate Chat Input"),
+        KeyboardConfig::KEY_DEACTIVATE_CHAT
+    },
+    {
+        N_("Other Keys"),
+        KeyboardConfig::KEY_NO_VALUE
+    },
+    {
+        N_("Ignore input 1"),
+        KeyboardConfig::KEY_IGNORE_INPUT_1
+    },
+    {
+        N_("Ignore input 2"),
+        KeyboardConfig::KEY_IGNORE_INPUT_2
+    },
+    {
+        N_("Direct Up"),
+        KeyboardConfig::KEY_DIRECT_UP
+    },
+    {
+        N_("Direct Down"),
+        KeyboardConfig::KEY_DIRECT_DOWN
+    },
+    {
+        N_("Direct Left"),
+        KeyboardConfig::KEY_DIRECT_LEFT
+    },
+    {
+        N_("Direct Right"),
+        KeyboardConfig::KEY_DIRECT_RIGHT
+    },
+    {
+        N_("Crazy moves"),
+        KeyboardConfig::KEY_CRAZY_MOVES
+    },
+    {
+        N_("Change Crazy Move mode"),
+        KeyboardConfig::KEY_CHANGE_CRAZY_MOVES_TYPE
+    },
+    {
+        N_("Quick Drop N Items from 0 slot"),
+        KeyboardConfig::KEY_QUICK_DROP
+    },
+    {
+        N_("Quick Drop N Items"),
+        KeyboardConfig::KEY_QUICK_DROPN
+    },
+    {
+        N_("Switch Quick Drop Counter"),
+        KeyboardConfig::KEY_SWITCH_QUICK_DROP
+    },
+    {
+        N_("Quick heal target or self"),
+        KeyboardConfig::KEY_MAGIC_INMA1
+    },
+    {
+        N_("Use #itenplz spell"),
+        KeyboardConfig::KEY_MAGIC_ITENPLZ
+    },
+    {
+        N_("Use magic attack"),
+        KeyboardConfig::KEY_MAGIC_ATTACK
+    },
+    {
+        N_("Switch magic attack"),
+        KeyboardConfig::KEY_SWITCH_MAGIC_ATTACK
+    },
+    {
+        N_("Switch pvp attack"),
+        KeyboardConfig::KEY_SWITCH_PVP_ATTACK
+    },
+    {
+        N_("Change move type"),
+        KeyboardConfig::KEY_INVERT_DIRECTION
+    },
+    {
+        N_("Change Attack Weapon Type"),
+        KeyboardConfig::KEY_CHANGE_ATTACK_WEAPON_TYPE
+    },
+    {
+        N_("Change Attack Type"),
+        KeyboardConfig::KEY_CHANGE_ATTACK_TYPE
+    },
+    {
+        N_("Change Follow mode"),
+        KeyboardConfig::KEY_CHANGE_FOLLOW_MODE
+    },
+    {
+        N_("Change Imitation mode"),
+        KeyboardConfig::KEY_CHANGE_IMITATION_MODE
+    },
+    {
+        N_("Disable / Enable Game modifier keys"),
+        KeyboardConfig::KEY_DISABLE_GAME_MODIFIERS
+    },
+    {
+        N_("On / Off audio"),
+        KeyboardConfig::KEY_CHANGE_AUDIO
+    },
+    {
+        N_("Enable / Disable away mode"),
+        KeyboardConfig::KEY_AWAY
+    },
+    {
+        N_("Emulate right click from keyboard"),
+        KeyboardConfig::KEY_RIGHT_CLICK
+    },
+    {
+        N_("Toggle camera mode"),
+        KeyboardConfig::KEY_CAMERA
+    },
+    {
+        N_("Modifier key"),
+        KeyboardConfig::KEY_MOD
+    },
+};
+
+const int keysSize = sizeof(setupActionData) / sizeof(SetupActionData);
 /**
  * The list model for key function list.
  *
@@ -53,7 +723,7 @@ class KeyListModel : public gcn::ListModel
          * Returns the number of elements in container.
          */
         int getNumberOfElements()
-        { return keyboard.KEY_TOTAL; }
+        { return keysSize; }
 
         /**
          * Returns element from container.
@@ -68,7 +738,7 @@ class KeyListModel : public gcn::ListModel
         { mKeyFunctions[i] = caption; }
 
     private:
-        std::string mKeyFunctions[KeyboardConfig::KEY_TOTAL];
+        std::string mKeyFunctions[keysSize];
 };
 
 Setup_Keyboard::Setup_Keyboard():
@@ -127,11 +797,18 @@ Setup_Keyboard::~Setup_Keyboard()
 void Setup_Keyboard::apply()
 {
     keyUnresolved();
+    int key1, key2;
 
-    if (keyboard.hasConflicts())
+    if (keyboard.hasConflicts(key1, key2))
     {
+        int s1 = keyToSetupData(key1);
+        int s2 = keyToSetupData(key2);
+
         new OkDialog(_("Key Conflict(s) Detected."),
-            keyboard.getBindError(), DIALOG_ERROR);
+            strprintf(_("Conflict \"%s\" and \"%s\" keys. "
+            "Resolve them, or gameplay may result in strange behaviour."),
+            setupActionData[s1].name.c_str(),
+            setupActionData[s2].name.c_str()), DIALOG_ERROR);
     }
     keyboard.setEnabled(true);
     keyboard.store();
@@ -154,15 +831,19 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
         if (!mKeySetting)
         {
             int i(mKeyList->getSelected());
-            if (keyboard.isSeparator(i))
-            {
-                mAssignKeyButton->setEnabled(false);
-                mUnassignKeyButton->setEnabled(false);
-            }
-            else
+            if (i >= 0 && i < keysSize)
             {
-                mAssignKeyButton->setEnabled(true);
-                mUnassignKeyButton->setEnabled(true);
+                if (setupActionData[i].actionId
+                    == KeyboardConfig::KEY_NO_VALUE)
+                {
+                    mAssignKeyButton->setEnabled(false);
+                    mUnassignKeyButton->setEnabled(false);
+                }
+                else
+                {
+                    mAssignKeyButton->setEnabled(true);
+                    mUnassignKeyButton->setEnabled(true);
+                }
             }
         }
     }
@@ -172,15 +853,26 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
         mAssignKeyButton->setEnabled(false);
         keyboard.setEnabled(false);
         int i(mKeyList->getSelected());
-        keyboard.setNewKeyIndex(i);
-        mKeyListModel->setElementAt(i, keyboard.getKeyCaption(i) + ": ?");
+        if (i >= 0 && i < keysSize)
+        {
+            const SetupActionData &key = setupActionData[i];
+            int ik = key.actionId;
+            keyboard.setNewKeyIndex(ik);
+            mKeyListModel->setElementAt(i, std::string(
+                gettext(key.name.c_str())) + ": ?");
+        }
     }
     else if (event.getId() == "unassign")
     {
         int i(mKeyList->getSelected());
-        keyboard.setNewKeyIndex(i);
-        refreshAssignedKey(mKeyList->getSelected());
-        keyboard.unassignKey();
+        if (i >= 0 && i < keysSize)
+        {
+            const SetupActionData &key = setupActionData[i];
+            int ik = key.actionId;
+            keyboard.setNewKeyIndex(ik);
+            refreshAssignedKey(mKeyList->getSelected());
+            keyboard.unassignKey();
+        }
         mAssignKeyButton->setEnabled(true);
     }
     else if (event.getId() == "makeDefault")
@@ -192,31 +884,45 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
 
 void Setup_Keyboard::refreshAssignedKey(int index)
 {
-    if (keyboard.isSeparator(index))
+    const SetupActionData &key = setupActionData[index];
+    if (key.actionId == KeyboardConfig::KEY_NO_VALUE)
     {
         const std::string str = " \342\200\225\342\200\225\342\200\225"
             "\342\200\225\342\200\225 ";
-        mKeyListModel->setElementAt(index, str
-            + keyboard.getKeyCaption(index) + str);
+        mKeyListModel->setElementAt(index,
+            str + gettext(key.name.c_str()) + str);
     }
     else
     {
         mKeyListModel->setElementAt(index, strprintf("%s: %s",
-            keyboard.getKeyCaption(index).c_str(),
-            keyboard.getKeyStringLong(index).c_str()));
+            gettext(key.name.c_str()),
+            keyboard.getKeyStringLong(key.actionId).c_str()));
     }
 }
 
 void Setup_Keyboard::newKeyCallback(int index)
 {
     mKeySetting = false;
-    refreshAssignedKey(index);
+    int i = keyToSetupData(index);
+    if (i >= 0)
+        refreshAssignedKey(i);
     mAssignKeyButton->setEnabled(true);
 }
 
+int Setup_Keyboard::keyToSetupData(int index)
+{
+    for (int i = 0; i < keysSize; i++)
+    {
+        const SetupActionData &key = setupActionData[i];
+        if (key.actionId == index)
+            return i;
+    }
+    return -1;
+}
+
 void Setup_Keyboard::refreshKeys()
 {
-    for (int i = 0; i < keyboard.KEY_TOTAL; i++)
+    for (int i = 0; i < keysSize; i++)
         refreshAssignedKey(i);
 }
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 5970a7735..3b5fd5dfa 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -46,6 +46,7 @@ class Setup_Keyboard : public SetupTab
         ~Setup_Keyboard();
 
         void apply();
+
         void cancel();
 
         void action(const gcn::ActionEvent &event);
@@ -70,6 +71,8 @@ class Setup_Keyboard : public SetupTab
          */
         void keyUnresolved();
 
+        int keyToSetupData(int index);
+
     private:
         class KeyListModel *mKeyListModel;
         gcn::ListBox *mKeyList;