run astyle

This commit is contained in:
Albert Medela
2017-08-16 13:55:18 +02:00
parent 94d87ed33e
commit 65e10c71b0
89 changed files with 888 additions and 488 deletions
+4 -2
View File
@@ -48,10 +48,12 @@ public:
boost::shared_ptr<Session> getSession();
void setSession(boost::shared_ptr<Session> session);
gameTableImpl* getMyW() const {
gameTableImpl* getMyW() const
{
return NULL;
}
guiLog* getMyGuiLog() const {
guiLog* getMyGuiLog() const
{
return NULL;
}
@@ -52,7 +52,8 @@ public:
bool eventFilter(QObject *obj, QEvent *event);
public slots:
bool getSettingsCorrect() const {
bool getSettingsCorrect() const
{
return settingsCorrect;
}
+12 -6
View File
@@ -55,7 +55,8 @@ public:
~ChatTools();
void setSession(boost::shared_ptr<Session> session) {
void setSession(boost::shared_ptr<Session> session)
{
mySession = session;
}
@@ -69,24 +70,29 @@ public slots:
void fillChatLinesHistory(QString fillString);
void showChatHistoryIndex(int index);
int getChatLinesHistorySize() {
int getChatLinesHistorySize()
{
return chatLinesHistory.size();
}
void nickAutoCompletition();
void setChatTextEdited();
void setPlayerNicksList(QStringList value) {
void setPlayerNicksList(QStringList value)
{
myNickStringList = value;
}
void setMyNick ( const QString& theValue ) {
void setMyNick ( const QString& theValue )
{
myNick = theValue;
}
QString getMyNick () {
QString getMyNick ()
{
return myNick;
}
void setMyStyle ( GameTableStyleReader* theValue ) {
void setMyStyle ( GameTableStyleReader* theValue )
{
myStyle = theValue;
}
void refreshIgnoreList();
@@ -51,7 +51,8 @@ public:
createInternetGameDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
void exec(bool guestMode, QString playerName);
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog() {
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog()
{
return myChangeCompleteBlindsDialog;
}
bool eventFilter(QObject *obj, QEvent *event);
@@ -52,7 +52,8 @@ public:
createNetworkGameDialogImpl(QWidget *parent = 0, ConfigFile *c = 0);
int exec();
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog() {
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog()
{
return myChangeCompleteBlindsDialog;
}
bool eventFilter(QObject *obj, QEvent *event);
@@ -66,17 +66,20 @@ public:
int exec();
ChatTools *getMyChat() {
ChatTools *getMyChat()
{
return myChat;
}
void setSession(boost::shared_ptr<Session> session);
boost::shared_ptr<Session> getSession() {
boost::shared_ptr<Session> getSession()
{
assert(mySession.get());
return mySession;
}
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
@@ -97,13 +100,16 @@ public slots:
void updateStats(ServerStats stats);
void refreshGameStats();
void refreshPlayerStats();
void setCurrentGameName ( const QString& theValue ) {
void setCurrentGameName ( const QString& theValue )
{
currentGameName = theValue;
}
QString getCurrentGameName() const {
QString getCurrentGameName() const
{
return currentGameName;
}
gameTableImpl* getMyW() const {
gameTableImpl* getMyW() const
{
return myW;
}
void checkPlayerQuantity();
@@ -39,19 +39,24 @@ class MyGameListSortFilterProxyModel : public QSortFilterProxyModel
public:
MyGameListSortFilterProxyModel(QObject *parent = 0);
void setColumn1RegExp(QRegExp column1) {
void setColumn1RegExp(QRegExp column1)
{
column1RegExp = column1;
}
void setColumn2RegExp(QRegExp column2) {
void setColumn2RegExp(QRegExp column2)
{
column2RegExp = column2;
}
void setColumn3RegExp(QRegExp column3) {
void setColumn3RegExp(QRegExp column3)
{
column3RegExp = column3;
}
void setColumn4RegExp(QRegExp column4) {
void setColumn4RegExp(QRegExp column4)
{
column4RegExp = column4;
}
void setColumn5RegExp(QRegExp column5) {
void setColumn5RegExp(QRegExp column5)
{
column5RegExp = column5;
}
@@ -41,10 +41,12 @@ public:
MyNickListSortFilterProxyModel(QObject *parent = 0);
void setFilterState(int state);
void setLastFilterStateCountry( bool country ) {
void setLastFilterStateCountry( bool country )
{
lastFilterStateCountry = country;
}
void setLastFilterStateAlpha( bool alpha ) {
void setLastFilterStateAlpha( bool alpha )
{
lastFilterStateAlpha = alpha;
}
+9 -9
View File
@@ -113,12 +113,12 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
tabsDiag = new QDialog(this);
tabs.setupUi(tabsDiag);
textLabel_handLabel->hide();
#ifdef ANDROID
tabsDiag->setStyleSheet("QObject { font: 26px; } QDialog { background-image: url(:/android/android-data/gfx/gui/table/default_800x480/table_dark.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
this->setWindowState(Qt::WindowFullScreen);
#else
tabs.pushButton_settings->hide();
#endif
#ifdef ANDROID
tabsDiag->setStyleSheet("QObject { font: 26px; } QDialog { background-image: url(:/android/android-data/gfx/gui/table/default_800x480/table_dark.png); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
this->setWindowState(Qt::WindowFullScreen);
#else
tabs.pushButton_settings->hide();
#endif
tabs.label_chance->setMyStyle(myGameTableStyle);
#else
label_chance->setMyStyle(myGameTableStyle);
@@ -1290,7 +1290,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status)
} else {
switch(status) {
//inactive
//inactive
case 0: {
if (!playerID) {
//hide buttons
@@ -1325,8 +1325,8 @@ void gameTableImpl::refreshGroupbox(int playerID, int status)
myGameTableStyle->setPlayerSeatInactiveStyle(groupBoxArray[playerID]);
}
break;
default:
{}
default: {
}
}
}
}
+16 -8
View File
@@ -87,26 +87,33 @@ public:
boost::shared_ptr<Session> getSession();
SoundEvents* getMySoundEventHandler() const {
SoundEvents* getMySoundEventHandler() const
{
return mySoundEventHandler;
}
ChatTools* getMyChat() const {
ChatTools* getMyChat() const
{
return myChat;
}
ConfigFile* getMyConfig() const {
ConfigFile* getMyConfig() const
{
return myConfig;
}
GameTableStyleReader* getMyGameTableStyle() const {
GameTableStyleReader* getMyGameTableStyle() const
{
return myGameTableStyle;
}
bool getGuestMode() const {
bool getGuestMode() const
{
return guestMode;
}
void setStartWindow(startWindowImpl* s) {
void setStartWindow(startWindowImpl* s)
{
myStartWindow = s;
}
void setGuiLog(guiLog* l) {
void setGuiLog(guiLog* l)
{
myGuiLog = l;
}
@@ -211,7 +218,8 @@ public slots:
void startTimeoutAnimation(int playerId, int timoutSec);
void stopTimeoutAnimation(int playerId);
void setGameSpeed(const int theValue) {
void setGameSpeed(const int theValue)
{
guiGameSpeed = theValue; // Achtung Faktor 10!!!
setSpeeds();
}
+4 -2
View File
@@ -94,10 +94,12 @@ public:
void writeLogFileStream(QString string);
void setMySqliteLogFileName(std::string theValue) {
void setMySqliteLogFileName(std::string theValue)
{
mySqliteLogFileName = theValue;
}
std::string getMySqliteLogFileName() {
std::string getMySqliteLogFileName()
{
return mySqliteLogFileName;
}
+3 -3
View File
@@ -76,7 +76,7 @@ bool MyActionButton::event(QEvent *event)
void MyActionButton::click()
{
if (!eatMyEvents) {
QPushButton::click();
}
if (!eatMyEvents) {
QPushButton::click();
}
}
+7 -4
View File
@@ -47,21 +47,24 @@ public:
~MyActionButton();
void paintEvent(QPaintEvent * event);
void setFKeyText ( const QString& theValue ) {
void setFKeyText ( const QString& theValue )
{
fKeyText = theValue;
}
void setMyStyle ( GameTableStyleReader* theValue ) {
void setMyStyle ( GameTableStyleReader* theValue )
{
myStyle = theValue;
}
void setEatMyEvents(bool e) {
void setEatMyEvents(bool e)
{
eatMyEvents = e;
}
bool event(QEvent *e);
public slots:
void click();
void click();
private:
+10 -5
View File
@@ -49,13 +49,16 @@ public:
MyAvatarLabel(QGroupBox*);
~MyAvatarLabel();
void setMyW(gameTableImpl* theValue) {
void setMyW(gameTableImpl* theValue)
{
myW = theValue;
}
void setMyId ( int theValue ) {
void setMyId ( int theValue )
{
myId = theValue;
}
void setMyUniqueId ( int theValue ) {
void setMyUniqueId ( int theValue )
{
myUniqueId = theValue;
}
void contextMenuEvent ( QContextMenuEvent * event );
@@ -68,12 +71,14 @@ public slots:
void sendTriggerVoteOnKickSignal();
void setEnabledContextMenu(bool);
void setVoteOnKickContextMenuEnabled(bool);
void setVoteRunning ( bool theValue ) {
void setVoteRunning ( bool theValue )
{
voteRunning = theValue;
}
void setPixmap ( const QPixmap &, const bool = false);
void setPixmapAndCountry ( const QPixmap &, QString country, int seatPlace, const bool = false);
void setPixmapPath ( const QString theValue) {
void setPixmapPath ( const QString theValue)
{
myPath = theValue;
}
void paintEvent(QPaintEvent*);
+12 -6
View File
@@ -49,21 +49,26 @@ public:
~MyCardsPixmapLabel();
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
void setIsFlipside(bool theValue) {
void setIsFlipside(bool theValue)
{
isFlipside = theValue;
}
bool getIsFlipside() const {
bool getIsFlipside() const
{
return isFlipside;
}
void setFadeOutAction(bool theValue) {
void setFadeOutAction(bool theValue)
{
fadeOutAction = theValue;
}
bool getFadeOutAction() const {
bool getFadeOutAction() const
{
return fadeOutAction;
}
@@ -72,7 +77,8 @@ public:
void startFlipCards(int, const QPixmap & , const QPixmap &);
void stopFlipCardsAnimation();
void setFlipsidePix(QPixmap p) {
void setFlipsidePix(QPixmap p)
{
flipside = p;
}
+2 -1
View File
@@ -48,7 +48,8 @@ public:
MyCashLabel(QGroupBox*);
~MyCashLabel();
void setMyW(gameTableImpl* theValue) {
void setMyW(gameTableImpl* theValue)
{
myW = theValue;
}
+4 -2
View File
@@ -50,10 +50,12 @@ public:
~MyChanceLabel();
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
void setMyStyle ( GameTableStyleReader* theValue ) {
void setMyStyle ( GameTableStyleReader* theValue )
{
myStyle = theValue;
}
void paintEvent(QPaintEvent * event);
+2 -1
View File
@@ -56,7 +56,8 @@ public slots:
void blinkChatTab();
QTabBar* getMyTabBar() const {
QTabBar* getMyTabBar() const
{
return myTabBar;
}
+3 -3
View File
@@ -92,15 +92,15 @@ void MyNameLabel::setText ( const QString &t, bool trans, bool guest, bool compu
} else {
linkString = QString("http://pokerth.net/redirect_user_profile.php?nick="+QUrl::toPercentEncoding(t));
}
// truncate nicknames longer than 13 characters
QString t2 = t;
if(t2.size() > 13){
if(t2.size() > 13) {
int chop = t.size() - 13 + 3;
t2.chop(chop);
t2.append("...");
}
QString tTruncated;
if(trans) {
+2 -1
View File
@@ -48,7 +48,8 @@ public:
MyNameLabel(QGroupBox*);
~MyNameLabel();
void setMyW(gameTableImpl* theValue) {
void setMyW(gameTableImpl* theValue)
{
myW = theValue;
}
+2 -1
View File
@@ -48,7 +48,8 @@ public:
void paintEvent(QPaintEvent * event);
QTabBar* getMyTabBar() const {
QTabBar* getMyTabBar() const
{
return myTabBar;
}
+2 -1
View File
@@ -50,7 +50,8 @@ public:
~MySetLabel();
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
void paintEvent(QPaintEvent * event);
+10 -5
View File
@@ -48,15 +48,18 @@ class Slider : public QSlider
public:
Slider( QWidget* parent = 0 )
: QSlider( parent ) {
: QSlider( parent )
{
}
Slider( Qt::Orientation orientation, QWidget* parent = 0 )
: QSlider( orientation, parent ) {
: QSlider( orientation, parent )
{
}
protected:
int pixelPosToRangeValue(int pos) const { // getted from QSlider.cpp with little adapt
int pixelPosToRangeValue(int pos) const // getted from QSlider.cpp with little adapt
{
QStyleOptionSlider opt;
initStyleOption(&opt);
QRect gr = style()->subControlRect(QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
@@ -76,11 +79,13 @@ protected:
sliderMax - sliderMin, opt.upsideDown);
}
int pick(const QPoint &pt) const { // getted from QSlider.cpp with little adapt
int pick(const QPoint &pt) const // getted from QSlider.cpp with little adapt
{
return orientation() == Qt::Horizontal ? pt.x() : pt.y();
}
virtual void mousePressEvent( QMouseEvent* ev ) { // getted from QSlider.cpp with little adapt
virtual void mousePressEvent( QMouseEvent* ev ) // getted from QSlider.cpp with little adapt
{
if (maximum() == minimum() || (ev->buttons() ^ ev->button())) {
ev->ignore();
return;
+2 -1
View File
@@ -50,7 +50,8 @@ public:
~MyStatusLabel();
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
+2 -1
View File
@@ -53,7 +53,8 @@ public:
~MyTimeoutLabel();
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
+4 -2
View File
@@ -54,10 +54,12 @@ public:
boost::shared_ptr<Session> getSession();
void setSession(boost::shared_ptr<Session> session);
gameTableImpl* getMyW() const {
gameTableImpl* getMyW() const
{
return myW;
}
guiLog* getMyGuiLog() const {
guiLog* getMyGuiLog() const
{
return myGuiLog;
}
@@ -54,7 +54,8 @@ public slots:
void regUserToggled(bool);
void guestUserToggled(bool);
void okButtonCheck();
void clickLoginButton() {
void clickLoginButton()
{
pushButton_login->click();
}
+6 -3
View File
@@ -58,7 +58,8 @@ public:
explicit LogFileDialog(QWidget *parent = 0, ConfigFile *c = 0);
~LogFileDialog();
void setGuiLog(guiLog *g) {
void setGuiLog(guiLog *g)
{
myGuiLog = g;
}
int exec();
@@ -76,10 +77,12 @@ public slots:
void exportLogToHtml();
void exportLogToTxt();
void saveLogFileAs();
void showLogFilePreviewInit() {
void showLogFilePreviewInit()
{
showLogFilePreview(INIT_VIEW);
}
void showLogFilePreviewSelected() {
void showLogFilePreviewSelected()
{
showLogFilePreview(SELECTED_GAME);
}
void showLogFilePreview(ShowLogMode);
@@ -53,7 +53,8 @@ public:
newGameDialogImpl(QMainWindow *parent = 0, ConfigFile* = 0);
int exec();
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog() {
changeCompleteBlindsDialogImpl* getChangeCompleteBlindsDialog()
{
return myChangeCompleteBlindsDialog;
}
@@ -52,7 +52,8 @@ public:
public slots:
bool getSettingsCorrect() const {
bool getSettingsCorrect() const
{
return settingsCorrect;
}
+4 -2
View File
@@ -44,10 +44,12 @@ public:
~MyAvatarButton();
void setMyLink(QString theValue) {
void setMyLink(QString theValue)
{
myLink = theValue;
}
QString getMyLink() const {
QString getMyLink() const
{
return myLink;
}
+4 -2
View File
@@ -44,10 +44,12 @@ public:
~MyHPAvatarButton();
void setMyLink(QString theValue) {
void setMyLink(QString theValue)
{
myLink = theValue;
}
QString getMyLink() const {
QString getMyLink() const
{
return myLink;
}
@@ -44,10 +44,12 @@ public:
~MyAvatarListItem();
void setMyLink(QString theValue) {
void setMyLink(QString theValue)
{
myLink = theValue;
}
QString getMyLink() const {
QString getMyLink() const
{
return myLink;
}
@@ -63,7 +63,8 @@ public slots:
QString getAvatarLink();
void setExternalAvatar();
bool getSettingsCorrect() const {
bool getSettingsCorrect() const
{
return settingsCorrect;
}
+12 -6
View File
@@ -67,25 +67,30 @@ public:
void prepareDialog();
void exec(bool ingame);
void setPlayerNickIsChanged(bool theValue) {
void setPlayerNickIsChanged(bool theValue)
{
playerNickIsChanged = theValue;
}
bool getPlayerNickIsChanged() const {
bool getPlayerNickIsChanged() const
{
return playerNickIsChanged;
}
bool getSettingsCorrect() const {
bool getSettingsCorrect() const
{
return settingsCorrect;
}
void setGuiLog(guiLog* l) {
void setGuiLog(guiLog* l)
{
myGuiLog = l;
}
public slots:
void isAccepted();
void playerNickChanged() {
void playerNickChanged()
{
setPlayerNickIsChanged(true);
};
void setFlipsidePicFileName();
@@ -104,7 +109,8 @@ public slots:
void callManualBlindsOrderDialog();
void callNetManualBlindsOrderDialog();
void callSelectAvatarDialog() {
void callSelectAvatarDialog()
{
mySelectAvatarDialogImpl->exec();
}
@@ -56,10 +56,12 @@ public:
public slots:
void setMyW ( gameTableImpl* theValue ) {
void setMyW ( gameTableImpl* theValue )
{
myW = theValue;
}
ChatTools *getMyChat() {
ChatTools *getMyChat()
{
return myChat;
}
@@ -84,11 +86,13 @@ public slots:
void keyPressEvent ( QKeyEvent*);
bool eventFilter(QObject *obj, QEvent *event);
void setMaxPlayerNumber ( int theValue ) {
void setMaxPlayerNumber ( int theValue )
{
maxPlayerNumber = theValue;
label_maxPlayerNumber->setText(QString::number(theValue,10));
}
int getMaxPlayerNumber() const {
int getMaxPlayerNumber() const
{
return maxPlayerNumber;
}
+6 -6
View File
@@ -775,9 +775,9 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/)
}
break;
case ERR_SOCK_CONNECT_IPV6_FAILED: {
MyMessageBox::warning(this, tr("Network Error"),
tr("Could not connect to the server.\n\nPlease note: IPv6 is enabled in the settings. The connection fails if your provider does not support IPv6.\nThis may be fixed by unchecking the \"Use IPv6\" checkbox in the settings."),
QMessageBox::Close);
MyMessageBox::warning(this, tr("Network Error"),
tr("Could not connect to the server.\n\nPlease note: IPv6 is enabled in the settings. The connection fails if your provider does not support IPv6.\nThis may be fixed by unchecking the \"Use IPv6\" checkbox in the settings."),
QMessageBox::Close);
}
break;
case ERR_SOCK_CONNECT_TIMEOUT: {
@@ -787,9 +787,9 @@ void startWindowImpl::networkError(int errorID, int /*osErrorID*/)
}
break;
case ERR_SOCK_CONNECT_IPV6_TIMEOUT: {
MyMessageBox::warning(this, tr("Network Error"),
tr("Connection timed out.\nPlease check the server address.\n\nPlease note: IPv6 is enabled in the settings. The connection fails if your provider does not support IPv6.\nThis may be fixed by unchecking the \"Use IPv6\" checkbox in the settings."),
QMessageBox::Close);
MyMessageBox::warning(this, tr("Network Error"),
tr("Connection timed out.\nPlease check the server address.\n\nPlease note: IPv6 is enabled in the settings. The connection fails if your provider does not support IPv6.\nThis may be fixed by unchecking the \"Use IPv6\" checkbox in the settings."),
QMessageBox::Close);
}
break;
case ERR_SOCK_SELECT_FAILED: {
+10 -5
View File
@@ -76,21 +76,26 @@ public:
startWindowImpl(ConfigFile *c, Log *l);
~startWindowImpl();
void setSession(boost::shared_ptr<Session> session) {
void setSession(boost::shared_ptr<Session> session)
{
mySession = session;
}
boost::shared_ptr<Session> getSession() {
boost::shared_ptr<Session> getSession()
{
assert(mySession.get());
return mySession;
}
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const {
boost::shared_ptr< GuiInterface > getMyServerGuiInterface() const
{
return myServerGuiInterface;
}
connectToServerDialogImpl* getMyConnectToServerDialog() const {
connectToServerDialogImpl* getMyConnectToServerDialog() const
{
return myConnectToServerDialog;
}
void setGuiLog(guiLog* l) {
void setGuiLog(guiLog* l)
{
myGuiLog = l;
}
+22 -11
View File
@@ -56,42 +56,53 @@ public:
void readStyleFile(QString);
QString getStyleDescription() const {
QString getStyleDescription() const
{
return StyleDescription;
}
QString getStyleMaintainerName() const {
QString getStyleMaintainerName() const
{
return StyleMaintainerName;
}
QString getStyleMaintainerEMail() const {
QString getStyleMaintainerEMail() const
{
return StyleMaintainerEMail;
}
QString getStyleCreateDate() const {
QString getStyleCreateDate() const
{
return StyleCreateDate;
}
QString getCurrentFileName() const {
QString getCurrentFileName() const
{
return currentFileName;
}
QString getCurrentDir() const {
QString getCurrentDir() const
{
return currentDir;
}
QString getPreview() const {
QString getPreview() const
{
return Preview;
}
QString getBigIndexesActionBottom() const {
QString getBigIndexesActionBottom() const
{
return BigIndexesActionBottom;
}
bool getFallBack() const {
bool getFallBack() const
{
return fallBack;
}
bool getLoadedSuccessfull() const {
bool getLoadedSuccessfull() const
{
return loadedSuccessfull;
}
CdStyleState getState() const {
CdStyleState getState() const
{
return myState;
}
+3 -3
View File
@@ -1422,7 +1422,7 @@ void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb)
void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
{
switch(state) {
// default
// default
case 0:
#ifdef GUI_800x480
bb->setStyleSheet("QPushButton:enabled { padding: 10px; background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+"; font-size: 26px} QPushButton:disabled { padding: 10px; background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900; font-size: 26px}");
@@ -1430,7 +1430,7 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}");
#endif
break;
// blink
// blink
case 1:
#ifdef GUI_800x480
bb->setStyleSheet("QPushButton { padding: 10px; background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+"; font-size: 26px}");
@@ -1558,7 +1558,7 @@ void GameTableStyleReader::setButtonsStyle(MyActionButton *br, MyActionButton *c
a->setMyStyle(this);
switch(state) {
//default
//default
case 0: {
br->setStyleSheet("QPushButton { border:none; background-repeat: no-repeat; background-position: center center; background-image: url(\""+BetRaiseButtonDefault+"\"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+BetRaiseButtonTextColor+";} QPushButton:unchecked { background-repeat: no-repeat; background-position: center center; background-image: url(\""+BetRaiseButtonDefault+"\"); } QPushButton:checked { background-repeat: no-repeat; background-position: center center; background-image: url(\""+BetRaiseButtonChecked+"\");} QPushButton:hover { background-repeat: no-repeat; background-position: center center; background-image: url(\""+BetRaiseButtonHover+"\"); } QPushButton:checked:hover { background-repeat: no-repeat; background-position: center center; background-image: url(\""+BetRaiseButtonCheckedHover+"\");}");
+110 -55
View File
@@ -66,136 +66,176 @@ public:
void showItemPicsLeftErrorMessage();
void showOutdatedErrorMessage();
QString getStyleDescription() const {
QString getStyleDescription() const
{
return StyleDescription;
}
QString getStyleMaintainerName() const {
QString getStyleMaintainerName() const
{
return StyleMaintainerName;
}
QString getStyleMaintainerEMail() const {
QString getStyleMaintainerEMail() const
{
return StyleMaintainerEMail;
}
QString getStyleCreateDate() const {
QString getStyleCreateDate() const
{
return StyleCreateDate;
}
QString getCurrentFileName() const {
QString getCurrentFileName() const
{
return currentFileName;
}
QString getPreview() const {
QString getPreview() const
{
return Preview;
}
QString getDefaultAvatar() const {
QString getDefaultAvatar() const
{
return DefaultAvatar;
}
QString getDealerPuck() const {
QString getDealerPuck() const
{
return DealerPuck;
}
QString getSmallBlindPuck() const {
QString getSmallBlindPuck() const
{
return SmallBlindPuck;
}
QString getBigBlindPuck() const {
QString getBigBlindPuck() const
{
return BigBlindPuck;
}
QString getHandRanking() const {
QString getHandRanking() const
{
return HandRanking;
}
QString getTable() const {
QString getTable() const
{
return Table;
}
QString getActionPic(int);
QString getFKeyIndicatorColor() const {
QString getFKeyIndicatorColor() const
{
return FKeyIndicatorColor;
}
QString getChanceLabelImpossibleColor() const {
QString getChanceLabelImpossibleColor() const
{
return ChanceLabelImpossibleColor;
}
QString getChanceLabelPossibleColor() const {
QString getChanceLabelPossibleColor() const
{
return ChanceLabelPossibleColor;
}
QString getChatLogTextColor() const {
QString getChatLogTextColor() const
{
return ChatLogTextColor;
}
QString getChatTextNickNotifyColor() const {
QString getChatTextNickNotifyColor() const
{
return ChatTextNickNotifyColor;
}
QString getLogWinnerMainPotColor() const {
QString getLogWinnerMainPotColor() const
{
return LogWinnerMainPotColor;
}
QString getLogWinnerSidePotColor() const {
QString getLogWinnerSidePotColor() const
{
return LogWinnerSidePotColor;
}
QString getLogPlayerSitsOutColor() const {
QString getLogPlayerSitsOutColor() const
{
return LogPlayerSitsOutColor;
}
QString getLogNewGameAdminColor() const {
QString getLogNewGameAdminColor() const
{
return LogNewGameAdminColor;
}
QString getBreakLobbyButtonBgColor() const {
QString getBreakLobbyButtonBgColor() const
{
return BreakLobbyButtonBgColor;
}
QString getRatingStarsColor() const {
QString getRatingStarsColor() const
{
return RatingStarsColor;
}
QString getPlayerInfoHintTextColor() const {
QString getPlayerInfoHintTextColor() const
{
return PlayerInfoHintTextColor;
}
QString getPlayerNickTextColor() const {
QString getPlayerNickTextColor() const
{
return PlayerNickTextColor;
}
QString getPlayerCashTextColor() const {
QString getPlayerCashTextColor() const
{
return PlayerCashTextColor;
}
QString getPlayerNameLabelFontSize() const {
QString getPlayerNameLabelFontSize() const
{
return playerNameLabelFontSize;
}
QString getPlayerCashLabelFontSize() const {
QString getPlayerCashLabelFontSize() const
{
return cashFontSize;
}
QString getFont2String() const {
QString getFont2String() const
{
return font2String;
}
QString getFont1String() const {
QString getFont1String() const
{
return font1String;
}
QString getMinimumWindowWidth() const {
QString getMinimumWindowWidth() const
{
return MinimumWindowWidth;
}
QString getMinimumWindowHeight() const {
QString getMinimumWindowHeight() const
{
return MinimumWindowHeight;
}
QString getMaximumWindowWidth() const {
QString getMaximumWindowWidth() const
{
return MaximumWindowWidth;
}
QString getMaximumWindowHeight() const {
QString getMaximumWindowHeight() const
{
return MaximumWindowHeight;
}
QString getFixedWindowWidth() const {
QString getFixedWindowWidth() const
{
return FixedWindowWidth;
}
QString getFixedWindowHeight() const {
QString getFixedWindowHeight() const
{
return FixedWindowHeight;
}
QString getIfFixedWindowSize() const {
QString getIfFixedWindowSize() const
{
return IfFixedWindowSize;
}
bool getFallBack() const {
bool getFallBack() const
{
return fallBack;
}
bool getLoadedSuccessfull() const {
bool getLoadedSuccessfull() const
{
return loadedSuccessfull;
}
GtStyleState getState() const {
GtStyleState getState() const
{
return myState;
}
@@ -231,49 +271,64 @@ public:
void setShowMyCardsButtonStyle( MyActionButton *sc);
void setAwayRadioButtonsStyle(QRadioButton*);
QString getActionAllInI18NString() const {
QString getActionAllInI18NString() const
{
return ActionAllInI18NString;
}
QString getActionRaiseI18NString() const {
QString getActionRaiseI18NString() const
{
return ActionRaiseI18NString;
}
QString getActionBetI18NString() const {
QString getActionBetI18NString() const
{
return ActionBetI18NString;
}
QString getActionCallI18NString() const {
QString getActionCallI18NString() const
{
return ActionCallI18NString;
}
QString getActionCheckI18NString() const {
QString getActionCheckI18NString() const
{
return ActionCheckI18NString;
}
QString getActionFoldI18NString() const {
QString getActionFoldI18NString() const
{
return ActionFoldI18NString;
}
QString getRiverI18NString() const {
QString getRiverI18NString() const
{
return RiverI18NString;
}
QString getTurnI18NString() const {
QString getTurnI18NString() const
{
return TurnI18NString;
}
QString getFlopI18NString() const {
QString getFlopI18NString() const
{
return FlopI18NString;
}
QString getPreflopI18NString() const {
QString getPreflopI18NString() const
{
return PreflopI18NString;
}
QString getHandI18NString() const {
QString getHandI18NString() const
{
return HandI18NString;
}
QString getGameI18NString() const {
QString getGameI18NString() const
{
return GameI18NString;
}
QString getBetsI18NString() const {
QString getBetsI18NString() const
{
return BetsI18NString;
}
QString getTotalI18NString() const {
QString getTotalI18NString() const
{
return TotalI18NString;
}
QString getPotI18NString() const {
QString getPotI18NString() const
{
return PotI18NString;
}
+6 -3
View File
@@ -61,13 +61,16 @@ public slots:
void timerRefresh();
void stopTimeout();
void setMySession ( boost::shared_ptr<Session> theValue ) {
void setMySession ( boost::shared_ptr<Session> theValue )
{
mySession = theValue;
}
void setMsgID ( NetTimeoutReason theValue ) {
void setMsgID ( NetTimeoutReason theValue )
{
msgID = theValue;
}
void setTimeoutDuration ( int theValue ) {
void setTimeoutDuration ( int theValue )
{
timeoutDuration = theValue;
}