summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 23:36:32 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 23:36:32 +0100
commit5774af3740d44399ac6ad4dfc223e4c9350f98c4 (patch)
treedfff58bcaa5196a3edb115d96aa94dd8e68d6148
parent4fa2d32cc9748c1381ceae59c727d090117652c1 (diff)
downloadmana-5774af3740d44399ac6ad4dfc223e4c9350f98c4.tar.gz
mana-5774af3740d44399ac6ad4dfc223e4c9350f98c4.tar.bz2
mana-5774af3740d44399ac6ad4dfc223e4c9350f98c4.tar.xz
mana-5774af3740d44399ac6ad4dfc223e4c9350f98c4.zip
Allow pressing enter with focus in port field
Added action event id to port field of login dialog.
-rw-r--r--src/gui/login.cpp3
-rw-r--r--src/keyboardconfig.cpp2
-rw-r--r--src/particle.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index c1eda00a..e9964f2e 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -79,6 +79,7 @@ LoginDialog::LoginDialog(LoginData *loginData):
mUserField->setActionEventId("ok");
mPassField->setActionEventId("ok");
mServerField->setActionEventId("ok");
+ mPortField->setActionEventId("ok");
mServerDropDown->setActionEventId("changeSelection");
mUserField->addKeyListener(this);
@@ -289,7 +290,7 @@ std::string LoginDialog::DropDownList::getElementAt(int i)
{
if (i < 0 || i >= getNumberOfElements())
{
- return "";
+ return "";
}
return getServerAt(i) + ":" + getPortAt(i);
}
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index 5d2d7797..73c0fe0a 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -197,7 +197,7 @@ int KeyboardConfig::getKeyEmoteOffset(int keyValue) const
bool KeyboardConfig::isKeyActive(int index)
{
- return mActiveKeys[ mKey[index].value];
+ return mActiveKeys[mKey[index].value];
}
void KeyboardConfig::refreshActiveKeys()
diff --git a/src/particle.h b/src/particle.h
index e79a46dd..1baf11f8 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _PARTICLE_H
-#define _PARTICLE_H
+#ifndef PARTICLE_H
+#define PARTICLE_H
#include <list>
#include <string>