bigger buttons for two lines of text (for international styles support)
doitux
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -25,22 +25,22 @@
|
||||
<CardHolderFlop value="cardholder_flop.png" /> <!-- optimal size width:height in px [54:82] -->
|
||||
<CardHolderTurn value="cardholder_turn.png" /> <!-- optimal size width:height in px [54:82] -->
|
||||
<CardHolderRiver value="cardholder_river.png" /> <!-- optimal size width:height in px [54:82] -->
|
||||
<FoldButtonDefault value="playeraction_red.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<FoldButtonHover value="playeraction_red_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<FoldButtonChecked value="playeraction_red_checked.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<FoldButtonCheckedHover value="playeraction_red_checked_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<CheckCallButtonDefault value="playeraction_blue.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<CheckCallButtonHover value="playeraction_blue_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<CheckCallButtonChecked value="playeraction_blue_checked.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<CheckCallButtonCheckedHover value="playeraction_blue_checked_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<BetRaiseButtonDefault value="playeraction_green.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<BetRaiseButtonHover value="playeraction_green_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<BetRaiseButtonChecked value="playeraction_green_checked.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<BetRaiseButtonCheckedHover value="playeraction_green_checked_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<AllInButtonDefault value="playeraction_orange.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<AllInButtonHover value="playeraction_orange_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<AllInButtonChecked value="playeraction_orange_checked.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<AllInButtonCheckedHover value="playeraction_orange_checked_hover.png" /> <!-- optimal size width:height in px [160:35] -->
|
||||
<FoldButtonDefault value="playeraction_red.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<FoldButtonHover value="playeraction_red_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<FoldButtonChecked value="playeraction_red_checked.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<FoldButtonCheckedHover value="playeraction_red_checked_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<CheckCallButtonDefault value="playeraction_blue.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<CheckCallButtonHover value="playeraction_blue_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<CheckCallButtonChecked value="playeraction_blue_checked.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<CheckCallButtonCheckedHover value="playeraction_blue_checked_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<BetRaiseButtonDefault value="playeraction_green.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<BetRaiseButtonHover value="playeraction_green_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<BetRaiseButtonChecked value="playeraction_green_checked.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<BetRaiseButtonCheckedHover value="playeraction_green_checked_hover.png" /> <!-- optimal size width:height in px [168:43] -->
|
||||
<AllInButtonDefault value="playeraction_orange.png" /> <!-- optimal size width:height in px [95:25] -->
|
||||
<AllInButtonHover value="playeraction_orange_hover.png" /> <!-- optimal size width:height in px [95:25] -->
|
||||
<AllInButtonChecked value="playeraction_orange_checked.png" /> <!-- optimal size width:height in px [95:25] -->
|
||||
<AllInButtonCheckedHover value="playeraction_orange_checked_hover.png" /> <!-- optimal size width:height in px [95:25] -->
|
||||
<RadioButtonPressed value="radiobutton_pressed.png" /> <!-- optimal size width:height in px [13:13] -->
|
||||
<RadioButtonChecked value="radiobutton_checked.png" /> <!-- optimal size width:height in px [13:13] -->
|
||||
<RadioButtonCheckedHover value="radiobutton_checked_hover.png" /> <!-- optimal size width:height in px [13:13] -->
|
||||
|
||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.2 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 3.0 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.4 KiB |
@@ -2714,13 +2714,13 @@
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<width>168</width>
|
||||
<height>188</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<width>168</width>
|
||||
<height>188</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -2765,13 +2765,13 @@
|
||||
<widget class="MyActionButton" name="pushButton_AllIn" >
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>85</width>
|
||||
<width>95</width>
|
||||
<height>25</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>85</width>
|
||||
<width>95</width>
|
||||
<height>25</height>
|
||||
</size>
|
||||
</property>
|
||||
@@ -2814,14 +2814,14 @@
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="focusPolicy" >
|
||||
@@ -2839,14 +2839,14 @@
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="focusPolicy" >
|
||||
@@ -2864,14 +2864,14 @@
|
||||
</property>
|
||||
<property name="minimumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize" >
|
||||
<size>
|
||||
<width>160</width>
|
||||
<height>35</height>
|
||||
<width>168</width>
|
||||
<height>43</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="focusPolicy" >
|
||||
|
||||
@@ -1308,11 +1308,11 @@ void gameTableImpl::provideMyActions(int mode) {
|
||||
if(currentHand->getCurrentRound() == 0) { // preflop
|
||||
|
||||
if (currentGame->getSeatsList()->front()->getMyCash()+currentGame->getSeatsList()->front()->getMySet() > currentHand->getCurrentBeRo()->getHighestSet()) {
|
||||
pushButtonBetRaiseString = RaiseString+" $"+QString::number(getMyBetAmount());
|
||||
pushButtonBetRaiseString = RaiseString+"\n$"+QString::number(getMyBetAmount());
|
||||
}
|
||||
|
||||
if (currentGame->getSeatsList()->front()->getMySet()== currentHand->getCurrentBeRo()->getHighestSet() && currentGame->getSeatsList()->front()->getMyButton() == 3) { pushButtonCallCheckString = CheckString; }
|
||||
else { pushButtonCallCheckString = CallString+" $"+QString::number(getMyCallAmount()); }
|
||||
else { pushButtonCallCheckString = CallString+"\n$"+QString::number(getMyCallAmount()); }
|
||||
|
||||
pushButtonFoldString = FoldString;
|
||||
pushButtonAllInString = AllInString;
|
||||
@@ -1326,12 +1326,12 @@ void gameTableImpl::provideMyActions(int mode) {
|
||||
if (currentHand->getCurrentBeRo()->getHighestSet() == 0) {
|
||||
|
||||
pushButtonCallCheckString = CheckString;
|
||||
pushButtonBetRaiseString = BetString+" $"+QString::number(getMyBetAmount());
|
||||
pushButtonBetRaiseString = BetString+"\n$"+QString::number(getMyBetAmount());
|
||||
}
|
||||
if (currentHand->getCurrentBeRo()->getHighestSet() > 0 && currentHand->getCurrentBeRo()->getHighestSet() > currentGame->getSeatsList()->front()->getMySet()) {
|
||||
pushButtonCallCheckString = CallString+" $"+QString::number(getMyCallAmount());
|
||||
pushButtonCallCheckString = CallString+"\n$"+QString::number(getMyCallAmount());
|
||||
if (currentGame->getSeatsList()->front()->getMyCash()+currentGame->getSeatsList()->front()->getMySet() > currentHand->getCurrentBeRo()->getHighestSet()) {
|
||||
pushButtonBetRaiseString = RaiseString+" $"+QString::number(getMyBetAmount());
|
||||
pushButtonBetRaiseString = RaiseString+"\n$"+QString::number(getMyBetAmount());
|
||||
}
|
||||
}
|
||||
pushButtonAllInString = AllInString;
|
||||
@@ -1339,7 +1339,7 @@ void gameTableImpl::provideMyActions(int mode) {
|
||||
|
||||
if(mode == 0) {
|
||||
if( currentHand->getSeatsList()->front()->getMyAction() != PLAYER_ACTION_FOLD ) {
|
||||
pushButtonBetRaiseString = BetString+" $"+QString::number(getMyBetAmount());
|
||||
pushButtonBetRaiseString = BetString+"\n$"+QString::number(getMyBetAmount());
|
||||
pushButtonCallCheckString = CheckString;
|
||||
if( (currentGame->getActivePlayerList()->size() > 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_SMALL_BLIND ) || ( currentGame->getActivePlayerList()->size() <= 2 && currentGame->getSeatsList()->front()->getMyButton() == BUTTON_BIG_BLIND)) { pushButtonFoldString = FoldString; }
|
||||
else { pushButtonFoldString = CheckString+" / "+FoldString; }
|
||||
@@ -1401,7 +1401,7 @@ void gameTableImpl::provideMyActions(int mode) {
|
||||
|
||||
|
||||
//if value changed on bet/raise button --> uncheck to prevent unwanted actions
|
||||
QString lastBetValueString = lastPushButtonBetRaiseString;
|
||||
QString lastBetValueString = lastPushButtonBetRaiseString.simplified();
|
||||
int index = lastBetValueString.indexOf("$");
|
||||
lastBetValueString.remove(0, index+1);
|
||||
bool ok;
|
||||
@@ -1575,7 +1575,7 @@ int gameTableImpl::getMyCallAmount() {
|
||||
|
||||
int gameTableImpl::getBetRaisePushButtonValue() {
|
||||
|
||||
QString betValueString = pushButton_BetRaise->text();
|
||||
QString betValueString = pushButton_BetRaise->text().simplified();
|
||||
int index = betValueString.indexOf("$");
|
||||
betValueString.remove(0, index+1);
|
||||
bool ok;
|
||||
@@ -2954,23 +2954,23 @@ void gameTableImpl::lineEditBetValueChanged(QString valueString) {
|
||||
|
||||
bool ok;
|
||||
int betValue = QString(valueString).toInt(&ok, 10);
|
||||
QString betRaise = pushButton_BetRaise->text().section(" ",0 ,0);
|
||||
QString betRaise = pushButton_BetRaise->text().section("\n",0 ,0);
|
||||
|
||||
if(betValue >= horizontalSlider_bet->minimum()) {
|
||||
|
||||
if(betValue > horizontalSlider_bet->maximum()) { // print the maximum
|
||||
pushButton_BetRaise->setText(betRaise + " $" + QString::number(horizontalSlider_bet->maximum()));
|
||||
pushButton_BetRaise->setText(betRaise + "\n$" + QString::number(horizontalSlider_bet->maximum()));
|
||||
betSliderChangedByInput = TRUE;
|
||||
horizontalSlider_bet->setValue(horizontalSlider_bet->maximum());
|
||||
}
|
||||
else { // really print the value
|
||||
pushButton_BetRaise->setText(betRaise + " $" + valueString);
|
||||
pushButton_BetRaise->setText(betRaise + "\n$" + valueString);
|
||||
betSliderChangedByInput = TRUE;
|
||||
horizontalSlider_bet->setValue(betValue);
|
||||
}
|
||||
}
|
||||
else { // print the minimum
|
||||
pushButton_BetRaise->setText(betRaise + " $" + QString::number(horizontalSlider_bet->minimum()));
|
||||
pushButton_BetRaise->setText(betRaise + "\n$" + QString::number(horizontalSlider_bet->minimum()));
|
||||
betSliderChangedByInput = TRUE;
|
||||
horizontalSlider_bet->setValue(horizontalSlider_bet->minimum());
|
||||
}
|
||||
|
||||
@@ -871,7 +871,7 @@ void settingsDialogImpl::showCurrentGameTableStylePreview()
|
||||
QString MaintainerEMail = tr("Maintainer EMail");
|
||||
QString CreateDate = tr("Create Date");
|
||||
|
||||
label_gameTableStyleInfo->setText("<b>"+MaintainerName+":</b> <i>"+style.getStyleMaintainerName()+"</i><br><b>"+MaintainerEMail+":</b> <i>"+style.getStyleMaintainerEMail()+"</i><br><b>"+CreateDate+":</b> <i>"+style.getStyleCreateDate()+"</i>");
|
||||
label_gameTableStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br><b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br><b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -961,7 +961,7 @@ void settingsDialogImpl::showCurrentCardDeckStylePreview()
|
||||
QString MaintainerEMail = tr("Maintainer EMail");
|
||||
QString CreateDate = tr("Create Date");
|
||||
|
||||
label_cardDeckStyleInfo->setText("<b>"+MaintainerName+":</b> <i>"+style.getStyleMaintainerName()+"</i><br><b>"+MaintainerEMail+":</b> <i>"+style.getStyleMaintainerEMail()+"</i><br><b>"+CreateDate+":</b> <i>"+style.getStyleCreateDate()+"</i>");
|
||||
label_cardDeckStyleInfo->setText("<b>"+MaintainerName+":</b> "+style.getStyleMaintainerName()+"<br><b>"+MaintainerEMail+":</b> "+style.getStyleMaintainerEMail()+"<br><b>"+CreateDate+":</b> "+style.getStyleCreateDate()+"");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -110,8 +110,8 @@ void CardDeckStyleReader::showLeftItemsErrorMessage(QString style, QStringList f
|
||||
{
|
||||
QString items = failedItems.join(", ");
|
||||
|
||||
QMessageBox::warning(myW, tr("Game Table Style Error"),
|
||||
tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
|
||||
QMessageBox::warning(myW, tr("Card Deck Style Error"),
|
||||
tr("Selected card deck style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are missing. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
|
||||
QMessageBox::Ok);
|
||||
}
|
||||
|
||||
|
||||
@@ -459,7 +459,7 @@ void GameTableStyleReader::showLeftItemsErrorMessage(QString style, QStringList
|
||||
QString items = failedItems.join(", ");
|
||||
|
||||
QMessageBox::warning(myW, tr("Game Table Style Error"),
|
||||
tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are left. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
|
||||
tr("Selected game table style \"%1\" seems to be incomplete or defective. \n\nThe value(s) of \"%2\" is/are missing. \n\nPlease contact the game table style builder %3.").arg(style).arg(items).arg(email),
|
||||
QMessageBox::Ok);
|
||||
}
|
||||
|
||||
|
||||