sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Browse Source
This commit is contained in:
doitux
2007-02-01 23:46:34 +00:00
parent 9331f8f17b
commit 4adb14a458
6 changed files with 100 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/deck.qrc
+55 -111
View File
@@ -1,5 +1,59 @@
<RCC>
<qresource prefix="/cards" />
<qresource prefix="/cards" >
<file>graphics/cards/0.png</file>
<file>graphics/cards/1.png</file>
<file>graphics/cards/10.png</file>
<file>graphics/cards/11.png</file>
<file>graphics/cards/12.png</file>
<file>graphics/cards/13.png</file>
<file>graphics/cards/14.png</file>
<file>graphics/cards/15.png</file>
<file>graphics/cards/16.png</file>
<file>graphics/cards/17.png</file>
<file>graphics/cards/18.png</file>
<file>graphics/cards/19.png</file>
<file>graphics/cards/2.png</file>
<file>graphics/cards/20.png</file>
<file>graphics/cards/21.png</file>
<file>graphics/cards/22.png</file>
<file>graphics/cards/23.png</file>
<file>graphics/cards/24.png</file>
<file>graphics/cards/25.png</file>
<file>graphics/cards/26.png</file>
<file>graphics/cards/27.png</file>
<file>graphics/cards/28.png</file>
<file>graphics/cards/29.png</file>
<file>graphics/cards/3.png</file>
<file>graphics/cards/30.png</file>
<file>graphics/cards/31.png</file>
<file>graphics/cards/32.png</file>
<file>graphics/cards/33.png</file>
<file>graphics/cards/34.png</file>
<file>graphics/cards/35.png</file>
<file>graphics/cards/36.png</file>
<file>graphics/cards/37.png</file>
<file>graphics/cards/38.png</file>
<file>graphics/cards/39.png</file>
<file>graphics/cards/4.png</file>
<file>graphics/cards/40.png</file>
<file>graphics/cards/41.png</file>
<file>graphics/cards/42.png</file>
<file>graphics/cards/43.png</file>
<file>graphics/cards/44.png</file>
<file>graphics/cards/45.png</file>
<file>graphics/cards/46.png</file>
<file>graphics/cards/47.png</file>
<file>graphics/cards/48.png</file>
<file>graphics/cards/49.png</file>
<file>graphics/cards/5.png</file>
<file>graphics/cards/50.png</file>
<file>graphics/cards/51.png</file>
<file>graphics/cards/6.png</file>
<file>graphics/cards/7.png</file>
<file>graphics/cards/8.png</file>
<file>graphics/cards/9.png</file>
<file>graphics/cards/flipside.png</file>
</qresource>
<qresource prefix="/fonts" >
<file>fonts/andybold.ttf</file>
<file>fonts/c059013l.pfb</file>
@@ -11,114 +65,4 @@
<file>graphics/fileopen16.png</file>
<file>graphics/logo-140-100.png</file>
</qresource>
<qresource prefix="/mycards" >
<file>graphics/cards/mycards/0.png</file>
<file>graphics/cards/mycards/1.png</file>
<file>graphics/cards/mycards/10.png</file>
<file>graphics/cards/mycards/11.png</file>
<file>graphics/cards/mycards/12.png</file>
<file>graphics/cards/mycards/13.png</file>
<file>graphics/cards/mycards/14.png</file>
<file>graphics/cards/mycards/15.png</file>
<file>graphics/cards/mycards/16.png</file>
<file>graphics/cards/mycards/17.png</file>
<file>graphics/cards/mycards/18.png</file>
<file>graphics/cards/mycards/19.png</file>
<file>graphics/cards/mycards/2.png</file>
<file>graphics/cards/mycards/20.png</file>
<file>graphics/cards/mycards/21.png</file>
<file>graphics/cards/mycards/22.png</file>
<file>graphics/cards/mycards/23.png</file>
<file>graphics/cards/mycards/24.png</file>
<file>graphics/cards/mycards/25.png</file>
<file>graphics/cards/mycards/26.png</file>
<file>graphics/cards/mycards/27.png</file>
<file>graphics/cards/mycards/28.png</file>
<file>graphics/cards/mycards/29.png</file>
<file>graphics/cards/mycards/3.png</file>
<file>graphics/cards/mycards/30.png</file>
<file>graphics/cards/mycards/31.png</file>
<file>graphics/cards/mycards/32.png</file>
<file>graphics/cards/mycards/33.png</file>
<file>graphics/cards/mycards/34.png</file>
<file>graphics/cards/mycards/35.png</file>
<file>graphics/cards/mycards/36.png</file>
<file>graphics/cards/mycards/37.png</file>
<file>graphics/cards/mycards/38.png</file>
<file>graphics/cards/mycards/39.png</file>
<file>graphics/cards/mycards/4.png</file>
<file>graphics/cards/mycards/40.png</file>
<file>graphics/cards/mycards/41.png</file>
<file>graphics/cards/mycards/42.png</file>
<file>graphics/cards/mycards/43.png</file>
<file>graphics/cards/mycards/44.png</file>
<file>graphics/cards/mycards/45.png</file>
<file>graphics/cards/mycards/46.png</file>
<file>graphics/cards/mycards/47.png</file>
<file>graphics/cards/mycards/48.png</file>
<file>graphics/cards/mycards/49.png</file>
<file>graphics/cards/mycards/5.png</file>
<file>graphics/cards/mycards/50.png</file>
<file>graphics/cards/mycards/51.png</file>
<file>graphics/cards/mycards/6.png</file>
<file>graphics/cards/mycards/7.png</file>
<file>graphics/cards/mycards/8.png</file>
<file>graphics/cards/mycards/9.png</file>
<file>graphics/cards/mycards/flipside.png</file>
</qresource>
<qresource prefix="/othercards" >
<file>graphics/cards/othercards/0.png</file>
<file>graphics/cards/othercards/1.png</file>
<file>graphics/cards/othercards/10.png</file>
<file>graphics/cards/othercards/11.png</file>
<file>graphics/cards/othercards/12.png</file>
<file>graphics/cards/othercards/13.png</file>
<file>graphics/cards/othercards/14.png</file>
<file>graphics/cards/othercards/15.png</file>
<file>graphics/cards/othercards/16.png</file>
<file>graphics/cards/othercards/17.png</file>
<file>graphics/cards/othercards/18.png</file>
<file>graphics/cards/othercards/19.png</file>
<file>graphics/cards/othercards/2.png</file>
<file>graphics/cards/othercards/20.png</file>
<file>graphics/cards/othercards/21.png</file>
<file>graphics/cards/othercards/22.png</file>
<file>graphics/cards/othercards/23.png</file>
<file>graphics/cards/othercards/24.png</file>
<file>graphics/cards/othercards/25.png</file>
<file>graphics/cards/othercards/26.png</file>
<file>graphics/cards/othercards/27.png</file>
<file>graphics/cards/othercards/28.png</file>
<file>graphics/cards/othercards/29.png</file>
<file>graphics/cards/othercards/3.png</file>
<file>graphics/cards/othercards/30.png</file>
<file>graphics/cards/othercards/31.png</file>
<file>graphics/cards/othercards/32.png</file>
<file>graphics/cards/othercards/33.png</file>
<file>graphics/cards/othercards/34.png</file>
<file>graphics/cards/othercards/35.png</file>
<file>graphics/cards/othercards/36.png</file>
<file>graphics/cards/othercards/37.png</file>
<file>graphics/cards/othercards/38.png</file>
<file>graphics/cards/othercards/39.png</file>
<file>graphics/cards/othercards/4.png</file>
<file>graphics/cards/othercards/40.png</file>
<file>graphics/cards/othercards/41.png</file>
<file>graphics/cards/othercards/42.png</file>
<file>graphics/cards/othercards/43.png</file>
<file>graphics/cards/othercards/44.png</file>
<file>graphics/cards/othercards/45.png</file>
<file>graphics/cards/othercards/46.png</file>
<file>graphics/cards/othercards/47.png</file>
<file>graphics/cards/othercards/48.png</file>
<file>graphics/cards/othercards/49.png</file>
<file>graphics/cards/othercards/5.png</file>
<file>graphics/cards/othercards/50.png</file>
<file>graphics/cards/othercards/51.png</file>
<file>graphics/cards/othercards/6.png</file>
<file>graphics/cards/othercards/7.png</file>
<file>graphics/cards/othercards/8.png</file>
<file>graphics/cards/othercards/9.png</file>
<file>graphics/cards/othercards/flipside.png</file>
</qresource>
</RCC>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+29 -17
View File
@@ -53,7 +53,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
int i;
// Schriftart laden
QFontDatabase::addApplicationFont ("src/gui/qt/fonts/n019003l.pfb");
QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.pfb");
QFont tmpFont("Nimbus Sans L",9);
QApplication::setFont(tmpFont);
@@ -66,30 +66,35 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0"));
pixmapLabel_cardBoard0->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard0->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard0->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard0, 0, 0, 1, 1);
pixmapLabel_cardBoard1 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard1->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard1"));
pixmapLabel_cardBoard1->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard1->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard1->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard1, 0, 1, 1, 1);
pixmapLabel_cardBoard2 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard2->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard2"));
pixmapLabel_cardBoard2->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard2->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard2->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard2, 0, 2, 1, 1);
pixmapLabel_cardBoard3 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard3->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard3"));
pixmapLabel_cardBoard3->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard3->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard3->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard3, 0, 3, 1, 1);
pixmapLabel_cardBoard4 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard4->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard4"));
pixmapLabel_cardBoard4->setMinimumSize(QSize(57, 80));
pixmapLabel_cardBoard4->setMaximumSize(QSize(57, 80));
pixmapLabel_cardBoard4->setScaledContents(true);
gridLayout11->addWidget(pixmapLabel_cardBoard4, 0, 4, 1, 1);
pixmapLabel_card0a = new MyCardsPixmapLabel(frame5);
@@ -124,47 +129,54 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
pixmapLabel_card2a->setObjectName(QString::fromUtf8("pixmapLabel_card2a"));
pixmapLabel_card2a->setMinimumSize(QSize(57, 80));
pixmapLabel_card2a->setMaximumSize(QSize(57, 80));
pixmapLabel_card2a->setScaledContents(true);
gridLayout24->addWidget(pixmapLabel_card2a, 0, 0, 1, 1);
pixmapLabel_card2b = new MyCardsPixmapLabel(frame8_2_2_2_4);
pixmapLabel_card2b->setObjectName(QString::fromUtf8("pixmapLabel_card2b"));
pixmapLabel_card2b->setMinimumSize(QSize(57, 80));
pixmapLabel_card2b->setMaximumSize(QSize(57, 80));
pixmapLabel_card2b->setMaximumSize(QSize(57, 80));
pixmapLabel_card2b->setScaledContents(true);
gridLayout24->addWidget(pixmapLabel_card2b, 0, 1, 1, 1);
pixmapLabel_card3a = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3a->setObjectName(QString::fromUtf8("pixmapLabel_card3a"));
pixmapLabel_card3a->setMinimumSize(QSize(57, 80));
pixmapLabel_card3a->setMaximumSize(QSize(57, 80));
pixmapLabel_card3a->setScaledContents(true);
gridLayout30->addWidget(pixmapLabel_card3a, 0, 0, 1, 1);
pixmapLabel_card3b = new MyCardsPixmapLabel(frame8_2_2_2_6);
pixmapLabel_card3b->setObjectName(QString::fromUtf8("pixmapLabel_card3b"));
pixmapLabel_card3b->setMinimumSize(QSize(57, 80));
pixmapLabel_card3b->setMaximumSize(QSize(57, 80));
pixmapLabel_card3b->setScaledContents(true);
gridLayout30->addWidget(pixmapLabel_card3b, 0, 1, 1, 1);
pixmapLabel_card4a = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4a->setObjectName(QString::fromUtf8("pixmapLabel_card4a"));
pixmapLabel_card4a->setMinimumSize(QSize(57, 80));
pixmapLabel_card4a->setMaximumSize(QSize(57, 80));
pixmapLabel_card4a->setScaledContents(true);
gridLayout36->addWidget(pixmapLabel_card4a, 0, 0, 1, 1);
pixmapLabel_card4b = new MyCardsPixmapLabel(frame8_2_2_2_7);
pixmapLabel_card4b->setObjectName(QString::fromUtf8("pixmapLabel_card4b"));
pixmapLabel_card4b->setMinimumSize(QSize(57, 80));
pixmapLabel_card4b->setMaximumSize(QSize(57, 80));
pixmapLabel_card4b->setScaledContents(true);
gridLayout36->addWidget(pixmapLabel_card4b, 0, 1, 1, 1);
// pixmapLabel_card4b->setPixmap(QPixmap(":/cards/graphics/cards/33.png"), FALSE);
//Flipside festlegen;
flipside = new QPixmap(":/mycards/graphics/cards/mycards/flipside.png");
flipside = new QPixmap(":/cards/graphics/cards/flipside.png");
if (myConfig->readConfigInt("FlipsideOwn",0) && myConfig->readConfigString("FlipsideOwnFile","") != "") {
QPixmap tmpFlipside(QString::fromStdString(myConfig->readConfigString("FlipsideOwnFile", "")));
flipside = new QPixmap(tmpFlipside.scaled(QSize(57, 80)));
}
else { flipside->load(":/mycards/graphics/cards/mycards/flipside.png"); }
else { flipside->load(":/cards/graphics/cards/flipside.png"); }
//Flipside Animation noch nicht erledigt
flipHolecardsAllInAlreadyDone = FALSE;
@@ -508,7 +520,7 @@ void mainWindowImpl::callSettingsDialog() {
QPixmap tmpFlipside(QString::fromStdString(myConfig->readConfigString("FlipsideOwnFile", "")));
flipside = new QPixmap(tmpFlipside.scaled(QSize(57, 80)));
}
else { flipside->load(":/othercards/cards/othercards/flipside.png"); }
else { flipside->load(":/cards/graphics/cards/flipside.png"); }
int i,j;
@@ -707,7 +719,7 @@ void mainWindowImpl::refreshPot() {
void mainWindowImpl::dealHoleCards() {
QPixmap onePix(":/graphics/cards/1px.png");
QPixmap onePix(":/graphics/graphics/1px.png");
//TempArrays
QPixmap tempCardsPixmapArray[2];
@@ -720,7 +732,7 @@ void mainWindowImpl::dealHoleCards() {
for(j=0; j<2; j++) {
if(actualHand->getPlayerArray()[i]->getMyActiveStatus()) {
if (debugMode) {
tempCardsPixmapArray[j].load(":/mycards/graphics/cards/mycards/"+QString::number(tempCardsIntArray[j], 10)+".png");
tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png");
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j],FALSE);
}
@@ -743,7 +755,7 @@ void mainWindowImpl::dealHoleCards() {
if(actualHand->getPlayerArray()[0]->getMyActiveStatus()) {
tempCardsPixmapArray[i].load(":/mycards/graphics/cards/mycards/"+QString::number(tempCardsIntArray[i], 10)+".png");
tempCardsPixmapArray[i].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[i], 10)+".png");
holeCardsArray[0][i]->setPixmap(tempCardsPixmapArray[i], FALSE);
}
@@ -789,7 +801,7 @@ void mainWindowImpl::dealFlopCards4() {
int tempBoardCardsArray[5];
QPixmap tempCardsPixmap;
actualHand->getBoard()->getMyCards(tempBoardCardsArray);
tempCardsPixmap.load(":/othercards/cards/othercards/"+QString::number(tempBoardCardsArray[0], 10)+".png");
tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[0], 10)+".png");
QPixmap card(tempCardsPixmap);
//Config? mit oder ohne Eye-Candy?
@@ -809,7 +821,7 @@ void mainWindowImpl::dealFlopCards5() {
int tempBoardCardsArray[5];
QPixmap tempCardsPixmap;
actualHand->getBoard()->getMyCards(tempBoardCardsArray);
tempCardsPixmap.load(":/othercards/cards/othercards/"+QString::number(tempBoardCardsArray[1], 10)+".png");
tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[1], 10)+".png");
QPixmap card(tempCardsPixmap);
//Config? mit oder ohne Eye-Candy?
@@ -830,7 +842,7 @@ void mainWindowImpl::dealFlopCards6() {
int tempBoardCardsArray[5];
QPixmap tempCardsPixmap;
actualHand->getBoard()->getMyCards(tempBoardCardsArray);
tempCardsPixmap.load(":/othercards/cards/othercards/"+QString::number(tempBoardCardsArray[2], 10)+".png");
tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[2], 10)+".png");
QPixmap card(tempCardsPixmap);
//Config? mit oder ohne Eye-Candy?
@@ -865,7 +877,7 @@ void mainWindowImpl::dealTurnCards2() {
int tempBoardCardsArray[5];
QPixmap tempCardsPixmap;
actualHand->getBoard()->getMyCards(tempBoardCardsArray);
tempCardsPixmap.load(":/othercards/cards/othercards/"+QString::number(tempBoardCardsArray[3], 10)+".png");
tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[3], 10)+".png");
QPixmap card(tempCardsPixmap);
//Config? mit oder ohne Eye-Candy?
@@ -901,7 +913,7 @@ void mainWindowImpl::dealRiverCards2() {
int tempBoardCardsArray[5];
QPixmap tempCardsPixmap;
actualHand->getBoard()->getMyCards(tempBoardCardsArray);
tempCardsPixmap.load(":/othercards/cards/othercards/"+QString::number(tempBoardCardsArray[4], 10)+".png");
tempCardsPixmap.load(":/cards/graphics/cards/"+QString::number(tempBoardCardsArray[4], 10)+".png");
QPixmap card(tempCardsPixmap);
//Config? mit oder ohne Eye-Candy?
@@ -1305,7 +1317,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
for(j=0; j<2; j++) {
if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) {
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/othercards/cards/othercards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
}
}
@@ -1327,7 +1339,7 @@ void mainWindowImpl::postRiverRunAnimation2() {
for(j=0; j<2; j++) {
if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) {
tempCardsPixmapArray[j].load(":/othercards/cards/othercards/"+QString::number(tempCardsIntArray[j], 10)+".png");
tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png");
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE);
}
@@ -1524,7 +1536,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
for(j=0; j<2; j++) {
if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) {
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/othercards/cards/othercards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
holeCardsArray[i][j]->startFlipCards(guiGameSpeed, QPixmap(":/cards/graphics/cards/"+QString::number(tempCardsIntArray[j], 10)+".png"), flipside);
}
}
@@ -1546,7 +1558,7 @@ void mainWindowImpl::flipHolecardsAllIn() {
for(j=0; j<2; j++) {
if(actualHand->getPlayerArray()[i]->getMyActiveStatus() && actualHand->getPlayerArray()[i]->getMyAction() != 1) {
tempCardsPixmapArray[j].load(":/othercards/cards/othercards/"+QString::number(temp2CardsIntArray[j], 10)+".png");
tempCardsPixmapArray[j].load(":/cards/graphics/cards/"+QString::number(temp2CardsIntArray[j], 10)+".png");
holeCardsArray[i][j]->setPixmap(tempCardsPixmapArray[j], FALSE);
}
src/gui/qt/mainwindow/mycardspixmaplabel.cpp
+9 -8
View File
@@ -27,7 +27,7 @@ MyCardsPixmapLabel::MyCardsPixmapLabel(QFrame* parent)
isFlipside = FALSE;
front = new QPixmap;
// flipside = new QPixmap;
flipside = new QPixmap;
fadeOutTimer = new QTimer;
connect(fadeOutTimer, SIGNAL(timeout()), this, SLOT(nextFadeOutFrame()));
@@ -122,10 +122,10 @@ void MyCardsPixmapLabel::nextFlipCardsFrame() {
}
}
void MyCardsPixmapLabel::setPixmap(const QPixmap &pic, const bool flipside) {
void MyCardsPixmapLabel::setPixmap(const QPixmap &pic, const bool flipsideIs) {
QLabel::setPixmap(pic);
isFlipside = flipside;
isFlipside = flipsideIs;
}
@@ -154,24 +154,25 @@ void MyCardsPixmapLabel::paintEvent(QPaintEvent * event) {
if (flipCardsAction1) {
QPainter painter2(this);
QPointF center(flipside->width()/2.0, flipside->height()/2.0);
QPixmap tmpFlipside = flipside->scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
QPointF center(tmpFlipside.width()/2.0, tmpFlipside.height()/2.0);
painter2.translate(center);
painter2.scale(frameFlipCardsAction1Size ,1);
painter2.translate(-center);
painter2.drawPixmap(0,0,*flipside);
painter2.drawPixmap(0,0, tmpFlipside);
}
if (flipCardsAction2) {
QPainter painter3(this);
QPointF center(front->width()/2.0, front->height()/2.0);
QPixmap tmpFront = front->scaled(width(), height(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
QPointF center(tmpFront.width()/2.0, tmpFront.height()/2.0);
painter3.translate(center);
painter3.scale(frameFlipCardsAction2Size ,1);
painter3.translate(-center);
painter3.drawPixmap(0,0,*front);
painter3.drawPixmap(0,0, tmpFront);
}
src/gui/qt/mainwindow/mycardspixmaplabel.h
+4 -3
View File
@@ -36,6 +36,9 @@ public:
void paintEvent(QPaintEvent * event);
QPixmap *front;
QPixmap *flipside;
public slots:
@@ -57,9 +60,7 @@ private:
QTimer *fadeOutTimer;
QTimer *flipCardsTimer;
QPixmap *front;
QPixmap *flipside;
bool isFlipside;
bool fadeOutAction;
bool flipCardsAction1;
src/gui/qt/mainwindow/startsplash/startsplash.cpp
+2 -2
View File
@@ -22,8 +22,8 @@
StartSplash::StartSplash(mainWindowImpl *parent)
: QSplashScreen(parent), myW(parent)
{
QFontDatabase::addApplicationFont ("src/gui/qt/fonts/c059013l.pfb");
QFontDatabase::addApplicationFont ("src/gui/qt/fonts/andybold.ttf");
QFontDatabase::addApplicationFont (":fonts/fonts/c059013l.pfb");
QFontDatabase::addApplicationFont (":fonts/fonts/andybold.ttf");
frameNo = 52;
opacityCounter = 13;