diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log.cpp index 9574563a..366a21ca 100644 --- a/src/gui/qt/log.cpp +++ b/src/gui/qt/log.cpp @@ -103,7 +103,7 @@ void Log::logNewGameHandMsg(int gameID, int handID) { int i; - myW->textBrowser_Log->append("## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); + myW->textBrowser_Log->append("## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); myLogFile->open( QIODevice::ReadWrite ); QTextStream stream( myLogFile ); diff --git a/src/gui/qt/mainwindow/mainwindow.ui b/src/gui/qt/mainwindow/mainwindow.ui index 117f1624..07659a4b 100644 --- a/src/gui/qt/mainwindow/mainwindow.ui +++ b/src/gui/qt/mainwindow/mainwindow.ui @@ -1805,11 +1805,6 @@ - - - 8 - - Qt::ScrollBarAlwaysOff @@ -2661,6 +2656,9 @@ 26 + + Qt::AlignCenter + @@ -2677,6 +2675,9 @@ 26 + + Qt::AlignCenter + @@ -2715,12 +2716,17 @@ - - - 11 - 50 - false - + + + 0 + 22 + + + + + 16777215 + 22 + Qt::AlignCenter @@ -2729,10 +2735,17 @@ - - - 11 - + + + 0 + 22 + + + + + 16777215 + 22 + Qt::AlignCenter @@ -2768,13 +2781,6 @@ - - - 15 - 75 - true - - Qt::AlignCenter @@ -4003,7 +4009,7 @@ 0 0 874 - 29 + 30 diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp index 650aa2cc..cb7e8af1 100755 --- a/src/gui/qt/mainwindow/mainwindowimpl.cpp +++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp @@ -54,10 +54,21 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) // Schriftart laden #ifdef _WIN32 - QFont tmpFont("Arial",9); + + QFont tmpFont; + tmpFont.setFamily("Arial"); + tmpFont.setPixelSize(12); + +// if(this->logicalDpiX() > 105) { tmpFont.setFont("Arial",8); } +// else { QFont tmpFont("Arial",9); } + #else QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.pfb"); - QFont tmpFont("Nimbus Sans L",9); +// QFont tmpFont("Nimbus Sans L",9); + QFont tmpFont; + tmpFont.setFamily("Nimbus Sans L"); + tmpFont.setPixelSize(12); + #endif QApplication::setFont(tmpFont); @@ -65,6 +76,23 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent) setupUi(this); + //Schriftgrößen festlegen + tmpFont.setPixelSize(11); + textBrowser_Log->setFont(tmpFont); + tmpFont.setPixelSize(18); + label_Pot->setFont(tmpFont); + tmpFont.setPixelSize(13); + label_Sets->setFont(tmpFont); + tmpFont.setPixelSize(14); + textLabel_handNumber->setFont(tmpFont); + textLabel_gameNumber->setFont(tmpFont); + textLabel_Sets->setFont(tmpFont); + tmpFont.setPixelSize(15); + textLabel_Pot->setFont(tmpFont); + tmpFont.setPixelSize(21); + tmpFont.setBold(TRUE); + textLabel_handLabel->setFont(tmpFont); + //pixmapCardsLabel erstellen und ins Layout einfügen! pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_5); pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0")); @@ -437,8 +465,8 @@ void mainWindowImpl::callNewGameDialog() { //restliche Singleshots killen!!! stopTimer(); - label_Pot->setText("

Pot Total

"); - label_Sets->setText("

Sets:

"); + label_Pot->setText("

Pot Total

"); + label_Sets->setText("

Sets:

"); //Tools und Board aufhellen und enablen @@ -470,8 +498,8 @@ void mainWindowImpl::callNewGameDialog() { //restliche Singleshots killen!!! stopTimer(); - label_Pot->setText("

Pot Total

"); - label_Sets->setText("

Sets:

"); + label_Pot->setText("

Pot Total

"); + label_Sets->setText("

Sets:

"); // debugMode = v->checkBox_debugMode->isChecked(); @@ -720,7 +748,7 @@ void mainWindowImpl::refreshChangePlayer() { void mainWindowImpl::refreshPot() { textLabel_Sets->setText("

"+QString::number(actualHand->getBoard()->getSets(),10)+" $

"); - textLabel_Pot->setText("

"+QString::number(actualHand->getBoard()->getPot(),10)+" $

"); + textLabel_Pot->setText("

"+QString::number(actualHand->getBoard()->getPot(),10)+" $

"); } @@ -1641,7 +1669,7 @@ void mainWindowImpl::nextRoundCleanGui() { tempPalette.setColor(QPalette::Window, active); frame_Pot->setPalette(tempPalette); - textLabel_handLabel->setText("

"); + textLabel_handLabel->setText(""); tempPalette = frame_handLabel->palette(); tempPalette.setColor(QPalette::Window, active); diff --git a/src/gui/qt/mainwindow/startsplash/startsplash.cpp b/src/gui/qt/mainwindow/startsplash/startsplash.cpp index 2c643e9b..ac336006 100644 --- a/src/gui/qt/mainwindow/startsplash/startsplash.cpp +++ b/src/gui/qt/mainwindow/startsplash/startsplash.cpp @@ -50,11 +50,18 @@ void StartSplash::paintEvent(QPaintEvent * event) { QPainter painter(this); #ifdef _WIN32 - QFont welcomeFont("Times New Roman",29); + QFont welcomeFont; + welcomeFont.setFamily("Times New Roman"); + welcomeFont.setPixelSize(42); #else - QFont welcomeFont("Century Schoolbook L",29); + QFont welcomeFont; + welcomeFont.setFamily("Century Schoolbook L"); + welcomeFont.setPixelSize(35); #endif - QFont haveFont("Andy MT",30); + QFont haveFont; + haveFont.setFamily("Andy MT"); + haveFont.setPixelSize(36); + QPixmap logo(":/graphics/graphics/logo-140-100.png"); if(frameNo >= 52 && frameNo < 65) {