sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nick highlighting also works now for nicks with whitespace

Browse Source
This commit is contained in:
doitux
2007-12-12 22:01:40 +00:00
parent 1a99169556
commit d61027b265
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/chattools/chattools.cpp
+7 -2
View File
@@ -25,7 +25,7 @@
using namespace std;
ChatTools::ChatTools(QLineEdit* l, ConfigFile *c, int notifyMode, QTextBrowser *b, QTreeWidget *t) : nickAutoCompletitionCounter(0), myLineEdit(l), myNickTreeWidget(t), myNickStringList(NULL), myTextBrowser(b), myNotifyMode(notifyMode), myConfig(c)
ChatTools::ChatTools(QLineEdit* l, ConfigFile *c, int notifyMode, QTextBrowser *b, QTreeWidget *t) : nickAutoCompletitionCounter(0), myLineEdit(l), myNickTreeWidget(t), myNickStringList(NULL), myTextBrowser(b), myNotifyMode(notifyMode), myConfig(c), myNick("")
{
}
@@ -53,7 +53,12 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
message = message.replace(">",">");
QString tempMsg;
if(message.contains(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()), Qt::CaseInsensitive)) {
QString nickString;
if(myNick == "") { nickString = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()); }
else { nickString = myNick; }
if(message.contains(nickString, Qt::CaseInsensitive)) {
switch (myNotifyMode) {
case 0: tempMsg = message;
src/gui/qt/chattools/chattools.h
+4
View File
@@ -53,8 +53,11 @@ public slots:
void setChatTextEdited();
void setPlayerNicksList(QStringList value) { myNickStringList = value; }
void setMyNick ( const QString& theValue ) { myNick = theValue; }
private:
QStringList chatLinesHistory;
QString lastChatString;
QStringList lastMatchStringList;
@@ -68,6 +71,7 @@ private:
int myNotifyMode; // 0 == no notification, 1 == bold notification, 2 == yellow notification
ConfigFile *myConfig;
QString myNick;
};
#endif
src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
+5 -2
View File
@@ -64,6 +64,7 @@ void LobbyChat::connected(QString server)
void LobbyChat::selfJoined(QString ownName, QString channel)
{
myNick = ownName;
myChatTools->setMyNick(myNick);
myLobby->textBrowser_ChatDisplay->append(tr("Joined channel:") + " " + channel + " " + tr("as user") + " " + ownName + ".");
myLobby->textBrowser_ChatDisplay->append("");
myLobby->lineEdit_ChatInput->setEnabled(true);
@@ -92,8 +93,10 @@ void LobbyChat::playerChanged(QString oldNick, QString newNick)
tmpList.front()->setData(0, Qt::DisplayRole, "@" + newNick);
}
if (myNick == oldNick)
if (myNick == oldNick) {
myNick = newNick;
myChatTools->setMyNick(myNick);
}
}
void LobbyChat::playerKicked(QString nickName, QString byWhom, QString reason)
@@ -127,7 +130,7 @@ void LobbyChat::displayMessage(QString playerName, QString message) {
myChatTools->receiveMessage(playerName, message);
if(message.contains(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()), Qt::CaseInsensitive) && myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) {
if(message.contains(myNick, Qt::CaseInsensitive) && myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) {
myLobby->getMyW()->getMySDLPlayer()->playSound("lobbychatnotify",0);
}
}