diff --git a/src/gui/qt/resources/graphics/cards/0.png b/data/gfx/cards/default/0.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/0.png rename to data/gfx/cards/default/0.png diff --git a/src/gui/qt/resources/graphics/cards/1.png b/data/gfx/cards/default/1.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/1.png rename to data/gfx/cards/default/1.png diff --git a/src/gui/qt/resources/graphics/cards/10.png b/data/gfx/cards/default/10.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/10.png rename to data/gfx/cards/default/10.png diff --git a/src/gui/qt/resources/graphics/cards/11.png b/data/gfx/cards/default/11.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/11.png rename to data/gfx/cards/default/11.png diff --git a/src/gui/qt/resources/graphics/cards/12.png b/data/gfx/cards/default/12.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/12.png rename to data/gfx/cards/default/12.png diff --git a/src/gui/qt/resources/graphics/cards/13.png b/data/gfx/cards/default/13.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/13.png rename to data/gfx/cards/default/13.png diff --git a/src/gui/qt/resources/graphics/cards/14.png b/data/gfx/cards/default/14.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/14.png rename to data/gfx/cards/default/14.png diff --git a/src/gui/qt/resources/graphics/cards/15.png b/data/gfx/cards/default/15.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/15.png rename to data/gfx/cards/default/15.png diff --git a/src/gui/qt/resources/graphics/cards/16.png b/data/gfx/cards/default/16.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/16.png rename to data/gfx/cards/default/16.png diff --git a/src/gui/qt/resources/graphics/cards/17.png b/data/gfx/cards/default/17.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/17.png rename to data/gfx/cards/default/17.png diff --git a/src/gui/qt/resources/graphics/cards/18.png b/data/gfx/cards/default/18.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/18.png rename to data/gfx/cards/default/18.png diff --git a/src/gui/qt/resources/graphics/cards/19.png b/data/gfx/cards/default/19.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/19.png rename to data/gfx/cards/default/19.png diff --git a/src/gui/qt/resources/graphics/cards/2.png b/data/gfx/cards/default/2.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/2.png rename to data/gfx/cards/default/2.png diff --git a/src/gui/qt/resources/graphics/cards/20.png b/data/gfx/cards/default/20.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/20.png rename to data/gfx/cards/default/20.png diff --git a/src/gui/qt/resources/graphics/cards/21.png b/data/gfx/cards/default/21.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/21.png rename to data/gfx/cards/default/21.png diff --git a/src/gui/qt/resources/graphics/cards/22.png b/data/gfx/cards/default/22.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/22.png rename to data/gfx/cards/default/22.png diff --git a/src/gui/qt/resources/graphics/cards/23.png b/data/gfx/cards/default/23.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/23.png rename to data/gfx/cards/default/23.png diff --git a/src/gui/qt/resources/graphics/cards/24.png b/data/gfx/cards/default/24.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/24.png rename to data/gfx/cards/default/24.png diff --git a/src/gui/qt/resources/graphics/cards/25.png b/data/gfx/cards/default/25.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/25.png rename to data/gfx/cards/default/25.png diff --git a/src/gui/qt/resources/graphics/cards/26.png b/data/gfx/cards/default/26.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/26.png rename to data/gfx/cards/default/26.png diff --git a/src/gui/qt/resources/graphics/cards/27.png b/data/gfx/cards/default/27.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/27.png rename to data/gfx/cards/default/27.png diff --git a/src/gui/qt/resources/graphics/cards/28.png b/data/gfx/cards/default/28.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/28.png rename to data/gfx/cards/default/28.png diff --git a/src/gui/qt/resources/graphics/cards/29.png b/data/gfx/cards/default/29.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/29.png rename to data/gfx/cards/default/29.png diff --git a/src/gui/qt/resources/graphics/cards/3.png b/data/gfx/cards/default/3.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/3.png rename to data/gfx/cards/default/3.png diff --git a/src/gui/qt/resources/graphics/cards/30.png b/data/gfx/cards/default/30.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/30.png rename to data/gfx/cards/default/30.png diff --git a/src/gui/qt/resources/graphics/cards/31.png b/data/gfx/cards/default/31.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/31.png rename to data/gfx/cards/default/31.png diff --git a/src/gui/qt/resources/graphics/cards/32.png b/data/gfx/cards/default/32.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/32.png rename to data/gfx/cards/default/32.png diff --git a/src/gui/qt/resources/graphics/cards/33.png b/data/gfx/cards/default/33.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/33.png rename to data/gfx/cards/default/33.png diff --git a/src/gui/qt/resources/graphics/cards/34.png b/data/gfx/cards/default/34.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/34.png rename to data/gfx/cards/default/34.png diff --git a/src/gui/qt/resources/graphics/cards/35.png b/data/gfx/cards/default/35.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/35.png rename to data/gfx/cards/default/35.png diff --git a/src/gui/qt/resources/graphics/cards/36.png b/data/gfx/cards/default/36.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/36.png rename to data/gfx/cards/default/36.png diff --git a/src/gui/qt/resources/graphics/cards/37.png b/data/gfx/cards/default/37.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/37.png rename to data/gfx/cards/default/37.png diff --git a/src/gui/qt/resources/graphics/cards/38.png b/data/gfx/cards/default/38.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/38.png rename to data/gfx/cards/default/38.png diff --git a/src/gui/qt/resources/graphics/cards/39.png b/data/gfx/cards/default/39.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/39.png rename to data/gfx/cards/default/39.png diff --git a/src/gui/qt/resources/graphics/cards/4.png b/data/gfx/cards/default/4.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/4.png rename to data/gfx/cards/default/4.png diff --git a/src/gui/qt/resources/graphics/cards/40.png b/data/gfx/cards/default/40.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/40.png rename to data/gfx/cards/default/40.png diff --git a/src/gui/qt/resources/graphics/cards/41.png b/data/gfx/cards/default/41.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/41.png rename to data/gfx/cards/default/41.png diff --git a/src/gui/qt/resources/graphics/cards/42.png b/data/gfx/cards/default/42.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/42.png rename to data/gfx/cards/default/42.png diff --git a/src/gui/qt/resources/graphics/cards/43.png b/data/gfx/cards/default/43.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/43.png rename to data/gfx/cards/default/43.png diff --git a/src/gui/qt/resources/graphics/cards/44.png b/data/gfx/cards/default/44.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/44.png rename to data/gfx/cards/default/44.png diff --git a/src/gui/qt/resources/graphics/cards/45.png b/data/gfx/cards/default/45.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/45.png rename to data/gfx/cards/default/45.png diff --git a/src/gui/qt/resources/graphics/cards/46.png b/data/gfx/cards/default/46.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/46.png rename to data/gfx/cards/default/46.png diff --git a/src/gui/qt/resources/graphics/cards/47.png b/data/gfx/cards/default/47.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/47.png rename to data/gfx/cards/default/47.png diff --git a/src/gui/qt/resources/graphics/cards/48.png b/data/gfx/cards/default/48.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/48.png rename to data/gfx/cards/default/48.png diff --git a/src/gui/qt/resources/graphics/cards/49.png b/data/gfx/cards/default/49.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/49.png rename to data/gfx/cards/default/49.png diff --git a/src/gui/qt/resources/graphics/cards/5.png b/data/gfx/cards/default/5.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/5.png rename to data/gfx/cards/default/5.png diff --git a/src/gui/qt/resources/graphics/cards/50.png b/data/gfx/cards/default/50.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/50.png rename to data/gfx/cards/default/50.png diff --git a/src/gui/qt/resources/graphics/cards/51.png b/data/gfx/cards/default/51.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/51.png rename to data/gfx/cards/default/51.png diff --git a/src/gui/qt/resources/graphics/cards/6.png b/data/gfx/cards/default/6.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/6.png rename to data/gfx/cards/default/6.png diff --git a/src/gui/qt/resources/graphics/cards/7.png b/data/gfx/cards/default/7.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/7.png rename to data/gfx/cards/default/7.png diff --git a/src/gui/qt/resources/graphics/cards/8.png b/data/gfx/cards/default/8.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/8.png rename to data/gfx/cards/default/8.png diff --git a/src/gui/qt/resources/graphics/cards/9.png b/data/gfx/cards/default/9.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/9.png rename to data/gfx/cards/default/9.png diff --git a/src/gui/qt/resources/graphics/cards/flipside.png b/data/gfx/cards/default/flipside.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/flipside.png rename to data/gfx/cards/default/flipside.png diff --git a/src/gui/qt/resources/graphics/cards/flipside_tux.png b/data/gfx/cards/default/flipside_tux.png similarity index 100% rename from src/gui/qt/resources/graphics/cards/flipside_tux.png rename to data/gfx/cards/default/flipside_tux.png diff --git a/src/engine/local_engine/localbero.h b/src/engine/local_engine/localbero.h index 111714f9..48de15ba 100644 --- a/src/engine/local_engine/localbero.h +++ b/src/engine/local_engine/localbero.h @@ -14,6 +14,7 @@ #include +#include "game_defs.h" #include "berointerface.h" #include "handinterface.h" diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp index 32705d60..33141a10 100644 --- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp +++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp @@ -34,6 +34,8 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(QWidget *parent, ConfigFile *c) treeWidget_GameList->setColumnWidth(0,250); treeWidget_GameList->setColumnWidth(1,75); treeWidget_GameList->setColumnWidth(2,70); + + lineEdit_ChatInput->setFocus(); } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 76e391db..5ed345f3 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -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); } } diff --git a/src/gui/qt/mainwindow/mainwindowimpl.h b/src/gui/qt/mainwindow/mainwindowimpl.h index 884e7de1..82d00ffc 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.h +++ b/src/gui/qt/mainwindow/mainwindowimpl.h @@ -390,6 +390,9 @@ private: //Sound SDLPlayer *mySDLPlayer; + QtHelper *myQtHelper; + + int distributePotAnimCounter; //Speed diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index deb17d7c..2e9302db 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -22,13 +22,16 @@ 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; opacity = 1.0; - + QTimer *timer = new QTimer; connect(timer, SIGNAL(timeout()), this, SLOT(nextAnimationFrame())); timer->start(40); diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 9cd785a7..bb505f19 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -9,98 +9,6 @@ resources/graphics/actions/action_set.png resources/graphics/actions/action_winner.png - - resources/avatar/Catherine_russia.png - resources/avatar/Columbus.png - resources/avatar/Elisabeth1.png - resources/avatar/George_Washington.png - resources/avatar/James_Watt.png - resources/avatar/Louis_XIV.png - resources/avatar/Martin_Luther_King.png - resources/avatar/Mona_Lisa.png - resources/avatar/Napoleon.png - resources/avatar/PopeInnocentX.png - resources/avatar/Pope_Clement_VII.png - resources/avatar/Sissi.png - resources/avatar/albert_einstein.png - resources/avatar/bach.png - resources/avatar/mozart.png - resources/avatar/clipart1.png - resources/avatar/goethe.png - resources/avatar/linus.png - resources/avatar/marc.png - resources/avatar/Kapitan.png - resources/avatar/benedikt.png - resources/avatar/lotodore.png - resources/avatar/viktoria.png - resources/avatar/felix.png - resources/avatar/florian.png - - - 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/flopValues - resources/data/preflopValues - - - resources/fonts/VeraBd.ttf - resources/fonts/andybold.ttf - resources/fonts/c059013l.pfb - resources/fonts/n019003l.pfb - resources/graphics/1px.png resources/graphics/bigblindPuck.png @@ -126,32 +34,4 @@ resources/guiv2/playeraction_07.png resources/guiv2/table.png - - resources/sounds/call.wav - resources/sounds/dealtwocards.wav - resources/sounds/raise.wav - resources/sounds/bet.wav - resources/sounds/allin.wav - resources/sounds/check.wav - resources/sounds/fold.wav - resources/sounds/yourturn.wav - resources/sounds/playerconnected.wav - resources/sounds/onlinegameready.wav - - - resources/translations/pokerth_de.qm - resources/translations/pokerth_nl.qm - resources/translations/pokerth_es.qm - resources/translations/pokerth_ru.qm - resources/translations/pokerth_no.qm - resources/translations/pokerth_fr.qm - resources/translations/pokerth_sk.qm - resources/translations/pokerth_hu.qm - resources/translations/pokerth_ptbr.qm - resources/translations/pokerth_it.qm - resources/translations/qt_de.qm - resources/translations/qt_fr.qm - resources/translations/qt_es.qm - resources/translations/qt_ru.qm - diff --git a/src/gui/qt/resources/graphics/dealerbutton.png b/src/gui/qt/resources/graphics/dealerbutton.png deleted file mode 100644 index 4305d45c..00000000 Binary files a/src/gui/qt/resources/graphics/dealerbutton.png and /dev/null differ diff --git a/src/gui/qt/resources/graphics/dealerbutton.xcf b/src/gui/qt/resources/graphics/dealerbutton.xcf deleted file mode 100644 index 753bca4a..00000000 Binary files a/src/gui/qt/resources/graphics/dealerbutton.xcf and /dev/null differ diff --git a/src/gui/qt/resources/graphics/logo-140-100.png b/src/gui/qt/resources/graphics/logo-140-100.png deleted file mode 100644 index 6b52f144..00000000 Binary files a/src/gui/qt/resources/graphics/logo-140-100.png and /dev/null differ