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

add netLeaveTableWhenGameFinish config dialog option for ticket #2,

Browse Source 
string changes, better recognizable (pm) support in chat
This commit is contained in:
doitux
2011-10-19 20:49:34 +00:00
parent ec721b9ea5
commit b43909d742
5 changed files with 201 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/chattools/chattools.cpp
+185 -180
View File
@@ -28,8 +28,8 @@ using namespace std;
ChatTools::ChatTools(QLineEdit* l, ConfigFile *c, ChatType ct, QTextBrowser *b, QStandardItemModel *m, gameLobbyDialogImpl *lo) : nickAutoCompletitionCounter(0), myLineEdit(l), myNickListModel(m), myNickStringList(NULL), myTextBrowser(b), myChatType(ct), myConfig(c), myNick(""), myLobby(lo) ChatTools::ChatTools(QLineEdit* l, ConfigFile *c, ChatType ct, QTextBrowser *b, QStandardItemModel *m, gameLobbyDialogImpl *lo) : nickAutoCompletitionCounter(0), myLineEdit(l), myNickListModel(m), myNickStringList(NULL), myTextBrowser(b), myChatType(ct), myConfig(c), myNick(""), myLobby(lo)
{ {
myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()); myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str());
ignoreList = myConfig->readConfigStringList("PlayerIgnoreList"); ignoreList = myConfig->readConfigStringList("PlayerIgnoreList");
} }
@@ -40,141 +40,146 @@ ChatTools::~ChatTools()
void ChatTools::sendMessage() void ChatTools::sendMessage()
{ {
if(myLineEdit->text().size() && mySession) { if(myLineEdit->text().size() && mySession) {
fillChatLinesHistory(myLineEdit->text()); fillChatLinesHistory(myLineEdit->text());
QString chatText(myLineEdit->text()); QString chatText(myLineEdit->text());
if(myChatType == INGAME_CHAT) { if(myChatType == INGAME_CHAT) {
mySession->sendGameChatMessage(chatText.toUtf8().constData()); mySession->sendGameChatMessage(chatText.toUtf8().constData());
} else { } else {
// Parse user name for private messages. // Parse user name for private messages.
if(chatText.indexOf(QString("/msg ")) == 0) { if(chatText.indexOf(QString("/msg ")) == 0) {
chatText.remove(0, 5); chatText.remove(0, 5);
unsigned playerId = parsePrivateMessageTarget(chatText); unsigned playerId = parsePrivateMessageTarget(chatText);
if (playerId) if (playerId)
mySession->sendPrivateChatMessage(playerId, chatText.toUtf8().constData()); mySession->sendPrivateChatMessage(playerId, chatText.toUtf8().constData());
} else { } else {
mySession->sendLobbyChatMessage(chatText.toUtf8().constData()); mySession->sendLobbyChatMessage(chatText.toUtf8().constData());
} }
} }
myLineEdit->setText(""); myLineEdit->setText("");
} }
} }
void ChatTools::receiveMessage(QString playerName, QString message) void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
{ {
if(myTextBrowser) { if(myTextBrowser) {
message = message.replace("<","&lt;"); message = message.replace("<","&lt;");
message = message.replace(">","&gt;"); message = message.replace(">","&gt;");
//refresh myNick if it was changed during runtime //refresh myNick if it was changed during runtime
myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()); myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str());
QString tempMsg; QString tempMsg;
if(myChatType == INET_LOBBY_CHAT && playerName == "(chat bot)" && message.startsWith(myNick)) { if(myChatType == INET_LOBBY_CHAT && playerName == "(chat bot)" && message.startsWith(myNick)) {
tempMsg = QString("<span style=\"font-weight:bold; color:red;\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:bold; color:red;\">"+message+"</span>");
//play beep sound only in INET-lobby-chat //play beep sound only in INET-lobby-chat
if(myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) { if(myLobby->isVisible() && myConfig->readConfigInt("PlayLobbyChatNotification")) {
myLobby->getMyW()->getMySDLPlayer()->playSound("lobbychatnotify",0); myLobby->getMyW()->getMySDLPlayer()->playSound("lobbychatnotify",0);
} }
} else if(message.contains(myNick, Qt::CaseInsensitive)) { } else if(message.contains(myNick, Qt::CaseInsensitive)) {
switch (myChatType) { switch (myChatType) {
case INET_LOBBY_CHAT: { case INET_LOBBY_CHAT: {
tempMsg = QString("<span style=\"font-weight:bold; color:"+myLobby->palette().link().color().name()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:bold; color:"+myLobby->palette().link().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")) {
myLobby->getMyW()->getMySDLPlayer()->playSound("lobbychatnotify",0); myLobby->getMyW()->getMySDLPlayer()->playSound("lobbychatnotify",0);
} }
} }
break; break;
case LAN_LOBBY_CHAT: case LAN_LOBBY_CHAT:
tempMsg = QString("<span style=\"font-weight:bold;\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:bold;\">"+message+"</span>");
break; break;
case INGAME_CHAT: case INGAME_CHAT:
tempMsg = QString("<span style=\"color:#"+myStyle->getChatTextNickNotifyColor()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"color:#"+myStyle->getChatTextNickNotifyColor()+";\">"+message+"</span>");
break; break;
default: default:
tempMsg = message; tempMsg = message;
} }
} else if(playerName == myNick) { } else if(playerName == myNick) {
switch (myChatType) { switch (myChatType) {
case INET_LOBBY_CHAT: case INET_LOBBY_CHAT:
tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().link().color().name()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().link().color().name()+";\">"+message+"</span>");
break; break;
case LAN_LOBBY_CHAT: case LAN_LOBBY_CHAT:
tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>");
break; break;
case INGAME_CHAT: case INGAME_CHAT:
tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>");
break; break;
default: default:
tempMsg = message; tempMsg = message;
} }
} else { } else {
switch (myChatType) { switch (myChatType) {
case INET_LOBBY_CHAT: case INET_LOBBY_CHAT:
tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().text().color().name()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:normal; color:"+myLobby->palette().text().color().name()+";\">"+message+"</span>");
break; break;
case LAN_LOBBY_CHAT: case LAN_LOBBY_CHAT:
tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>"); tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>");
break; break;
case INGAME_CHAT: case INGAME_CHAT:
tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>"); tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>");
break; break;
default: default:
tempMsg = message; tempMsg = message;
} }
} }
bool nickFoundOnIgnoreList = false; bool nickFoundOnIgnoreList = false;
list<std::string>::iterator it1; list<std::string>::iterator it1;
for(it1=ignoreList.begin(); it1 != ignoreList.end(); ++it1) { for(it1=ignoreList.begin(); it1 != ignoreList.end(); ++it1) {
if(playerName == QString::fromUtf8(it1->c_str())) { if(playerName == QString::fromUtf8(it1->c_str())) {
nickFoundOnIgnoreList = true; nickFoundOnIgnoreList = true;
} }
} }
if(!nickFoundOnIgnoreList) { if(!nickFoundOnIgnoreList) {
if(message.indexOf(QString("/me "))==0) { if(message.indexOf(QString("/me "))==0) {
myTextBrowser->append(tempMsg.replace("/me ","<i>*"+playerName+" ")+"</i>"); myTextBrowser->append(tempMsg.replace("/me ","<i>*"+playerName+" ")+"</i>");
} else { }
myTextBrowser->append(playerName + ": " + tempMsg); else if(pm == true) {
} myTextBrowser->append("<i>"+playerName+"(pm): " + tempMsg+"</i>");
} }
} else {
myTextBrowser->append(playerName + ": " + tempMsg);
}
}
}
} }
void ChatTools::privateMessage(QString playerName, QString message) void ChatTools::privateMessage(QString playerName, QString message)
{ {
receiveMessage(playerName, "->" + message); bool pm=true;
receiveMessage(playerName, message, pm);
} }
void ChatTools::clearChat() void ChatTools::clearChat()
{ {
if(myTextBrowser) if(myTextBrowser)
myTextBrowser->clear(); myTextBrowser->clear();
} }
void ChatTools::checkInputLength(QString string) void ChatTools::checkInputLength(QString string)
{ {
if(string.toUtf8().length() > 120) myLineEdit->setMaxLength(string.length()); if(string.toUtf8().length() > 120) myLineEdit->setMaxLength(string.length());
} }
void ChatTools::fillChatLinesHistory(QString fillString) void ChatTools::fillChatLinesHistory(QString fillString)
{ {
chatLinesHistory << fillString; chatLinesHistory << fillString;
if(chatLinesHistory.size() > 50) chatLinesHistory.removeFirst(); if(chatLinesHistory.size() > 50) chatLinesHistory.removeFirst();
} }
@@ -182,114 +187,114 @@ void ChatTools::fillChatLinesHistory(QString fillString)
void ChatTools::showChatHistoryIndex(int index) void ChatTools::showChatHistoryIndex(int index)
{ {
if(index <= chatLinesHistory.size()) { if(index <= chatLinesHistory.size()) {
// cout << chatLinesHistory.size() << " : " << index << endl; // cout << chatLinesHistory.size() << " : " << index << endl;
if(index > 0) if(index > 0)
myLineEdit->setText(chatLinesHistory.at(chatLinesHistory.size()-(index))); myLineEdit->setText(chatLinesHistory.at(chatLinesHistory.size()-(index)));
else else
myLineEdit->setText(""); myLineEdit->setText("");
} }
} }
void ChatTools::nickAutoCompletition() void ChatTools::nickAutoCompletition()
{ {
QString myChatString = myLineEdit->text(); QString myChatString = myLineEdit->text();
QStringList myChatStringList = myChatString.split(" "); QStringList myChatStringList = myChatString.split(" ");
QStringList matchStringList; QStringList matchStringList;
if(nickAutoCompletitionCounter == 0) { if(nickAutoCompletitionCounter == 0) {
if(myNickListModel) { if(myNickListModel) {
int it = 0; int it = 0;
while (myNickListModel->item(it)) { while (myNickListModel->item(it)) {
QString text = myNickListModel->item(it, 0)->data(Qt::DisplayRole).toString(); QString text = myNickListModel->item(it, 0)->data(Qt::DisplayRole).toString();
if(text.startsWith(myChatStringList.last(), Qt::CaseInsensitive) && myChatStringList.last() != "") { if(text.startsWith(myChatStringList.last(), Qt::CaseInsensitive) && myChatStringList.last() != "") {
matchStringList << text; matchStringList << text;
} }
++it; ++it;
} }
} }
if(!myNickStringList.isEmpty()) { if(!myNickStringList.isEmpty()) {
QStringListIterator it(myNickStringList); QStringListIterator it(myNickStringList);
while (it.hasNext()) { while (it.hasNext()) {
QString next = it.next(); QString next = it.next();
if (next.startsWith(myChatStringList.last(), Qt::CaseInsensitive) && myChatStringList.last() != "") if (next.startsWith(myChatStringList.last(), Qt::CaseInsensitive) && myChatStringList.last() != "")
matchStringList << next; matchStringList << next;
} }
} }
} }
if(!matchStringList.isEmpty() || nickAutoCompletitionCounter > 0) { if(!matchStringList.isEmpty() || nickAutoCompletitionCounter > 0) {
myChatStringList.removeLast(); myChatStringList.removeLast();
// cout << nickAutoCompletitionCounter << endl; // cout << nickAutoCompletitionCounter << endl;
if(nickAutoCompletitionCounter == 0) { if(nickAutoCompletitionCounter == 0) {
//first one //first one
lastChatString = myChatStringList.join(" "); lastChatString = myChatStringList.join(" ");
lastMatchStringList = matchStringList; lastMatchStringList = matchStringList;
} }
if(nickAutoCompletitionCounter == lastMatchStringList.size()) nickAutoCompletitionCounter = 0; if(nickAutoCompletitionCounter == lastMatchStringList.size()) nickAutoCompletitionCounter = 0;
// cout << nickAutoCompletitionCounter << "\n"; // cout << nickAutoCompletitionCounter << "\n";
if(lastChatString == "") if(lastChatString == "")
myLineEdit->setText(lastMatchStringList.at(nickAutoCompletitionCounter)+": "); myLineEdit->setText(lastMatchStringList.at(nickAutoCompletitionCounter)+": ");
else else
myLineEdit->setText(lastChatString+" "+lastMatchStringList.at(nickAutoCompletitionCounter)+" "); myLineEdit->setText(lastChatString+" "+lastMatchStringList.at(nickAutoCompletitionCounter)+" ");
nickAutoCompletitionCounter++; nickAutoCompletitionCounter++;
} }
} }
void ChatTools::setChatTextEdited() void ChatTools::setChatTextEdited()
{ {
nickAutoCompletitionCounter = 0; nickAutoCompletitionCounter = 0;
} }
void ChatTools::refreshIgnoreList() void ChatTools::refreshIgnoreList()
{ {
ignoreList = myConfig->readConfigStringList("PlayerIgnoreList"); ignoreList = myConfig->readConfigStringList("PlayerIgnoreList");
} }
unsigned ChatTools::parsePrivateMessageTarget(QString &chatText) unsigned ChatTools::parsePrivateMessageTarget(QString &chatText)
{ {
QString playerName; QString playerName;
int endPosName = -1; int endPosName = -1;
// Target player is either in the format "this is a user" or singlename. // Target player is either in the format "this is a user" or singlename.
if (chatText.startsWith('"')) { if (chatText.startsWith('"')) {
chatText.remove(0, 1); chatText.remove(0, 1);
endPosName = chatText.indexOf('"'); endPosName = chatText.indexOf('"');
} else { } else {
endPosName = chatText.indexOf(' '); endPosName = chatText.indexOf(' ');
} }
if (endPosName > 0) { if (endPosName > 0) {
playerName = chatText.left(endPosName); playerName = chatText.left(endPosName);
chatText.remove(0, endPosName + 1); chatText.remove(0, endPosName + 1);
} }
chatText = chatText.trimmed(); chatText = chatText.trimmed();
unsigned playerId = 0; unsigned playerId = 0;
if (!playerName.isEmpty() && !chatText.isEmpty()) { if (!playerName.isEmpty() && !chatText.isEmpty()) {
if(myNickListModel) { if(myNickListModel) {
int it = 0; int it = 0;
while (myNickListModel->item(it)) { while (myNickListModel->item(it)) {
QString text = myNickListModel->item(it, 0)->data(Qt::DisplayRole).toString(); QString text = myNickListModel->item(it, 0)->data(Qt::DisplayRole).toString();
if(text == playerName) { if(text == playerName) {
playerId = myNickListModel->item(it, 0)->data(Qt::UserRole).toUInt(); playerId = myNickListModel->item(it, 0)->data(Qt::UserRole).toUInt();
break; break;
} }
++it; ++it;
} }
} }
} }
return playerId; return playerId;
} }
src/gui/qt/chattools/chattools.h
+1 -1
View File
@@ -46,7 +46,7 @@ public:
public slots: public slots:
void sendMessage(); void sendMessage();
void receiveMessage(QString playerName, QString message); void receiveMessage(QString playerName, QString message, bool pm=false);
void privateMessage(QString playerName, QString message); void privateMessage(QString playerName, QString message);
void clearChat(); void clearChat();
void checkInputLength(QString string); void checkInputLength(QString string);
src/gui/qt/settingsdialog.ui
+9 -2
View File
@@ -1554,7 +1554,7 @@ p, li { white-space: pre-wrap; }
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget_2"> <widget class="QTabWidget" name="tabWidget_2">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="title"> <attribute name="title">
@@ -1844,7 +1844,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<spacer name="spacer"> <spacer name="spacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@@ -1857,6 +1857,13 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox_InetGane_AutoLeaveTheTableAfterGameFinished">
<property name="text">
<string>Automatically leave the table after the game finished</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_6"> <widget class="QWidget" name="tab_6">
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+4 -2
View File
@@ -234,7 +234,8 @@ void settingsDialogImpl::prepareDialog()
lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str())); lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
} }
checkBox_UseLobbyChat->setChecked(myConfig->readConfigInt("UseLobbyChat")); checkBox_UseLobbyChat->setChecked(myConfig->readConfigInt("UseLobbyChat"));
comboBox_internetGameType->setCurrentIndex(myConfig->readConfigInt("InternetGameType")); checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->setChecked(myConfig->readConfigInt("NetAutoLeaveGameAfterFinish"));
comboBox_internetGameType->setCurrentIndex(myConfig->readConfigInt("InternetGameType"));
lineEdit_internetGameName->setText(QString::fromUtf8(myConfig->readConfigString("InternetGameName").c_str())); lineEdit_internetGameName->setText(QString::fromUtf8(myConfig->readConfigString("InternetGameName").c_str()));
std::list<std::string> playerIgnoreList = myConfig->readConfigStringList("PlayerIgnoreList"); std::list<std::string> playerIgnoreList = myConfig->readConfigStringList("PlayerIgnoreList");
@@ -596,7 +597,8 @@ void settingsDialogImpl::isAccepted()
myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked()); myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked());
myConfig->writeConfigString("InternetGamePassword", lineEdit_InternetGamePassword->text().toUtf8().constData()); myConfig->writeConfigString("InternetGamePassword", lineEdit_InternetGamePassword->text().toUtf8().constData());
myConfig->writeConfigInt("UseLobbyChat", checkBox_UseLobbyChat->isChecked()); myConfig->writeConfigInt("UseLobbyChat", checkBox_UseLobbyChat->isChecked());
myConfig->writeConfigInt("InternetGameType", comboBox_internetGameType->currentIndex()); myConfig->writeConfigInt("NetAutoLeaveGameAfterFinish", checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->isChecked());
myConfig->writeConfigInt("InternetGameType", comboBox_internetGameType->currentIndex());
myConfig->writeConfigString("InternetGameName", lineEdit_internetGameName->text().toUtf8().constData()); myConfig->writeConfigString("InternetGameName", lineEdit_internetGameName->text().toUtf8().constData());
int k; int k;
src/gui/qt/startwindow/startwindowimpl.cpp
+2 -2
View File
@@ -691,7 +691,7 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/)
case ERR_SOCK_RECV_FAILED: // Sometimes windows reports recv failed on close. case ERR_SOCK_RECV_FAILED: // Sometimes windows reports recv failed on close.
case ERR_SOCK_CONN_RESET: { case ERR_SOCK_CONN_RESET: {
QMessageBox::warning(this, tr("Network Error"), QMessageBox::warning(this, tr("Network Error"),
tr("Connection was closed by the server."), tr("The connection to the server was lost."),
QMessageBox::Close); QMessageBox::Close);
} }
break; break;
@@ -917,7 +917,7 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/)
myGameLobbyDialog->reject(); myGameLobbyDialog->reject();
myConnectToServerDialog->reject(); myConnectToServerDialog->reject();
myStartNetworkGameDialog->reject(); myStartNetworkGameDialog->reject();
myGuiInterface->getMyW()->close(); myGuiInterface->getMyW()->close();
} }
void startWindowImpl::networkNotification(int notificationId) void startWindowImpl::networkNotification(int notificationId)