diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp index 78eec464..39f78752 100644 --- a/src/gui/qt/chattools/chattools.cpp +++ b/src/gui/qt/chattools/chattools.cpp @@ -29,8 +29,7 @@ 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) { myNick = QString::fromUtf8(myConfig->readConfigString("MyName").c_str()); - ignoreList = myConfig->readConfigStringList("PlayerIgnoreList"); - + ignoreList = myConfig->readConfigStringList("PlayerIgnoreList"); } ChatTools::~ChatTools() @@ -154,12 +153,14 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm) if(!nickFoundOnIgnoreList) { + tempMsg = checkForEmotes(tempMsg); + if(message.indexOf(QString("/me "))==0) { myTextBrowser->append(tempMsg.replace("/me ","*"+playerName+" ")+""); } else if(pm == true) { myTextBrowser->append(""+playerName+"(pm): " + tempMsg+""); } else { - myTextBrowser->append(playerName + ": " + tempMsg); + myTextBrowser->append(playerName + ": " + tempMsg); } } } @@ -313,3 +314,39 @@ unsigned ChatTools::parsePrivateMessageTarget(QString &chatText) return playerId; } +QString ChatTools::checkForEmotes(QString msg) { + + msg.replace("0:-)", ""); + msg.replace("X-(", ""); + msg.replace("B-)", ""); + msg.replace("8-)", ""); + msg.replace(":'(", ""); + msg.replace(">:-)", ""); + msg.replace(":-[", ""); + msg.replace(":-*", ""); + msg.replace(":-))", ""); + msg.replace(":))", ""); + msg.replace(":-|", ""); + msg.replace(":-P", ""); + msg.replace(":-p", ""); + msg.replace(":-(", ""); + msg.replace(":(", ""); + msg.replace(":-&", ""); + msg.replace(":-D", ""); + msg.replace(":D", ""); + msg.replace(":-!", ""); + msg.replace(":-0", ""); + msg.replace(":-O", ""); + msg.replace(":-o", ""); + msg.replace(":-/", ""); + msg.replace(":/", ""); + msg.replace(";-)", ""); + msg.replace(";)", ""); + msg.replace(":-S", ""); + msg.replace(":-s", ""); + msg.replace(":-)", ""); + msg.replace(":)", ""); + + return msg; +} + diff --git a/src/gui/qt/chattools/chattools.h b/src/gui/qt/chattools/chattools.h index 13a08edc..dd23c096 100644 --- a/src/gui/qt/chattools/chattools.h +++ b/src/gui/qt/chattools/chattools.h @@ -74,6 +74,7 @@ public slots: myStyle = theValue; } void refreshIgnoreList(); + QString checkForEmotes(QString); protected: diff --git a/src/gui/qt/resources/emotes/face-angel.png b/src/gui/qt/resources/emotes/face-angel.png new file mode 100644 index 00000000..ee48c5f7 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-angel.png differ diff --git a/src/gui/qt/resources/emotes/face-angry.png b/src/gui/qt/resources/emotes/face-angry.png new file mode 100644 index 00000000..c604fae5 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-angry.png differ diff --git a/src/gui/qt/resources/emotes/face-confused.png b/src/gui/qt/resources/emotes/face-confused.png new file mode 100644 index 00000000..0d25c192 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-confused.png differ diff --git a/src/gui/qt/resources/emotes/face-cool.png b/src/gui/qt/resources/emotes/face-cool.png new file mode 100644 index 00000000..20ce403b Binary files /dev/null and b/src/gui/qt/resources/emotes/face-cool.png differ diff --git a/src/gui/qt/resources/emotes/face-crying.png b/src/gui/qt/resources/emotes/face-crying.png new file mode 100644 index 00000000..57325036 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-crying.png differ diff --git a/src/gui/qt/resources/emotes/face-devilish.png b/src/gui/qt/resources/emotes/face-devilish.png new file mode 100644 index 00000000..189233f8 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-devilish.png differ diff --git a/src/gui/qt/resources/emotes/face-embarrassed.png b/src/gui/qt/resources/emotes/face-embarrassed.png new file mode 100644 index 00000000..b8be9ef7 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-embarrassed.png differ diff --git a/src/gui/qt/resources/emotes/face-in-love.png b/src/gui/qt/resources/emotes/face-in-love.png new file mode 100644 index 00000000..483d4d68 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-in-love.png differ diff --git a/src/gui/qt/resources/emotes/face-kiss.png b/src/gui/qt/resources/emotes/face-kiss.png new file mode 100644 index 00000000..25eaf9f4 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-kiss.png differ diff --git a/src/gui/qt/resources/emotes/face-laugh.png b/src/gui/qt/resources/emotes/face-laugh.png new file mode 100644 index 00000000..ec21ffba Binary files /dev/null and b/src/gui/qt/resources/emotes/face-laugh.png differ diff --git a/src/gui/qt/resources/emotes/face-plain.png b/src/gui/qt/resources/emotes/face-plain.png new file mode 100644 index 00000000..cf0eda4c Binary files /dev/null and b/src/gui/qt/resources/emotes/face-plain.png differ diff --git a/src/gui/qt/resources/emotes/face-quiet.png b/src/gui/qt/resources/emotes/face-quiet.png new file mode 100644 index 00000000..101aa00f Binary files /dev/null and b/src/gui/qt/resources/emotes/face-quiet.png differ diff --git a/src/gui/qt/resources/emotes/face-raspberry.png b/src/gui/qt/resources/emotes/face-raspberry.png new file mode 100644 index 00000000..0731afb6 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-raspberry.png differ diff --git a/src/gui/qt/resources/emotes/face-sad.png b/src/gui/qt/resources/emotes/face-sad.png new file mode 100644 index 00000000..a9d6e27d Binary files /dev/null and b/src/gui/qt/resources/emotes/face-sad.png differ diff --git a/src/gui/qt/resources/emotes/face-sick.png b/src/gui/qt/resources/emotes/face-sick.png new file mode 100644 index 00000000..c05b89a6 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-sick.png differ diff --git a/src/gui/qt/resources/emotes/face-sleep.png b/src/gui/qt/resources/emotes/face-sleep.png new file mode 100644 index 00000000..662c283b Binary files /dev/null and b/src/gui/qt/resources/emotes/face-sleep.png differ diff --git a/src/gui/qt/resources/emotes/face-smile-big.png b/src/gui/qt/resources/emotes/face-smile-big.png new file mode 100644 index 00000000..e9022031 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-smile-big.png differ diff --git a/src/gui/qt/resources/emotes/face-smile-grin.png b/src/gui/qt/resources/emotes/face-smile-grin.png new file mode 100644 index 00000000..d67ffa66 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-smile-grin.png differ diff --git a/src/gui/qt/resources/emotes/face-smile.png b/src/gui/qt/resources/emotes/face-smile.png new file mode 100644 index 00000000..df52d2dc Binary files /dev/null and b/src/gui/qt/resources/emotes/face-smile.png differ diff --git a/src/gui/qt/resources/emotes/face-smirk.png b/src/gui/qt/resources/emotes/face-smirk.png new file mode 100644 index 00000000..dee3a73c Binary files /dev/null and b/src/gui/qt/resources/emotes/face-smirk.png differ diff --git a/src/gui/qt/resources/emotes/face-surprise.png b/src/gui/qt/resources/emotes/face-surprise.png new file mode 100644 index 00000000..4aa2cbdd Binary files /dev/null and b/src/gui/qt/resources/emotes/face-surprise.png differ diff --git a/src/gui/qt/resources/emotes/face-uncertain.png b/src/gui/qt/resources/emotes/face-uncertain.png new file mode 100644 index 00000000..8b07f78d Binary files /dev/null and b/src/gui/qt/resources/emotes/face-uncertain.png differ diff --git a/src/gui/qt/resources/emotes/face-wink.png b/src/gui/qt/resources/emotes/face-wink.png new file mode 100644 index 00000000..aed02d7f Binary files /dev/null and b/src/gui/qt/resources/emotes/face-wink.png differ diff --git a/src/gui/qt/resources/emotes/face-worried.png b/src/gui/qt/resources/emotes/face-worried.png new file mode 100644 index 00000000..9edcd127 Binary files /dev/null and b/src/gui/qt/resources/emotes/face-worried.png differ diff --git a/src/gui/qt/resources/emotes/face-yawn.png b/src/gui/qt/resources/emotes/face-yawn.png new file mode 100644 index 00000000..d315cc8f Binary files /dev/null and b/src/gui/qt/resources/emotes/face-yawn.png differ diff --git a/src/gui/qt/resources/pokerth.qrc b/src/gui/qt/resources/pokerth.qrc index 10b8894a..8d255717 100644 --- a/src/gui/qt/resources/pokerth.qrc +++ b/src/gui/qt/resources/pokerth.qrc @@ -1,4 +1,4 @@ - + view-fullscreen.png swbuttoninternetgame.png @@ -309,4 +309,31 @@ cflags/np.png cflags/undefined.png + + emotes/face-angel.png + emotes/face-angry.png + emotes/face-confused.png + emotes/face-cool.png + emotes/face-crying.png + emotes/face-devilish.png + emotes/face-embarrassed.png + emotes/face-in-love.png + emotes/face-kiss.png + emotes/face-laugh.png + emotes/face-plain.png + emotes/face-quiet.png + emotes/face-raspberry.png + emotes/face-sad.png + emotes/face-sick.png + emotes/face-sleep.png + emotes/face-smile-big.png + emotes/face-smile-grin.png + emotes/face-smile.png + emotes/face-smirk.png + emotes/face-surprise.png + emotes/face-uncertain.png + emotes/face-wink.png + emotes/face-worried.png + emotes/face-yawn.png + diff --git a/src/pokerth.cpp b/src/pokerth.cpp index 5fa8c3f3..48b8bbf9 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -72,8 +72,9 @@ int main( int argc, char **argv ) /////// can be removed for non-qt-guis //////////// QtSingleApplication a( argc, argv ); + Q_INIT_RESOURCE(pokerth); - if (a.sendMessage("Wake up!")) { + if (a.sendMessage("Wake up!")) { return 0; }