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

#319, #320, c++11 mode, mysql errors to server log

Browse Source
This commit is contained in:
Albert Medela
2017-02-05 00:44:48 +01:00
parent 16c7200028
commit 19f95f6204
91 changed files with 4561 additions and 2146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/aboutpokerth/aboutpokerthimpl.cpp
+1 -1
View File
@@ -35,7 +35,7 @@
#ifdef ANDROID
#ifndef ANDROID_TEST
#include "QtGui/5.2.0/QtGui/qpa/qplatformnativeinterface.h"
#include "QtGui/5.7.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#endif
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+3
View File
@@ -275,6 +275,9 @@ int gameLobbyDialogImpl::exec()
registeredUserMode();
}
// Bug #320: https://github.com/pokerth/pokerth/issues/320
myChat->refreshIgnoreList();
#ifdef ANDROID
this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
#endif
src/gui/qt/gametable/gametableimpl.cpp
+1 -1
View File
@@ -69,7 +69,7 @@
#ifdef ANDROID
#ifndef ANDROID_TEST
#include "QtGui/5.2.0/QtGui/qpa/qplatformnativeinterface.h"
#include "QtGui/5.7.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#endif
src/gui/qt/gametable/myavatarlabel.cpp
+13 -3
View File
@@ -156,9 +156,14 @@ void MyAvatarLabel::setPlayerRating(QString playerInfo)
std::list<std::string> result;
std::string separator="(!#$%)";
std::list<std::string>::iterator iterator;
// Bug #319: https://github.com/pokerth/pokerth/issues/319
QString playerName = playerInfoList.at(0);
playerName = QUrl::fromPercentEncoding(playerName.toUtf8());
for(iterator = tipsList.begin(); iterator != tipsList.end(); ++iterator) {
tipInfo=QString::fromUtf8(iterator->c_str()).split("(!#$%)", QString::KeepEmptyParts, Qt::CaseSensitive);
if(tipInfo.at(0)==playerInfoList.at(0)) {
if(tipInfo.at(0)==playerName) {
result.push_back(tipInfo.at(0).toUtf8().constData()+separator+tipInfo.at(1).toUtf8().constData()+separator+playerInfoList.at(1).toUtf8().constData()+separator);
found=1;
} else {
@@ -166,7 +171,7 @@ void MyAvatarLabel::setPlayerRating(QString playerInfo)
}
}
if(found==0) {
result.push_back(playerInfoList.at(0).toUtf8().constData()+separator+separator+playerInfoList.at(1).toUtf8().constData()+separator);
result.push_back(playerName.toUtf8().constData()+separator+separator+playerInfoList.at(1).toUtf8().constData()+separator);
}
myW->getMyConfig()->writeConfigStringList("PlayerTooltips", result);
myW->getMyConfig()->writeBuffer();
@@ -224,7 +229,12 @@ void MyAvatarLabel::refreshStars()
for(int i=1; i<=5; i++)myW->playerStarsArray[i][seatPlace]->setText("");
if(myW->myStartWindow->getSession()->getGameType() == Session::GAME_TYPE_INTERNET && !myW->getSession()->getClientPlayerInfo((*it_c)->getMyUniqueID()).isGuest && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER) {
if((*it_c)->getMyStayOnTableStatus() == true && (*it_c)->getMyName()!="" && seatPlace!=0) {
int playerStars=getPlayerRating(QString::fromUtf8((*it_c)->getMyName().c_str()));
// Bug #319: https://github.com/pokerth/pokerth/issues/319
QString playerName = QString::fromUtf8((*it_c)->getMyName().c_str());
int playerStars=getPlayerRating(playerName);
playerName = QString(QUrl::toPercentEncoding(playerName));
for(int i=1; i<=5; i++) {
myW->playerStarsArray[i][seatPlace]->setText("<a style='color: #"+myW->getMyGameTableStyle()->getRatingStarsColor()+"; "+fontFamily+" font-size: "+fontSize+"px; text-decoration: none;' href='"+QString::fromUtf8((*it_c)->getMyName().c_str())+"\""+QString::number(i)+"'>&#9734;</a>");
}
src/gui/qt/startwindow/startwindowimpl.cpp
+1 -1
View File
@@ -61,7 +61,7 @@
#ifdef ANDROID
#ifndef ANDROID_TEST
#include "QtGui/5.2.0/QtGui/qpa/qplatformnativeinterface.h"
#include "QtGui/5.7.1/QtGui/qpa/qplatformnativeinterface.h"
#include <jni.h>
#endif
#endif