From 24b515bd868bcbd1dfc8b8f0f96d0d3d19f1b55f Mon Sep 17 00:00:00 2001 From: doitux Date: Sat, 11 Apr 2009 11:23:58 +0000 Subject: [PATCH] new translation strings added to style --- data/gfx/gui/misc/actionpics/action_call.png | Bin 1259 -> 1272 bytes .../gui/table/danuxi1/danuxi1tablestyle.xml | 11 +- .../gui/table/default/defaulttablestyle.xml | 11 +- src/gui/qt/gametable.ui | 592 ++++++++++-------- src/gui/qt/gametable/gametableimpl.cpp | 43 +- src/gui/qt/gametable/gametableimpl.h | 9 + src/gui/qt/styles/gametablestylereader.cpp | 18 + src/gui/qt/styles/gametablestylereader.h | 18 + 8 files changed, 436 insertions(+), 266 deletions(-) diff --git a/data/gfx/gui/misc/actionpics/action_call.png b/data/gfx/gui/misc/actionpics/action_call.png index 5566174e314f582c01c1efec67335db8b83631cf..cc0a82e4441cbe30adf6c69fd08600d63f663de6 100644 GIT binary patch delta 1154 zcmV-|1bzGK3HS++Bnkm@Qb$4nuFf3kks&M!*#rv+8yz1I{l6odQ-Al40K(iS^`;a6-@g*JyQD z<8!4&B9O~px}3@^UgURyO)`7tXneb#nh_CA^sFv^wfg>ApI6RdBH_ZYdNRG267RIO z-!>w;?C|Q^7+D}h5jG~*0GTjXZ~eGc|8A;lk*A>{36Io&xPNetN(UGCixh4m)JZM= zXyZ@&w4e3FZGr-&?m=2P1MK7(;7^_cX7M&vGQp{@X38R(Ag)`ow|P!4@6kyd69ADC zT6mwip|0vZNjqZCr349s>s&U*bql~G&HylxML7llk=!&>e99tnWzAbFYmd`P9{?2u zfngF{Bt<}}+<)(zUmPqJJcyW#5Q~o!cneI#vTPL*Cd;Vo zR}?Y;nt#G#u`y6=(#c^i5+?`50T?G)a3aH_W`rUD28c5|(7jRn0$lTy9rX{Fl+F*H z#8y=-rvtdjS3E1EKN#8};H|6k1`&Zz=?3a}oz+Na9JtHf zuQ;_Z-AEscu?07f;bRW5TwT|&w&6Z+jC~A}r+*)SWjsI`%3Z2dcjQ7$9_ZTKT=6n( zr08QOpAf~Si>nm#I3lwE=;V89ILIG`E0Vp~+ZJlw?)S2v>x|J!=j4|lGBO)DMS@R{QAJIi44`v4VDv(~XTlgjH-}HUbYaMjKavW?tedGOz#zP>GTUDkfST z8h?N=Mbj(<(|eC7zBi&i4-Xn+NQi(|i3F`@vB#|*G3fBW06CgTHzsx|9WIccE?(C)8ZoA#W0xeCY+lG57Ek#3& zG+u}?3P~e~FB-hTgNc$7O$Hrr59q6((Nv# z?cTaGv*SbS8~VUPx)1Zc&iPNym-CU3R#s=X|O{BUhK_*(03L(*HGD+12=5X^{wIa~Cfq z(@U55oM4g2^c;IL{=PLTN@<< z1S!J8;3^;!;>yh*w`$+r-b&=WG$i4X`VW5>&r|5)Jb#hIMVLCN#TRM(X`lMD7QaQ1 zztlBCJ3YWoo&o;kDPRt7Qza9)-L>Q)q6%W`vc1jo26&HdVi*93l+eQa%n$Zf?@3r; zYd$4N=v?EHKBbue1~G<#=`6}J42Wd&%8fikHA&KL#? zl`Id&o<6tw+}D<)phQ$r*<3At&P70C6T5Mm(S%^F@U%F$Qi9ABdpJfK0}By1O*~Ii z#IeJx6xNPZgzDi3EFi#(2z>iZ>@$CIN>k0FigP$8)O;e7dnM?KIktf zk@=<0QKrjMIdydD6T7s_pdLB*W$YodYFS%(sF^3Y2R9~{d6(<_%|SE@?Tjdjm|zNk z5DpSi{VIT_b5=c1?dbaDq1VVVP8yRSEgS;6NZ~0k5!193M3^a~vd`fl4WNHISSmL9 ziw(Lt%mrd(ffxW&BnnPsY{Cdr1i&yc=KA|Ksb7F|fn!Jg!zHB)11EWf0W6%zFmp>- zSOu3_eZ$c;6)WiiZtxY)3aJl9cL;du>O28N;8Xg5I$mcj5-JDoYWFMNZlI>8jz!sm z3rO=Zhghk!Hmq;B&l6=IBjkS=0$>FXP=@2KRH{34Atny=Zf>r4nGTW+vXf7UVA0DJ zig_H7IRJF?JvAKUkHQtnTo~vGwr}@&*v~a4>85+;O8^;}jhrIR0Na2tHJm9_5iO&B z^y@tL3)@&lC&%f-LLkf<+L(*LgG|!FWuTdtxPlBU!T~5m$N?48tqy+;K!~Ee3PHZ_ z5r_AU$dpMumk9zG#!z==qIzGQ;sHn{20O?1YS~#5nR%~=Tz-G4>@v+{EIG-jHVLYOkh{WP zX6434^hqQ{z#>DOAT9(TM;x8dOoHo-Xc_xAij9qpjg5^B`~#HPf(kHiY;ynr002ov JPDHLkV1f~_8Ug?S diff --git a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml index e996ff29..d6b435c0 100644 --- a/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml +++ b/data/gfx/gui/table/danuxi1/danuxi1tablestyle.xml @@ -59,13 +59,22 @@ - + + + + + + + + + + diff --git a/data/gfx/gui/table/default/defaulttablestyle.xml b/data/gfx/gui/table/default/defaulttablestyle.xml index 1db1cb6a..42e6009f 100644 --- a/data/gfx/gui/table/default/defaulttablestyle.xml +++ b/data/gfx/gui/table/default/defaulttablestyle.xml @@ -63,13 +63,22 @@ - + + + + + + + + + + diff --git a/src/gui/qt/gametable.ui b/src/gui/qt/gametable.ui index 058157f4..23751164 100644 --- a/src/gui/qt/gametable.ui +++ b/src/gui/qt/gametable.ui @@ -1528,7 +1528,7 @@ - 535 + 580 94 @@ -1541,273 +1541,357 @@ QGroupBox {border-style:none;} - - - - 440 - 42 - 90 - 36 - + + + 0 - - - 90 - 0 - + + 0 - - - 90 - 16777215 - - - - - 0 - - - 2 - - - 0 - - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - 0 - 15 - 120 - 62 - - - - - 4 - - - 0 - - - - - - - - Qt::AlignCenter - - - - - - + + + + 0 - - 2 - - + 0 - - + + 8 + + + 0 + + + 8 + + + + + + 145 + 0 + + + + + - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Qt::AlignCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + 3 - - - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + 2 - + + 0 + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 75 + 0 + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + - - - - - - - 440 - 15 - 91 - 22 - - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - 140 - 5 - 54 - 82 - - - - true - - - - - - 195 - 5 - 54 - 82 - - - - true - - - - - - 250 - 5 - 54 - 82 - - - - true - - - - - - 305 - 5 - 54 - 82 - - - - true - - - - - - 360 - 5 - 54 - 82 - - - - true - - - - - - 143 - 8 - 48 - 76 - - - - true - - - - - - 198 - 8 - 48 - 76 - - - - true - - - - - - 253 - 8 - 48 - 76 - - - - true - - - - - - 308 - 8 - 48 - 76 - - - - true - - - - - - 363 - 8 - 48 - 76 - - - - true - - + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 91 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 91 + + + + + + + + 0 + + + 8 + + + 8 + + + + + + 142 + 0 + + + + Qt::AlignCenter + + + + + + + + 90 + 0 + + + + + 3 + + + 2 + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + 45 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + 285 + 0 + + + + + + 230 + 10 + 48 + 76 + + + + true + + + + + + 65 + 10 + 48 + 76 + + + + true + + + + + + 62 + 7 + 54 + 82 + + + + true + + + + + + 7 + 7 + 54 + 82 + + + + true + + + + + + 10 + 10 + 48 + 76 + + + + true + + + + + + 227 + 7 + 54 + 82 + + + + true + + + + + + 117 + 7 + 54 + 82 + + + + true + + + + + + 120 + 10 + 48 + 76 + + + + true + + + + + + 172 + 7 + 54 + 82 + + + + true + + + + + + 175 + 10 + 48 + 76 + + + + true + + + + + diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 990c0c21..df6baba2 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -327,12 +327,17 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent) //raise actionLable above just inserted mypixmaplabel for (i=0; iraise(); } + //raise board cards + for (i=0; i<5; i++) { boardCardsArray[i]->raise(); } + //fix for away string bug in righttabwidget on windows #if (defined _WIN32) || (defined __APPLE__) tabWidget_Right->setTabText(0, " "+tabWidget_Right->tabText(0)+" "); tabWidget_Right->setTabText(1, " "+tabWidget_Right->tabText(1)+" "); + tabWidget_Right->setTabText(2, " "+tabWidget_Right->tabText(2)+" "); tabWidget_Left->setTabText(0, " "+tabWidget_Left->tabText(0)+" "); tabWidget_Left->setTabText(1, " "+tabWidget_Left->tabText(1)+" "); + tabWidget_Left->setTabText(2, " "+tabWidget_Left->tabText(2)+" "); #endif //resize stop-button depending on translation @@ -648,11 +653,11 @@ void gameTableImpl::initGui(int speed) //kill running Singleshots!!! stopTimer(); - label_Pot->setText("Pot"); - label_Total->setText("Total:"); - label_Sets->setText("Bets:"); - label_handNumber->setText("Hand:"); - label_gameNumber->setText("Game:"); + label_Pot->setText(PotString); + label_Total->setText(TotalString+":"); + label_Sets->setText(BetsString+":"); + label_handNumber->setText(HandString+":"); + label_gameNumber->setText(GameString+":"); groupBox_RightToolBox->setDisabled(FALSE); groupBox_LeftToolBox->setDisabled(FALSE); @@ -971,16 +976,16 @@ void gameTableImpl::refreshGameLabels(int gameState) { switch(gameState) { case 0: { - textLabel_handLabel->setText("Preflop"); + textLabel_handLabel->setText(PreflopString); } break; case 1: { - textLabel_handLabel->setText("Flop"); + textLabel_handLabel->setText(FlopString); } break; case 2: { - textLabel_handLabel->setText("Turn"); + textLabel_handLabel->setText(TurnString); } break; case 3: { - textLabel_handLabel->setText("River"); + textLabel_handLabel->setText(RiverString); } break; case 4: { textLabel_handLabel->setText(""); @@ -2187,7 +2192,7 @@ void gameTableImpl::postRiverRunAnimation5() { } } else { - label_Pot->setText("Pot"); + label_Pot->setText(PotString); for(it_c=currentHand->getActivePlayerList()->begin(); it_c!=currentHand->getActivePlayerList()->end(); it_c++) { if((*it_c)->getMyAction() != PLAYER_ACTION_FOLD && (*it_c)->getMyCardsValueInt() == currentHand->getCurrentBeRo()->getHighestCardsValue() ) { @@ -3248,6 +3253,24 @@ void gameTableImpl::refreshGameTableStyle() else { FoldString = myGameTableStyle->getActionFoldI18NString(); } if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getActionAllInI18NString() == "NULL") { AllInString = "All-In"; } else { AllInString = myGameTableStyle->getActionAllInI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getPotI18NString() == "NULL") { PotString = "Pot"; } + else { PotString = myGameTableStyle->getPotI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getTotalI18NString() == "NULL") { TotalString = "Total"; } + else { TotalString = myGameTableStyle->getTotalI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getBetsI18NString() == "NULL") { BetsString = "Bets"; } + else { BetsString = myGameTableStyle->getBetsI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getGameI18NString() == "NULL") { GameString = "Game"; } + else { GameString = myGameTableStyle->getGameI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getHandI18NString() == "NULL") { HandString = "Hand"; } + else { HandString = myGameTableStyle->getHandI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getPreflopI18NString() == "NULL") { PreflopString = "Preflop"; } + else { PreflopString = myGameTableStyle->getPreflopI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getFlopI18NString() == "NULL") { FlopString = "Flop"; } + else { FlopString = myGameTableStyle->getFlopI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getTurnI18NString() == "NULL") { TurnString = "Turn"; } + else { TurnString = myGameTableStyle->getTurnI18NString(); } + if(myConfig->readConfigInt("DontTranslateInternationalPokerStringsFromStyle") || myGameTableStyle->getRiverI18NString() == "NULL") { RiverString = "River"; } + else { RiverString = myGameTableStyle->getRiverI18NString(); } } diff --git a/src/gui/qt/gametable/gametableimpl.h b/src/gui/qt/gametable/gametableimpl.h index f2f789d6..aea89f15 100755 --- a/src/gui/qt/gametable/gametableimpl.h +++ b/src/gui/qt/gametable/gametableimpl.h @@ -424,6 +424,15 @@ private: QString CallString; QString CheckString; QString FoldString; + QString PotString; + QString TotalString; + QString BetsString; + QString GameString; + QString HandString; + QString PreflopString; + QString FlopString; + QString TurnString; + QString RiverString; friend class GuiWrapper; }; diff --git a/src/gui/qt/styles/gametablestylereader.cpp b/src/gui/qt/styles/gametablestylereader.cpp index 3784b150..ddd6b70f 100644 --- a/src/gui/qt/styles/gametablestylereader.cpp +++ b/src/gui/qt/styles/gametablestylereader.cpp @@ -170,6 +170,15 @@ void GameTableStyleReader::readStyleFile(QString file) { else if (itemsList->ValueStr() == "ActionCallI18NString") { ActionCallI18NString = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionCheckI18NString") { ActionCheckI18NString = QString::fromUtf8(tempString1.c_str()); } else if (itemsList->ValueStr() == "ActionFoldI18NString") { ActionFoldI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PotI18NString") { PotI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "TotalI18NString") { TotalI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "BetsI18NString") { BetsI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "GameI18NString") { GameI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "HandI18NString") { HandI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "PreflopI18NString") { PreflopI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "FlopI18NString") { FlopI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "TurnI18NString") { TurnI18NString = QString::fromUtf8(tempString1.c_str()); } + else if (itemsList->ValueStr() == "RiverI18NString") { RiverI18NString = QString::fromUtf8(tempString1.c_str()); } // COLORS else if (itemsList->ValueStr() == "FKeyIndicatorColor") { FKeyIndicatorColor = QString::fromUtf8(tempString1.c_str()); } @@ -382,6 +391,15 @@ void GameTableStyleReader::readStyleFile(QString file) { if(ActionCallI18NString == "") { leftItems << "ActionCallI18NString"; } if(ActionCheckI18NString == "") { leftItems << "ActionCheckI18NString"; } if(ActionFoldI18NString == "") { leftItems << "ActionFoldI18NString"; } + if(PotI18NString == "") { leftItems << "PotI18NString"; } + if(TotalI18NString == "") { leftItems << "TotalI18NString"; } + if(BetsI18NString == "") { leftItems << "BetsI18NString"; } + if(GameI18NString == "") { leftItems << "GameI18NString"; } + if(HandI18NString == "") { leftItems << "HandI18NString"; } + if(PreflopI18NString == "") { leftItems << "PreflopI18NString"; } + if(FlopI18NString == "") { leftItems << "FlopI18NString"; } + if(TurnI18NString == "") { leftItems << "TurnI18NString"; } + if(RiverI18NString == "") { leftItems << "RiverI18NString"; } // COLORS if(FKeyIndicatorColor == "") { leftItems << "FKeyIndicatorColor"; } diff --git a/src/gui/qt/styles/gametablestylereader.h b/src/gui/qt/styles/gametablestylereader.h index 1102b8e5..f2068e47 100644 --- a/src/gui/qt/styles/gametablestylereader.h +++ b/src/gui/qt/styles/gametablestylereader.h @@ -112,6 +112,15 @@ public: QString getActionCallI18NString() const { return ActionCallI18NString; } QString getActionCheckI18NString() const { return ActionCheckI18NString; } QString getActionFoldI18NString() const { return ActionFoldI18NString; } + QString getRiverI18NString() const { return RiverI18NString; } + QString getTurnI18NString() const { return TurnI18NString; } + QString getFlopI18NString() const { return FlopI18NString; } + QString getPreflopI18NString() const { return PreflopI18NString; } + QString getHandI18NString() const { return HandI18NString; } + QString getGameI18NString() const { return GameI18NString; } + QString getBetsI18NString() const { return BetsI18NString; } + QString getTotalI18NString() const { return TotalI18NString; } + QString getPotI18NString() const { return PotI18NString; } private: //style values @@ -181,6 +190,15 @@ private: QString ActionCallI18NString; QString ActionCheckI18NString; QString ActionFoldI18NString; + QString PotI18NString; + QString TotalI18NString; + QString BetsI18NString; + QString GameI18NString; + QString HandI18NString; + QString PreflopI18NString; + QString FlopI18NString; + QString TurnI18NString; + QString RiverI18NString; // COLORS QString FKeyIndicatorColor;