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

chat color bugfix. change inet game name dialog bugfix

Browse Source
This commit is contained in:
doitux
2010-07-14 10:08:12 +00:00
parent 91090579cf
commit e2346b46f9
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/changecontentdialog.ui
+1 -1
View File
@@ -46,7 +46,7 @@
<string>in der Konfiguration speichern!</string> <string>in der Konfiguration speichern!</string>
</property> </property>
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
src/gui/qt/chattools/chattools.cpp
+13 -2
View File
@@ -69,7 +69,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
switch (myChatType) { switch (myChatType) {
case INET_LOBBY_CHAT: { case INET_LOBBY_CHAT: {
tempMsg = QString("<span style=\"font-weight:bold; color:"+myLobby->palette().highlight().color().name()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:bold; color:"+myLobby->palette().linkVisited().color().name()+";\">"+message+"</span>");
//play beep sound only in INET-lobby-chat //play beep sound only in INET-lobby-chat
// TODO dont play when message is from yourself // TODO dont play when message is from yourself
if(myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) { if(myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) {
@@ -84,9 +84,20 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
default: tempMsg = message; default: tempMsg = message;
} }
} }
else if(playerName == myNick) {
switch (myChatType) {
case INET_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().linkVisited().color().name()+";\">"+message+"</span>");
break;
case LAN_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>");
break;
case INGAME_CHAT: tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>");
break;
default: tempMsg = message;
}
}
else { else {
switch (myChatType) { switch (myChatType) {
case INET_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().highlight().color().name()+";\">"+message+"</span>"); case INET_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().text().color().name()+";\">"+message+"</span>");
break; break;
case LAN_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>"); case LAN_LOBBY_CHAT: tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>");
break; break;