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

basic table skinning works. pics are changeable. colors will follow

Browse Source
This commit is contained in:
doitux
2009-03-31 20:31:28 +00:00
parent 98efc0745e
commit 6d973aa178
20 changed files with 444 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/gfx/gui/misc/radiobutton_checked.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 535 B

data/gfx/gui/misc/radiobutton_checked_hover.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 544 B

data/gfx/gui/misc/radiobutton_pressed.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 506 B

data/gfx/gui/misc/radiobutton_unchecked.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 377 B

data/gfx/gui/misc/radiobutton_unchecked_hover.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 436 B

data/gfx/gui/misc/toolboxFrameBG.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 512 B

data/gfx/gui/table/default/defaulttablestyle.xml
+3 -1
View File
@@ -38,11 +38,13 @@
<BetRaiseButtonChecked value="playeraction_green_checked.png" /> <BetRaiseButtonChecked value="playeraction_green_checked.png" />
<BetRaiseButtonCheckedHover value="playeraction_green_checked_hover.png" /> <BetRaiseButtonCheckedHover value="playeraction_green_checked_hover.png" />
<AllInButtonDefault value="playeraction_orange.png" /> <AllInButtonDefault value="playeraction_orange.png" />
<AllInButtonHover value="playeraction_organge_hover.png" /> <AllInButtonHover value="playeraction_orange_hover.png" />
<AllInButtonChecked value="playeraction_orange_checked.png" /> <AllInButtonChecked value="playeraction_orange_checked.png" />
<AllInButtonCheckedHover value="playeraction_orange_checked_hover.png" /> <AllInButtonCheckedHover value="playeraction_orange_checked_hover.png" />
<PlayerSeatInActive value="playerSeatInactive.png" /> <PlayerSeatInActive value="playerSeatInactive.png" />
<PlayerSeatActive value="playerSeatActive.png" /> <PlayerSeatActive value="playerSeatActive.png" />
<Table value="table.png" /> <Table value="table.png" />
<ToolBoxBackground value="toolboxbg.png" />
<HandRanking value="handranking.png" />
</TableStyle> </TableStyle>
</PokerTH> </PokerTH>
data/gfx/gui/misc/handRanking.png → data/gfx/gui/table/default/handranking.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 136 KiB

data/gfx/gui/table/default/toolboxbg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 685 B

