From 62464498358873fe496a7ca746bb9933dcfbf170 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Sat, 7 Apr 2018 08:51:59 +0200
Subject: [PATCH] reordered and renamed some controller mappings

---
 src/gui/GameInfoDialog.cxx | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/gui/GameInfoDialog.cxx b/src/gui/GameInfoDialog.cxx
index a3241432f..c4bc2cfce 100644
--- a/src/gui/GameInfoDialog.cxx
+++ b/src/gui/GameInfoDialog.cxx
@@ -176,7 +176,7 @@ GameInfoDialog::GameInfoDialog(
   tabID = myTab->addTab("Controller");
 
   ypos = vBorder;
-  pwidth = font.getStringWidth("BoosterGrip A");
+  pwidth = font.getStringWidth("Booster-Grip A");
   myP0Label = new StaticTextWidget(myTab, font, hSpace, ypos+1, "P0 controller    ");
   ctrls.clear();
   VarList::push_back(ctrls, "Joystick A", "JOYSTICK_A");
@@ -186,28 +186,28 @@ GameInfoDialog::GameInfoDialog(
   //VarList::push_back(ctrls, "Paddles_IAxis", "PADDLES_IAXIS");
   //VarList::push_back(ctrls, "Paddles_IDir", "PADDLES_IDIR");
   //VarList::push_back(ctrls, "Paddles_IAxDr", "PADDLES_IAXDR");
-  VarList::push_back(ctrls, "BoosterGrip A", "BOOSTERGRIP_A");
-  VarList::push_back(ctrls, "BoosterGrip B", "BOOSTERGRIP_B");
   VarList::push_back(ctrls, "Driving A", "DRIVING_A");
   VarList::push_back(ctrls, "Driving B", "DRIVING_B");
   VarList::push_back(ctrls, "Keyboard A", "KEYBOARD_A");
   VarList::push_back(ctrls, "Keyboard B", "KEYBOARD_B");
-  VarList::push_back(ctrls, "AmigaMouse", "AMIGAMOUSE");
-  VarList::push_back(ctrls, "AtariMouse", "ATARIMOUSE");
-  VarList::push_back(ctrls, "TrakBall", "TRAKBALL");
-  VarList::push_back(ctrls, "AtariVox", "ATARIVOX");
-  VarList::push_back(ctrls, "SaveKey", "SAVEKEY");
-  VarList::push_back(ctrls, "Sega Genesis A", "GENESIS_A");
-  VarList::push_back(ctrls, "Sega Genesis B", "GENESIS_B");
   //  VarList::push_back(ctrls, "KidVid",        "KIDVID"      );
   VarList::push_back(ctrls, "MindLink", "MINDLINK");
+  VarList::push_back(ctrls, "Booster-Grip A", "BOOSTERGRIP_A");
+  VarList::push_back(ctrls, "Booster-Grip B", "BOOSTERGRIP_B");
+  VarList::push_back(ctrls, "Sega Genesis A", "GENESIS_A");
+  VarList::push_back(ctrls, "Sega Genesis B", "GENESIS_B");
+  VarList::push_back(ctrls, "Trak-Ball", "TRAKBALL");
+  VarList::push_back(ctrls, "Atari Mouse", "ATARIMOUSE");
+  VarList::push_back(ctrls, "Amiga Mouse", "AMIGAMOUSE");
+  VarList::push_back(ctrls, "AtariVox", "ATARIVOX");
+  VarList::push_back(ctrls, "SaveKey", "SAVEKEY");
 
   myP0Controller = new PopUpWidget(myTab, font, myP0Label->getRight(), myP0Label->getTop()-1,
                                    pwidth, lineHeight, ctrls, "", 0, kLeftCChanged);
   wid.push_back(myP0Controller);
 
   ypos += lineHeight + VGAP;
-  pwidth = font.getStringWidth("BoosterGrip A");
+  pwidth = font.getStringWidth("Booster-Grip A");
   myP1Label = new StaticTextWidget(myTab, font, hSpace, ypos+1, "P1 controller    ");
   myP1Controller = new PopUpWidget(myTab, font, myP1Label->getRight(), myP1Label->getTop()-1,
                                    pwidth, lineHeight, ctrls, "", 0, kRightCChanged);