diff --git a/src/gui/qt/changecontentdialog.ui b/src/gui/qt/changecontentdialog.ui index 59b6d7f2..93788192 100644 --- a/src/gui/qt/changecontentdialog.ui +++ b/src/gui/qt/changecontentdialog.ui @@ -36,11 +36,7 @@ - - - 12 - - + @@ -49,6 +45,9 @@ in der Konfiguration speichern! + + false + diff --git a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp index 0b442848..f836e3bc 100644 --- a/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp +++ b/src/gui/qt/changecontentdialog/changecontentdialogimpl.cpp @@ -37,6 +37,7 @@ changeContentDialogImpl::changeContentDialogImpl(QWidget *parent, ConfigFile *co label_Message->setText(tr("You cannot join Internet-Game-Lobby with \"Human Player\" as nickname.\nPlease choose another one.")); label_lineLabel->setText(tr("Nick name:")); lineEdit->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str())); + lineEdit->setMaxLength(12); checkBox->hide(); this->setGeometry(this->x(), this->y(), this->width(), this->height()-20 ); } @@ -45,18 +46,21 @@ changeContentDialogImpl::changeContentDialogImpl(QWidget *parent, ConfigFile *co label_Message->setText(tr("Your player name is already used by another player.\nPlease choose a different name.")); label_lineLabel->setText(tr("Nick name:")); lineEdit->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str())); + lineEdit->setMaxLength(12); } break; case CHANGE_NICK_INVALID: { label_Message->setText(tr("The player name is too short, too long or invalid. Please choose another one.")); label_lineLabel->setText(tr("Nick name:")); lineEdit->setText(QString::fromUtf8(myConfig->readConfigString("MyName").c_str())); + lineEdit->setMaxLength(12); } break; case CHANGE_INET_GAME_NAME: { label_Message->setText(tr("There is already a game with your choosen game name.\nPlease choose another one!")); label_lineLabel->setText(tr("Game name:")); lineEdit->setText(QString::fromUtf8(myConfig->readConfigString("InternetGameName").c_str())); + lineEdit->setMaxLength(48); } break; } diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index 1804b3a2..bedbaf63 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -32,6 +32,7 @@ ChatTools::ChatTools(QLineEdit* l, ConfigFile *c, ChatType ct, QTextBrowser *b, { myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()); ignoreList = myConfig->readConfigStringList("PlayerIgnoreList"); + } ChatTools::~ChatTools() @@ -68,7 +69,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) { switch (myChatType) { case INET_LOBBY_CHAT: { - tempMsg = QString(""+message+""); + tempMsg = QString("palette().highlight().color().name()+";\">"+message+""); //play beep sound only in INET-lobby-chat // TODO dont play when message is from yourself if(myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) { @@ -85,7 +86,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) { } else { switch (myChatType) { - case INET_LOBBY_CHAT: tempMsg = QString(""+message+""); + case INET_LOBBY_CHAT: tempMsg = QString("palette().highlight().color().name()+";\">"+message+""); break; case LAN_LOBBY_CHAT: tempMsg = QString(""+message+""); break; @@ -106,7 +107,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) { } if(!nickFoundOnIgnoreList) { - myTextBrowser->append(playerName + ": " + tempMsg); + myTextBrowser->append(playerName + ": " + tempMsg); } } } diff --git a/src/gui/qt/createinternetgamedialog.ui b/src/gui/qt/createinternetgamedialog.ui index 4c7d3c01..86cb56fe 100644 --- a/src/gui/qt/createinternetgamedialog.ui +++ b/src/gui/qt/createinternetgamedialog.ui @@ -30,7 +30,11 @@ - + + + 48 + +