skinning is basically completed now. error handling and bugfixes will follow ;-)

This commit is contained in:
doitux
2009-04-02 16:59:28 +00:00
parent b944852a4e
commit 543513ad5d
7 changed files with 265 additions and 74 deletions
@@ -49,14 +49,50 @@
<FKeyIndicatorColor value="FFFFFF" /> <FKeyIndicatorColor value="FFFFFF" />
<ChanceLabelPossibleColor value="9CD500" /> <ChanceLabelPossibleColor value="9CD500" />
<ChanceLabelImpossibleColor value="55632F" /> <ChanceLabelImpossibleColor value="55632F" />
<ChatTextColor value="FFFFFF" />
<ChatTextNickNotifyColor value="FFFF00" /> <ChatTextNickNotifyColor value="FFFF00" />
<LogTextColor value="FFFFFF" /> <ChatLogTextColor value="F0F0F0" />
<ChatLogBgColor value="1D3B00" />
<ChatLogScrollBarBorderColor value="104600" />
<ChatLogScrollBarBgColor value="135000" />
<ChatLogScrollBarHandleBorderColor value="1B7200" />
<ChatLogScrollBarHandleBgColor value="176400" />
<ChatLogScrollBarArrowBorderColor value="208A00" />
<ChatLogScrollBarArrowBgColor value="27A800" />
<LogWinnerMainPotColor value="FFFF00" /> <LogWinnerMainPotColor value="FFFF00" />
<LogWinnerSidePotColor value="FFFFCC" /> <LogWinnerSidePotColor value="FFFFCC" />
<LogPlayerSitsOutColor value="FF6633" /> <LogPlayerSitsOutColor value="FF6633" />
<LogNewGameAdminColor value="69FF33" /> <LogNewGameAdminColor value="69FF33" />
<ChatTextSize value="11" /> <TabWidgetBorderColor value="286400" />
<LogTextSize value="11" /> <TabWidgetBgColor value="145300" />
<TabWidgetTextColor value="99D500" />
<MenuBgColor value="145300" />
<MenuTextColor value="99D500" />
<BreakLobbyButtonBgColor value="145300" />
<BreakLobbyButtonTextColor value="99D500" />
<BreakLobbyButtonBgDisabledColor value="145300" />
<BreakLobbyButtonTextDisabledColor value="486F3E" />
<BreakLobbyButtonBgBlinkColor value="6E9E00" />
<BreakLobbyButtonTextBlinkColor value="000000" />
<PlayerCashTextColor value="FFFF00" />
<PlayerBetTextColor value="FFFF00" />
<PlayerNickTextColor value="F0F0F0" />
<BoardBigTextColor value="669900" />
<BoardSmallTextColor value="669900" />
<SpeedTextColor value="99D500" />
<VoteButtonBgColor value="1C7000" />
<VoteButtonTextColor value="99D500" />
<BetInputTextColor value="F0F0F0" />
<BetInputBgColor value="1D3B00" />
<BetInputDisabledTextColor value="6d7b5f" />
<BetInputDisabledBgColor value="316300" />
<FoldButtonTextColor value="F0F0F0" />
<FoldButtonCheckableTextColor value="FF8787" />
<CheckCallButtonTextColor value="F0F0F0" />
<CheckCallButtonCheckableTextColor value="87CDFF" />
<BetRaiseButtonTextColor value="F0F0F0" />
<BetRaiseButtonCheckableTextColor value="87FF97" />
<AllInButtonTextColor value="F0F0F0" />
<AllInButtonCheckableTextColor value="FFE187" />
<ChatLogTextSize value="11" />
</TableStyle> </TableStyle>
</PokerTH> </PokerTH>
+1 -1
View File
@@ -81,7 +81,7 @@ void ChatTools::receiveMessage(QString playerName, QString message) {
case 1: tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>"); case 1: tempMsg = QString("<span style=\"font-weight:normal;\">"+message+"</span>");
break; break;
// ingame // ingame
case 2: tempMsg = QString("<span style=\"color:#"+myStyle->getChatTextColor()+";\">"+message+"</span>"); case 2: tempMsg = QString("<span style=\"color:#"+myStyle->getChatLogTextColor()+";\">"+message+"</span>");
break; break;
default:; default:;
} }
+23 -14
View File
@@ -1540,7 +1540,7 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string>QGroupBox {border-style:none;}</string> <string notr="true">QGroupBox {border-style:none;}</string>
</property> </property>
<widget class="QFrame" name="framegameinfo"> <widget class="QFrame" name="framegameinfo">
<property name="geometry"> <property name="geometry">
@@ -2469,13 +2469,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>190</height> <height>188</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>190</height> <height>188</height>
</size> </size>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@@ -2696,8 +2696,8 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>170</width> <width>155</width>
<height>180</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -2726,7 +2726,7 @@
</size> </size>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
<string>QGroupBox {border-style:none;}</string> <string notr="true">QGroupBox {border-style:none;}</string>
</property> </property>
<property name="title"> <property name="title">
<string/> <string/>
@@ -2979,7 +2979,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -2992,7 +2992,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -3010,8 +3010,8 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>170</width> <width>155</width>
<height>180</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> </spacer>
@@ -3061,13 +3061,13 @@
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>190</height> <height>188</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>260</width> <width>260</width>
<height>190</height> <height>188</height>
</size> </size>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
@@ -3172,8 +3172,17 @@
<string>Chance</string> <string>Chance</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<property name="margin"> <property name="leftMargin">
<number>2</number> <number>1</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property> </property>
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
+3 -2
View File
@@ -3164,8 +3164,9 @@ void gameTableImpl::refreshActionButtonFKeyIndicator(bool clear)
void gameTableImpl::refreshGameTableStyle() void gameTableImpl::refreshGameTableStyle()
{ {
myGameTableStyle->setLogStyle(textBrowser_Log); myGameTableStyle->setWindowsGeometry(this);
myGameTableStyle->setChatStyle(textBrowser_Chat); myGameTableStyle->setChatLogStyle(textBrowser_Log);
myGameTableStyle->setChatLogStyle(textBrowser_Chat);
myGameTableStyle->setChatInputStyle(lineEdit_ChatInput); myGameTableStyle->setChatInputStyle(lineEdit_ChatInput);
int i; int i;
@@ -247,6 +247,7 @@ void settingsDialogImpl::exec() {
defaultTableStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml"); defaultTableStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
QListWidgetItem *defaultTableItem = new QListWidgetItem(defaultTableStyle.getStyleDescription(),listWidget_gameTableStyles); QListWidgetItem *defaultTableItem = new QListWidgetItem(defaultTableStyle.getStyleDescription(),listWidget_gameTableStyles);
defaultTableItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml"); defaultTableItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
defaultTableItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/gui/table/default/defaulttablestyle.xml");
//load secondary styles into list (if fallback no entry) //load secondary styles into list (if fallback no entry)
myGameTableStylesList = myConfig->readConfigStringList("GameTableStylesList"); myGameTableStylesList = myConfig->readConfigStringList("GameTableStylesList");
@@ -257,6 +258,7 @@ void settingsDialogImpl::exec() {
if(!nextStyle.getFallBack()) { if(!nextStyle.getFallBack()) {
QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription()); QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription());
nextItem->setData(15,QString::fromUtf8(it1->c_str())); nextItem->setData(15,QString::fromUtf8(it1->c_str()));
nextItem->setData(Qt::ToolTipRole,QString::fromUtf8(it1->c_str()));
listWidget_gameTableStyles->addItem(nextItem); listWidget_gameTableStyles->addItem(nextItem);
} }
} }
@@ -292,11 +294,13 @@ void settingsDialogImpl::exec() {
defaultCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml"); defaultCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
QListWidgetItem *defaultCardItem = new QListWidgetItem(defaultCardStyle.getStyleDescription(),listWidget_cardDeckStyles); QListWidgetItem *defaultCardItem = new QListWidgetItem(defaultCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
defaultCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml"); defaultCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
defaultCardItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default/defaultdeckstyle.xml");
//define PokerTH default CardDeck4c //define PokerTH default CardDeck4c
CardDeckStyleReader default4cCardStyle(myConfig); CardDeckStyleReader default4cCardStyle(myConfig);
default4cCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml"); default4cCardStyle.readStyleFile(QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
QListWidgetItem *default4cCardItem = new QListWidgetItem(default4cCardStyle.getStyleDescription(),listWidget_cardDeckStyles); QListWidgetItem *default4cCardItem = new QListWidgetItem(default4cCardStyle.getStyleDescription(),listWidget_cardDeckStyles);
default4cCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml"); default4cCardItem->setData(15, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
default4cCardItem->setData(Qt::ToolTipRole, QString::fromUtf8(myConfig->readConfigString("AppDataDir").c_str())+"gfx/cards/default4c/default4cdeckstyle.xml");
//load secondary card styles into list (if fallback no entry) //load secondary card styles into list (if fallback no entry)
myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList"); myCardDeckStylesList = myConfig->readConfigStringList("CardDeckStylesList");
@@ -307,6 +311,7 @@ void settingsDialogImpl::exec() {
if(!nextStyle.getFallBack()) { if(!nextStyle.getFallBack()) {
QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription()); QListWidgetItem *nextItem = new QListWidgetItem(nextStyle.getStyleDescription());
nextItem->setData(15,QString::fromUtf8(it2->c_str())); nextItem->setData(15,QString::fromUtf8(it2->c_str()));
nextItem->setData(Qt::ToolTipRole,QString::fromUtf8(it2->c_str()));
listWidget_cardDeckStyles->addItem(nextItem); listWidget_cardDeckStyles->addItem(nextItem);
} }
} }
@@ -902,6 +907,7 @@ void settingsDialogImpl::addGameTableStyle()
if(!newStyle.getFallBack()) { if(!newStyle.getFallBack()) {
QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription()); QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription());
newItem->setData(15,fileName); newItem->setData(15,fileName);
newItem->setData(Qt::ToolTipRole,fileName);
listWidget_gameTableStyles->addItem(newItem); listWidget_gameTableStyles->addItem(newItem);
} }
else { else {
@@ -985,6 +991,7 @@ void settingsDialogImpl::addCardDeckStyle()
if(!newStyle.getFallBack()) { if(!newStyle.getFallBack()) {
QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription()); QListWidgetItem *newItem = new QListWidgetItem(newStyle.getStyleDescription());
newItem->setData(15,fileName); newItem->setData(15,fileName);
newItem->setData(Qt::ToolTipRole,fileName);
listWidget_cardDeckStyles->addItem(newItem); listWidget_cardDeckStyles->addItem(newItem);
} }
else { else {
+146 -45
View File
@@ -33,7 +33,6 @@ GameTableStyleReader::GameTableStyleReader(ConfigFile *c, gameTableImpl *w) : my
#ifdef _WIN32 #ifdef _WIN32
font1String = "font-family: \"Arial\";"; font1String = "font-family: \"Arial\";";
font2String = "font-family: \"Nimbus Sans L\";"; font2String = "font-family: \"Nimbus Sans L\";";
textBrowserFontsize= "11";
cashFontSize = "11"; cashFontSize = "11";
setLabelFontSize = "11"; setLabelFontSize = "11";
playerNameLabelFontSize = "11"; playerNameLabelFontSize = "11";
@@ -158,15 +157,51 @@ void GameTableStyleReader::readStyleFile(QString file) {
else if (itemsList->ValueStr() == "ChanceLabelPossibleColor") { ChanceLabelPossibleColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChanceLabelPossibleColor") { ChanceLabelPossibleColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChanceLabelImpossibleColor") { ChanceLabelImpossibleColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChanceLabelImpossibleColor") { ChanceLabelImpossibleColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatTextNickNotifyColor") { ChatTextNickNotifyColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChatTextNickNotifyColor") { ChatTextNickNotifyColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatTextColor") { ChatTextColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChatLogTextColor") { ChatLogTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogTextColor") { LogTextColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChatLogBgColor") { ChatLogBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarBorderColor") { ChatLogScrollBarBorderColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarBgColor") { ChatLogScrollBarBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarHandleBorderColor") { ChatLogScrollBarHandleBorderColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarHandleBgColor") { ChatLogScrollBarHandleBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarArrowBorderColor") { ChatLogScrollBarArrowBorderColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "ChatLogScrollBarArrowBgColor") { ChatLogScrollBarArrowBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogWinnerMainPotColor") { LogWinnerMainPotColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "LogWinnerMainPotColor") { LogWinnerMainPotColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogWinnerSidePotColor") { LogWinnerSidePotColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "LogWinnerSidePotColor") { LogWinnerSidePotColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogPlayerSitsOutColor") { LogPlayerSitsOutColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "LogPlayerSitsOutColor") { LogPlayerSitsOutColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogNewGameAdminColor") { LogNewGameAdminColor = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "LogNewGameAdminColor") { LogNewGameAdminColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "TabWidgetBorderColor") { TabWidgetBorderColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "TabWidgetBgColor") { TabWidgetBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "TabWidgetTextColor") { TabWidgetTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MenuBgColor") { MenuBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "MenuTextColor") { MenuTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonBgColor") { BreakLobbyButtonBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonTextColor") { BreakLobbyButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonBgDisabledColor") { BreakLobbyButtonBgDisabledColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonTextDisabledColor") { BreakLobbyButtonTextDisabledColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonBgBlinkColor") { BreakLobbyButtonBgBlinkColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BreakLobbyButtonTextBlinkColor") { BreakLobbyButtonTextBlinkColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "PlayerCashTextColor") { PlayerCashTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "PlayerBetTextColor") { PlayerBetTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "PlayerNickTextColor") { PlayerNickTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BoardBigTextColor") { BoardBigTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BoardSmallTextColor") { BoardSmallTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "SpeedTextColor") { SpeedTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "VoteButtonBgColor") { VoteButtonBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "VoteButtonTextColor") { VoteButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetInputTextColor") { BetInputTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetInputBgColor") { BetInputBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetInputDisabledTextColor") { BetInputDisabledTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetInputDisabledBgColor") { BetInputDisabledBgColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonTextColor") { FoldButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "FoldButtonCheckableTextColor") { FoldButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonTextColor") { CheckCallButtonTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "CheckCallButtonCheckableTextColor") { CheckCallButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "BetRaiseButtonTextColor") { BetRaiseButtonTextColor = 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() == "AllInButtonCheckableTextColor") { AllInButtonCheckableTextColor = QString::fromUtf8(tempString1.c_str()); }
// SIZES // SIZES
else if (itemsList->ValueStr() == "ChatTextSize") { ChatTextSize = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ChatLogTextSize") { ChatLogTextSize = QString::fromUtf8(tempString1.c_str()); }
else if (itemsList->ValueStr() == "LogTextSize") { LogTextSize = 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;
} }
@@ -218,15 +253,51 @@ void GameTableStyleReader::readStyleFile(QString file) {
if(FKeyIndicatorColor == "") { wrongItems << "FKeyIndicatorColor"; } if(FKeyIndicatorColor == "") { wrongItems << "FKeyIndicatorColor"; }
if(ChanceLabelPossibleColor == "") { wrongItems << "ChanceLabelPossibleColor"; } if(ChanceLabelPossibleColor == "") { wrongItems << "ChanceLabelPossibleColor"; }
if(ChanceLabelImpossibleColor == "") { wrongItems << "ChanceLabelImpossibleColor"; } if(ChanceLabelImpossibleColor == "") { wrongItems << "ChanceLabelImpossibleColor"; }
if(ChatTextColor == "") { wrongItems << "ChatTextColor"; } if(ChatLogTextColor == "") { wrongItems << "ChatLogTextColor"; }
if(ChatTextNickNotifyColor == "") { wrongItems << "ChatTextNickNotifyColor"; } if(ChatTextNickNotifyColor == "") { wrongItems << "ChatTextNickNotifyColor"; }
if(LogTextColor == "") { wrongItems << "LogTextColor"; } if(ChatLogBgColor == "") { wrongItems << "ChatLogBgColor"; }
if(ChatLogScrollBarBorderColor == "") { wrongItems << "ChatLogScrollBarBorderColor"; }
if(ChatLogScrollBarBgColor == "") { wrongItems << "ChatLogScrollBarBgColor"; }
if(ChatLogScrollBarHandleBorderColor == "") { wrongItems << "ChatLogScrollBarHandleBorderColor"; }
if(ChatLogScrollBarHandleBgColor == "") { wrongItems << "ChatLogScrollBarHandleBgColor"; }
if(ChatLogScrollBarArrowBorderColor == "") { wrongItems << "ChatLogScrollBarArrowBorderColor"; }
if(ChatLogScrollBarArrowBgColor == "") { wrongItems << "ChatLogScrollBarArrowBgColor"; }
if(LogWinnerMainPotColor == "") { wrongItems << "LogWinnerMainPotColor"; } if(LogWinnerMainPotColor == "") { wrongItems << "LogWinnerMainPotColor"; }
if(LogWinnerSidePotColor == "") { wrongItems << "LogWinnerSidePotColor"; } if(LogWinnerSidePotColor == "") { wrongItems << "LogWinnerSidePotColor"; }
if(LogPlayerSitsOutColor == "") { wrongItems << "LogPlayerSitsOutColor"; } if(LogPlayerSitsOutColor == "") { wrongItems << "LogPlayerSitsOutColor"; }
if(LogNewGameAdminColor == "") { wrongItems << "LogNewGameAdminColor"; } if(LogNewGameAdminColor == "") { wrongItems << "LogNewGameAdminColor"; }
if(ChatTextSize == "") { wrongItems << "ChatTextSize"; } if(TabWidgetBorderColor == "") { wrongItems << "TabWidgetBorderColor"; }
if(LogTextSize == "") { wrongItems << "LogTextSize"; } if(TabWidgetBgColor == "") { wrongItems << "TabWidgetBgColor"; }
if(TabWidgetTextColor == "") { wrongItems << "TabWidgetTextColor"; }
if(MenuBgColor == "") { wrongItems << "MenuBgColor"; }
if(MenuTextColor == "") { wrongItems << "MenuTextColor"; }
if(BreakLobbyButtonBgColor == "") { wrongItems << "BreakLobbyButtonBgColor"; }
if(BreakLobbyButtonTextColor == "") { wrongItems << "BreakLobbyButtonTextColor"; }
if(BreakLobbyButtonBgDisabledColor == "") { wrongItems << "BreakLobbyButtonBgDisabledColor"; }
if(BreakLobbyButtonTextDisabledColor == "") { wrongItems << "BreakLobbyButtonTextDisabledColor"; }
if(BreakLobbyButtonBgBlinkColor == "") { wrongItems << "BreakLobbyButtonBgBlinkColor"; }
if(BreakLobbyButtonTextBlinkColor == "") { wrongItems << "BreakLobbyButtonTextBlinkColor"; }
if(PlayerCashTextColor == "") { wrongItems << "PlayerCashTextColor"; }
if(PlayerBetTextColor == "") { wrongItems << "PlayerBetTextColor"; }
if(PlayerNickTextColor == "") { wrongItems << "PlayerNickTextColor"; }
if(BoardBigTextColor == "") { wrongItems << "BoardBigTextColor"; }
if(BoardSmallTextColor == "") { wrongItems << "BoardSmallTextColor"; }
if(SpeedTextColor == "") { wrongItems << "SpeedTextColor"; }
if(VoteButtonBgColor == "") { wrongItems << "VoteButtonBgColor"; }
if(VoteButtonTextColor == "") { wrongItems << "VoteButtonTextColor"; }
if(BetInputTextColor == "") { wrongItems << "BetInputTextColor"; }
if(BetInputBgColor == "") { wrongItems << "BetInputBgColor"; }
if(BetInputDisabledTextColor == "") { wrongItems << "BetInputDisabledTextColor"; }
if(BetInputDisabledBgColor == "") { wrongItems << "BetInputDisabledBgColor"; }
if(FoldButtonTextColor == "") { wrongItems << "FoldButtonTextColor"; }
if(FoldButtonCheckableTextColor == "") { wrongItems << "FoldButtonCheckableTextColor"; }
if(CheckCallButtonTextColor == "") { wrongItems << "CheckCallButtonTextColor"; }
if(CheckCallButtonCheckableTextColor == "") { wrongItems << "CheckCallButtonCheckableTextColor"; }
if(BetRaiseButtonTextColor == "") { wrongItems << "BetRaiseButtonTextColor"; }
if(BetRaiseButtonCheckableTextColor == "") { wrongItems << "BetRaiseButtonCheckableTextColor"; }
if(AllInButtonTextColor == "") { wrongItems << "AllInButtonTextColor"; }
if(AllInButtonCheckableTextColor == "") { wrongItems << "AllInButtonCheckableTextColor"; }
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
if(!wrongItems.isEmpty() && myW != 0) showErrorMessage(StyleDescription, wrongItems, StyleMaintainerEMail); if(!wrongItems.isEmpty() && myW != 0) showErrorMessage(StyleDescription, wrongItems, StyleMaintainerEMail);
@@ -245,48 +316,43 @@ void GameTableStyleReader::showErrorMessage(QString style, QStringList failedIte
void GameTableStyleReader::setTableBackground(gameTableImpl *gt) void GameTableStyleReader::setTableBackground(gameTableImpl *gt)
{ {
gt->setStyleSheet("QMainWindow { background-image: url("+Table+"); background-position: bottom center; background-origin: content;}"); gt->setStyleSheet("QMainWindow { background-image: url("+Table+"); background-position: bottom center; background-origin: content; background-repeat: no-repeat;}");
} }
void GameTableStyleReader::setLogStyle(QTextBrowser *tb) void GameTableStyleReader::setChatLogStyle(QTextBrowser *tb)
{ {
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+LogTextSize+"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; }"); tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border:none; } QScrollBar:vertical { border: 1px solid #"+ChatLogScrollBarBorderColor+"; background: #"+ChatLogScrollBarBgColor+"; width: 15px; margin: 17px -1px 17px 0px; } QScrollBar::handle:vertical { border-radius: 1px; border: 1px solid #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; 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 #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; 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 #"+ChatLogScrollBarHandleBorderColor+"; background: #"+ChatLogScrollBarHandleBgColor+"; height: 15px; subcontrol-position: top; subcontrol-origin: margin; } QScrollBar:up-arrow:vertical, QScrollBar::down-arrow:vertical { border: 1px solid #"+ChatLogScrollBarArrowBorderColor+"; height: 3px; width: 3px; background: #"+ChatLogScrollBarArrowBgColor+"; } QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { background: none; }");
} }
void GameTableStyleReader::setChatStyle(QTextBrowser *tb)
{
tb->setStyleSheet("QTextBrowser { "+ font1String +" font-size: "+ChatTextSize+"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) void GameTableStyleReader::setChatInputStyle(QLineEdit *ci)
{ {
ci->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+textBrowserFontsize+"px; color: #F0F0F0; background-color: #1D3B00; border-top: 2px solid #286400; }"); ci->setStyleSheet("QLineEdit { "+ font1String +" font-size: "+ChatLogTextSize+"px; color: #"+ChatLogTextColor+"; background-color: #"+ChatLogBgColor+"; border-top: 2px solid #"+TabWidgetBorderColor+"; }");
} }
void GameTableStyleReader::setCashLabelStyle(QLabel *cl) void GameTableStyleReader::setCashLabelStyle(QLabel *cl)
{ {
cl->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #FFFF00; }"); cl->setStyleSheet("QLabel { "+ font2String +" font-size: "+cashFontSize+"px; font-weight: bold; color: #"+PlayerCashTextColor+"; }");
} }
void GameTableStyleReader::setSetLabelStyle(QLabel *sl) void GameTableStyleReader::setSetLabelStyle(QLabel *sl)
{ {
sl->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #FFFF00; }"); sl->setStyleSheet("QLabel { "+ font2String +" font-size: "+setLabelFontSize+"px; font-weight: bold; color: #"+PlayerBetTextColor+"; }");
} }
void GameTableStyleReader::setPlayerNameLabelStyle(QLabel *pnl) void GameTableStyleReader::setPlayerNameLabelStyle(QLabel *pnl)
{ {
pnl->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #F0F0F0; }"); pnl->setStyleSheet("QLabel { "+ font2String +" font-size: "+playerNameLabelFontSize+"px; font-weight: bold; color: #"+PlayerNickTextColor+"; }");
} }
void GameTableStyleReader::setSmallFontBoardStyle(QLabel *l) void GameTableStyleReader::setSmallFontBoardStyle(QLabel *l)
{ {
l->setStyleSheet("QLabel { "+ font2String +" font-size: "+smallBoardFontSize+"px; font-weight: bold; color: #669900; }"); l->setStyleSheet("QLabel { "+ font2String +" font-size: "+smallBoardFontSize+"px; font-weight: bold; color: #"+BoardSmallTextColor+"; }");
} }
void GameTableStyleReader::setBigFontBoardStyle(QLabel *l) void GameTableStyleReader::setBigFontBoardStyle(QLabel *l)
{ {
l->setStyleSheet("QLabel { "+ font2String +" font-size: "+bigBoardFontSize+"px; font-weight: bold; color: #669900; }"); l->setStyleSheet("QLabel { "+ font2String +" font-size: "+bigBoardFontSize+"px; font-weight: bold; color: #"+BoardBigTextColor+"; }");
} }
void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero) void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero)
@@ -303,17 +369,17 @@ void GameTableStyleReader::setCardHolderStyle(QLabel *l, int bero)
void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb) void GameTableStyleReader::setMenuBarStyle(QMenuBar *mb)
{ {
mb->setStyleSheet("QMenuBar { background-color: #145300; } QMenuBar::item { color: #99D500; }"); mb->setStyleSheet("QMenuBar { background-color: #"+MenuBgColor+"; font-size:12px; } QMenuBar::item { color: #"+MenuTextColor+"; }");
} }
void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state) void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
{ {
switch(state) { switch(state) {
// default // default
case 0: bb->setStyleSheet("QPushButton:enabled { background-color: #145300; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); case 0: bb->setStyleSheet("QPushButton:enabled { background-color: #"+BreakLobbyButtonBgColor+"; color: #"+BreakLobbyButtonTextColor+";} QPushButton:disabled { background-color: #"+BreakLobbyButtonBgDisabledColor+"; color: #"+BreakLobbyButtonTextDisabledColor+"; font-weight: 900;}");
break; break;
// blink // blink
case 1: bb->setStyleSheet("QPushButton { background-color: #6E9E00; color: black;}"); case 1: bb->setStyleSheet("QPushButton { background-color: #"+BreakLobbyButtonBgBlinkColor+"; color: "+BreakLobbyButtonTextBlinkColor+";}");
break; break;
} }
@@ -321,17 +387,17 @@ void GameTableStyleReader::setBreakButtonStyle(QPushButton *bb, int state)
void GameTableStyleReader::setSpeedStringStyle(QLabel *l) void GameTableStyleReader::setSpeedStringStyle(QLabel *l)
{ {
l->setStyleSheet("QLabel { color: #99D500;}"); l->setStyleSheet("QLabel { color: #"+SpeedTextColor+";}");
} }
void GameTableStyleReader::setVoteButtonStyle(QPushButton *b) void GameTableStyleReader::setVoteButtonStyle(QPushButton *b)
{ {
b->setStyleSheet("QPushButton:enabled { background-color: #1C7000; color: #99D500;} QPushButton:disabled { background-color: #145300; color: #486F3E; font-weight: 900;}"); b->setStyleSheet("QPushButton:enabled { background-color: #"+VoteButtonBgColor+"; color: #"+VoteButtonTextColor+";} ");
} }
void GameTableStyleReader::setVoteStringsStyle(QLabel *l) void GameTableStyleReader::setVoteStringsStyle(QLabel *l)
{ {
l->setStyleSheet("QLabel { color: #99D500; font-size: 11px;}"); l->setStyleSheet("QLabel { color: #"+TabWidgetTextColor+"; font-size: 11px;}");
} }
void GameTableStyleReader::setPlayerSeatInActiveStyle(QGroupBox *ps) void GameTableStyleReader::setPlayerSeatInActiveStyle(QGroupBox *ps)
@@ -346,12 +412,12 @@ void GameTableStyleReader::setPlayerSeatActiveStyle(QGroupBox *ps)
void GameTableStyleReader::setBetValueInputStyle(QLineEdit *bv) 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 }"); bv->setStyleSheet("QLineEdit { "+ font2String +" font-size: "+betValueFontSize+"px; font-weight: bold; background-color: #"+BetInputBgColor+"; color: #"+BetInputTextColor+"; } QLineEdit:disabled { background-color: #"+BetInputDisabledBgColor+"; color: #"+BetInputDisabledTextColor+" }");
} }
void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb) void GameTableStyleReader::setAwayRadioButtonsStyle(QRadioButton *rb)
{ {
rb->setStyleSheet("QRadioButton { color: #99D500; } QRadioButton::indicator { color: #99D500; }"); rb->setStyleSheet("QRadioButton { color: #"+TabWidgetTextColor+"; } QRadioButton::indicator { color: #"+TabWidgetTextColor+"; }");
} }
QString GameTableStyleReader::getActionPic(int action) QString GameTableStyleReader::getActionPic(int action)
@@ -386,35 +452,35 @@ void GameTableStyleReader::setButtonsStyle(MyActionButton *br, MyActionButton *c
switch(state) { switch(state) {
//default //default
case 0: { 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+");}"); br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+BetRaiseButtonTextColor+";} 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+");}"); cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+CheckCallButtonTextColor+";} 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+");}"); f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+FoldButtonTextColor+";} 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+");}"); a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+AllInButtonTextColor+";} 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; break;
//no hover //no hover
case 1: { 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+");}"); br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+BetRaiseButtonTextColor+";} 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+");}"); cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+CheckCallButtonTextColor+";} 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+");}"); f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+FoldButtonTextColor+";} 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+");}"); a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+AllInButtonTextColor+";} 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; break;
//checkable //checkable
case 2: { 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+");}"); br->setStyleSheet("QPushButton { border:none; background-image: url("+BetRaiseButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+BetRaiseButtonCheckableTextColor+";} 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+");}"); cc->setStyleSheet("QPushButton { border:none; background-image: url("+CheckCallButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+CheckCallButtonCheckableTextColor+";} 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+");}"); f->setStyleSheet("QPushButton { border:none; background-image: url("+FoldButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+FoldButtonCheckableTextColor+";} 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+");}"); a->setStyleSheet("QPushButton { border:none; background-image: url("+AllInButtonDefault+"); "+ font2String +" font-size: "+humanPlayerButtonFontSize+"px; font-weight: bold; color: #"+AllInButtonCheckableTextColor+";} 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; break;
} }
@@ -427,8 +493,43 @@ void GameTableStyleReader::setToolBoxBackground(QGroupBox* gb)
void GameTableStyleReader::setTabWidgetStyle(QTabWidget *tw, QTabBar *tb) 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; } "); tw->setStyleSheet("QTabWidget::pane { border: 2px solid #"+TabWidgetBorderColor+"; border-radius: 2px; background-color: #"+TabWidgetBgColor+"; } 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; }"); tb->setStyleSheet("QTabBar::tab{ "+ font1String +" font-size: 11px; color: #"+TabWidgetTextColor+"; background-color: #"+TabWidgetBgColor+"; border: 2px solid #"+TabWidgetBorderColor+"; border-bottom-color: #"+TabWidgetBorderColor+"; 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: #"+TabWidgetBgColor+"; padding-top: "+tabBarPaddingTop+"px; padding-left:"+tabBarPaddingSide+"px; padding-right:"+tabBarPaddingSide+"px;} QTabBar::tab:selected { border-color: #"+TabWidgetBorderColor+"; border-bottom-color: #"+TabWidgetBgColor+"; 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; } ");
}
void GameTableStyleReader::setWindowsGeometry(gameTableImpl *gt)
{
if(IfFixedWindowSize.toInt()) {
gt->setMinimumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->setMaximumSize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
gt->resize(FixedWindowWidth.toInt(), FixedWindowHeight.toInt());
QDesktopWidget dw;
int availableWidth = dw.screenGeometry().width();
int availableHeight = dw.screenGeometry().height();
if(availableWidth == FixedWindowWidth.toInt() && availableHeight == FixedWindowHeight.toInt()) {
gt->actionFullScreen->setEnabled(TRUE);
}
else {
gt->actionFullScreen->setDisabled(TRUE);
}
}
else {
gt->setMinimumSize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
gt->setMaximumSize(MaximumWindowWidth.toInt(), MaximumWindowHeight.toInt());
gt->resize(MinimumWindowWidth.toInt(), MinimumWindowHeight.toInt());
QDesktopWidget dw;
int availableWidth = dw.screenGeometry().width();
int availableHeight = dw.screenGeometry().height();
if(availableWidth <= MaximumWindowWidth.toInt() && availableHeight <= MaximumWindowHeight.toInt()) {
gt->actionFullScreen->setEnabled(TRUE);
}
else {
gt->actionFullScreen->setDisabled(TRUE);
}
}
} }
+44 -7
View File
@@ -50,7 +50,7 @@ public:
QString getFKeyIndicatorColor() const { return FKeyIndicatorColor; } QString getFKeyIndicatorColor() const { return FKeyIndicatorColor; }
QString getChanceLabelImpossibleColor() const { return ChanceLabelImpossibleColor; } QString getChanceLabelImpossibleColor() const { return ChanceLabelImpossibleColor; }
QString getChanceLabelPossibleColor() const { return ChanceLabelPossibleColor; } QString getChanceLabelPossibleColor() const { return ChanceLabelPossibleColor; }
QString getChatTextColor() const { return ChatTextColor; } QString getChatLogTextColor() const { return ChatLogTextColor; }
QString getChatTextNickNotifyColor() const { return ChatTextNickNotifyColor; } QString getChatTextNickNotifyColor() const { return ChatTextNickNotifyColor; }
QString getActionPic(int); QString getActionPic(int);
@@ -65,8 +65,7 @@ public:
void setToolBoxBackground(QGroupBox*); void setToolBoxBackground(QGroupBox*);
//set fonts + colors //set fonts + colors
void setLogStyle(QTextBrowser*); void setChatLogStyle(QTextBrowser*);
void setChatStyle(QTextBrowser*);
void setChatInputStyle(QLineEdit*); void setChatInputStyle(QLineEdit*);
void setCashLabelStyle(QLabel*); void setCashLabelStyle(QLabel*);
void setSetLabelStyle(QLabel*); void setSetLabelStyle(QLabel*);
@@ -82,6 +81,8 @@ public:
void setTabWidgetStyle(QTabWidget*, QTabBar*); void setTabWidgetStyle(QTabWidget*, QTabBar*);
void setWindowsGeometry(gameTableImpl*);
//set pics and fonts and colors //set pics and fonts and colors
void setButtonsStyle(MyActionButton*, MyActionButton*, MyActionButton*, MyActionButton*, int); void setButtonsStyle(MyActionButton*, MyActionButton*, MyActionButton*, MyActionButton*, int);
void setAwayRadioButtonsStyle(QRadioButton*); void setAwayRadioButtonsStyle(QRadioButton*);
@@ -145,16 +146,52 @@ private:
QString FKeyIndicatorColor; QString FKeyIndicatorColor;
QString ChanceLabelPossibleColor; QString ChanceLabelPossibleColor;
QString ChanceLabelImpossibleColor; QString ChanceLabelImpossibleColor;
QString ChatTextColor;
QString ChatTextNickNotifyColor; QString ChatTextNickNotifyColor;
QString LogTextColor; QString ChatLogTextColor;
QString ChatLogBgColor;
QString ChatLogScrollBarBorderColor;
QString ChatLogScrollBarBgColor;
QString ChatLogScrollBarHandleBorderColor;
QString ChatLogScrollBarHandleBgColor;
QString ChatLogScrollBarArrowBorderColor;
QString ChatLogScrollBarArrowBgColor;
QString LogWinnerMainPotColor; QString LogWinnerMainPotColor;
QString LogWinnerSidePotColor; QString LogWinnerSidePotColor;
QString LogPlayerSitsOutColor; QString LogPlayerSitsOutColor;
QString LogNewGameAdminColor; QString LogNewGameAdminColor;
QString TabWidgetBorderColor;
QString TabWidgetBgColor;
QString TabWidgetTextColor;
QString MenuBgColor;
QString MenuTextColor;
QString BreakLobbyButtonBgColor;
QString BreakLobbyButtonTextColor;
QString BreakLobbyButtonBgDisabledColor;
QString BreakLobbyButtonTextDisabledColor;
QString BreakLobbyButtonBgBlinkColor;
QString BreakLobbyButtonTextBlinkColor;
QString PlayerCashTextColor;
QString PlayerBetTextColor;
QString PlayerNickTextColor;
QString BoardBigTextColor;
QString BoardSmallTextColor;
QString SpeedTextColor;
QString VoteButtonBgColor;
QString VoteButtonTextColor;
QString BetInputTextColor;
QString BetInputBgColor;
QString BetInputDisabledTextColor;
QString BetInputDisabledBgColor;
QString FoldButtonTextColor;
QString FoldButtonCheckableTextColor;
QString CheckCallButtonTextColor;
QString CheckCallButtonCheckableTextColor;
QString BetRaiseButtonTextColor;
QString BetRaiseButtonCheckableTextColor;
QString AllInButtonTextColor;
QString AllInButtonCheckableTextColor;
// SIZES // SIZES
QString ChatTextSize; QString ChatLogTextSize;
QString LogTextSize;
//internal //internal
QString font2String; QString font2String;