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

radiobutton gfx also in theme path now.

Browse Source
This commit is contained in:
doitux
2009-04-03 01:52:58 +00:00
parent 543513ad5d
commit 6bfeac2402
12 changed files with 939 additions and 1075 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/gfx/gui/table/default/defaulttablestyle.xml
+9
View File
@@ -41,6 +41,11 @@
<AllInButtonHover value="playeraction_orange_hover.png" />
<AllInButtonChecked value="playeraction_orange_checked.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" />
<PlayerSeatActive value="playerSeatActive.png" />
<Table value="table.png" />
@@ -93,6 +98,10 @@
<BetRaiseButtonCheckableTextColor value="87FF97" />
<AllInButtonTextColor value="F0F0F0" />
<AllInButtonCheckableTextColor value="FFE187" />
<BetSpeedSliderGrooveBgColor value="145300" />
<BetSpeedSliderGrooveBorderColor value="286400" />
<BetSpeedSliderHandleBgColor value="99D500" />
<BetSpeedSliderHandleBorderColor value="286400" />
<ChatLogTextSize value="11" />
</TableStyle>
</PokerTH>
data/gfx/gui/table/default/radiobutton_checked.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 535 B

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

After

Width:  |  Height:  |  Size: 544 B

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

After

Width:  |  Height:  |  Size: 506 B

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

After

Width:  |  Height:  |  Size: 377 B

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

After

Width:  |  Height:  |  Size: 436 B

