diff --git a/pokerth.pro b/pokerth.pro index 6dc92e26..43ea744b 100755 --- a/pokerth.pro +++ b/pokerth.pro @@ -114,7 +114,7 @@ SOURCES += pokerth.cpp \ thread.cpp \ rand.cpp TEMPLATE = vcapp -RESOURCES = src/gui/qt/deck.qrc +RESOURCES = src/gui/qt/resources.qrc TEMPLATE = app DEPENDPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core src/core/common INCLUDEPATH += . src uics src/config src/core/tinyxml src/gui src/gui/qt src/gui/qt/mainwindow/startsplash src/gui/qt/mainwindow src/gui/qt/aboutpokerth src/gui/qt/joinnetworkgamedialog src/gui/qt/connecttoserverdialog src/gui/qt/newlocalgamedialog src/gui/qt/settingsdialog src/gui/qt/waitforservertostartgamedialog src/gui/qt/startnetworkgamedialog src/gui/qt/createnetworkgamedialog src/gui/qt/log src/engine src/engine/local_engine src/net src/net/common src/core src/core/common diff --git a/src/gui/qt/deck.qrc b/src/gui/qt/deck.qrc deleted file mode 100755 index 34551e05..00000000 --- a/src/gui/qt/deck.qrc +++ /dev/null @@ -1,69 +0,0 @@ - - - graphics/cards/0.png - graphics/cards/1.png - graphics/cards/10.png - graphics/cards/11.png - graphics/cards/12.png - graphics/cards/13.png - graphics/cards/14.png - graphics/cards/15.png - graphics/cards/16.png - graphics/cards/17.png - graphics/cards/18.png - graphics/cards/19.png - graphics/cards/2.png - graphics/cards/20.png - graphics/cards/21.png - graphics/cards/22.png - graphics/cards/23.png - graphics/cards/24.png - graphics/cards/25.png - graphics/cards/26.png - graphics/cards/27.png - graphics/cards/28.png - graphics/cards/29.png - graphics/cards/3.png - graphics/cards/30.png - graphics/cards/31.png - graphics/cards/32.png - graphics/cards/33.png - graphics/cards/34.png - graphics/cards/35.png - graphics/cards/36.png - graphics/cards/37.png - graphics/cards/38.png - graphics/cards/39.png - graphics/cards/4.png - graphics/cards/40.png - graphics/cards/41.png - graphics/cards/42.png - graphics/cards/43.png - graphics/cards/44.png - graphics/cards/45.png - graphics/cards/46.png - graphics/cards/47.png - graphics/cards/48.png - graphics/cards/49.png - graphics/cards/5.png - graphics/cards/50.png - graphics/cards/51.png - graphics/cards/6.png - graphics/cards/7.png - graphics/cards/8.png - graphics/cards/9.png - graphics/cards/flipside.png - - - fonts/andybold.ttf - fonts/c059013l.pfb - fonts/n019003l.pfb - - - graphics/1px.png - graphics/dealerbutton.png - graphics/fileopen16.png - graphics/handRanking_release.png - graphics/logo-140-100.png - - diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index a73b73a9..3fb24701 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -728,7 +728,7 @@ - :/graphics/graphics/handRanking_release.png + :/graphics/resources/graphics/handRanking_release.png @@ -4259,7 +4259,7 @@ pushButton_allin - + diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 88d51436..c4fa3dce 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -55,6 +55,13 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) { int i; + myConfig = new ConfigFile; + +// Resourcen abladen + QFile preflopValuesFile(":data/resources/data/preflopValues"); + QFile preflopValuesFileDest(QString::fromStdString(myConfig->readConfigString("DataDir")+"preflopValues")); + if(!preflopValuesFileDest.exists()) { preflopValuesFile.copy(QString::fromStdString(myConfig->readConfigString("DataDir")+"preflopValues")); } + // Schriftart laden #ifdef _WIN32 @@ -66,7 +73,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) // else { QFont tmpFont("Arial",9); } #else - QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.pfb"); + QFontDatabase::addApplicationFont (":fonts/resources/fonts/n019003l.pfb"); // QFont tmpFont("Nimbus Sans L",9); QFont tmpFont; tmpFont.setFamily("Nimbus Sans L"); @@ -75,8 +82,6 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) #endif QApplication::setFont(tmpFont); - myConfig = new ConfigFile; - setupUi(this); //Schriftgrößen festlegen @@ -104,12 +109,12 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) //Logos label_logoleft = new QLabel; - label_logoleft->setPixmap(QPixmap(QString::fromUtf8(":/graphics/graphics/logo-140-100.png"))); + label_logoleft->setPixmap(QPixmap(QString::fromUtf8(":/graphics/resources/graphics/logo-140-100.png"))); label_logoleft->hide(); vboxLayout->addWidget(label_logoleft); label_logoright = new QLabel; - label_logoright->setPixmap(QPixmap(QString::fromUtf8(":/graphics/graphics/logo-140-100.png"))); + label_logoright->setPixmap(QPixmap(QString::fromUtf8(":/graphics/resources/graphics/logo-140-100.png"))); label_logoright->setAlignment(Qt::AlignRight); label_logoright->hide(); vboxLayout3->addWidget(label_logoright); @@ -220,16 +225,16 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) pixmapLabel_card4b->setScaledContents(true); gridLayout31->addWidget(pixmapLabel_card4b, 0, 1, 1, 1); -// pixmapLabel_card4b->setPixmap(QPixmap(":/cards/graphics/cards/33.png"), FALSE); +// pixmapLabel_card4b->setPixmap(QPixmap(":/cards/resources/graphics/cards/33.png"), FALSE); //Flipside festlegen; - flipside = new QPixmap(":/cards/graphics/cards/flipside.png"); + flipside = new QPixmap(":/cards/resources/graphics/cards/flipside.png"); if (myConfig->readConfigInt("FlipsideOwn") && myConfig->readConfigString("FlipsideOwnFile") != "") { QPixmap tmpFlipside(QString::fromStdString(myConfig->readConfigString("FlipsideOwnFile"))); flipside = new QPixmap(tmpFlipside.scaled(QSize(57, 80))); } - else { flipside->load(":/cards/graphics/cards/flipside.png"); } + else { flipside->load(":/cards/resources/graphics/cards/flipside.png"); } //Flipside Animation noch nicht erledigt flipHolecardsAllInAlreadyDone = FALSE; @@ -681,7 +686,7 @@ void mainWindowImpl::callSettingsDialog() { QPixmap tmpFlipside(QString::fromStdString(myConfig->readConfigString("FlipsideOwnFile"))); flipside = new QPixmap(tmpFlipside.scaled(QSize(57, 80))); } - else { flipside->load(":/cards/graphics/cards/flipside.png"); } + else { flipside->load(":/cards/resources/graphics/cards/flipside.png"); } int i,j; @@ -716,8 +721,8 @@ void mainWindowImpl::refreshSet() { void mainWindowImpl::refreshButton() { - QPixmap dealerButton(":/graphics/graphics/dealerbutton.png"); - QPixmap onePix(":/graphics/graphics/1px.png"); + QPixmap dealerButton(":/graphics/resources/graphics/dealerbutton.png"); + QPixmap onePix(":/graphics/resources/graphics/1px.png"); int i; int k; @@ -768,7 +773,7 @@ void mainWindowImpl::refreshAction() { if (actualHand->getPlayerArray()[i]->getMyAction()==1) { groupBoxArray[i]->setDisabled(TRUE); - QPixmap onePix(":/graphics/graphics/1px.png"); + QPixmap onePix(":/graphics/resources/graphics/1px.png"); if(i != 0) { holeCardsArray[i][0]->setPixmap(onePix, FALSE); holeCardsArray[i][1]->setPixmap(onePix, FALSE); @@ -896,7 +901,7 @@ void mainWindowImpl::refreshPot() { void mainWindowImpl::dealHoleCards() { - QPixmap onePix(":/graphics/graphics/1px.png"); + QPixmap onePix(":/graphics/resources/graphics/1px.png"); //TempArrays QPixmap tempCardsPixmapArray[2]; @@ -909,7 +914,7 @@ void mainWindowImpl::dealHoleCards() { for(j=0; j<2; j++) { if(actualHand->getPlayerArray()[i]->getMyActiveStatus()) { if (debugMode) { - tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"); + tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"); holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j],FALSE); } @@ -932,7 +937,7 @@ void mainWindowImpl::dealHoleCards() { if(actualHand->getPlayerArray()[0]->getMyActiveStatus()) { - tempCardsPixmapArray[i].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[i], 10)+".png"); + tempCardsPixmapArray[i].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[i], 10)+".png"); holeCardsArray[0][i]->setPixmap(tempCardsPixmapArray[i], FALSE); } @@ -978,7 +983,7 @@ void mainWindowImpl::dealFlopCards4() { int tempBoardCardsArray[5]; QPixmap tempCardsPixmap; actualHand->getBoard()->getMyCards(tempBoardCardsArray); - tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[0], 10)+".png"); + tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[0], 10)+".png"); QPixmap card(tempCardsPixmap); //Config? mit oder ohne Eye-Candy? @@ -998,7 +1003,7 @@ void mainWindowImpl::dealFlopCards5() { int tempBoardCardsArray[5]; QPixmap tempCardsPixmap; actualHand->getBoard()->getMyCards(tempBoardCardsArray); - tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[1], 10)+".png"); + tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[1], 10)+".png"); QPixmap card(tempCardsPixmap); //Config? mit oder ohne Eye-Candy? @@ -1019,7 +1024,7 @@ void mainWindowImpl::dealFlopCards6() { int tempBoardCardsArray[5]; QPixmap tempCardsPixmap; actualHand->getBoard()->getMyCards(tempBoardCardsArray); - tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[2], 10)+".png"); + tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[2], 10)+".png"); QPixmap card(tempCardsPixmap); //Config? mit oder ohne Eye-Candy? @@ -1055,7 +1060,7 @@ void mainWindowImpl::dealTurnCards2() { int tempBoardCardsArray[5]; QPixmap tempCardsPixmap; actualHand->getBoard()->getMyCards(tempBoardCardsArray); - tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[3], 10)+".png"); + tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[3], 10)+".png"); QPixmap card(tempCardsPixmap); //Config? mit oder ohne Eye-Candy? @@ -1092,7 +1097,7 @@ void mainWindowImpl::dealRiverCards2() { int tempBoardCardsArray[5]; QPixmap tempCardsPixmap; actualHand->getBoard()->getMyCards(tempBoardCardsArray); - tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[4], 10)+".png"); + tempCardsPixmap.load(":/cards/resources/graphics/cards/"+QString::number(tempBoardCardsArray[4], 10)+".png"); QPixmap card(tempCardsPixmap); //Config? mit oder ohne Eye-Candy? @@ -1498,7 +1503,7 @@ void mainWindowImpl::postRiverRunAnimation2() { if(i) { for(j=0; j<2; j++) { - holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside); + holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside); } } //Karten umdrehen Loggen @@ -1524,7 +1529,7 @@ void mainWindowImpl::postRiverRunAnimation2() { if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) { if(i) { for(j=0; j<2; j++) { - tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"); + tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"); holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE); } @@ -1755,7 +1760,7 @@ void mainWindowImpl::flipHolecardsAllIn() { if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) { if(i) { for(j=0; j<2; j++) { - holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside); + holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/resources/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside); } } //Karten umdrehen Loggen @@ -1783,7 +1788,7 @@ void mainWindowImpl::flipHolecardsAllIn() { if(i) { for(j=0; j<2; j++) { - tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(temp2CardsIntArray[j], 10)+".png"); + tempCardsPixmapArray[j].load(":/cards/resources/graphics/cards/"+QString::number(temp2CardsIntArray[j], 10)+".png"); holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE); } } diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index 2c67094e..530151f4 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -22,8 +22,8 @@ StartSplash::StartSplash(mainWindowImpl *parent) : QSplashScreen(parent), myW(parent) { - QFontDatabase::addApplicationFont (":fonts/fonts/c059013l.pfb"); - QFontDatabase::addApplicationFont (":fonts/fonts/andybold.ttf"); + QFontDatabase::addApplicationFont (":fonts/resources/fonts/c059013l.pfb"); + QFontDatabase::addApplicationFont (":fonts/resources/fonts/andybold.ttf"); frameNo = 52; opacityCounter = 13; @@ -62,7 +62,7 @@ void StartSplash::paintEvent(QPaintEvent * event) { haveFont.setFamily("Andy MT"); haveFont.setPixelSize(36); - QPixmap logo(":/graphics/graphics/logo-140-100.png"); + QPixmap logo(":/graphics/resources/graphics/logo-140-100.png"); if(frameNo >= 52 && frameNo < 65) { diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc new file mode 100755 index 00000000..0729d5d9 --- /dev/null +++ b/src/gui/qt/resources.qrc @@ -0,0 +1,72 @@ + + + resources/graphics/cards/0.png + resources/graphics/cards/1.png + resources/graphics/cards/10.png + resources/graphics/cards/11.png + resources/graphics/cards/12.png + resources/graphics/cards/13.png + resources/graphics/cards/14.png + resources/graphics/cards/15.png + resources/graphics/cards/16.png + resources/graphics/cards/17.png + resources/graphics/cards/18.png + resources/graphics/cards/19.png + resources/graphics/cards/2.png + resources/graphics/cards/20.png + resources/graphics/cards/21.png + resources/graphics/cards/22.png + resources/graphics/cards/23.png + resources/graphics/cards/24.png + resources/graphics/cards/25.png + resources/graphics/cards/26.png + resources/graphics/cards/27.png + resources/graphics/cards/28.png + resources/graphics/cards/29.png + resources/graphics/cards/3.png + resources/graphics/cards/30.png + resources/graphics/cards/31.png + resources/graphics/cards/32.png + resources/graphics/cards/33.png + resources/graphics/cards/34.png + resources/graphics/cards/35.png + resources/graphics/cards/36.png + resources/graphics/cards/37.png + resources/graphics/cards/38.png + resources/graphics/cards/39.png + resources/graphics/cards/4.png + resources/graphics/cards/40.png + resources/graphics/cards/41.png + resources/graphics/cards/42.png + resources/graphics/cards/43.png + resources/graphics/cards/44.png + resources/graphics/cards/45.png + resources/graphics/cards/46.png + resources/graphics/cards/47.png + resources/graphics/cards/48.png + resources/graphics/cards/49.png + resources/graphics/cards/5.png + resources/graphics/cards/50.png + resources/graphics/cards/51.png + resources/graphics/cards/6.png + resources/graphics/cards/7.png + resources/graphics/cards/8.png + resources/graphics/cards/9.png + resources/graphics/cards/flipside.png + + + resources/data/preflopValues + + + resources/fonts/andybold.ttf + resources/fonts/c059013l.pfb + resources/fonts/n019003l.pfb + + + resources/graphics/1px.png + resources/graphics/dealerbutton.png + resources/graphics/fileopen16.png + resources/graphics/handRanking_release.png + resources/graphics/logo-140-100.png + + diff --git a/src/gui/qt/resources/data/preflopValues b/src/gui/qt/resources/data/preflopValues new file mode 100644 index 00000000..1581c205 --- /dev/null +++ b/src/gui/qt/resources/data/preflopValues @@ -0,0 +1,169 @@ +00000|0.392398|0.276545|0.212940|0.178564 +00010|0.341141|0.213735|0.153802|0.121123 +00011|0.374930|0.252093|0.194671|0.161691 +00020|0.351826|0.220031|0.160432|0.127509 +00021|0.385048|0.260354|0.200738|0.167674 +00030|0.362845|0.227411|0.167515|0.132691 +00031|0.393682|0.265876|0.207630|0.172295 +00040|0.364174|0.220155|0.158920|0.124233 +00041|0.395005|0.261673|0.199692|0.165581 +00050|0.368042|0.220327|0.157511|0.119645 +00051|0.403993|0.258386|0.197324|0.159935 +00060|0.389178|0.234286|0.164548|0.126870 +00061|0.418772|0.270658|0.204814|0.167860 +00070|0.411282|0.248507|0.175819|0.133796 +00071|0.441392|0.285024|0.216091|0.174384 +00080|0.440480|0.268060|0.190030|0.147938 +00081|0.467023|0.302555|0.231871|0.188436 +00090|0.467598|0.292983|0.206409|0.159414 +00091|0.492893|0.327706|0.247315|0.200483 +00100|0.500946|0.321231|0.229723|0.176626 +00101|0.523507|0.354234|0.266130|0.216512 +00110|0.546298|0.361122|0.262676|0.202235 +00111|0.564731|0.391539|0.300782|0.241582 +00120|0.612210|0.437722|0.333962|0.266613 +00121|0.631711|0.466625|0.370526|0.302552 +01010|0.425249|0.294167|0.227440|0.189070 +01020|0.368338|0.236502|0.175148|0.141144 +01021|0.398522|0.274875|0.213918|0.181193 +01030|0.380584|0.244160|0.183336|0.148602 +01031|0.411600|0.280911|0.221748|0.185122 +01040|0.379182|0.238104|0.174768|0.138399 +01041|0.410886|0.274157|0.214447|0.178769 +01050|0.388704|0.236244|0.169994|0.133749 +01051|0.416815|0.269452|0.210729|0.172591 +01060|0.396943|0.237112|0.169488|0.130860 +01061|0.425483|0.274880|0.208163|0.171587 +01070|0.421637|0.255125|0.181848|0.138975 +01071|0.447019|0.291320|0.219969|0.180664 +01080|0.448126|0.274144|0.196289|0.151646 +01081|0.473606|0.310826|0.235919|0.190739 +01090|0.478501|0.298148|0.212041|0.163683 +01091|0.504431|0.333231|0.251471|0.204792 +01100|0.510525|0.327482|0.234555|0.180396 +01101|0.532065|0.360810|0.270922|0.220332 +01110|0.553686|0.367362|0.268589|0.207489 +01111|0.576153|0.400387|0.303690|0.247722 +01120|0.621342|0.446336|0.343233|0.273911 +01121|0.637968|0.474715|0.373390|0.310121 +02020|0.458947|0.313939|0.242610|0.200423 +02030|0.398033|0.259838|0.198458|0.161070 +02031|0.425525|0.293960|0.235756|0.199501 +02040|0.397817|0.255376|0.190636|0.154640 +02041|0.425873|0.292207|0.228006|0.194654 +02050|0.405126|0.253793|0.186274|0.148799 +02051|0.434334|0.290140|0.224181|0.187256 +02060|0.415893|0.254033|0.183065|0.144964 +02061|0.442020|0.289907|0.223390|0.183388 +02070|0.431662|0.261557|0.186207|0.143897 +02071|0.458148|0.295690|0.221357|0.182633 +02080|0.458244|0.283182|0.202632|0.158355 +02081|0.485387|0.317359|0.244065|0.197194 +02090|0.486843|0.305900|0.219227|0.169682 +02091|0.509158|0.336822|0.255117|0.209493 +02100|0.520532|0.334651|0.241959|0.186116 +02101|0.544106|0.367181|0.277500|0.224167 +02110|0.562867|0.376359|0.275377|0.213308 +02111|0.583419|0.408087|0.311465|0.251205 +02120|0.631754|0.455162|0.349977|0.281266 +02121|0.647554|0.478675|0.382699|0.318028 +03030|0.491574|0.334918|0.260822|0.215129 +03040|0.415659|0.266638|0.203475|0.168118 +03041|0.440987|0.306280|0.241409|0.206000 +03050|0.420281|0.269759|0.202282|0.163709 +03051|0.446296|0.302118|0.239135|0.202622 +03060|0.434861|0.270280|0.199293|0.158721 +03061|0.457776|0.306309|0.238337|0.200351 +03070|0.445102|0.275557|0.201226|0.157838 +03071|0.471762|0.310139|0.239625|0.197345 +03080|0.468139|0.289426|0.208934|0.162483 +03081|0.491828|0.325417|0.244964|0.199125 +03090|0.499743|0.313642|0.227720|0.176322 +03091|0.521336|0.347760|0.262093|0.214462 +03100|0.534472|0.344431|0.248543|0.193602 +03101|0.553252|0.374123|0.284209|0.232423 +03110|0.573378|0.384744|0.283403|0.220253 +03111|0.588956|0.415055|0.318031|0.259790 +03120|0.641023|0.464428|0.359995|0.290579 +03121|0.657020|0.489627|0.389187|0.322193 +04040|0.516006|0.359183|0.277032|0.228881 +04050|0.435729|0.282211|0.212923|0.174751 +04051|0.462412|0.313824|0.249562|0.212472 +04060|0.447638|0.285155|0.212276|0.172773 +04061|0.470266|0.319709|0.250671|0.208987 +04070|0.460265|0.288142|0.213646|0.171749 +04071|0.487225|0.324893|0.250578|0.208518 +04080|0.482136|0.303300|0.219496|0.173420 +04081|0.502701|0.334032|0.255191|0.211497 +04090|0.504535|0.319118|0.230051|0.180925 +04091|0.530570|0.355567|0.265668|0.219096 +04100|0.539041|0.348698|0.254279|0.198336 +04101|0.560032|0.381288|0.289776|0.233638 +04110|0.582704|0.393881|0.290373|0.226942 +04111|0.598407|0.422241|0.321170|0.263919 +04120|0.642734|0.464127|0.357691|0.287758 +04121|0.659588|0.488409|0.390229|0.321964 +05050|0.549268|0.382451|0.297085|0.244325 +05060|0.461289|0.298799|0.224119|0.184892 +05061|0.485634|0.330149|0.263757|0.223014 +05070|0.473494|0.303907|0.228508|0.183815 +05071|0.499667|0.340404|0.266624|0.219160 +05080|0.497160|0.318137|0.235993|0.189195 +05081|0.519271|0.346657|0.273157|0.225601 +05090|0.519085|0.333791|0.244852|0.193839 +05091|0.545203|0.363052|0.280410|0.228881 +05100|0.548230|0.359064|0.263356|0.204509 +05101|0.565488|0.387187|0.295925|0.242237 +05110|0.591864|0.402174|0.298403|0.235400 +05111|0.608657|0.431376|0.331219|0.269897 +05120|0.652519|0.476460|0.368421|0.296733 +05121|0.666606|0.497720|0.396138|0.331399 +06060|0.572002|0.405822|0.316323|0.263300 +06070|0.490941|0.317838|0.241244|0.198071 +06071|0.511400|0.351731|0.277871|0.233745 +06080|0.513155|0.333109|0.251517|0.203524 +06081|0.534313|0.364968|0.284903|0.239425 +06090|0.535497|0.351791|0.262208|0.209001 +06091|0.555172|0.379223|0.294741|0.242575 +06100|0.564425|0.375204|0.277724|0.220820 +06101|0.585780|0.404858|0.309063|0.255885 +06110|0.601187|0.412856|0.307546|0.243076 +06111|0.619748|0.439626|0.340543|0.278683 +06120|0.663506|0.484994|0.379012|0.308522 +06121|0.672680|0.508199|0.406539|0.338819 +07070|0.602459|0.432679|0.339776|0.280706 +07080|0.525674|0.349554|0.266348|0.218304 +07081|0.546982|0.380494|0.299939|0.252933 +07090|0.550741|0.367646|0.277965|0.224762 +07091|0.570817|0.396292|0.308852|0.257872 +07100|0.578107|0.392576|0.296196|0.237797 +07101|0.597385|0.417610|0.325814|0.269943 +07110|0.616725|0.429318|0.326413|0.260805 +07111|0.633622|0.455894|0.358718|0.295226 +07120|0.673638|0.496498|0.389773|0.317947 +07121|0.685843|0.518038|0.416296|0.347696 +08080|0.633155|0.462777|0.368277|0.305162 +08090|0.569903|0.386443|0.299307|0.246643 +08091|0.582209|0.415800|0.328378|0.277974 +08100|0.597204|0.413220|0.317080|0.258892 +08101|0.612997|0.437354|0.344853|0.288854 +08110|0.632288|0.447764|0.345514|0.281554 +08111|0.651514|0.473083|0.372330|0.311285 +08120|0.689345|0.516179|0.410605|0.339648 +08121|0.700118|0.537866|0.439058|0.369618 +09090|0.660660|0.495556|0.396267|0.332142 +09100|0.606741|0.425296|0.327092|0.266201 +09101|0.626335|0.449237|0.357001|0.298544 +09110|0.645998|0.460582|0.357830|0.289691 +09111|0.657509|0.486536|0.383815|0.322174 +09120|0.699304|0.529890|0.420874|0.350739 +09121|0.711152|0.550163|0.444167|0.379029 +10100|0.698831|0.534374|0.436462|0.369034 +10110|0.660376|0.479650|0.373328|0.304814 +10111|0.677518|0.502799|0.401653|0.334030 +10120|0.718249|0.550870|0.440722|0.365350 +10121|0.732486|0.566302|0.463868|0.391412 +11110|0.757306|0.604317|0.501322|0.428978 +11120|0.745230|0.580949|0.472283|0.393985 +11121|0.754219|0.599772|0.495033|0.416241 +12120|0.855608|0.736617|0.642366|0.562044 diff --git a/src/gui/qt/fonts/andybold.ttf b/src/gui/qt/resources/fonts/andybold.ttf similarity index 100% rename from src/gui/qt/fonts/andybold.ttf rename to src/gui/qt/resources/fonts/andybold.ttf diff --git a/src/gui/qt/fonts/c059013l.pfb b/src/gui/qt/resources/fonts/c059013l.pfb similarity index 100% rename from src/gui/qt/fonts/c059013l.pfb rename to src/gui/qt/resources/fonts/c059013l.pfb diff --git a/src/gui/qt/fonts/n019003l.pfb b/src/gui/qt/resources/fonts/n019003l.pfb similarity index 100% rename from src/gui/qt/fonts/n019003l.pfb rename to src/gui/qt/resources/fonts/n019003l.pfb diff --git a/src/gui/qt/graphics/1px.png b/src/gui/qt/resources/graphics/1px.png similarity index 100% rename from src/gui/qt/graphics/1px.png rename to src/gui/qt/resources/graphics/1px.png diff --git a/src/gui/qt/graphics/cards/0.png b/src/gui/qt/resources/graphics/cards/0.png similarity index 100% rename from src/gui/qt/graphics/cards/0.png rename to src/gui/qt/resources/graphics/cards/0.png diff --git a/src/gui/qt/graphics/cards/1.png b/src/gui/qt/resources/graphics/cards/1.png similarity index 100% rename from src/gui/qt/graphics/cards/1.png rename to src/gui/qt/resources/graphics/cards/1.png diff --git a/src/gui/qt/graphics/cards/10.png b/src/gui/qt/resources/graphics/cards/10.png similarity index 100% rename from src/gui/qt/graphics/cards/10.png rename to src/gui/qt/resources/graphics/cards/10.png diff --git a/src/gui/qt/graphics/cards/11.png b/src/gui/qt/resources/graphics/cards/11.png similarity index 100% rename from src/gui/qt/graphics/cards/11.png rename to src/gui/qt/resources/graphics/cards/11.png diff --git a/src/gui/qt/graphics/cards/12.png b/src/gui/qt/resources/graphics/cards/12.png similarity index 100% rename from src/gui/qt/graphics/cards/12.png rename to src/gui/qt/resources/graphics/cards/12.png diff --git a/src/gui/qt/graphics/cards/13.png b/src/gui/qt/resources/graphics/cards/13.png similarity index 100% rename from src/gui/qt/graphics/cards/13.png rename to src/gui/qt/resources/graphics/cards/13.png diff --git a/src/gui/qt/graphics/cards/14.png b/src/gui/qt/resources/graphics/cards/14.png similarity index 100% rename from src/gui/qt/graphics/cards/14.png rename to src/gui/qt/resources/graphics/cards/14.png diff --git a/src/gui/qt/graphics/cards/15.png b/src/gui/qt/resources/graphics/cards/15.png similarity index 100% rename from src/gui/qt/graphics/cards/15.png rename to src/gui/qt/resources/graphics/cards/15.png diff --git a/src/gui/qt/graphics/cards/16.png b/src/gui/qt/resources/graphics/cards/16.png similarity index 100% rename from src/gui/qt/graphics/cards/16.png rename to src/gui/qt/resources/graphics/cards/16.png diff --git a/src/gui/qt/graphics/cards/17.png b/src/gui/qt/resources/graphics/cards/17.png similarity index 100% rename from src/gui/qt/graphics/cards/17.png rename to src/gui/qt/resources/graphics/cards/17.png diff --git a/src/gui/qt/graphics/cards/18.png b/src/gui/qt/resources/graphics/cards/18.png similarity index 100% rename from src/gui/qt/graphics/cards/18.png rename to src/gui/qt/resources/graphics/cards/18.png diff --git a/src/gui/qt/graphics/cards/19.png b/src/gui/qt/resources/graphics/cards/19.png similarity index 100% rename from src/gui/qt/graphics/cards/19.png rename to src/gui/qt/resources/graphics/cards/19.png diff --git a/src/gui/qt/graphics/cards/2.png b/src/gui/qt/resources/graphics/cards/2.png similarity index 100% rename from src/gui/qt/graphics/cards/2.png rename to src/gui/qt/resources/graphics/cards/2.png diff --git a/src/gui/qt/graphics/cards/20.png b/src/gui/qt/resources/graphics/cards/20.png similarity index 100% rename from src/gui/qt/graphics/cards/20.png rename to src/gui/qt/resources/graphics/cards/20.png diff --git a/src/gui/qt/graphics/cards/21.png b/src/gui/qt/resources/graphics/cards/21.png similarity index 100% rename from src/gui/qt/graphics/cards/21.png rename to src/gui/qt/resources/graphics/cards/21.png diff --git a/src/gui/qt/graphics/cards/22.png b/src/gui/qt/resources/graphics/cards/22.png similarity index 100% rename from src/gui/qt/graphics/cards/22.png rename to src/gui/qt/resources/graphics/cards/22.png diff --git a/src/gui/qt/graphics/cards/23.png b/src/gui/qt/resources/graphics/cards/23.png similarity index 100% rename from src/gui/qt/graphics/cards/23.png rename to src/gui/qt/resources/graphics/cards/23.png diff --git a/src/gui/qt/graphics/cards/24.png b/src/gui/qt/resources/graphics/cards/24.png similarity index 100% rename from src/gui/qt/graphics/cards/24.png rename to src/gui/qt/resources/graphics/cards/24.png diff --git a/src/gui/qt/graphics/cards/25.png b/src/gui/qt/resources/graphics/cards/25.png similarity index 100% rename from src/gui/qt/graphics/cards/25.png rename to src/gui/qt/resources/graphics/cards/25.png diff --git a/src/gui/qt/graphics/cards/26.png b/src/gui/qt/resources/graphics/cards/26.png similarity index 100% rename from src/gui/qt/graphics/cards/26.png rename to src/gui/qt/resources/graphics/cards/26.png diff --git a/src/gui/qt/graphics/cards/27.png b/src/gui/qt/resources/graphics/cards/27.png similarity index 100% rename from src/gui/qt/graphics/cards/27.png rename to src/gui/qt/resources/graphics/cards/27.png diff --git a/src/gui/qt/graphics/cards/28.png b/src/gui/qt/resources/graphics/cards/28.png similarity index 100% rename from src/gui/qt/graphics/cards/28.png rename to src/gui/qt/resources/graphics/cards/28.png diff --git a/src/gui/qt/graphics/cards/29.png b/src/gui/qt/resources/graphics/cards/29.png similarity index 100% rename from src/gui/qt/graphics/cards/29.png rename to src/gui/qt/resources/graphics/cards/29.png diff --git a/src/gui/qt/graphics/cards/3.png b/src/gui/qt/resources/graphics/cards/3.png similarity index 100% rename from src/gui/qt/graphics/cards/3.png rename to src/gui/qt/resources/graphics/cards/3.png diff --git a/src/gui/qt/graphics/cards/30.png b/src/gui/qt/resources/graphics/cards/30.png similarity index 100% rename from src/gui/qt/graphics/cards/30.png rename to src/gui/qt/resources/graphics/cards/30.png diff --git a/src/gui/qt/graphics/cards/31.png b/src/gui/qt/resources/graphics/cards/31.png similarity index 100% rename from src/gui/qt/graphics/cards/31.png rename to src/gui/qt/resources/graphics/cards/31.png diff --git a/src/gui/qt/graphics/cards/32.png b/src/gui/qt/resources/graphics/cards/32.png similarity index 100% rename from src/gui/qt/graphics/cards/32.png rename to src/gui/qt/resources/graphics/cards/32.png diff --git a/src/gui/qt/graphics/cards/33.png b/src/gui/qt/resources/graphics/cards/33.png similarity index 100% rename from src/gui/qt/graphics/cards/33.png rename to src/gui/qt/resources/graphics/cards/33.png diff --git a/src/gui/qt/graphics/cards/34.png b/src/gui/qt/resources/graphics/cards/34.png similarity index 100% rename from src/gui/qt/graphics/cards/34.png rename to src/gui/qt/resources/graphics/cards/34.png diff --git a/src/gui/qt/graphics/cards/35.png b/src/gui/qt/resources/graphics/cards/35.png similarity index 100% rename from src/gui/qt/graphics/cards/35.png rename to src/gui/qt/resources/graphics/cards/35.png diff --git a/src/gui/qt/graphics/cards/36.png b/src/gui/qt/resources/graphics/cards/36.png similarity index 100% rename from src/gui/qt/graphics/cards/36.png rename to src/gui/qt/resources/graphics/cards/36.png diff --git a/src/gui/qt/graphics/cards/37.png b/src/gui/qt/resources/graphics/cards/37.png similarity index 100% rename from src/gui/qt/graphics/cards/37.png rename to src/gui/qt/resources/graphics/cards/37.png diff --git a/src/gui/qt/graphics/cards/38.png b/src/gui/qt/resources/graphics/cards/38.png similarity index 100% rename from src/gui/qt/graphics/cards/38.png rename to src/gui/qt/resources/graphics/cards/38.png diff --git a/src/gui/qt/graphics/cards/39.png b/src/gui/qt/resources/graphics/cards/39.png similarity index 100% rename from src/gui/qt/graphics/cards/39.png rename to src/gui/qt/resources/graphics/cards/39.png diff --git a/src/gui/qt/graphics/cards/4.png b/src/gui/qt/resources/graphics/cards/4.png similarity index 100% rename from src/gui/qt/graphics/cards/4.png rename to src/gui/qt/resources/graphics/cards/4.png diff --git a/src/gui/qt/graphics/cards/40.png b/src/gui/qt/resources/graphics/cards/40.png similarity index 100% rename from src/gui/qt/graphics/cards/40.png rename to src/gui/qt/resources/graphics/cards/40.png diff --git a/src/gui/qt/graphics/cards/41.png b/src/gui/qt/resources/graphics/cards/41.png similarity index 100% rename from src/gui/qt/graphics/cards/41.png rename to src/gui/qt/resources/graphics/cards/41.png diff --git a/src/gui/qt/graphics/cards/42.png b/src/gui/qt/resources/graphics/cards/42.png similarity index 100% rename from src/gui/qt/graphics/cards/42.png rename to src/gui/qt/resources/graphics/cards/42.png diff --git a/src/gui/qt/graphics/cards/43.png b/src/gui/qt/resources/graphics/cards/43.png similarity index 100% rename from src/gui/qt/graphics/cards/43.png rename to src/gui/qt/resources/graphics/cards/43.png diff --git a/src/gui/qt/graphics/cards/44.png b/src/gui/qt/resources/graphics/cards/44.png similarity index 100% rename from src/gui/qt/graphics/cards/44.png rename to src/gui/qt/resources/graphics/cards/44.png diff --git a/src/gui/qt/graphics/cards/45.png b/src/gui/qt/resources/graphics/cards/45.png similarity index 100% rename from src/gui/qt/graphics/cards/45.png rename to src/gui/qt/resources/graphics/cards/45.png diff --git a/src/gui/qt/graphics/cards/46.png b/src/gui/qt/resources/graphics/cards/46.png similarity index 100% rename from src/gui/qt/graphics/cards/46.png rename to src/gui/qt/resources/graphics/cards/46.png diff --git a/src/gui/qt/graphics/cards/47.png b/src/gui/qt/resources/graphics/cards/47.png similarity index 100% rename from src/gui/qt/graphics/cards/47.png rename to src/gui/qt/resources/graphics/cards/47.png diff --git a/src/gui/qt/graphics/cards/48.png b/src/gui/qt/resources/graphics/cards/48.png similarity index 100% rename from src/gui/qt/graphics/cards/48.png rename to src/gui/qt/resources/graphics/cards/48.png diff --git a/src/gui/qt/graphics/cards/49.png b/src/gui/qt/resources/graphics/cards/49.png similarity index 100% rename from src/gui/qt/graphics/cards/49.png rename to src/gui/qt/resources/graphics/cards/49.png diff --git a/src/gui/qt/graphics/cards/5.png b/src/gui/qt/resources/graphics/cards/5.png similarity index 100% rename from src/gui/qt/graphics/cards/5.png rename to src/gui/qt/resources/graphics/cards/5.png diff --git a/src/gui/qt/graphics/cards/50.png b/src/gui/qt/resources/graphics/cards/50.png similarity index 100% rename from src/gui/qt/graphics/cards/50.png rename to src/gui/qt/resources/graphics/cards/50.png diff --git a/src/gui/qt/graphics/cards/51.png b/src/gui/qt/resources/graphics/cards/51.png similarity index 100% rename from src/gui/qt/graphics/cards/51.png rename to src/gui/qt/resources/graphics/cards/51.png diff --git a/src/gui/qt/graphics/cards/6.png b/src/gui/qt/resources/graphics/cards/6.png similarity index 100% rename from src/gui/qt/graphics/cards/6.png rename to src/gui/qt/resources/graphics/cards/6.png diff --git a/src/gui/qt/graphics/cards/7.png b/src/gui/qt/resources/graphics/cards/7.png similarity index 100% rename from src/gui/qt/graphics/cards/7.png rename to src/gui/qt/resources/graphics/cards/7.png diff --git a/src/gui/qt/graphics/cards/8.png b/src/gui/qt/resources/graphics/cards/8.png similarity index 100% rename from src/gui/qt/graphics/cards/8.png rename to src/gui/qt/resources/graphics/cards/8.png diff --git a/src/gui/qt/graphics/cards/9.png b/src/gui/qt/resources/graphics/cards/9.png similarity index 100% rename from src/gui/qt/graphics/cards/9.png rename to src/gui/qt/resources/graphics/cards/9.png diff --git a/src/gui/qt/graphics/cards/flipside.png b/src/gui/qt/resources/graphics/cards/flipside.png similarity index 100% rename from src/gui/qt/graphics/cards/flipside.png rename to src/gui/qt/resources/graphics/cards/flipside.png diff --git a/src/gui/qt/graphics/dealerbutton.png b/src/gui/qt/resources/graphics/dealerbutton.png similarity index 100% rename from src/gui/qt/graphics/dealerbutton.png rename to src/gui/qt/resources/graphics/dealerbutton.png diff --git a/src/gui/qt/graphics/dealerbutton.xcf b/src/gui/qt/resources/graphics/dealerbutton.xcf similarity index 100% rename from src/gui/qt/graphics/dealerbutton.xcf rename to src/gui/qt/resources/graphics/dealerbutton.xcf diff --git a/src/gui/qt/graphics/fileopen16.png b/src/gui/qt/resources/graphics/fileopen16.png similarity index 100% rename from src/gui/qt/graphics/fileopen16.png rename to src/gui/qt/resources/graphics/fileopen16.png diff --git a/src/gui/qt/graphics/handRanking_release.png b/src/gui/qt/resources/graphics/handRanking_release.png similarity index 100% rename from src/gui/qt/graphics/handRanking_release.png rename to src/gui/qt/resources/graphics/handRanking_release.png diff --git a/src/gui/qt/graphics/logo-140-100.png b/src/gui/qt/resources/graphics/logo-140-100.png similarity index 100% rename from src/gui/qt/graphics/logo-140-100.png rename to src/gui/qt/resources/graphics/logo-140-100.png diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui index eb524091..7e1c03b7 100644 --- a/src/gui/qt/settingsdialog.ui +++ b/src/gui/qt/settingsdialog.ui @@ -5,8 +5,8 @@ 0 0 - 544 - 381 + 579 + 382 @@ -140,7 +140,7 @@ - :/graphics/graphics/fileopen16.png + :/graphics/resources/graphics/fileopen16.png @@ -741,7 +741,7 @@ p, li { white-space: pre-wrap; } - :/graphics/graphics/fileopen16.png + :/graphics/resources/graphics/fileopen16.png @@ -830,7 +830,7 @@ p, li { white-space: pre-wrap; } buttonBox - + @@ -840,8 +840,8 @@ p, li { white-space: pre-wrap; } reject() - 304 - 339 + 313 + 372 286 @@ -865,5 +865,37 @@ p, li { white-space: pre-wrap; } + + radioButton_flipsideOwn + toggled(bool) + lineEdit_OwnFlipsideFilename + setEnabled(bool) + + + 212 + 268 + + + 438 + 267 + + + + + radioButton_flipsideOwn + toggled(bool) + pushButton_openFlipsidePicture + setEnabled(bool) + + + 225 + 270 + + + 533 + 261 + + + diff --git a/src/pokerth.cpp b/src/pokerth.cpp index f6aa56d6..ca22d92d 100755 --- a/src/pokerth.cpp +++ b/src/pokerth.cpp @@ -64,7 +64,7 @@ int main( int argc, char **argv ) /////// can be removed for non-qt-guis //////////// QApplication a( argc, argv ); a.setStyle(new QPlastiqueStyle); - Q_INIT_RESOURCE(deck); + Q_INIT_RESOURCE(resources); /////////////////////////////////////////////////// GuiInterface *myGuiInterface = new GuiWrapper();