From 0e11228a95a93fad5bdfcc0ebc2ab9b99c1406ba Mon Sep 17 00:00:00 2001 From: doitux Date: Sun, 30 Sep 2007 18:48:43 +0000 Subject: [PATCH] highlight lobbychat messages with own nick into --- .../qt/gamelobbydialog/gamelobbydialogimpl.cpp | 4 ++-- .../qt/gamelobbydialog/lobbychat/lobbychat.cpp | 15 +++++++++++++-- src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h | 5 ++++- src/gui/qt/settingsdialog/settingsdialogimpl.cpp | 2 +- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 209e6a8d..4aec0991 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -22,7 +22,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) { setupUi(this); - myChat = new LobbyChat(this); + myChat = new LobbyChat(this, myConfig); myAppDataPath = QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str()); @@ -214,7 +214,7 @@ void gameLobbyDialogImpl::updateGameItem(QTreeWidgetItem *item, unsigned gameId) if (info.mode == GAME_MODE_STARTED) item->setData(2, Qt::DisplayRole, tr("running")); else - item->setData(2, Qt::DisplayRole, tr("registering")); + item->setData(2, Qt::DisplayRole, tr("open")); if (info.isPasswordProtected) item->setIcon(3, QIcon(myAppDataPath+"gfx/gui/misc/lock.png")); diff --git a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp index 3bd51b51..15a2fcc2 100644 --- a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp +++ b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp @@ -24,11 +24,12 @@ #include "gamelobbydialogimpl.h" #include "session.h" +#include "configfile.h" using namespace std; -LobbyChat::LobbyChat(gameLobbyDialogImpl* l) : myLobby(l) +LobbyChat::LobbyChat(gameLobbyDialogImpl* l, ConfigFile *c) : myLobby(l), myConfig(c) { } @@ -113,8 +114,18 @@ void LobbyChat::playerLeft(QString playerName) } void LobbyChat::displayMessage(QString playerName, QString message) { + + QString tempMsg; + cout << message.toStdString() << endl; + cout << QString::fromUtf8(myConfig->readConfigString("MyName").c_str()).toStdString() << endl; - myLobby->textBrowser_ChatDisplay->append(playerName + ": " + message); + if(message.contains(QString::fromUtf8(myConfig->readConfigString("MyName").c_str()), Qt::CaseInsensitive)) { + tempMsg = QString(""+message+""); + } + else { + tempMsg = message; + } + myLobby->textBrowser_ChatDisplay->append(playerName + ": " + tempMsg); } void LobbyChat::checkInputLength(QString string) { diff --git a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h index 998c0c7b..bd2840d0 100644 --- a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h +++ b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.h @@ -25,13 +25,14 @@ class gameLobbyDialogImpl; class Session; +class ConfigFile; class LobbyChat : public QObject { Q_OBJECT public: - LobbyChat(gameLobbyDialogImpl*); + LobbyChat(gameLobbyDialogImpl*, ConfigFile*); ~LobbyChat(); @@ -53,8 +54,10 @@ public slots: private: gameLobbyDialogImpl *myLobby; + ConfigFile *myConfig; QString myNick; + // friend class GuiWrapper; }; diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp index 15bdd0b9..443dbc7f 100644 --- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp +++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp @@ -459,7 +459,7 @@ void settingsDialogImpl::callManualBlindsOrderDialog() { } myAfterMBAlwaysDoubleBlinds = myManualBlindsOrderDialog->radioButton_alwaysDoubleBlinds->isChecked(); - myAfterMBAlwaysRaiseAbout = myManualBlindsOrderDialog->radioButton_alwaysRaiseAbout->isChecked(); + myAfterMBAlwaysRaiseAbout = myManualBlindsOrderDialog->radioButton_alwaysRaiseAbout->isChecked(); myAfterMBAlwaysRaiseValue = myManualBlindsOrderDialog->spinBox_alwaysRaiseValue->value(); myAfterMBStayAtLastBlind = myManualBlindsOrderDialog->radioButton_stayAtLastBlind->isChecked();