This commit is contained in:
doitux committed
1 parent
2ee35d97de
commit
1e20e202e0
63 files changed
+30
-140
No files matched your search
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -14,6 +14,7 @@
|
||||
|
||||
|
||||
#include <iostream>
|
||||
#include "game_defs.h"
|
||||
|
||||
#include "berointerface.h"
|
||||
#include "handinterface.h"
|
||||
|
||||
@@ -35,6 +35,8 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c)
|
||||
treeWidget_GameList->setColumnWidth(1,75);
|
||||
treeWidget_GameList->setColumnWidth(2,70);
|
||||
|
||||
lineEdit_ChatInput->setFocus();
|
||||
|
||||
}
|
||||
|
||||
void gameLobbyDialogImpl::exec()
|
||||
|
||||
@@ -70,15 +70,16 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
}
|
||||
////////////////////////////
|
||||
|
||||
myQtHelper = new QtHelper;
|
||||
|
||||
// Resourcen abladen
|
||||
QFile preflopValuesFile(":data/resources/data/preflopValues");
|
||||
QFile preflopValuesFile(myQtHelper->getDataPath() +"misc/preflopValues");
|
||||
QFile preflopValuesFileDest(QString::fromUtf8(myConfig->readConfigString("DataDir").c_str())+QString("preflopValues"));
|
||||
// if(!preflopValuesFileDest.exists()) {
|
||||
preflopValuesFile.copy(QString::fromUtf8(myConfig->readConfigString("DataDir").c_str())+QString("preflopValues"));
|
||||
// }
|
||||
|
||||
QFile flopValuesFile(":data/resources/data/flopValues");
|
||||
QFile flopValuesFile(myQtHelper->getDataPath() +"misc/flopValues");
|
||||
QFile flopValuesFileDest(QString::fromUtf8(myConfig->readConfigString("DataDir").c_str())+QString("flopValues"));
|
||||
// if(!flopValuesFileDest.exists()) {
|
||||
flopValuesFile.copy(QString::fromUtf8(myConfig->readConfigString("DataDir").c_str())+QString("flopValues"));
|
||||
@@ -93,8 +94,8 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
// else { QFont tmpFont("Arial",9); }
|
||||
|
||||
#else
|
||||
QFontDatabase::addApplicationFont (":fonts/resources/fonts/n019003l.pfb");
|
||||
QFontDatabase::addApplicationFont (":fonts/resources/fonts/VeraBd.ttf");
|
||||
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/n019003l.pfb");
|
||||
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/VeraBd.ttf");
|
||||
// QFont tmpFont("Nimbus Sans L",9);
|
||||
QFont tmpFont1;
|
||||
tmpFont1.setFamily("Nimbus Sans L");
|
||||
@@ -207,13 +208,13 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
|
||||
|
||||
|
||||
//Flipside festlegen;
|
||||
flipside = new QPixmap(":/cards/resources/graphics/cards/flipside.png");
|
||||
flipside = new QPixmap(myQtHelper->getDataPath() +"gfx/cards/default/flipside.png");
|
||||
|
||||
if (myConfig->readConfigInt("FlipsideOwn") && myConfig->readConfigString("FlipsideOwnFile") != "") {
|
||||
QPixmap tmpFlipside(QString::fromUtf8(myConfig->readConfigString("FlipsideOwnFile").c_str()));
|
||||
flipside = new QPixmap(tmpFlipside.scaled(QSize(80, 111),Qt::IgnoreAspectRatio, Qt::SmoothTransformation));
|
||||
}
|
||||
else { flipside->load(":/cards/resources/graphics/cards/flipside.png"); }
|
||||
else { flipside->load(myQtHelper->getDataPath() +"gfx/cards/default/flipside.png"); }
|
||||
|
||||
//Flipside Animation noch nicht erledigt
|
||||
flipHolecardsAllInAlreadyDone = FALSE;
|
||||
@@ -895,7 +896,7 @@ void mainWindowImpl::callSettingsDialog() {
|
||||
QPixmap tmpFlipside(QString::fromUtf8(myConfig->readConfigString("FlipsideOwnFile").c_str()));
|
||||
flipside = new QPixmap(tmpFlipside.scaled(QSize(57, 80)));
|
||||
}
|
||||
else { flipside->load(":/cards/resources/graphics/cards/flipside.png"); }
|
||||
else { flipside->load(myQtHelper->getDataPath() +"gfx/cards/default/flipside.png"); }
|
||||
|
||||
if(mySession->getCurrentGame()) {
|
||||
//blind buttons refresh
|
||||
@@ -1356,11 +1357,11 @@ void mainWindowImpl::dealHoleCards() {
|
||||
if ((i == 0) || DEBUG_MODE) {
|
||||
if(myConfig->readConfigInt("AntiPeekMode")) {
|
||||
holeCardsArray[i][j]->setPixmap(*flipside, TRUE);
|
||||
tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
tempCardsPixmapArray[j].load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
holeCardsArray[i][j]->setFrontPixmap(tempCardsPixmapArray[j]);
|
||||
}
|
||||
else {
|
||||
tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
tempCardsPixmapArray[j].load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j],FALSE);
|
||||
}
|
||||
}
|
||||
@@ -1420,7 +1421,7 @@ void mainWindowImpl::dealFlopCards4() {
|
||||
int tempBoardCardsArray[5];
|
||||
QPixmap tempCardsPixmap;
|
||||
mySession->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(tempBoardCardsArray);
|
||||
tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[0], 10)+".png");
|
||||
tempCardsPixmap.load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempBoardCardsArray[0], 10)+".png");
|
||||
QPixmap card(tempCardsPixmap);
|
||||
|
||||
//Config? mit oder ohne Eye-Candy?
|
||||
@@ -1440,7 +1441,7 @@ void mainWindowImpl::dealFlopCards5() {
|
||||
int tempBoardCardsArray[5];
|
||||
QPixmap tempCardsPixmap;
|
||||
mySession->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(tempBoardCardsArray);
|
||||
tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[1], 10)+".png");
|
||||
tempCardsPixmap.load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempBoardCardsArray[1], 10)+".png");
|
||||
QPixmap card(tempCardsPixmap);
|
||||
|
||||
//Config? mit oder ohne Eye-Candy?
|
||||
@@ -1460,7 +1461,7 @@ void mainWindowImpl::dealFlopCards6() {
|
||||
int tempBoardCardsArray[5];
|
||||
QPixmap tempCardsPixmap;
|
||||
mySession->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(tempBoardCardsArray);
|
||||
tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[2], 10)+".png");
|
||||
tempCardsPixmap.load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempBoardCardsArray[2], 10)+".png");
|
||||
QPixmap card(tempCardsPixmap);
|
||||
|
||||
//Config? mit oder ohne Eye-Candy?
|
||||
@@ -1493,7 +1494,7 @@ void mainWindowImpl::dealTurnCards2() {
|
||||
int tempBoardCardsArray[5];
|
||||
QPixmap tempCardsPixmap;
|
||||
mySession->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(tempBoardCardsArray);
|
||||
tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[3], 10)+".png");
|
||||
tempCardsPixmap.load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempBoardCardsArray[3], 10)+".png");
|
||||
QPixmap card(tempCardsPixmap);
|
||||
|
||||
//Config? mit oder ohne Eye-Candy?
|
||||
@@ -1528,7 +1529,7 @@ void mainWindowImpl::dealRiverCards2() {
|
||||
int tempBoardCardsArray[5];
|
||||
QPixmap tempCardsPixmap;
|
||||
mySession->getCurrentGame()->getCurrentHand()->getBoard()->getMyCards(tempBoardCardsArray);
|
||||
tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[4], 10)+".png");
|
||||
tempCardsPixmap.load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempBoardCardsArray[4], 10)+".png");
|
||||
QPixmap card(tempCardsPixmap);
|
||||
|
||||
//Config? mit oder ohne Eye-Candy?
|
||||
@@ -1949,7 +1950,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
|
||||
if(i || (i==0 && myConfig->readConfigInt("AntiPeekMode")) ) {
|
||||
for(j=0; j<2; j++) {
|
||||
|
||||
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
|
||||
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
|
||||
}
|
||||
}
|
||||
//set Player value (logging)
|
||||
@@ -1973,7 +1974,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
|
||||
if(currentHand->getPlayerArray()[i]->getMyActiveStatus() && currentHand->getPlayerArray()[i]->getMyAction() != 1) {
|
||||
if(i || (i==0 && myConfig->readConfigInt("AntiPeekMode")) ) {
|
||||
for(j=0; j<2; j++) {
|
||||
tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
tempCardsPixmapArray[j].load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png");
|
||||
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE);
|
||||
|
||||
}
|
||||
@@ -2234,7 +2235,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
|
||||
if(currentHand->getPlayerArray()[i]->getMyActiveStatus() && currentHand->getPlayerArray()[i]->getMyAction() != 1) {
|
||||
if(i || (i==0 && myConfig->readConfigInt("AntiPeekMode")) ) {
|
||||
for(j=0; j<2; j++) {
|
||||
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
|
||||
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
|
||||
}
|
||||
}
|
||||
//set Player value (logging)
|
||||
@@ -2260,7 +2261,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
|
||||
if(i || (i==0 && myConfig->readConfigInt("AntiPeekMode")) ) {
|
||||
for(j=0; j<2; j++) {
|
||||
|
||||
tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(temp2CardsIntArray[j], 10)+".png");
|
||||
tempCardsPixmapArray[j].load(myQtHelper->getDataPath() +"gfx/cards/default/"+QString::number(temp2CardsIntArray[j], 10)+".png");
|
||||
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -390,6 +390,9 @@ private:
|
||||
//Sound
|
||||
SDLPlayer *mySDLPlayer;
|
||||
|
||||
QtHelper *myQtHelper;
|
||||
|
||||
|
||||
int distributePotAnimCounter;
|
||||
|
||||
//Speed
|
||||
|
||||
@@ -22,8 +22,11 @@
|
||||
StartSplash::StartSplash(mainWindowImpl *parent)
|
||||
: QSplashScreen(parent), myW(parent)
|
||||
{
|
||||
QFontDatabase::addApplicationFont (":fonts/resources/fonts/c059013l.pfb");
|
||||
QFontDatabase::addApplicationFont (":fonts/resources/fonts/andybold.ttf");
|
||||
|
||||
myQtHelper = new QtHelper;
|
||||
|
||||
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/c059013l.pfb");
|
||||
QFontDatabase::addApplicationFont (myQtHelper->getDataPath() +"fonts/andybold.ttf");
|
||||
|
||||
frameNo = 52;
|
||||
opacityCounter = 13;
|
||||
|
||||
@@ -9,98 +9,6 @@
|
||||
<file>resources/graphics/actions/action_set.png</file>
|
||||
<file>resources/graphics/actions/action_winner.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/avatar" >
|
||||
<file>resources/avatar/Catherine_russia.png</file>
|
||||
<file>resources/avatar/Columbus.png</file>
|
||||
<file>resources/avatar/Elisabeth1.png</file>
|
||||
<file>resources/avatar/George_Washington.png</file>
|
||||
<file>resources/avatar/James_Watt.png</file>
|
||||
<file>resources/avatar/Louis_XIV.png</file>
|
||||
<file>resources/avatar/Martin_Luther_King.png</file>
|
||||
<file>resources/avatar/Mona_Lisa.png</file>
|
||||
<file>resources/avatar/Napoleon.png</file>
|
||||
<file>resources/avatar/PopeInnocentX.png</file>
|
||||
<file>resources/avatar/Pope_Clement_VII.png</file>
|
||||
<file>resources/avatar/Sissi.png</file>
|
||||
<file>resources/avatar/albert_einstein.png</file>
|
||||
<file>resources/avatar/bach.png</file>
|
||||
<file>resources/avatar/mozart.png</file>
|
||||
<file>resources/avatar/clipart1.png</file>
|
||||
<file>resources/avatar/goethe.png</file>
|
||||
<file>resources/avatar/linus.png</file>
|
||||
<file>resources/avatar/marc.png</file>
|
||||
<file>resources/avatar/Kapitan.png</file>
|
||||
<file>resources/avatar/benedikt.png</file>
|
||||
<file>resources/avatar/lotodore.png</file>
|
||||
<file>resources/avatar/viktoria.png</file>
|
||||
<file>resources/avatar/felix.png</file>
|
||||
<file>resources/avatar/florian.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/cards" >
|
||||
<file>resources/graphics/cards/0.png</file>
|
||||
<file>resources/graphics/cards/1.png</file>
|
||||
<file>resources/graphics/cards/10.png</file>
|
||||
<file>resources/graphics/cards/11.png</file>
|
||||
<file>resources/graphics/cards/12.png</file>
|
||||
<file>resources/graphics/cards/13.png</file>
|
||||
<file>resources/graphics/cards/14.png</file>
|
||||
<file>resources/graphics/cards/15.png</file>
|
||||
<file>resources/graphics/cards/16.png</file>
|
||||
<file>resources/graphics/cards/17.png</file>
|
||||
<file>resources/graphics/cards/18.png</file>
|
||||
<file>resources/graphics/cards/19.png</file>
|
||||
<file>resources/graphics/cards/2.png</file>
|
||||
<file>resources/graphics/cards/20.png</file>
|
||||
<file>resources/graphics/cards/21.png</file>
|
||||
<file>resources/graphics/cards/22.png</file>
|
||||
<file>resources/graphics/cards/23.png</file>
|
||||
<file>resources/graphics/cards/24.png</file>
|
||||
<file>resources/graphics/cards/25.png</file>
|
||||
<file>resources/graphics/cards/26.png</file>
|
||||
<file>resources/graphics/cards/27.png</file>
|
||||
<file>resources/graphics/cards/28.png</file>
|
||||
<file>resources/graphics/cards/29.png</file>
|
||||
<file>resources/graphics/cards/3.png</file>
|
||||
<file>resources/graphics/cards/30.png</file>
|
||||
<file>resources/graphics/cards/31.png</file>
|
||||
<file>resources/graphics/cards/32.png</file>
|
||||
<file>resources/graphics/cards/33.png</file>
|
||||
<file>resources/graphics/cards/34.png</file>
|
||||
<file>resources/graphics/cards/35.png</file>
|
||||
<file>resources/graphics/cards/36.png</file>
|
||||
<file>resources/graphics/cards/37.png</file>
|
||||
<file>resources/graphics/cards/38.png</file>
|
||||
<file>resources/graphics/cards/39.png</file>
|
||||
<file>resources/graphics/cards/4.png</file>
|
||||
<file>resources/graphics/cards/40.png</file>
|
||||
<file>resources/graphics/cards/41.png</file>
|
||||
<file>resources/graphics/cards/42.png</file>
|
||||
<file>resources/graphics/cards/43.png</file>
|
||||
<file>resources/graphics/cards/44.png</file>
|
||||
<file>resources/graphics/cards/45.png</file>
|
||||
<file>resources/graphics/cards/46.png</file>
|
||||
<file>resources/graphics/cards/47.png</file>
|
||||
<file>resources/graphics/cards/48.png</file>
|
||||
<file>resources/graphics/cards/49.png</file>
|
||||
<file>resources/graphics/cards/5.png</file>
|
||||
<file>resources/graphics/cards/50.png</file>
|
||||
<file>resources/graphics/cards/51.png</file>
|
||||
<file>resources/graphics/cards/6.png</file>
|
||||
<file>resources/graphics/cards/7.png</file>
|
||||
<file>resources/graphics/cards/8.png</file>
|
||||
<file>resources/graphics/cards/9.png</file>
|
||||
<file>resources/graphics/cards/flipside.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/data" >
|
||||
<file>resources/data/flopValues</file>
|
||||
<file>resources/data/preflopValues</file>
|
||||
</qresource>
|
||||
<qresource prefix="/fonts" >
|
||||
<file>resources/fonts/VeraBd.ttf</file>
|
||||
<file>resources/fonts/andybold.ttf</file>
|
||||
<file>resources/fonts/c059013l.pfb</file>
|
||||
<file>resources/fonts/n019003l.pfb</file>
|
||||
</qresource>
|
||||
<qresource prefix="/graphics" >
|
||||
<file>resources/graphics/1px.png</file>
|
||||
<file>resources/graphics/bigblindPuck.png</file>
|
||||
@@ -126,32 +34,4 @@
|
||||
<file>resources/guiv2/playeraction_07.png</file>
|
||||
<file>resources/guiv2/table.png</file>
|
||||
</qresource>
|
||||
<qresource prefix="/sounds" >
|
||||
<file>resources/sounds/call.wav</file>
|
||||
<file>resources/sounds/dealtwocards.wav</file>
|
||||
<file>resources/sounds/raise.wav</file>
|
||||
<file>resources/sounds/bet.wav</file>
|
||||
<file>resources/sounds/allin.wav</file>
|
||||
<file>resources/sounds/check.wav</file>
|
||||
<file>resources/sounds/fold.wav</file>
|
||||
<file>resources/sounds/yourturn.wav</file>
|
||||
<file>resources/sounds/playerconnected.wav</file>
|
||||
<file>resources/sounds/onlinegameready.wav</file>
|
||||
</qresource>
|
||||
<qresource prefix="/translations" >
|
||||
<file>resources/translations/pokerth_de.qm</file>
|
||||
<file>resources/translations/pokerth_nl.qm</file>
|
||||
<file>resources/translations/pokerth_es.qm</file>
|
||||
<file>resources/translations/pokerth_ru.qm</file>
|
||||
<file>resources/translations/pokerth_no.qm</file>
|
||||
<file>resources/translations/pokerth_fr.qm</file>
|
||||
<file>resources/translations/pokerth_sk.qm</file>
|
||||
<file>resources/translations/pokerth_hu.qm</file>
|
||||
<file>resources/translations/pokerth_ptbr.qm</file>
|
||||
<file>resources/translations/pokerth_it.qm</file>
|
||||
<file>resources/translations/qt_de.qm</file>
|
||||
<file>resources/translations/qt_fr.qm</file>
|
||||
<file>resources/translations/qt_es.qm</file>
|
||||
<file>resources/translations/qt_ru.qm</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 446 B |
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
Reference in new issue
Block a user