radiobutton gfx also in theme path now.
This commit is contained in:
@@ -41,6 +41,11 @@
|
|||||||
<AllInButtonHover value="playeraction_orange_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" />
|
||||||
|
<RadioButtonPressed value="radiobutton_pressed.png" />
|
||||||
|
<RadioButtonChecked value="radiobutton_checked.png" />
|
||||||
|
<RadioButtonCheckedHover value="radiobutton_checked_hover.png" />
|
||||||
|
<RadioButtonUnchecked value="radiobutton_unchecked.png" />
|
||||||
|
<RadioButtonUncheckedHover value="radiobutton_unchecked_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" />
|
||||||
@@ -93,6 +98,10 @@
|
|||||||
<BetRaiseButtonCheckableTextColor value="87FF97" />
|
<BetRaiseButtonCheckableTextColor value="87FF97" />
|
||||||
<AllInButtonTextColor value="F0F0F0" />
|
<AllInButtonTextColor value="F0F0F0" />
|
||||||
<AllInButtonCheckableTextColor value="FFE187" />
|
<AllInButtonCheckableTextColor value="FFE187" />
|
||||||
|
<BetSpeedSliderGrooveBgColor value="145300" />
|
||||||
|
<BetSpeedSliderGrooveBorderColor value="286400" />
|
||||||
|
<BetSpeedSliderHandleBgColor value="99D500" />
|
||||||
|
<BetSpeedSliderHandleBorderColor value="286400" />
|
||||||
<ChatLogTextSize value="11" />
|
<ChatLogTextSize value="11" />
|
||||||
</TableStyle>
|
</TableStyle>
|
||||||
</PokerTH>
|
</PokerTH>
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 535 B |
Binary file not shown.
|
After Width: | Height: | Size: 544 B |
Binary file not shown.
|
After Width: | Height: | Size: 506 B |
Binary file not shown.
|
After Width: | Height: | Size: 377 B |
Binary file not shown.
|
After Width: | Height: | Size: 436 B |
+2
-2
@@ -7,8 +7,8 @@ isEmpty( PREFIX ){
|
|||||||
TEMPLATE = app
|
TEMPLATE = app
|
||||||
CODECFORSRC = UTF-8
|
CODECFORSRC = UTF-8
|
||||||
|
|
||||||
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
|
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
|
||||||
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
|
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
|
||||||
|
|
||||||
#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
|
#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
|
||||||
#QTPLUGIN += qjpeg qgif
|
#QTPLUGIN += qjpeg qgif
|
||||||
|
|||||||
+2
-2
@@ -3,8 +3,8 @@
|
|||||||
TEMPLATE = lib
|
TEMPLATE = lib
|
||||||
CODECFORSRC = UTF-8
|
CODECFORSRC = UTF-8
|
||||||
|
|
||||||
CONFIG += staticlib thread exceptions rtti stl warn_on release
|
#CONFIG += staticlib thread exceptions rtti stl warn_on release
|
||||||
#CONFIG += staticlib thread exceptions rtti stl warn_on debug
|
CONFIG += staticlib thread exceptions rtti stl warn_on debug
|
||||||
|
|
||||||
UI_DIR = uics
|
UI_DIR = uics
|
||||||
TARGET = lib/pokerth_lib
|
TARGET = lib/pokerth_lib
|
||||||
|
|||||||
+886
-1069
File diff suppressed because it is too large
Load Diff
@@ -2717,7 +2717,7 @@ void gameTableImpl::blinkingStartButtonAnimationAction() {
|
|||||||
|
|
||||||
QString style = pushButton_break->styleSheet();
|
QString style = pushButton_break->styleSheet();
|
||||||
|
|
||||||
if(style.contains("QPushButton:enabled { background-color: #145300;")) {
|
if(style.contains("QPushButton:enabled { background-color: #"+myGameTableStyle->getBreakLobbyButtonBgColor())) {
|
||||||
myGameTableStyle->setBreakButtonStyle(pushButton_break,1);
|
myGameTableStyle->setBreakButtonStyle(pushButton_break,1);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@@ -3214,6 +3214,8 @@ void gameTableImpl::refreshGameTableStyle()
|
|||||||
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
|
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
|
||||||
|
|
||||||
myGameTableStyle->setBetValueInputStyle(lineEdit_betValue);
|
myGameTableStyle->setBetValueInputStyle(lineEdit_betValue);
|
||||||
|
myGameTableStyle->setSliderStyle(horizontalSlider_bet);
|
||||||
|
myGameTableStyle->setSliderStyle(horizontalSlider_speed);
|
||||||
|
|
||||||
// away radiobuttons
|
// away radiobuttons
|
||||||
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction);
|
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction);
|
||||||
|
|||||||
@@ -147,6 +147,11 @@ void GameTableStyleReader::readStyleFile(QString file) {
|
|||||||
else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "AllInButtonHover") { AllInButtonHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "AllInButtonChecked") { AllInButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "AllInButtonCheckedHover") { AllInButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "RadioButtonPressed") { RadioButtonPressed = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "RadioButtonChecked") { RadioButtonChecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "RadioButtonCheckedHover") { RadioButtonCheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "RadioButtonUnchecked") { RadioButtonUnchecked = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "RadioButtonUncheckedHover") { RadioButtonUncheckedHover = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "PlayerSeatInActive") { PlayerSeatInActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "PlayerSeatActive") { PlayerSeatActive = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "Table") { Table = currentDir+QString::fromUtf8(tempString1.c_str()); }
|
||||||
@@ -200,6 +205,10 @@ void GameTableStyleReader::readStyleFile(QString file) {
|
|||||||
else if (itemsList->ValueStr() == "BetRaiseButtonCheckableTextColor") { BetRaiseButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "BetRaiseButtonCheckableTextColor") { BetRaiseButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "AllInButtonTextColor") { AllInButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "AllInButtonTextColor") { AllInButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
else if (itemsList->ValueStr() == "AllInButtonCheckableTextColor") { AllInButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "AllInButtonCheckableTextColor") { AllInButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "BetSpeedSliderGrooveBgColor") { BetSpeedSliderGrooveBgColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "BetSpeedSliderGrooveBorderColor") { BetSpeedSliderGrooveBorderColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "BetSpeedSliderHandleBgColor") { BetSpeedSliderHandleBgColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
else if (itemsList->ValueStr() == "BetSpeedSliderHandleBorderColor") { BetSpeedSliderHandleBorderColor = QString::fromUtf8(tempString1.c_str()); }
|
||||||
// SIZES
|
// SIZES
|
||||||
else if (itemsList->ValueStr() == "ChatLogTextSize") { ChatLogTextSize = QString::fromUtf8(tempString1.c_str()); }
|
else if (itemsList->ValueStr() == "ChatLogTextSize") { ChatLogTextSize = QString::fromUtf8(tempString1.c_str()); }
|
||||||
|
|
||||||
@@ -245,6 +254,11 @@ void GameTableStyleReader::readStyleFile(QString file) {
|
|||||||
if(AllInButtonHover == "") { wrongItems << "AllInButtonHover"; }
|
if(AllInButtonHover == "") { wrongItems << "AllInButtonHover"; }
|
||||||
if(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; }
|
if(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; }
|
||||||
if(AllInButtonCheckedHover == "") { wrongItems << "AllInButtonCheckedHover"; }
|
if(AllInButtonCheckedHover == "") { wrongItems << "AllInButtonCheckedHover"; }
|
||||||
|
if(RadioButtonPressed == "") { wrongItems << "RadioButtonPressed"; }
|
||||||
|
if(RadioButtonChecked == "") { wrongItems << "RadioButtonChecked"; }
|
||||||
|
if(RadioButtonCheckedHover == "") { wrongItems << "RadioButtonCheckedHover"; }
|
||||||
|
if(RadioButtonUnchecked == "") { wrongItems << "RadioButtonUnchecked"; }
|
||||||
|
if(RadioButtonUncheckedHover == "") { wrongItems << "RadioButtonUncheckedHover"; }
|
||||||
if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; }
|
if(PlayerSeatActive == "") { wrongItems << "PlayerSeatActive"; }
|
||||||
if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; }
|
if(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; }
|
||||||
if(Table == "") { wrongItems << "Table"; }
|
if(Table == "") { wrongItems << "Table"; }
|
||||||
@@ -297,6 +311,10 @@ void GameTableStyleReader::readStyleFile(QString file) {
|
|||||||
if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; }
|
if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; }
|
||||||
if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; }
|
if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; }
|
||||||
if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; }
|
if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; }
|
||||||
|
if(BetSpeedSliderGrooveBgColor == "") { wrongItems << "BetSpeedSliderGrooveBgColor"; }
|
||||||
|
if(BetSpeedSliderGrooveBorderColor == "") { wrongItems << "BetSpeedSliderGrooveBorderColor"; }
|
||||||
|
if(BetSpeedSliderHandleBgColor == "") { wrongItems << "BetSpeedSliderHandleBgColor"; }
|
||||||
|
if(BetSpeedSliderHandleBorderColor == "") { wrongItems << "BetSpeedSliderHandleBorderColor"; }
|
||||||
if(ChatLogTextSize == "") { wrongItems << "ChatLogTextSize"; }
|
if(ChatLogTextSize == "") { wrongItems << "ChatLogTextSize"; }
|
||||||
|
|
||||||
//if one or more items are wrong or left show detailed error message
|
//if one or more items are wrong or left show detailed error message
|
||||||
@@ -417,7 +435,8 @@ void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv)
|
|||||||
|
|
||||||
void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb)
|
void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb)
|
||||||
{
|
{
|
||||||
rb->setStyleSheet("QRadioButton { color: #"+TabWidgetTextColor+"; } QRadioButton::indicator { color: #"+TabWidgetTextColor+"; }");
|
rb->setStyleSheet("QRadioButton { color: #"+TabWidgetTextColor+"; } QRadioButton::indicator { width: 13px; height: 13px;} QRadioButton::indicator::checked { image: url("+RadioButtonChecked+");} QRadioButton::indicator::unchecked { image: url("+RadioButtonUnchecked+");} QRadioButton::indicator:unchecked:hover { image: url("+RadioButtonUncheckedHover+");} QRadioButton::indicator:unchecked:pressed { image: url("+RadioButtonPressed+");} QRadioButton::indicator::checked { image: url("+RadioButtonChecked+");} QRadioButton::indicator:checked:hover { image: url("+RadioButtonCheckedHover+");} QRadioButton::indicator:checked:pressed { image: url("+RadioButtonPressed+");}");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString GameTableStyleReader::getActionPic(int action)
|
QString GameTableStyleReader::getActionPic(int action)
|
||||||
@@ -533,3 +552,9 @@ void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GameTableStyleReader::setSliderStyle(QSlider *s)
|
||||||
|
{
|
||||||
|
s->setStyleSheet("QSlider::groove:horizontal { border: 1px solid #"+BetSpeedSliderGrooveBorderColor+"; height: 3px; background: #"+BetSpeedSliderGrooveBgColor+"; margin: 4px 4px; border-radius: 2px; } QSlider::handle:horizontal { background: #"+BetSpeedSliderHandleBgColor+"; border: 1px solid #"+BetSpeedSliderHandleBorderColor+"; width: 9px; margin: -6px 0; border-radius: 4px;}");
|
||||||
|
|
||||||
|
}
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ public:
|
|||||||
void setVoteButtonStyle(QPushButton*);
|
void setVoteButtonStyle(QPushButton*);
|
||||||
void setVoteStringsStyle(QLabel*);
|
void setVoteStringsStyle(QLabel*);
|
||||||
void setBetValueInputStyle(QLineEdit*);
|
void setBetValueInputStyle(QLineEdit*);
|
||||||
|
void setSliderStyle(QSlider*);
|
||||||
|
|
||||||
void setTabWidgetStyle(QTabWidget*, QTabBar*);
|
void setTabWidgetStyle(QTabWidget*, QTabBar*);
|
||||||
|
|
||||||
@@ -91,6 +92,7 @@ public:
|
|||||||
QString getLogWinnerSidePotColor() const { return LogWinnerSidePotColor; }
|
QString getLogWinnerSidePotColor() const { return LogWinnerSidePotColor; }
|
||||||
QString getLogPlayerSitsOutColor() const { return LogPlayerSitsOutColor; }
|
QString getLogPlayerSitsOutColor() const { return LogPlayerSitsOutColor; }
|
||||||
QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; }
|
QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; }
|
||||||
|
QString getBreakLobbyButtonBgColor() const { return BreakLobbyButtonBgColor; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//style values
|
//style values
|
||||||
@@ -137,6 +139,11 @@ private:
|
|||||||
QString AllInButtonHover;
|
QString AllInButtonHover;
|
||||||
QString AllInButtonChecked;
|
QString AllInButtonChecked;
|
||||||
QString AllInButtonCheckedHover;
|
QString AllInButtonCheckedHover;
|
||||||
|
QString RadioButtonPressed;
|
||||||
|
QString RadioButtonChecked;
|
||||||
|
QString RadioButtonCheckedHover;
|
||||||
|
QString RadioButtonUnchecked;
|
||||||
|
QString RadioButtonUncheckedHover;
|
||||||
QString PlayerSeatInActive;
|
QString PlayerSeatInActive;
|
||||||
QString PlayerSeatActive;
|
QString PlayerSeatActive;
|
||||||
QString Table;
|
QString Table;
|
||||||
@@ -190,6 +197,10 @@ private:
|
|||||||
QString BetRaiseButtonCheckableTextColor;
|
QString BetRaiseButtonCheckableTextColor;
|
||||||
QString AllInButtonTextColor;
|
QString AllInButtonTextColor;
|
||||||
QString AllInButtonCheckableTextColor;
|
QString AllInButtonCheckableTextColor;
|
||||||
|
QString BetSpeedSliderGrooveBgColor;
|
||||||
|
QString BetSpeedSliderGrooveBorderColor;
|
||||||
|
QString BetSpeedSliderHandleBgColor;
|
||||||
|
QString BetSpeedSliderHandleBorderColor;
|
||||||
// SIZES
|
// SIZES
|
||||||
QString ChatLogTextSize;
|
QString ChatLogTextSize;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user