setText(""+actionArray[actualHand->getPlayerArray()[i]->getMyAction()]+"
");
+ //if no action --> clear Pixmap
+ if(actualHand->getPlayerArray()[i]->getMyAction() == 0) {
+ actionLabelArray[i]->setPixmap(onePix);
+ }
+ else {
+ //paint action pixmap and raise
+ actionLabelArray[i]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_"+actionArray[actualHand->getPlayerArray()[i]->getMyAction()]+".png"));
+ }
+
if (actualHand->getPlayerArray()[i]->getMyAction()==1) {
// groupBoxArray[i]->setDisabled(TRUE);
- QPixmap onePix(":/graphics/resources/graphics/1px.png");
+
if(i != 0) {
holeCardsArray[i][0]->setPixmap(onePix, FALSE);
holeCardsArray[i][1]->setPixmap(onePix, FALSE);
}
-
-// QColor c(199,199,199);
-// QPalette labelPalette = cashTopLabelArray[i]->palette();
-// labelPalette.setColor(QPalette::WindowText, c);
-// cashTopLabelArray[i]->setPalette(labelPalette);
-// cashTopLabelArray[i]->setAutoFillBackground(FALSE);
}
-// else {
-// QColor c(0,0,0);
-// QPalette labelPalette = cashTopLabelArray[i]->palette();
-// labelPalette.setColor(QPalette::WindowText, c);
-// cashTopLabelArray[i]->setPalette(labelPalette);
-// cashTopLabelArray[i]->setAutoFillBackground(FALSE);
-// }
}
}
@@ -1588,7 +1583,7 @@ void mainWindowImpl::postRiverRunAnimation3() {
// QPalette tempPalette = groupBoxArray[i]->palette();
// tempPalette.setColor(QPalette::Window, highlight);
// groupBoxArray[i]->setPalette(tempPalette);
- actionLabelArray[i]->setText("- Winner -
");
+ actionLabelArray[i]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_winner.png"));
//nicht gewonnene Karten ausblenden
if ( actualHand->getActivePlayersCounter() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) {
diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc
index fbea989c..7f9d8437 100755
--- a/src/gui/qt/resources.qrc
+++ b/src/gui/qt/resources.qrc
@@ -1,4 +1,14 @@
+
+ resources/graphics/actions/action_allin.png
+ resources/graphics/actions/action_bet.png
+ resources/graphics/actions/action_call.png
+ resources/graphics/actions/action_check.png
+ resources/graphics/actions/action_fold.png
+ resources/graphics/actions/action_raise.png
+ resources/graphics/actions/action_set.png
+ resources/graphics/actions/action_winner.png
+
resources/graphics/cards/0.png
resources/graphics/cards/1.png
@@ -82,6 +92,6 @@
resources/guiv2/playeraction_03.png
resources/guiv2/playeraction_05.png
resources/guiv2/playeraction_07.png
- resources/guiv2/table.png
+ resources/guiv2/table.png
diff --git a/src/gui/qt/resources/graphics/actions/action_allin.png b/src/gui/qt/resources/graphics/actions/action_allin.png
new file mode 100644
index 00000000..f99507e2
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_allin.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_bet.png b/src/gui/qt/resources/graphics/actions/action_bet.png
new file mode 100644
index 00000000..82b2a504
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_bet.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_call.png b/src/gui/qt/resources/graphics/actions/action_call.png
new file mode 100644
index 00000000..5566174e
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_call.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_check.png b/src/gui/qt/resources/graphics/actions/action_check.png
new file mode 100644
index 00000000..6f76e635
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_check.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_fold.png b/src/gui/qt/resources/graphics/actions/action_fold.png
new file mode 100644
index 00000000..2e56d3bb
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_fold.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_raise.png b/src/gui/qt/resources/graphics/actions/action_raise.png
new file mode 100644
index 00000000..8051bbf9
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_raise.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_set.png b/src/gui/qt/resources/graphics/actions/action_set.png
new file mode 100644
index 00000000..bb655fb1
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_set.png differ
diff --git a/src/gui/qt/resources/graphics/actions/action_template.xcf b/src/gui/qt/resources/graphics/actions/action_template.xcf
new file mode 100644
index 00000000..5a865810
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_template.xcf differ
diff --git a/src/gui/qt/resources/graphics/actions/action_winner.png b/src/gui/qt/resources/graphics/actions/action_winner.png
new file mode 100644
index 00000000..7a176f0b
Binary files /dev/null and b/src/gui/qt/resources/graphics/actions/action_winner.png differ