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

Running astyle.

Browse Source
This commit is contained in:
lotodore
2012-03-03 14:24:00 +00:00
parent 06145f30e9
commit 295610fbf9
5 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/chattools/chattools.cpp
+6 -6
View File
@@ -103,8 +103,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
case INGAME_CHAT: { case INGAME_CHAT: {
message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatLogTextColor()+"; text-decoration: underline;\" href"); message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatLogTextColor()+"; text-decoration: underline;\" href");
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;
} }
@@ -119,8 +119,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
case INGAME_CHAT: { case INGAME_CHAT: {
message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatTextNickNotifyColor()+"; text-decoration: underline;\" href"); message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatTextNickNotifyColor()+"; text-decoration: underline;\" href");
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;
} }
@@ -135,8 +135,8 @@ void ChatTools::receiveMessage(QString playerName, QString message, bool pm)
case INGAME_CHAT: { case INGAME_CHAT: {
message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatTextNickNotifyColor()+"; text-decoration: underline;\" href"); message = message.replace("<a href","<a style=\"color:#"+myStyle->getChatTextNickNotifyColor()+"; text-decoration: underline;\" href");
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;
} }
src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+2 -3
View File
@@ -32,7 +32,7 @@ using namespace std;
gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c) gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
: QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0), lastNickListFilterState(0) : QDialog(parent), myW(NULL), myStartWindow(parent), myConfig(c), currentGameName(""), myPlayerId(0), isGameAdministrator(false), inGame(false), guestMode(false), blinkingButtonAnimationState(true), myChat(NULL), keyUpCounter(0), infoMsgToShowId(0), currentInvitationGameId(0), inviteDialogIsCurrentlyShown(false), autoStartTimerCounter(0), lastNickListFilterState(0)
{ {
#ifdef __APPLE__ #ifdef __APPLE__
@@ -1498,8 +1498,7 @@ void gameLobbyDialogImpl::changeNickListFilter(int state)
if(lastNickListFilterState == 0) { if(lastNickListFilterState == 0) {
myNickListSortFilterProxyModel->setLastFilterStateCountry(false); myNickListSortFilterProxyModel->setLastFilterStateCountry(false);
myNickListSortFilterProxyModel->setLastFilterStateAlpha(true); myNickListSortFilterProxyModel->setLastFilterStateAlpha(true);
} } else if(lastNickListFilterState == 1) {
else if(lastNickListFilterState == 1) {
myNickListSortFilterProxyModel->setLastFilterStateCountry(true); myNickListSortFilterProxyModel->setLastFilterStateCountry(true);
myNickListSortFilterProxyModel->setLastFilterStateAlpha(false); myNickListSortFilterProxyModel->setLastFilterStateAlpha(false);
} }
src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.cpp
+2 -3
View File
@@ -20,7 +20,7 @@
#include <QtCore> #include <QtCore>
MyNickListSortFilterProxyModel::MyNickListSortFilterProxyModel(QObject *parent) MyNickListSortFilterProxyModel::MyNickListSortFilterProxyModel(QObject *parent)
: QSortFilterProxyModel(parent), filterState(0), lastFilterStateCountry(false), lastFilterStateAlpha(true) : QSortFilterProxyModel(parent), filterState(0), lastFilterStateCountry(false), lastFilterStateAlpha(true)
{ {
} }
@@ -67,8 +67,7 @@ bool MyNickListSortFilterProxyModel::lessThan(const QModelIndex &left, const QMo
QString leftCountryAndName(sourceModel()->data(left, 33).toString().toUpper()+sourceModel()->data(left, Qt::DisplayRole).toString().toLower()); QString leftCountryAndName(sourceModel()->data(left, 33).toString().toUpper()+sourceModel()->data(left, Qt::DisplayRole).toString().toLower());
QString rightCountryAndName(sourceModel()->data(right, 33).toString().toUpper()+sourceModel()->data(right, Qt::DisplayRole).toString().toLower()); QString rightCountryAndName(sourceModel()->data(right, 33).toString().toUpper()+sourceModel()->data(right, Qt::DisplayRole).toString().toLower());
return leftCountryAndName < rightCountryAndName; return leftCountryAndName < rightCountryAndName;
} } else if(lastFilterStateAlpha) {
else if(lastFilterStateAlpha) {
return QSortFilterProxyModel::lessThan(left, right); return QSortFilterProxyModel::lessThan(left, right);
} }
} }
src/gui/qt/gamelobbydialog/mynicklistsortfilterproxymodel.h
+6 -2
View File
@@ -28,8 +28,12 @@ public:
MyNickListSortFilterProxyModel(QObject *parent = 0); MyNickListSortFilterProxyModel(QObject *parent = 0);
void setFilterState(int state); void setFilterState(int state);
void setLastFilterStateCountry( bool country ) { lastFilterStateCountry = country;} void setLastFilterStateCountry( bool country ) {
void setLastFilterStateAlpha( bool alpha ) { lastFilterStateAlpha = alpha;} lastFilterStateCountry = country;
}
void setLastFilterStateAlpha( bool alpha ) {
lastFilterStateAlpha = alpha;
}
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
src/gui/qt/gametable/log/guilog.h
+3 -1
View File
@@ -78,7 +78,9 @@ public:
void setMySqliteLogFileName(std::string theValue) { void setMySqliteLogFileName(std::string theValue) {
mySqliteLogFileName = theValue; mySqliteLogFileName = theValue;
} }
std::string getMySqliteLogFileName() { return mySqliteLogFileName; } std::string getMySqliteLogFileName() {
return mySqliteLogFileName;
}
signals: signals:
void signalLogPlayerActionMsg(QString playerName, int action, int setValue); void signalLogPlayerActionMsg(QString playerName, int action, int setValue);