Running astyle.
This commit is contained in:
lotodore
+182
-184
@@ -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,146 +40,144 @@ 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, bool pm)
|
void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
|
||||||
{
|
{
|
||||||
|
|
||||||
if(myTextBrowser) {
|
if(myTextBrowser) {
|
||||||
|
|
||||||
message = message.replace("<","<");
|
message = message.replace("<","<");
|
||||||
message = message.replace(">",">");
|
message = message.replace(">",">");
|
||||||
|
|
||||||
//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 if(pm == true) {
|
||||||
else if(pm == true) {
|
myTextBrowser->append("<i>"+playerName+"(pm): " + tempMsg+"</i>");
|
||||||
myTextBrowser->append("<i>"+playerName+"(pm): " + tempMsg+"</i>");
|
} else {
|
||||||
}
|
myTextBrowser->append(playerName + ": " + tempMsg);
|
||||||
else {
|
}
|
||||||
myTextBrowser->append(playerName + ": " + tempMsg);
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChatTools::privateMessage(QString playerName, QString message)
|
void ChatTools::privateMessage(QString playerName, QString message)
|
||||||
{
|
{
|
||||||
bool pm=true;
|
bool pm=true;
|
||||||
receiveMessage(playerName, message, pm);
|
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();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -187,114 +185,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public:
|
|||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
void sendMessage();
|
void sendMessage();
|
||||||
void receiveMessage(QString playerName, QString message, bool pm=false);
|
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);
|
||||||
|
|||||||
@@ -234,8 +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"));
|
||||||
checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->setChecked(myConfig->readConfigInt("NetAutoLeaveGameAfterFinish"));
|
checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->setChecked(myConfig->readConfigInt("NetAutoLeaveGameAfterFinish"));
|
||||||
comboBox_internetGameType->setCurrentIndex(myConfig->readConfigInt("InternetGameType"));
|
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");
|
||||||
@@ -597,8 +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("NetAutoLeaveGameAfterFinish", checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->isChecked());
|
myConfig->writeConfigInt("NetAutoLeaveGameAfterFinish", checkBox_InetGane_AutoLeaveTheTableAfterGameFinished->isChecked());
|
||||||
myConfig->writeConfigInt("InternetGameType", comboBox_internetGameType->currentIndex());
|
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;
|
||||||
|
|||||||
@@ -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("The connection to the server was lost."),
|
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)
|
||||||
|
|||||||
@@ -53,126 +53,126 @@ class internetGameLoginDialogImpl;
|
|||||||
|
|
||||||
class startWindowImpl: public QMainWindow, public Ui::startWindow
|
class startWindowImpl: public QMainWindow, public Ui::startWindow
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
startWindowImpl(ConfigFile *c =0);
|
startWindowImpl(ConfigFile *c =0);
|
||||||
~startWindowImpl();
|
~startWindowImpl();
|
||||||
|
|
||||||
void setSession(boost::shared_ptr<Session> session) {
|
void setSession(boost::shared_ptr<Session> session) {
|
||||||
mySession = session;
|
mySession = session;
|
||||||
}
|
}
|
||||||
boost::shared_ptr<Session> getSession() {
|
boost::shared_ptr<Session> getSession() {
|
||||||
assert(mySession.get());
|
assert(mySession.get());
|
||||||
return mySession;
|
return mySession;
|
||||||
}
|
}
|
||||||
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const {
|
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const {
|
||||||
return myServerGuiInterface;
|
return myServerGuiInterface;
|
||||||
}
|
}
|
||||||
connectToServerDialogImpl* getMyConnectToServerDialog() const {
|
connectToServerDialogImpl* getMyConnectToServerDialog() const {
|
||||||
return myConnectToServerDialog;
|
return myConnectToServerDialog;
|
||||||
}
|
}
|
||||||
|
|
||||||
// void keyPressEvent( QKeyEvent *);
|
// void keyPressEvent( QKeyEvent *);
|
||||||
bool eventFilter(QObject *obj, QEvent *event);
|
bool eventFilter(QObject *obj, QEvent *event);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void signalShowClientDialog();
|
void signalShowClientDialog();
|
||||||
|
|
||||||
void signalNetClientConnect(int actionID);
|
void signalNetClientConnect(int actionID);
|
||||||
void signalNetClientServerListShow();
|
void signalNetClientServerListShow();
|
||||||
void signalNetClientServerListClear();
|
void signalNetClientServerListClear();
|
||||||
void signalNetClientServerListAdd(unsigned serverId);
|
void signalNetClientServerListAdd(unsigned serverId);
|
||||||
void signalNetClientLoginShow();
|
void signalNetClientLoginShow();
|
||||||
void signalNetClientRejoinPossible(unsigned gameId);
|
void signalNetClientRejoinPossible(unsigned gameId);
|
||||||
void signalNetClientGameInfo(int actionID);
|
void signalNetClientGameInfo(int actionID);
|
||||||
void signalNetClientError(int errorID, int osErrorID);
|
void signalNetClientError(int errorID, int osErrorID);
|
||||||
void signalNetClientNotification(int notificationId);
|
void signalNetClientNotification(int notificationId);
|
||||||
void signalNetClientStatsUpdate(ServerStats stats);
|
void signalNetClientStatsUpdate(ServerStats stats);
|
||||||
void signalNetClientShowTimeoutDialog(int, unsigned);
|
void signalNetClientShowTimeoutDialog(int, unsigned);
|
||||||
void signalNetClientRemovedFromGame(int notificationId);
|
void signalNetClientRemovedFromGame(int notificationId);
|
||||||
void signalNetServerError(int errorID, int osErrorID);
|
void signalNetServerError(int errorID, int osErrorID);
|
||||||
void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
void signalNetClientSelfJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
||||||
void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
void signalNetClientPlayerJoined(unsigned playerId, QString playerName, bool isGameAdmin);
|
||||||
void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName);
|
void signalNetClientPlayerChanged(unsigned playerId, QString newPlayerName);
|
||||||
void signalNetClientPlayerLeft(unsigned playerId, QString playerName);
|
void signalNetClientPlayerLeft(unsigned playerId, QString playerName);
|
||||||
void signalNetClientNewGameAdmin(unsigned playerId, QString playerName);
|
void signalNetClientNewGameAdmin(unsigned playerId, QString playerName);
|
||||||
void signalNetClientGameListNew(unsigned gameId);
|
void signalNetClientGameListNew(unsigned gameId);
|
||||||
void signalNetClientGameListRemove(unsigned gameId);
|
void signalNetClientGameListRemove(unsigned gameId);
|
||||||
void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
|
void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
|
||||||
void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
|
void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
|
||||||
void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
|
void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
|
||||||
void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
|
void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
|
||||||
void signalNetClientGameStart(boost::shared_ptr<Game> game);
|
void signalNetClientGameStart(boost::shared_ptr<Game> game);
|
||||||
void signalNetClientGameChatMsg(QString nickName, QString msg);
|
void signalNetClientGameChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientLobbyChatMsg(QString nickName, QString msg);
|
void signalNetClientLobbyChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientPrivateChatMsg(QString nickName, QString msg);
|
void signalNetClientPrivateChatMsg(QString nickName, QString msg);
|
||||||
void signalNetClientMsgBox(QString msg);
|
void signalNetClientMsgBox(QString msg);
|
||||||
void signalNetClientMsgBox(unsigned msgId);
|
void signalNetClientMsgBox(unsigned msgId);
|
||||||
|
|
||||||
void signalLobbyPlayerJoined(unsigned playerId, QString nickName);
|
void signalLobbyPlayerJoined(unsigned playerId, QString nickName);
|
||||||
void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason);
|
void signalLobbyPlayerKicked(QString nickName, QString byWhom, QString reason);
|
||||||
void signalLobbyPlayerLeft(unsigned playerId);
|
void signalLobbyPlayerLeft(unsigned playerId);
|
||||||
|
|
||||||
void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom);
|
void signalSelfGameInvitation(unsigned gameId, unsigned playerIdFrom);
|
||||||
void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom);
|
void signalPlayerGameInvitation(unsigned gameId, unsigned playerIdWho, unsigned playerIdFrom);
|
||||||
void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason);
|
void signalRejectedGameInvitation(unsigned gameId, unsigned playerIdWho, DenyGameInvitationReason reason);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
void callAboutPokerthDialog();
|
void callAboutPokerthDialog();
|
||||||
void callSettingsDialog();
|
void callSettingsDialog();
|
||||||
void callNewGameDialog();
|
void callNewGameDialog();
|
||||||
void callGameLobbyDialog();
|
void callGameLobbyDialog();
|
||||||
void callCreateNetworkGameDialog();
|
void callCreateNetworkGameDialog();
|
||||||
void callJoinNetworkGameDialog();
|
void callJoinNetworkGameDialog();
|
||||||
void showLobbyDialog();
|
void showLobbyDialog();
|
||||||
void callInternetGameLoginDialog();
|
void callInternetGameLoginDialog();
|
||||||
void callRejoinPossibleDialog(unsigned);
|
void callRejoinPossibleDialog(unsigned);
|
||||||
void joinGameLobby();
|
void joinGameLobby();
|
||||||
void showClientDialog();
|
void showClientDialog();
|
||||||
void showNetworkStartDialog();
|
void showNetworkStartDialog();
|
||||||
|
|
||||||
void startNewLocalGame(newGameDialogImpl* =0);
|
void startNewLocalGame(newGameDialogImpl* =0);
|
||||||
|
|
||||||
void showTimeoutDialog(int msgID, unsigned duration);
|
void showTimeoutDialog(int msgID, unsigned duration);
|
||||||
void hideTimeoutDialog();
|
void hideTimeoutDialog();
|
||||||
|
|
||||||
void networkError(int, int);
|
void networkError(int, int);
|
||||||
void networkNotification(int);
|
void networkNotification(int);
|
||||||
void networkMessage(QString);
|
void networkMessage(QString);
|
||||||
void networkMessage(unsigned);
|
void networkMessage(unsigned);
|
||||||
|
|
||||||
void networkStart(boost::shared_ptr<Game> game);
|
void networkStart(boost::shared_ptr<Game> game);
|
||||||
QStringList getPlayerNicksList();
|
QStringList getPlayerNicksList();
|
||||||
|
|
||||||
QString checkForFirstStartAfterUpdated();
|
QString checkForFirstStartAfterUpdated();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ConfigFile *myConfig;
|
ConfigFile *myConfig;
|
||||||
|
|
||||||
boost::shared_ptr<GuiInterface> myGuiInterface;
|
boost::shared_ptr<GuiInterface> myGuiInterface;
|
||||||
boost::shared_ptr<Session> mySession;
|
boost::shared_ptr<Session> mySession;
|
||||||
boost::shared_ptr<GuiInterface> myServerGuiInterface;
|
boost::shared_ptr<GuiInterface> myServerGuiInterface;
|
||||||
|
|
||||||
// Dialogs
|
// Dialogs
|
||||||
aboutPokerthImpl *myAboutPokerthDialog;
|
aboutPokerthImpl *myAboutPokerthDialog;
|
||||||
newGameDialogImpl *myNewGameDialog;
|
newGameDialogImpl *myNewGameDialog;
|
||||||
settingsDialogImpl *mySettingsDialog;
|
settingsDialogImpl *mySettingsDialog;
|
||||||
selectAvatarDialogImpl *mySelectAvatarDialog;
|
selectAvatarDialogImpl *mySelectAvatarDialog;
|
||||||
joinNetworkGameDialogImpl *myJoinNetworkGameDialog;
|
joinNetworkGameDialogImpl *myJoinNetworkGameDialog;
|
||||||
connectToServerDialogImpl *myConnectToServerDialog;
|
connectToServerDialogImpl *myConnectToServerDialog;
|
||||||
startNetworkGameDialogImpl *myStartNetworkGameDialog;
|
startNetworkGameDialogImpl *myStartNetworkGameDialog;
|
||||||
createNetworkGameDialogImpl *myCreateNetworkGameDialog;
|
createNetworkGameDialogImpl *myCreateNetworkGameDialog;
|
||||||
gameLobbyDialogImpl *myGameLobbyDialog;
|
gameLobbyDialogImpl *myGameLobbyDialog;
|
||||||
timeoutMsgBoxImpl *myTimeoutDialog;
|
timeoutMsgBoxImpl *myTimeoutDialog;
|
||||||
startWindowImpl *myStartWindow;
|
startWindowImpl *myStartWindow;
|
||||||
serverListDialogImpl *myServerListDialog;
|
serverListDialogImpl *myServerListDialog;
|
||||||
internetGameLoginDialogImpl *myInternetGameLoginDialog;
|
internetGameLoginDialogImpl *myInternetGameLoginDialog;
|
||||||
|
|
||||||
QMessageBox msgBoxOutdatedVersion;
|
QMessageBox msgBoxOutdatedVersion;
|
||||||
bool msgBoxOutdatedVersionActive;
|
bool msgBoxOutdatedVersionActive;
|
||||||
|
|
||||||
friend class GuiWrapper;
|
friend class GuiWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -227,9 +227,9 @@ ClientThread::SendJoinFirstGame(const std::string &password, bool autoLeave)
|
|||||||
joinExisting->gameId = 1;
|
joinExisting->gameId = 1;
|
||||||
if (!password.empty()) {
|
if (!password.empty()) {
|
||||||
joinExisting->password = OCTET_STRING_new_fromBuf(
|
joinExisting->password = OCTET_STRING_new_fromBuf(
|
||||||
&asn_DEF_UTF8String,
|
&asn_DEF_UTF8String,
|
||||||
password.c_str(),
|
password.c_str(),
|
||||||
(int)password.length());
|
(int)password.length());
|
||||||
}
|
}
|
||||||
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
||||||
}
|
}
|
||||||
@@ -249,9 +249,9 @@ ClientThread::SendJoinGame(unsigned gameId, const std::string &password, bool au
|
|||||||
joinExisting->gameId = gameId;
|
joinExisting->gameId = gameId;
|
||||||
if (!password.empty()) {
|
if (!password.empty()) {
|
||||||
joinExisting->password = OCTET_STRING_new_fromBuf(
|
joinExisting->password = OCTET_STRING_new_fromBuf(
|
||||||
&asn_DEF_UTF8String,
|
&asn_DEF_UTF8String,
|
||||||
password.c_str(),
|
password.c_str(),
|
||||||
(int)password.length());
|
(int)password.length());
|
||||||
}
|
}
|
||||||
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
||||||
}
|
}
|
||||||
@@ -290,9 +290,9 @@ ClientThread::SendCreateGame(const GameData &gameData, const std::string &name,
|
|||||||
(int)name.length());
|
(int)name.length());
|
||||||
if (!password.empty()) {
|
if (!password.empty()) {
|
||||||
joinNew->password = OCTET_STRING_new_fromBuf(
|
joinNew->password = OCTET_STRING_new_fromBuf(
|
||||||
&asn_DEF_UTF8String,
|
&asn_DEF_UTF8String,
|
||||||
password.c_str(),
|
password.c_str(),
|
||||||
(int)password.length());
|
(int)password.length());
|
||||||
}
|
}
|
||||||
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
m_ioService->post(boost::bind(&ClientThread::SendSessionPacket, shared_from_this(), packet));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user