pokerth_game.pro
+2 -2
View File
@@ -7,8 +7,8 @@ isEmpty( PREFIX ){
TEMPLATE = app
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 debug
#CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on release
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on debug
#####Uncomment this for RELEASE on Linux/Unix/BSD (only for static Qt)
#QTPLUGIN += qjpeg qgif
pokerth_lib.pro
+2 -2
View File
@@ -3,8 +3,8 @@
TEMPLATE = lib
CODECFORSRC = UTF-8
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 release
CONFIG += staticlib thread exceptions rtti stl warn_on debug
UI_DIR = uics
TARGET = lib/pokerth_lib
src/gui/qt/gametable.ui
+14 -197
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0" >
<class>gameTable</class>
<widget class="QMainWindow" name="gameTable" >
@@ -48,7 +47,7 @@
<property name="spacing" >
<number>0</number>
</property>
<item row="0" column="0" rowspan="5">
<item rowspan="5" row="0" column="0" >
<layout class="QVBoxLayout" name="verticalLayout_2" >
<property name="spacing" >
<number>0</number>
@@ -1061,7 +1060,7 @@
</item>
</layout>
</item>
<item row="0" column="2" rowspan="5">
<item rowspan="5" row="0" column="2" >
<layout class="QVBoxLayout" name="verticalLayout_3" >
<property name="spacing" >
<number>0</number>
@@ -1522,7 +1521,7 @@
<item>
<widget class="QGroupBox" name="groupBox_Board" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2573,7 +2572,7 @@
<item>
<widget class="QLabel" name="label_voteStarterNick" >
<property name="sizePolicy" >
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2600,7 +2599,7 @@
<item>
<widget class="QLabel" name="label_kickVoteTimeout" >
<property name="sizePolicy" >
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2617,7 +2616,7 @@
<item row="1" column="0" >
<widget class="QLabel" name="label_kickUser" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2708,7 +2707,7 @@
<bool>true</bool>
</property>
<property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2716,13 +2715,13 @@
<property name="minimumSize" >
<size>
<width>160</width>
<height>186</height>
<height>188</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>160</width>
<height>186</height>
<height>188</height>
</size>
</property>
<property name="styleSheet" >
@@ -2785,97 +2784,6 @@
</item>
<item row="2" column="0" >
<widget class="QSlider" name="horizontalSlider_bet" >
<property name="palette">
<palette>
<active>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="focusPolicy" >
<enum>Qt::NoFocus</enum>
</property>
@@ -2899,7 +2807,7 @@
<item row="3" column="0" >
<widget class="MyActionButton" name="pushButton_BetRaise" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2924,7 +2832,7 @@
<item row="4" column="0" >
<widget class="MyActionButton" name="pushButton_CallCheck" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -2949,7 +2857,7 @@
<item row="5" column="0" >
<widget class="MyActionButton" name="pushButton_Fold" >
<property name="sizePolicy" >
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -3357,102 +3265,11 @@
<item>
<widget class="QSlider" name="horizontalSlider_speed" >
<property name="sizePolicy" >
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
<sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="palette">
<palette>
<active>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active>
<inactive>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive>
<disabled>
<colorrole role="Button">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>102</red>
<green>153</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Base">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
<colorrole role="Window">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>40</red>
<green>100</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled>
</palette>
</property>
<property name="focusPolicy" >
<enum>Qt::NoFocus</enum>
</property>
@@ -3500,7 +3317,7 @@
<x>0</x>
<y>0</y>
<width>1024</width>
<height>25</height>
<height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuView" >
src/gui/qt/gametable/gametableimpl.cpp
+3 -1
View File
@@ -2717,7 +2717,7 @@ void gameTableImpl::blinkingStartButtonAnimationAction() {
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);
}
else {
@@ -3214,6 +3214,8 @@ void gameTableImpl::refreshGameTableStyle()
myGameTableStyle->setButtonsStyle(pushButton_BetRaise, pushButton_CallCheck, pushButton_Fold, pushButton_AllIn, 0);
myGameTableStyle->setBetValueInputStyle(lineEdit_betValue);
myGameTableStyle->setSliderStyle(horizontalSlider_bet);
myGameTableStyle->setSliderStyle(horizontalSlider_speed);
// away radiobuttons
myGameTableStyle->setAwayRadioButtonsStyle(radioButton_manualAction);
src/gui/qt/styles/gametablestylereader.cpp
+26 -1
View File
@@ -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() == "AllInButtonChecked") { AllInButtonChecked = 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() == "PlayerSeatActive") { PlayerSeatActive = 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() == "AllInButtonTextColor") { AllInButtonTextColor = 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
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(AllInButtonChecked == "") { wrongItems << "AllInButtonChecked"; }
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(PlayerSeatInActive == "") { wrongItems << "PlayerSeatInActive"; }
if(Table == "") { wrongItems << "Table"; }
@@ -297,6 +311,10 @@ void GameTableStyleReader::readStyleFile(QString file) {
if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; }
if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; }
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 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)
{
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)
@@ -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;}");
}
src/gui/qt/styles/gametablestylereader.h
+11
View File
@@ -78,6 +78,7 @@ public:
void setVoteButtonStyle(QPushButton*);
void setVoteStringsStyle(QLabel*);
void setBetValueInputStyle(QLineEdit*);
void setSliderStyle(QSlider*);
void setTabWidgetStyle(QTabWidget*, QTabBar*);
@@ -91,6 +92,7 @@ public:
QString getLogWinnerSidePotColor() const { return LogWinnerSidePotColor; }
QString getLogPlayerSitsOutColor() const { return LogPlayerSitsOutColor; }
QString getLogNewGameAdminColor() const { return LogNewGameAdminColor; }
QString getBreakLobbyButtonBgColor() const { return BreakLobbyButtonBgColor; }
private:
//style values
@@ -137,6 +139,11 @@ private:
QString AllInButtonHover;
QString AllInButtonChecked;
QString AllInButtonCheckedHover;
QString RadioButtonPressed;
QString RadioButtonChecked;
QString RadioButtonCheckedHover;
QString RadioButtonUnchecked;
QString RadioButtonUncheckedHover;
QString PlayerSeatInActive;
QString PlayerSeatActive;
QString Table;
@@ -190,6 +197,10 @@ private:
QString BetRaiseButtonCheckableTextColor;
QString AllInButtonTextColor;
QString AllInButtonCheckableTextColor;
QString BetSpeedSliderGrooveBgColor;
QString BetSpeedSliderGrooveBorderColor;
QString BetSpeedSliderHandleBgColor;
QString BetSpeedSliderHandleBorderColor;
// SIZES
QString ChatLogTextSize;