summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-03-08 16:23:55 -0500
committerChuck Miller <shadowmil@gmail.com>2010-03-08 16:23:55 -0500
commitaa1de77b2c6aa4f60dd643d300f9f9f51e566fcb (patch)
tree768d176697c25c62be1f4f2efaba692f037a93cf
parent1826d95339a371d6246b1453605374260e111e47 (diff)
downloadmana-client-aa1de77b2c6aa4f60dd643d300f9f9f51e566fcb.tar.gz
mana-client-aa1de77b2c6aa4f60dd643d300f9f9f51e566fcb.tar.bz2
mana-client-aa1de77b2c6aa4f60dd643d300f9f9f51e566fcb.tar.xz
mana-client-aa1de77b2c6aa4f60dd643d300f9f9f51e566fcb.zip
Rename UnAssign to Unassign
-rw-r--r--src/gui/setup_keyboard.cpp12
-rw-r--r--src/gui/setup_keyboard.h2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/setup_keyboard.cpp b/src/gui/setup_keyboard.cpp
index 21891d33..57a21270 100644
--- a/src/gui/setup_keyboard.cpp
+++ b/src/gui/setup_keyboard.cpp
@@ -87,9 +87,9 @@ Setup_Keyboard::Setup_Keyboard():
mAssignKeyButton->addActionListener(this);
mAssignKeyButton->setEnabled(false);
- mUnAssignKeyButton = new Button(_("Unassign"), "unassign", this);
- mUnAssignKeyButton->addActionListener(this);
- mUnAssignKeyButton->setEnabled(false);
+ mUnassignKeyButton = new Button(_("Unassign"), "unassign", this);
+ mUnassignKeyButton->addActionListener(this);
+ mUnassignKeyButton->setEnabled(false);
mMakeDefaultButton = new Button(_("Default"), "makeDefault", this);
mMakeDefaultButton->addActionListener(this);
@@ -101,7 +101,7 @@ Setup_Keyboard::Setup_Keyboard():
place(0, 0, scrollArea, 4, 6).setPadding(2);
place(0, 6, mMakeDefaultButton);
place(2, 6, mAssignKeyButton);
- place(3, 6, mUnAssignKeyButton);
+ place(3, 6, mUnassignKeyButton);
setDimension(gcn::Rectangle(0, 0, 365, 280));
}
@@ -112,7 +112,7 @@ Setup_Keyboard::~Setup_Keyboard()
delete mKeyListModel;
delete mAssignKeyButton;
- delete mUnAssignKeyButton;
+ delete mUnassignKeyButton;
delete mMakeDefaultButton;
}
@@ -146,7 +146,7 @@ void Setup_Keyboard::action(const gcn::ActionEvent &event)
if (!mKeySetting)
{
mAssignKeyButton->setEnabled(true);
- mUnAssignKeyButton->setEnabled(true);
+ mUnassignKeyButton->setEnabled(true);
}
}
else if (event.getId() == "assign")
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 28f6f9aa..4c916705 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -72,7 +72,7 @@ class Setup_Keyboard : public SetupTab, public gcn::ActionListener
gcn::ListBox *mKeyList;
gcn::Button *mAssignKeyButton;
- gcn::Button *mUnAssignKeyButton;
+ gcn::Button *mUnassignKeyButton;
gcn::Button *mMakeDefaultButton;
bool mKeySetting; /**< flag to check if key being set. */