src/gui/qt/gametable/gametableimpl.cpp
+107 -161
View File
@@ -318,131 +318,8 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
holeCardsArray[9][0] = pixmapLabel_card9a; holeCardsArray[9][0] = pixmapLabel_card9a;
holeCardsArray[9][1] = pixmapLabel_card9b; holeCardsArray[9][1] = pixmapLabel_card9b;
// Farben initalisieren //style Game Table
active.setRgb(86,170,86); refreshGameTableStyle();
inactive.setRgb(83,141,107);
highlight.setRgb(151,214,109);
// Schriftart laden und für Dialoge setzen
#ifdef _WIN32
font1String = "font-family: \"Arial\";";
font2String = "font-family: \"Nimbus Sans L\";";
QString textBrowserFontsize= "11";
QString cashFontSize = "11";
QString setLabelFontSize = "11";
QString playerNameLabelFontSize = "11";
QString mediumTableFontSize = "13";
QString handLabelFontSize = "18";
QString labelPotFontSize = "19";
QString humanPlayerButtonFontSize = "13";
QString betValueFontSize = "11";
#else
#ifdef __APPLE__
font1String = "font-family: \"Lucida Grande\";";
font2String = "font-family: \"Lucida Grande\";";
#else
font1String = "font-family: \"Nimbus Sans L\";";
font2String = "font-family: \"Bitstream Vera Sans\";";
#endif
QString textBrowserFontsize= "10";
QString cashFontSize = "10";
QString setLabelFontSize = "10";
QString playerNameLabelFontSize = "11";
QString mediumTableFontSize = "13";
QString handLabelFontSize = "17";
QString labelPotFontSize = "18";
QString humanPlayerButtonFontSize = "12";
QString betValueFontSize = "10";
#endif
textBrowser_Log->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border:none; } QScrollBar:vertical { border: 1px solid #104600; background: #135000; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #1B7200; background: #176400; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #208A00; height: 3px; width: 3px; background: #27A800; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
textBrowser_Chat->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border:none; } QScrollBar:vertical { border: 1px solid #104600; background: #135000; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #1B7200; background: #176400; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #208A00; height: 3px; width: 3px; background: #27A800; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
lineEdit_ChatInput->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border-top: 2px solid #286400; }");
#ifdef __APPLE__
// tabWidget_Right->setStyleSheet("QTabWidget { "+ font1String +" font-size: 11px; background-color: #145300; }");
// tabWidget_Left->setStyleSheet("QTabWidget { "+ font1String +" font-size: 11px; background-color: #145300;}");
#else
// tabWidget_Right->setStyleSheet("QTabWidget::pane { "+ font1String +" font-size: 10px; background-color: #145300; border: 1px solid #286400; border-radius: 2px; }");
// tabWidget_Left->setStyleSheet("QTabWidget::pane { border: 1px solid #286400; border-radius: 2px; background-color: #145300; }");
#endif
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
cashLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }");
setLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }");
playerNameLabelArray[i]->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
}
label_Sets->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
label_Total->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
textLabel_Sets->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
textLabel_Pot->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
label_handNumber->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
label_gameNumber->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
label_handNumberValue->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
label_gameNumberValue->setStyleSheet("QLabel { "+ font2String +" font-size: "+mediumTableFontSize+"px; font-weight: bold; color: #669900; }");
textLabel_handLabel->setStyleSheet("QLabel { "+ font2String +" font-size: "+handLabelFontSize+"px; font-weight: bold; color: #669900; }");
label_Pot->setStyleSheet("QLabel { "+ font2String +" font-size: "+labelPotFontSize+"px; font-weight: bold; color: #669900; }");
//Widgets Grafiken setzen
label_CardHolder0->setPixmap(myAppDataPath + "gfx/gui/table/default/cardholder_flop.png");
label_CardHolder1->setPixmap(myAppDataPath + "gfx/gui/table/default/cardholder_flop.png");
label_CardHolder2->setPixmap(myAppDataPath + "gfx/gui/table/default/cardholder_flop.png");
label_CardHolder3->setPixmap(myAppDataPath + "gfx/gui/table/default/cardholder_turn.png");
label_CardHolder4->setPixmap(myAppDataPath + "gfx/gui/table/default/cardholder_river.png");
label_Handranking->setPixmap(myAppDataPath + "gfx/gui/misc/handRanking.png");
//Widgets Grafiken per Stylesheets setzen
this->setStyleSheet("QMainWindow { background-image: url(" + myAppDataPath +"gfx/gui/table/default/table.png); background-position: bottom center; background-origin: content;}");
menubar->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #99D500; }");
pushButton_break->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
label_speedString->setStyleSheet("QLabel { color: #99D500;}");
label_speedValue->setStyleSheet("QLabel { color: #99D500;}");
pushButton_voteOnKickYes->setStyleSheet("QPushButton:enabled { background-color: #1C7000; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
pushButton_voteOnKickNo->setStyleSheet("QPushButton:enabled { background-color: #1C7000; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
label_timeout->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_kickVoteTimeout->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_kickUser->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_votesMonitor->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_voteStarterNick->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
label_votestartedby->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
// statusbar->setStyleSheet(" QStatusBar { "+ font1String +" font-size: 12px; color: #B7FF00; }");
//Groupbox Background
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
groupBoxArray[i]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }");
}
//Human player button
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked_hover.png);}");
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked_hover.png);}");
pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked_hover.png);}");
pushButton_AllIn->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked_hover.png);}");
lineEdit_betValue->setStyleSheet("QLineEdit { "+ font2String +" font-size: "+betValueFontSize+"px; font-weight: bold; background-color: #1D3B00; color: #F0F0F0; } QLineEdit:disabled { background-color: #316300; color: #6d7b5f }");
// away radiobuttons
// QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px; } QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png); }");
QString radioButtonString("QRadioButton { color: #99D500; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator::unchecked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked.png);} QRadioButton::indicator:unchecked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_unchecked_hover.png);} QRadioButton::indicator:unchecked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);} QRadioButton::indicator::checked { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked.png);} QRadioButton::indicator:checked:hover { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_checked_hover.png);} QRadioButton::indicator:checked:pressed { image: url("+myAppDataPath+"gfx/gui/misc/radiobutton_pressed.png);}");
radioButton_manualAction->setStyleSheet(radioButtonString);
radioButton_autoCheckFold->setStyleSheet(radioButtonString);
radioButton_autoCheckCallAny->setStyleSheet(radioButtonString);
groupBox_RightToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
groupBox_LeftToolBox->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/misc/toolboxFrameBG.png) }");
//raise actionLable above just inserted mypixmaplabel //raise actionLable above just inserted mypixmaplabel
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); } for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
@@ -619,6 +496,11 @@ void gameTableImpl::callSettingsDialog() { myStartWindow->callSettingsDialog();
void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) { void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
//apply card deck style
myCardDeckStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentCardDeckStyle").c_str()));
//apply game table style
myGameTableStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentGameTableStyle").c_str()));
//Toolbox verstecken? //Toolbox verstecken?
if (myConfig->readConfigInt("ShowLeftToolBox")) { groupBox_LeftToolBox->show(); } if (myConfig->readConfigInt("ShowLeftToolBox")) { groupBox_LeftToolBox->show(); }
else { groupBox_LeftToolBox->hide(); } else { groupBox_LeftToolBox->hide(); }
@@ -678,8 +560,6 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
refreshPlayerAvatar(); refreshPlayerAvatar();
} }
//apply card deck style
myCardDeckStyle->readStyleFile(QString::fromUtf8(myConfig->readConfigString("CurrentCardDeckStyle").c_str()));
//refresh board cards if game is running //refresh board cards if game is running
if(myStartWindow->getSession()->getCurrentGame()) { if(myStartWindow->getSession()->getCurrentGame()) {
@@ -743,10 +623,13 @@ void gameTableImpl::applySettings(settingsDialogImpl* mySettingsDialog) {
} }
} }
if(myStartWindow->getSession()->getCurrentGame()) { refreshGameTableStyle();
//blind buttons refresh //blind buttons refresh
if(myStartWindow->getSession()->getCurrentGame()) {
refreshButton(); refreshButton();
} }
// Re-init audio. // Re-init audio.
mySDLPlayer->audioDone(); mySDLPlayer->audioDone();
mySDLPlayer->initAudio(); mySDLPlayer->initAudio();
@@ -801,9 +684,9 @@ void gameTableImpl::refreshSet() {
void gameTableImpl::refreshButton() { void gameTableImpl::refreshButton() {
QPixmap dealerButton = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/dealerPuck.png")); QPixmap dealerButton = QPixmap::fromImage(QImage(myGameTableStyle->getDealerPuck()));
QPixmap smallblindButton = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/smallblindPuck.png")); QPixmap smallblindButton = QPixmap::fromImage(QImage(myGameTableStyle->getSmallBlindPuck()));
QPixmap bigblindButton = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/bigblindPuck.png")); QPixmap bigblindButton = QPixmap::fromImage(QImage(myGameTableStyle->getBigBlindPuck()));
QPixmap onePix = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/misc/1px.png")); QPixmap onePix = QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/misc/1px.png"));
Game *currentGame = myStartWindow->getSession()->getCurrentGame(); Game *currentGame = myStartWindow->getSession()->getCurrentGame();
@@ -883,7 +766,7 @@ void gameTableImpl::refreshPlayerAvatar() {
if((*it_c)->getMyActiveStatus()) { if((*it_c)->getMyActiveStatus()) {
if((*it_c)->getMyAvatar() == "" || !QFile::QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) { if((*it_c)->getMyAvatar() == "" || !QFile::QFile(QString::fromUtf8((*it_c)->getMyAvatar().c_str())).exists()) {
playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png"))); playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar())));
} }
else { else {
playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(QString::fromUtf8((*it_c)->getMyAvatar().c_str())))); playerAvatarLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(QString::fromUtf8((*it_c)->getMyAvatar().c_str()))));
@@ -907,7 +790,7 @@ void gameTableImpl::setPlayerAvatar(int myID, QString myAvatar) {
tmpPlayer->setMyAvatar(myAvatar.toUtf8().constData()); tmpPlayer->setMyAvatar(myAvatar.toUtf8().constData());
} }
else { else {
playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/genereticAvatar.png"))); playerAvatarLabelArray[tmpPlayer->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getDefaultAvatar())));
tmpPlayer->setMyAvatar(""); tmpPlayer->setMyAvatar("");
} }
} }
@@ -935,7 +818,7 @@ void gameTableImpl::refreshAction(int playerID, int playerAction) {
} }
else { else {
//paint action pixmap //paint action pixmap
actionLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/action_"+actionArray[(*it_c)->getMyAction()]+".png"))); actionLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getActionPic((*it_c)->getMyAction()))));
} }
if ((*it_c)->getMyAction()==1) { if ((*it_c)->getMyAction()==1) {
@@ -955,7 +838,7 @@ void gameTableImpl::refreshAction(int playerID, int playerAction) {
else { else {
// paint action pixmap and raise // paint action pixmap and raise
actionLabelArray[playerID]->setPixmap(QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/action_"+actionArray[playerAction]+".png"))); actionLabelArray[playerID]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getActionPic(playerAction))));
//play sounds if exist //play sounds if exist
if(myConfig->readConfigInt("PlayGameActions")) if(myConfig->readConfigInt("PlayGameActions"))
@@ -1004,7 +887,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
if((*it_c)->getMyTurn()) { if((*it_c)->getMyTurn()) {
//Groupbox glow wenn der Spiele dran ist. //Groupbox glow wenn der Spiele dran ist.
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); myGameTableStyle->setPlayerSeatActiveStyle(groupBoxArray[(*it_c)->getMyID()]);
} else { } else {
//Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist. //Groupbox auf Hintergrundfarbe setzen wenn der Spiele nicht dran aber aktiv ist.
if((*it_c)->getMyActiveStatus()) { if((*it_c)->getMyActiveStatus()) {
@@ -1014,7 +897,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
userWidgetsArray[j]->show(); userWidgetsArray[j]->show();
} }
} }
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]);
} }
//Groupbox verdunkeln wenn der Spiele inactive ist. //Groupbox verdunkeln wenn der Spiele inactive ist.
@@ -1028,7 +911,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE);
} }
groupBoxArray[(*it_c)->getMyID()]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[(*it_c)->getMyID()]);
} }
} }
} }
@@ -1047,7 +930,7 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
holeCardsArray[0][0]->signalFastFlipCards(FALSE); holeCardsArray[0][0]->signalFastFlipCards(FALSE);
holeCardsArray[0][1]->signalFastFlipCards(FALSE); holeCardsArray[0][1]->signalFastFlipCards(FALSE);
} }
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
} }
break; break;
//active but fold //active but fold
@@ -1058,17 +941,17 @@ void gameTableImpl::refreshGroupbox(int playerID, int status) {
userWidgetsArray[j]->show(); userWidgetsArray[j]->show();
} }
} }
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
} }
break; break;
//active in action //active in action
case 2: { case 2: {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatActive.png) }"); myGameTableStyle->setPlayerSeatActiveStyle(groupBoxArray[playerID]);
} }
break; break;
//active not in action //active not in action
case 3: { case 3: {
groupBoxArray[playerID]->setStyleSheet("QGroupBox { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playerSeatInactive.png) }"); myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[playerID]);
} }
break; break;
default: {} default: {}
@@ -2169,7 +2052,7 @@ void gameTableImpl::postRiverRunAnimation3() {
// QPalette tempPalette = groupBoxArray[i]->palette(); // QPalette tempPalette = groupBoxArray[i]->palette();
// tempPalette.setColor(QPalette::Window, highlight); // tempPalette.setColor(QPalette::Window, highlight);
// groupBoxArray[i]->setPalette(tempPalette); // groupBoxArray[i]->setPalette(tempPalette);
actionLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myAppDataPath +"gfx/gui/table/default/action_winner.png"))); actionLabelArray[(*it_c)->getMyID()]->setPixmap(QPixmap::fromImage(QImage(myGameTableStyle->getActionPic(7))));
//show winnercards if more than one player is active TODO //show winnercards if more than one player is active TODO
if ( nonfoldPlayerCounter != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) { if ( nonfoldPlayerCounter != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) {
@@ -2970,12 +2853,6 @@ void gameTableImpl::clearMyButtons() {
void gameTableImpl::myButtonsCheckable(bool state) { void gameTableImpl::myButtonsCheckable(bool state) {
#ifdef _WIN32
QString humanPlayerButtonFontSize = "13";
#else
QString humanPlayerButtonFontSize = "12";
#endif
if(state) { if(state) {
//checkable //checkable
@@ -2985,10 +2862,7 @@ void gameTableImpl::myButtonsCheckable(bool state) {
pushButton_AllIn->setCheckable(TRUE); pushButton_AllIn->setCheckable(TRUE);
//design //design
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87FF97;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png);} QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_hover.png);} QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked_hover.png);}"); myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 2);
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87CDFF;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked_hover.png); }");
pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #FF8787;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked_hover.png); }");
pushButton_AllIn->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #ffe187;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_hover.png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked_hover.png); }");
myButtonsAreCheckable = TRUE; myButtonsAreCheckable = TRUE;
} }
@@ -3001,19 +2875,17 @@ void gameTableImpl::myButtonsCheckable(bool state) {
pushButton_AllIn->setCheckable(FALSE); pushButton_AllIn->setCheckable(FALSE);
QString hover; QString hover;
if(pushButton_AllIn->text()=="All-In") { hover = "_hover"; } if(pushButton_AllIn->text()=="All-In") {
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
}
else {
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 1);
}
//design
pushButton_BetRaise->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green"+hover+".png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_green_checked"+hover+".png);}");
pushButton_CallCheck->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue"+hover+".png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_blue_checked"+hover+".png);}");
pushButton_Fold->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red"+hover+".png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_red_checked"+hover+".png);}");
pushButton_AllIn->setStyleSheet("QPushButton { border:none; background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange.png); } QPushButton:checked { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked.png);} QPushButton:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange"+hover+".png); } QPushButton:checked:hover { background-image: url(" + myAppDataPath +"gfx/gui/table/default/playeraction_orange_checked"+hover+".png);}");
myButtonsAreCheckable = FALSE; myButtonsAreCheckable = FALSE;
} }
} }
// // void gameTableImpl::closeEvent(QCloseEvent* /*event*/) { closeGameTable(); }
void gameTableImpl::showMaximized () { void gameTableImpl::showMaximized () {
this->showFullScreen (); this->showFullScreen ();
} }
@@ -3285,3 +3157,77 @@ void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear)
} }
} }
} }
void gameTableImpl::refreshGameTableStyle()
{
myGameTableStyle->setLogStyle(textBrowser_Log);
myGameTableStyle->setChatStyle(textBrowser_Chat);
myGameTableStyle->setChatInputStyle(lineEdit_ChatInput);
#ifdef __APPLE__
// tabWidget_Right->setStyleSheet("QTabWidget { "+ font1String +" font-size: 11px; background-color: #145300; }");
// tabWidget_Left->setStyleSheet("QTabWidget { "+ font1String +" font-size: 11px; background-color: #145300;}");
#else
// tabWidget_Right->setStyleSheet("QTabWidget::pane { "+ font1String +" font-size: 10px; background-color: #145300; border: 1px solid #286400; border-radius: 2px; }");
// tabWidget_Left->setStyleSheet("QTabWidget::pane { border: 1px solid #286400; border-radius: 2px; background-color: #145300; }");
#endif
int i;
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
myGameTableStyle->setCashLabelStyle(cashLabelArray[i]);
myGameTableStyle->setSetLabelStyle(setLabelArray[i]);
myGameTableStyle->setPlayerNameLabelStyle(playerNameLabelArray[i]);
}
myGameTableStyle->setSmallFontBoardStyle(label_Sets);
myGameTableStyle->setSmallFontBoardStyle(label_Total);
myGameTableStyle->setSmallFontBoardStyle(textLabel_Sets);
myGameTableStyle->setSmallFontBoardStyle(textLabel_Pot);
myGameTableStyle->setSmallFontBoardStyle(label_handNumber);
myGameTableStyle->setSmallFontBoardStyle(label_gameNumber);
myGameTableStyle->setSmallFontBoardStyle(label_handNumberValue);
myGameTableStyle->setSmallFontBoardStyle(label_gameNumberValue);
myGameTableStyle->setBigFontBoardStyle(textLabel_handLabel);
myGameTableStyle->setBigFontBoardStyle(label_Pot);
myGameTableStyle->setCardHolderStyle(label_CardHolder0,0);
myGameTableStyle->setCardHolderStyle(label_CardHolder1,0);
myGameTableStyle->setCardHolderStyle(label_CardHolder2,0);
myGameTableStyle->setCardHolderStyle(label_CardHolder3,1);
myGameTableStyle->setCardHolderStyle(label_CardHolder4,2);
myGameTableStyle->setTableBackground(this);
myGameTableStyle->setMenuBarStyle(menubar);
myGameTableStyle->setBreakButtonStyle(pushButton_break);
myGameTableStyle->setSpeedStringStyle(label_speedString);
myGameTableStyle->setSpeedStringStyle(label_speedValue);
myGameTableStyle->setVoteButtonStyle(pushButton_voteOnKickYes);
myGameTableStyle->setVoteButtonStyle(pushButton_voteOnKickNo);
myGameTableStyle->setVoteStringsStyle(label_timeout);
myGameTableStyle->setVoteStringsStyle(label_kickVoteTimeout);
myGameTableStyle->setVoteStringsStyle(label_kickUser);
myGameTableStyle->setVoteStringsStyle(label_votesMonitor);
myGameTableStyle->setVoteStringsStyle(label_voteStarterNick);
myGameTableStyle->setVoteStringsStyle(label_votestartedby);
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) {
myGameTableStyle->setPlayerSeatInActiveStyle(groupBoxArray[i]);
}
//Human player button
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
myGameTableStyle->setBetValueInputStyle(lineEdit_betValue);
// away radiobuttons
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction);
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_autoCheckFold);
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_autoCheckCallAny);
myGameTableStyle->setToolBoxBackground(groupBox_RightToolBox);
myGameTableStyle->setToolBoxBackground(groupBox_LeftToolBox);
myGameTableStyle->setTabWidgetStyle(tabWidget_Right, tabWidget_Right->getMyTabBar());
myGameTableStyle->setTabWidgetStyle(tabWidget_Left, tabWidget_Left->getMyTabBar());
label_Handranking->setPixmap(myGameTableStyle->getHandRanking());
}
src/gui/qt/gametable/gametableimpl.h
+2 -4
View File
@@ -294,6 +294,8 @@ public slots:
void nextVoteOnKickTimeoutAnimationFrame(); void nextVoteOnKickTimeoutAnimationFrame();
void refreshVotesMonitor(int currentVotes, int numVotesNeededToKick); void refreshVotesMonitor(int currentVotes, int numVotesNeededToKick);
void refreshGameTableStyle();
private: private:
boost::shared_ptr<GuiInterface> myServerGuiInterface; boost::shared_ptr<GuiInterface> myServerGuiInterface;
@@ -398,10 +400,6 @@ private:
bool flipHolecardsAllInAlreadyDone; bool flipHolecardsAllInAlreadyDone;
bool betSliderChangedByInput; bool betSliderChangedByInput;
QColor active;
QColor inactive;
QColor highlight;
// statistic testing // statistic testing
int statisticArray[15]; int statisticArray[15];
src/gui/qt/gametable/mylefttabwidget.cpp
+8 -35
View File
@@ -11,40 +11,13 @@
// //
#include "mylefttabwidget.h" #include "mylefttabwidget.h"
// using namespace std;
MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent) MyLeftTabWidget::MyLeftTabWidget(QGroupBox *parent)
: QTabWidget(parent), chatBlinkTimer(0), myTabBar(0) : QTabWidget(parent), chatBlinkTimer(0), myTabBar(0)
{ {
// fadeOutTimer = new QTimer;
// connect(flipCardsTimer, SIGNAL(timeout()), this, SLOT(nextFlipCardsFrame()));
myTabBar = this->tabBar(); myTabBar = this->tabBar();
chatBlinkTimer = new QTimer; // chatBlinkTimer = new QTimer;
connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() )); // connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() ));
this->setStyleSheet("QTabWidget::pane { border: 2px solid #286400; border-radius: 2px; background-color: #145300; } QTabWidget::tab-bar { left: 5px; } ");
#ifdef _WIN32
QString font1String("font-family: \"Arial\";");
int paddingTop = 1;
int paddingSide = 7;
#else
#ifdef __APPLE__
QString font1String("font-family: \"Lucida Grande\";");
int paddingTop = 1;
int paddingSide = 9;
#else
QString font1String("font-family: \"Nimbus Sans L\";");
int paddingTop = 0;
int paddingSide = 9;
#endif
#endif
QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #99D500; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide+5,10)+"px; padding-right:"+QString::number(paddingSide+5,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide+5,10)+"px; padding-right:"+QString::number(paddingSide+5,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
} }
@@ -52,15 +25,15 @@ MyLeftTabWidget::~MyLeftTabWidget()
{ {
} }
void MyLeftTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); } void MyLeftTabWidget::startBlinkChatTab() { /*chatBlinkTimer->start(500);*/ }
void MyLeftTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); } void MyLeftTabWidget::stopBlinkChatTab() { /*chatBlinkTimer->stop();*/ }
void MyLeftTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); } void MyLeftTabWidget::showDefaultChatTab() { /*myTabBar->setTabTextColor(1, QColor(240,240,240));*/ }
void MyLeftTabWidget::disableTab(int tabIndex, bool yesNo) { myTabBar->setTabEnabled(tabIndex, !yesNo); } void MyLeftTabWidget::disableTab(int tabIndex, bool yesNo) { myTabBar->setTabEnabled(tabIndex, !yesNo); }
void MyLeftTabWidget::blinkChatTab() { void MyLeftTabWidget::blinkChatTab() {
//TODO doesnt work while stylesheet is set :(
if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0)); // if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0));
else myTabBar->setTabTextColor(1, QColor(240,240,240)); // else myTabBar->setTabTextColor(1, QColor(240,240,240));
} }
void MyLeftTabWidget::paintEvent(QPaintEvent * event) { void MyLeftTabWidget::paintEvent(QPaintEvent * event) {
src/gui/qt/gametable/mylefttabwidget.h
+2
View File
@@ -35,6 +35,8 @@ public slots:
void blinkChatTab(); void blinkChatTab();
QTabBar* getMyTabBar() const { return myTabBar; }
private: private:
QTimer *chatBlinkTimer; QTimer *chatBlinkTimer;
src/gui/qt/gametable/myrighttabwidget.cpp
-38
View File
@@ -17,51 +17,13 @@ using namespace std;
MyRightTabWidget::MyRightTabWidget(QGroupBox *parent) MyRightTabWidget::MyRightTabWidget(QGroupBox *parent)
: QTabWidget(parent), myTabBar(0) : QTabWidget(parent), myTabBar(0)
{ {
// fadeOutTimer = new QTimer;
// connect(flipCardsTimer, SIGNAL(timeout()), this, SLOT(nextFlipCardsFrame()));
myTabBar = this->tabBar(); myTabBar = this->tabBar();
// chatBlinkTimer = new QTimer;
// connect(chatBlinkTimer, SIGNAL(timeout()), this, SLOT( blinkChatTab() ));
this->setStyleSheet("QTabWidget::pane { border: 2px solid #286400; border-radius: 2px; background-color: #145300; } QTabWidget::tab-bar { left: 5px; } ");
#ifdef _WIN32
QString font1String("font-family: \"Arial\";");
int paddingTop = 1;
int paddingSide = 7;
#else
#ifdef __APPLE__
QString font1String("font-family: \"Lucida Grande\";");
int paddingTop = 1;
int paddingSide = 9;
#else
QString font1String("font-family: \"Nimbus Sans L\";");
int paddingTop = 0;
int paddingSide = 9;
#endif
#endif
QTabBar *myTabBar = this->tabBar();
myTabBar->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #99D500; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+QString::number(paddingTop,10)+"px; padding-left:"+QString::number(paddingSide,10)+"px; padding-right:"+QString::number(paddingSide,10)+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
} }
MyRightTabWidget::~MyRightTabWidget() MyRightTabWidget::~MyRightTabWidget()
{ {
} }
// // void MyRightTabWidget::startBlinkChatTab() { chatBlinkTimer->start(500); }
// void MyRightTabWidget::stopBlinkChatTab() { chatBlinkTimer->stop(); }
// void MyRightTabWidget::showDefaultChatTab() { myTabBar->setTabTextColor(1, QColor(240,240,240)); }
// void MyRightTabWidget::blinkChatTab() {
//
// if(myTabBar->tabTextColor(1).red() == 240) myTabBar->setTabTextColor(1, QColor(113,162,0));
// else myTabBar->setTabTextColor(1, QColor(240,240,240));
// }
void MyRightTabWidget::paintEvent(QPaintEvent * event) { void MyRightTabWidget::paintEvent(QPaintEvent * event) {
QTabWidget::paintEvent(event); QTabWidget::paintEvent(event);
src/gui/qt/gametable/myrighttabwidget.h
+3 -6
View File
@@ -25,17 +25,14 @@ public:
void paintEvent(QPaintEvent * event); void paintEvent(QPaintEvent * event);
// void startBlinkChatTab();
// void stopBlinkChatTab(); QTabBar* getMyTabBar() const { return myTabBar; }
// void showDefaultChatTab();
public slots: public slots:
// void blinkChatTab();
private: private:
// QTimer *chatBlinkTimer;
QTabBar *myTabBar; QTabBar *myTabBar;
}; };
src/gui/qt/gametable/mysetlabel.cpp
+4 -4
View File
@@ -36,7 +36,7 @@ void MySetLabel::startTimeOutAnimation(int secs, bool beep) {
timeOutValue = secs; timeOutValue = secs;
timeOutFrame = 1; timeOutFrame = 1;
timeOutAnimationWidth = 118; timeOutAnimationWidth = 103;
int preTimerIntervall = ((timeOutValue-3) * 1000)/timeOutAnimationWidth; int preTimerIntervall = ((timeOutValue-3) * 1000)/timeOutAnimationWidth;
@@ -90,7 +90,7 @@ void MySetLabel::nextTimeOutAnimationFrame() {
} }
//save gfx ressources and never play more the 10 pps //save gfx ressources and never play more the 10 pps
unsigned int realTimerValue = realTimer.elapsed().total_milliseconds(); unsigned int realTimerValue = realTimer.elapsed().total_milliseconds();
timeOutAnimationWidth = 118-(((realTimerValue-3000)*118)/((timeOutValue-3)*1000)); timeOutAnimationWidth = 103-(((realTimerValue-3000)*103)/((timeOutValue-3)*1000));
} }
timeOutFrame++; timeOutFrame++;
@@ -114,7 +114,7 @@ void MySetLabel::paintEvent(QPaintEvent * event) {
QPainter painter(this); QPainter painter(this);
QLinearGradient linearGrad(QPointF(0, 10), QPointF(113, 10)); QLinearGradient linearGrad(QPointF(0, 10), QPointF(98, 10));
linearGrad.setColorAt(0, Qt::red); linearGrad.setColorAt(0, Qt::red);
linearGrad.setColorAt(0.5, Qt::yellow); linearGrad.setColorAt(0.5, Qt::yellow);
linearGrad.setColorAt(1, Qt::green); linearGrad.setColorAt(1, Qt::green);
@@ -122,6 +122,6 @@ void MySetLabel::paintEvent(QPaintEvent * event) {
painter.setBrush(linearGrad); painter.setBrush(linearGrad);
painter.setPen(QColor(0,0,0)); painter.setPen(QColor(0,0,0));
painter.drawRect(0,6,timeOutAnimationWidth-1,8); painter.drawRect(0,2,timeOutAnimationWidth-1,8);
} }
} }
src/gui/qt/styles/carddeckstylereader.cpp
+1 -6
View File
@@ -67,7 +67,7 @@ void CardDeckStyleReader::readStyleFile(QString file) {
tempString1 = tmpStr1; tempString1 = tmpStr1;
if(itemsList->ValueStr() == "StyleDescription") { StyleDescription = QString::fromUtf8(tempString1.c_str()); } if(itemsList->ValueStr() == "StyleDescription") { StyleDescription = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "Preview") { Preview = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "Preview") { Preview = currentDir+QString::fromUtf8(tempString1.c_str()); }
} }
} }
@@ -75,8 +75,3 @@ void CardDeckStyleReader::readStyleFile(QString file) {
else { qDebug() << "could not load card deck file: " << tinyFileName.c_str(); } else { qDebug() << "could not load card deck file: " << tinyFileName.c_str(); }
} }
QString CardDeckStyleReader::getPreview()
{
return QString(currentDir+"/"+Preview);
}
src/gui/qt/styles/carddeckstylereader.h
+3 -1
View File
@@ -38,10 +38,12 @@ public:
QString getStyleDescription() const { return StyleDescription; } QString getStyleDescription() const { return StyleDescription; }
QString getCurrentFileName() const { return currentFileName; } QString getCurrentFileName() const { return currentFileName; }
QString getCurrentDir() const { return currentDir; } QString getCurrentDir() const { return currentDir; }
QString getPreview();
QString getPreview() const { return Preview; }
bool getFallBack() const { return fallBack; } bool getFallBack() const { return fallBack; }
private: private:
QString StyleDescription; QString StyleDescription;
src/gui/qt/styles/gametablestylereader.cpp
+256 -44
View File
@@ -29,6 +29,45 @@ using namespace std;
GameTableStyleReader::GameTableStyleReader(ConfigFile *c, gameTableImpl *w) : myConfig(c), myW(w), fallBack(0) GameTableStyleReader::GameTableStyleReader(ConfigFile *c, gameTableImpl *w) : myConfig(c), myW(w), fallBack(0)
{ {
//set fonts and font sizes
#ifdef _WIN32
font1String = "font-family: \"Arial\";";
font2String = "font-family: \"Nimbus Sans L\";";
textBrowserFontsize= "11";
cashFontSize = "11";
setLabelFontSize = "11";
playerNameLabelFontSize = "11";
smallBoardFontSize = "13";
bigBoardFontSize = "18";
humanPlayerButtonFontSize = "13";
betValueFontSize = "11";
tabBarPaddingTop = "1";
tabBarPaddingSide = "7";
#else
#ifdef __APPLE__
font1String = "font-family: \"Lucida Grande\";";
font2String = "font-family: \"Lucida Grande\";";
tabBarPaddingTop = "1";
tabBarPaddingSide = "9";
#else
font1String = "font-family: \"Nimbus Sans L\";";
font2String = "font-family: \"Bitstream Vera Sans\";";
tabBarPaddingTop = "0";
tabBarPaddingSide = "9";
#endif
textBrowserFontsize= "10";
cashFontSize = "10";
setLabelFontSize = "10";
playerNameLabelFontSize = "11";
smallBoardFontSize = "13";
bigBoardFontSize = "17";
humanPlayerButtonFontSize = "12";
betValueFontSize = "10";
#endif
} }
@@ -51,7 +90,7 @@ void GameTableStyleReader::readStyleFile(QString file) {
fallBack = 1; fallBack = 1;
} }
QFileInfo info(currentFileName); QFileInfo info(currentFileName);
currentFileDir = info.absolutePath(); currentDir = info.absolutePath()+"/";
//start reading the file and fill vars //start reading the file and fill vars
string tempString1(""); string tempString1("");
@@ -68,47 +107,49 @@ void GameTableStyleReader::readStyleFile(QString file) {
if(itemsList->ValueStr() == "StyleDescription") { StyleDescription = QString::fromUtf8(tempString1.c_str()); } if(itemsList->ValueStr() == "StyleDescription") { StyleDescription = QString::fromUtf8(tempString1.c_str()); }
else if(itemsList->ValueStr() == "StyleMaintainerEMail") { StyleMaintainerEMail = QString::fromUtf8(tempString1.c_str()); } else if(itemsList->ValueStr() == "StyleMaintainerEMail") { StyleMaintainerEMail = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "Preview") { Preview = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "Preview") { Preview = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "IfFixedWindowSize") { IfFixedWindowSize = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "IfFixedWindowSize") { IfFixedWindowSize = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FixedWindowWidth") { FixedWindowWidth = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FixedWindowWidth") { FixedWindowWidth = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FixedWindowHeight") { FixedWindowHeight = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FixedWindowHeight") { FixedWindowHeight = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MinimumWindowWidth") { MinimumWindowWidth = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "MinimumWindowWidth") { MinimumWindowWidth = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MinimumWindowHeight") { MinimumWindowHeight = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "MinimumWindowHeight") { MinimumWindowHeight = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MaximumWindowWidth") { MaximumWindowWidth = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "MaximumWindowWidth") { MaximumWindowWidth = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MaximumWindowHeight") { MaximumWindowHeight = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "MaximumWindowHeight") { MaximumWindowHeight = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionAllIn") { ActionAllIn = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionAllIn") { ActionAllIn = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionRaise") { ActionRaise = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionRaise") { ActionRaise = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionBet") { ActionBet = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionBet") { ActionBet = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionCall") { ActionCall = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionCall") { ActionCall = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionCheck") { ActionCheck = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionCheck") { ActionCheck = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionFold") { ActionFold = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionFold") { ActionFold = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ActionWinner") { ActionWinner = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionWinner") { ActionWinner = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BigBlindPuck") { BigBlindPuck = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BigBlindPuck") { BigBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "SmallBlindPuck") { SmallBlindPuck = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "SmallBlindPuck") { SmallBlindPuck = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "DealerPuck") { DealerPuck = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "DealerPuck") { DealerPuck = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "DefaultAvatar") { DefaultAvatar = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "DefaultAvatar") { DefaultAvatar = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CardHolderFlop") { CardHolderFlop = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CardHolderFlop") { CardHolderFlop = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CardHolderTurn") { CardHolderTurn = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CardHolderTurn") { CardHolderTurn = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CardHolderRiver") { CardHolderRiver = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CardHolderRiver") { CardHolderRiver = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonDefault") { FoldButtonDefault = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FoldButtonDefault") { FoldButtonDefault = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonHover") { FoldButtonHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FoldButtonHover") { FoldButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonChecked") { FoldButtonChecked = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FoldButtonChecked") { FoldButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonCheckedHover") { FoldButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "FoldButtonCheckedHover") { FoldButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonDefault") { CheckCallButtonDefault = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CheckCallButtonDefault") { CheckCallButtonDefault = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonHover") { CheckCallButtonHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CheckCallButtonHover") { CheckCallButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonChecked") { CheckCallButtonChecked = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CheckCallButtonChecked") { CheckCallButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonCheckedHover") { CheckCallButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "CheckCallButtonCheckedHover") { CheckCallButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetRaiseButtonDefault") { BetRaiseButtonDefault = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BetRaiseButtonDefault") { BetRaiseButtonDefault = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetRaiseButtonHover") { BetRaiseButtonHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BetRaiseButtonHover") { BetRaiseButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetRaiseButtonChecked") { BetRaiseButtonChecked = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BetRaiseButtonChecked") { BetRaiseButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetRaiseButtonCheckedHover") { BetRaiseButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "BetRaiseButtonCheckedHover") { BetRaiseButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "AllInButtonDefault") { AllInButtonDefault = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonDefault") { AllInButtonDefault = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "Table") { Table = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "HandRanking") { HandRanking = currentDir+QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ToolBoxBackground") { ToolBoxBackground = currentDir+QString::fromUtf8(tempString1.c_str()); }
// std::cout << "ÖLP" << itemsList->ValueStr() <<"§4s"<< itemsList->ValueStr()<<"§89"<< endl; // std::cout << "ÖLP" << itemsList->ValueStr() <<"§4s"<< itemsList->ValueStr()<<"§89"<< endl;
} }
@@ -171,8 +212,179 @@ void GameTableStyleReader::showErrorMessage(QString style, QStringList failedIte
QMessageBox::Ok); QMessageBox::Ok);
} }
QString GameTableStyleReader::getPreview() void GameTableStyleReader::setTableBackground(gameTableImpl *gt)
{ {
return QString(currentFileDir+"/"+Preview); gt->setStyleSheet("QMainWindow { background-image: url("+Table+"); background-position: bottom center; background-origin: content;}");
} }
void GameTableStyleReader::setLogStyle(QTextBrowser *tb)
{
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border:none; } QScrollBar:vertical { border: 1px solid #104600; background: #135000; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #1B7200; background: #176400; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #208A00; height: 3px; width: 3px; background: #27A800; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
}
void GameTableStyleReader::setChatStyle(QTextBrowser *tb)
{
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border:none; } QScrollBar:vertical { border: 1px solid #104600; background: #135000; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #1B7200; background: #176400; min-height: 20px; } QScrollBar::add-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; border-top-right-radius: 1px; border-top-left-radius: 1px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: bottom; subcontrol-origin: margin; } QScrollBar::sub-line:vertical { margin-right: 0px; margin-left: 1px; border-bottom-right-radius: 1px; border-bottom-left-radius: 1px; border-top-right-radius: 2px; border-top-left-radius: 2px; border: 1px solid #1E7F00; background: #1A6F00; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #208A00; height: 3px; width: 3px; background: #27A800; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
}
void GameTableStyleReader::setChatInputStyle(QLineEdit *ci)
{
ci->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border-top: 2px solid #286400; }");
}
void GameTableStyleReader::setCashLabelStyle(QLabel *cl)
{
cl->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }");
}
void GameTableStyleReader::setSetLabelStyle(QLabel *sl)
{
sl->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }");
}
void GameTableStyleReader::setPlayerNameLabelStyle(QLabel *pnl)
{
pnl->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }");
}
void GameTableStyleReader::setSmallFontBoardStyle(QLabel *l)
{
l->setStyleSheet("QLabel { "+ font2String +" font-size: "+smallBoardFontSize+"px; font-weight: bold; color: #669900; }");
}
void GameTableStyleReader::setBigFontBoardStyle(QLabel *l)
{
l->setStyleSheet("QLabel { "+ font2String +" font-size: "+bigBoardFontSize+"px; font-weight: bold; color: #669900; }");
}
void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero)
{
switch(bero) {
case 0: l->setPixmap(CardHolderFlop);
break;
case 1: l->setPixmap(CardHolderTurn);
break;
case 2: l->setPixmap(CardHolderRiver);
break;
}
}
void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb)
{
mb->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #99D500; }");
}
void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb)
{
bb->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
}
void GameTableStyleReader::setSpeedStringStyle(QLabel *l)
{
l->setStyleSheet("QLabel { color: #99D500;}");
}
void GameTableStyleReader::setVoteButtonStyle(QPushButton *b)
{
b->setStyleSheet("QPushButton:enabled { background-color: #1C7000; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}");
}
void GameTableStyleReader::setVoteStringsStyle(QLabel *l)
{
l->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}");
}
void GameTableStyleReader::setPlayerSeatInActiveStyle(QGroupBox *ps)
{
ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatInActive+") }");
}
void GameTableStyleReader::setPlayerSeatActiveStyle(QGroupBox *ps)
{
ps->setStyleSheet("QGroupBox { border:none; background-image: url("+PlayerSeatActive+") }");
}
void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv)
{
bv->setStyleSheet("QLineEdit { "+ font2String +" font-size: "+betValueFontSize+"px; font-weight: bold; background-color: #1D3B00; color: #F0F0F0; } QLineEdit:disabled { background-color: #316300; color: #6d7b5f }");
}
void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb)
{
rb->setStyleSheet("QRadioButton { color: #99D500; } QRadioButton::indicator { color: #99D500; }");
}
QString GameTableStyleReader::getActionPic(int action)
{
// 1 = fold, 2 = check, 3 = call, 4 = bet, 5 = raise, 6 = allin, 7 = winner
switch(action) {
case 1: { return ActionFold; }
break;
case 2: { return ActionCheck; }
break;
case 3: { return ActionCall; }
break;
case 4: { return ActionBet; }
break;
case 5: { return ActionRaise; }
break;
case 6: { return ActionAllIn; }
break;
case 7: { return ActionWinner; }
break;
default: return QString("");
}
}
void GameTableStyleReader::setButtonsStyle(QPushButton *br, QPushButton *cc, QPushButton *f, QPushButton *a, int state)
{
switch(state) {
//default
case 0: {
br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+BetRaiseButtonDefault+"); } QPushButton:checked { background-image: url("+BetRaiseButtonChecked+");} QPushButton:hover { background-image: url("+BetRaiseButtonHover+"); } QPushButton:checked:hover { background-image: url("+BetRaiseButtonCheckedHover+");}");
cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+CheckCallButtonDefault+"); } QPushButton:checked { background-image: url("+CheckCallButtonChecked+");} QPushButton:hover { background-image: url("+CheckCallButtonHover+"); } QPushButton:checked:hover { background-image: url("+CheckCallButtonCheckedHover+");}");
f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+FoldButtonDefault+"); } QPushButton:checked { background-image: url("+FoldButtonChecked+");} QPushButton:hover { background-image: url("+FoldButtonHover+"); } QPushButton:checked:hover { background-image: url("+FoldButtonCheckedHover+");}");
a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+AllInButtonDefault+"); } QPushButton:checked { background-image: url("+AllInButtonChecked+");} QPushButton:hover { background-image: url("+AllInButtonHover+"); } QPushButton:checked:hover { background-image: url("+AllInButtonCheckedHover+");}");
}
break;
//no hover
case 1: {
br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+BetRaiseButtonDefault+"); } QPushButton:checked { background-image: url("+BetRaiseButtonChecked+");} QPushButton:hover { background-image: url("+BetRaiseButtonDefault+"); } QPushButton:checked:hover { background-image: url("+BetRaiseButtonChecked+");}");
cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+CheckCallButtonDefault+"); } QPushButton:checked { background-image: url("+CheckCallButtonChecked+");} QPushButton:hover { background-image: url("+CheckCallButtonDefault+"); } QPushButton:checked:hover { background-image: url("+CheckCallButtonChecked+");}");
f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+FoldButtonDefault+"); } QPushButton:checked { background-image: url("+FoldButtonChecked+");} QPushButton:hover { background-image: url("+FoldButtonDefault+"); } QPushButton:checked:hover { background-image: url("+FoldButtonChecked+");}");
a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #F0F0F0;} QPushButton:unchecked { background-image: url("+AllInButtonDefault+"); } QPushButton:checked { background-image: url("+AllInButtonChecked+");} QPushButton:hover { background-image: url("+AllInButtonDefault+"); } QPushButton:checked:hover { background-image: url("+AllInButtonChecked+");}");
}
break;
//checkable
case 2: {
br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87FF97;} QPushButton:unchecked { background-image: url("+BetRaiseButtonDefault+"); } QPushButton:checked { background-image: url("+BetRaiseButtonChecked+");} QPushButton:hover { background-image: url("+BetRaiseButtonHover+"); } QPushButton:checked:hover { background-image: url("+BetRaiseButtonCheckedHover+");}");
cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #87CDFF;} QPushButton:unchecked { background-image: url("+CheckCallButtonDefault+"); } QPushButton:checked { background-image: url("+CheckCallButtonChecked+");} QPushButton:hover { background-image: url("+CheckCallButtonHover+"); } QPushButton:checked:hover { background-image: url("+CheckCallButtonCheckedHover+");}");
f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #FF8787;} QPushButton:unchecked { background-image: url("+FoldButtonDefault+"); } QPushButton:checked { background-image: url("+FoldButtonChecked+");} QPushButton:hover { background-image: url("+FoldButtonHover+"); } QPushButton:checked:hover { background-image: url("+FoldButtonCheckedHover+");}");
a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #ffe187;} QPushButton:unchecked { background-image: url("+AllInButtonDefault+"); } QPushButton:checked { background-image: url("+AllInButtonChecked+");} QPushButton:hover { background-image: url("+AllInButtonHover+"); } QPushButton:checked:hover { background-image: url("+AllInButtonCheckedHover+");}");
}
break;
}
}
void GameTableStyleReader::setToolBoxBackground(QGroupBox* gb)
{
gb->setStyleSheet("QGroupBox { border:none; background-image: url("+ToolBoxBackground+") }");
}
void GameTableStyleReader::setTabWidgetStyle(QTabWidget *tw, QTabBar *tb)
{
tw->setStyleSheet("QTabWidget::pane { border: 2px solid #286400; border-radius: 2px; background-color: #145300; } QTabWidget::tab-bar { left: 5px; } ");
tb->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #99D500; background-color: #145300; border: 2px solid #286400; border-bottom-color: #286400; border-top-left-radius: 4px; border-top-right-radius: 4px; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected, QTabBar::tab:hover { background-color: #145300; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected { border-color: #286400; border-bottom-color: #145300; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:!selected { margin-top: 2px; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected { margin-left: -4px; margin-right: -4px; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:first:selected { margin-left: 0; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:last:selected { margin-right: 0; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:only-one { margin: 0; } QTabBar::tab:disabled { font-size: 11px; font-weight: 900; color: #144D03; background-color: #144D03; border-left-color: #255704; border-right-color: #255704; border-top-color: #255704; }");
}
src/gui/qt/styles/gametablestylereader.h
+54 -2
View File
@@ -39,10 +39,46 @@ public:
QString getStyleDescription() const { return StyleDescription; } QString getStyleDescription() const { return StyleDescription; }
QString getCurrentFileName() const { return currentFileName; } QString getCurrentFileName() const { return currentFileName; }
QString getPreview(); QString getPreview() const { return Preview; }
QString getDefaultAvatar() const { return DefaultAvatar; }
QString getDealerPuck() const { return DealerPuck; }
QString getSmallBlindPuck() const { return SmallBlindPuck; }
QString getBigBlindPuck() const { return BigBlindPuck; }
QString getHandRanking() const { return HandRanking; }
QString getActionPic(int);
bool getFallBack() const { return fallBack; } bool getFallBack() const { return fallBack; }
//set pictures
void setTableBackground(gameTableImpl*);
void setCardHolderStyle(QLabel*, int /*bero*/);
void setPlayerSeatActiveStyle(QGroupBox*);
void setPlayerSeatInActiveStyle(QGroupBox*);
void setToolBoxBackground(QGroupBox*);
//set fonts + colors
void setLogStyle(QTextBrowser*);
void setChatStyle(QTextBrowser*);
void setChatInputStyle(QLineEdit*);
void setCashLabelStyle(QLabel*);
void setSetLabelStyle(QLabel*);
void setPlayerNameLabelStyle(QLabel*);
void setSmallFontBoardStyle(QLabel*);
void setBigFontBoardStyle(QLabel*);
void setMenuBarStyle(QMenuBar*);
void setBreakButtonStyle(QPushButton*);
void setSpeedStringStyle(QLabel*);
void setVoteButtonStyle(QPushButton*);
void setVoteStringsStyle(QLabel*);
void setBetValueInputStyle(QLineEdit*);
void setTabWidgetStyle(QTabWidget*, QTabBar*);
//set pics and fonts and colors
void setButtonsStyle(QPushButton*, QPushButton*, QPushButton*, QPushButton*, int);
void setAwayRadioButtonsStyle(QRadioButton*);
private: private:
QString StyleDescription; QString StyleDescription;
@@ -88,9 +124,25 @@ private:
QString PlayerSeatInActive; QString PlayerSeatInActive;
QString PlayerSeatActive; QString PlayerSeatActive;
QString Table; QString Table;
QString HandRanking;
QString ToolBoxBackground;
QString font2String;
QString font1String;
QString textBrowserFontsize;
QString cashFontSize;
QString setLabelFontSize;
QString playerNameLabelFontSize;
QString smallBoardFontSize;
QString bigBoardFontSize;
QString humanPlayerButtonFontSize;
QString betValueFontSize;
QString tabBarPaddingTop;
QString tabBarPaddingSide;
QString currentFileName; QString currentFileName;
QString currentFileDir; QString currentDir;
QStringList wrongItems; QStringList wrongItems;