new translation strings added to style

This commit is contained in:
doitux
2009-04-11 11:23:58 +00:00
parent bd2aece3da
commit 24b515bd86
8 changed files with 436 additions and 266 deletions
+338 -254
View File
@@ -1528,7 +1528,7 @@
</property>
<property name="minimumSize" >
<size>
<width>535</width>
<width>580</width>
<height>94</height>
</size>
</property>
@@ -1541,273 +1541,357 @@
<property name="styleSheet" >
<string notr="true" >QGroupBox {border-style:none;}</string>
</property>
<widget class="QFrame" name="framegameinfo" >
<property name="geometry" >
<rect>
<x>440</x>
<y>42</y>
<width>90</width>
<height>36</height>
</rect>
<layout class="QGridLayout" name="gridLayout_5" >
<property name="margin" >
<number>0</number>
</property>
<property name="minimumSize" >
<size>
<width>90</width>
<height>0</height>
</size>
<property name="spacing" >
<number>0</number>
</property>
<property name="maximumSize" >
<size>
<width>90</width>
<height>16777215</height>
</size>
</property>
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_gameNumber" />
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_handNumberValue" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_gameNumberValue" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_handNumber" />
</item>
</layout>
</widget>
<widget class="QFrame" name="frame_2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>15</y>
<width>120</width>
<height>62</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4" >
<property name="spacing" >
<number>4</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_Pot" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="grid2" >
<property name="horizontalSpacing" >
<item row="0" column="0" >
<widget class="QFrame" name="frame_2" >
<layout class="QVBoxLayout" name="verticalLayout_4" >
<property name="spacing" >
<number>0</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<property name="margin" >
<property name="leftMargin" >
<number>0</number>
</property>
<item row="1" column="1" >
<widget class="QLabel" name="textLabel_Sets" >
<property name="topMargin" >
<number>8</number>
</property>
<property name="rightMargin" >
<number>0</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<item>
<widget class="QLabel" name="label_Pot" >
<property name="minimumSize" >
<size>
<width>145</width>
<height>0</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_Total" />
</item>
<item row="0" column="1" >
<widget class="QLabel" name="textLabel_Pot" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<item>
<layout class="QGridLayout" name="grid2" >
<property name="horizontalSpacing" >
<number>3</number>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_Sets" >
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<property name="verticalSpacing" >
<number>2</number>
</property>
</widget>
<property name="margin" >
<number>0</number>
</property>
<item row="1" column="1" >
<widget class="QLabel" name="textLabel_Sets" >
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_Total" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="textLabel_Pot" >
<property name="minimumSize" >
<size>
<width>75</width>
<height>0</height>
</size>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_Sets" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QLabel" name="textLabel_handLabel" >
<property name="geometry" >
<rect>
<x>440</x>
<y>15</y>
<width>91</width>
<height>22</height>
</rect>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder0" >
<property name="geometry" >
<rect>
<x>140</x>
<y>5</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder1" >
<property name="geometry" >
<rect>
<x>195</x>
<y>5</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder2" >
<property name="geometry" >
<rect>
<x>250</x>
<y>5</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder3" >
<property name="geometry" >
<rect>
<x>305</x>
<y>5</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder4" >
<property name="geometry" >
<rect>
<x>360</x>
<y>5</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard0" >
<property name="geometry" >
<rect>
<x>143</x>
<y>8</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard1" >
<property name="geometry" >
<rect>
<x>198</x>
<y>8</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard2" >
<property name="geometry" >
<rect>
<x>253</x>
<y>8</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard3" >
<property name="geometry" >
<rect>
<x>308</x>
<y>8</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard4" >
<property name="geometry" >
<rect>
<x>363</x>
<y>8</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
</item>
<item row="0" column="1" >
<spacer name="horizontalSpacer_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>3</width>
<height>91</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3" >
<spacer name="horizontalSpacer_4" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>3</width>
<height>91</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="4" >
<layout class="QVBoxLayout" name="verticalLayout_5" >
<property name="spacing" >
<number>0</number>
</property>
<property name="topMargin" >
<number>8</number>
</property>
<property name="bottomMargin" >
<number>8</number>
</property>
<item>
<widget class="QLabel" name="textLabel_handLabel" >
<property name="minimumSize" >
<size>
<width>142</width>
<height>0</height>
</size>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QFrame" name="framegameinfo" >
<property name="minimumSize" >
<size>
<width>90</width>
<height>0</height>
</size>
</property>
<layout class="QGridLayout" >
<property name="horizontalSpacing" >
<number>3</number>
</property>
<property name="verticalSpacing" >
<number>2</number>
</property>
<property name="margin" >
<number>0</number>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="label_gameNumber" >
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLabel" name="label_handNumberValue" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QLabel" name="label_gameNumberValue" >
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="label_handNumber" >
<property name="minimumSize" >
<size>
<width>45</width>
<height>0</height>
</size>
</property>
<property name="alignment" >
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item row="0" column="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="minimumSize" >
<size>
<width>285</width>
<height>0</height>
</size>
</property>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard4" >
<property name="geometry" >
<rect>
<x>230</x>
<y>10</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard1" >
<property name="geometry" >
<rect>
<x>65</x>
<y>10</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder1" >
<property name="geometry" >
<rect>
<x>62</x>
<y>7</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder0" >
<property name="geometry" >
<rect>
<x>7</x>
<y>7</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard0" >
<property name="geometry" >
<rect>
<x>10</x>
<y>10</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder4" >
<property name="geometry" >
<rect>
<x>227</x>
<y>7</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder2" >
<property name="geometry" >
<rect>
<x>117</x>
<y>7</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard2" >
<property name="geometry" >
<rect>
<x>120</x>
<y>10</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_CardHolder3" >
<property name="geometry" >
<rect>
<x>172</x>
<y>7</y>
<width>54</width>
<height>82</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="MyCardsPixmapLabel" name="pixmapLabel_cardBoard3" >
<property name="geometry" >
<rect>
<x>175</x>
<y>10</y>
<width>48</width>
<height>76</height>
</rect>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
<item>
+33 -10
View File
@@ -327,12 +327,17 @@ gameTableImpl::gameTableImpl(ConfigFile *c, QMainWindow *parent)
//raise actionLable above just inserted mypixmaplabel
for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
//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(); }
}
+9
View File
@@ -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;
};
@@ -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"; }
+18
View File
@@ -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;