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

fixed fontsizes Windows/Linux

Browse Source
This commit is contained in:
doitux
2007-02-08 01:28:58 +00:00
parent ad02d4572f
commit ff18ca3df5
4 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/log.cpp
+1 -1
View File
@@ -103,7 +103,7 @@ void Log::logNewGameHandMsg(int gameID, int handID) {
int i; int i;
myW->textBrowser_Log->append("## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##"); myW->textBrowser_Log->append("<b>## Game: "+QString::number(gameID,10)+" | Hand: "+QString::number(handID,10)+" ##</b>");
myLogFile->open( QIODevice::ReadWrite ); myLogFile->open( QIODevice::ReadWrite );
QTextStream stream( myLogFile ); QTextStream stream( myLogFile );
src/gui/qt/mainwindow/mainwindow.ui
+29 -23
View File
@@ -1805,11 +1805,6 @@
</disabled> </disabled>
</palette> </palette>
</property> </property>
<property name="font" >
<font>
<pointsize>8</pointsize>
</font>
</property>
<property name="horizontalScrollBarPolicy" > <property name="horizontalScrollBarPolicy" >
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
@@ -2661,6 +2656,9 @@
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -2677,6 +2675,9 @@
<height>26</height> <height>26</height>
</size> </size>
</property> </property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -2715,12 +2716,17 @@
</property> </property>
<item rowspan="2" row="1" column="0" > <item rowspan="2" row="1" column="0" >
<widget class="QLabel" name="textLabel_handNumber" > <widget class="QLabel" name="textLabel_handNumber" >
<property name="font" > <property name="minimumSize" >
<font> <size>
<pointsize>11</pointsize> <width>0</width>
<weight>50</weight> <height>22</height>
<bold>false</bold> </size>
</font> </property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>22</height>
</size>
</property> </property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -2729,10 +2735,17 @@
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="textLabel_gameNumber" > <widget class="QLabel" name="textLabel_gameNumber" >
<property name="font" > <property name="minimumSize" >
<font> <size>
<pointsize>11</pointsize> <width>0</width>
</font> <height>22</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>16777215</width>
<height>22</height>
</size>
</property> </property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
@@ -2768,13 +2781,6 @@
</property> </property>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="textLabel_handLabel" > <widget class="QLabel" name="textLabel_handLabel" >
<property name="font" >
<font>
<pointsize>15</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="alignment" > <property name="alignment" >
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>
</property> </property>
@@ -4003,7 +4009,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>874</width> <width>874</width>
<height>29</height> <height>30</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuSpiel" > <widget class="QMenu" name="menuSpiel" >
src/gui/qt/mainwindow/mainwindowimpl.cpp
+36 -8
View File
@@ -54,10 +54,21 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
// Schriftart laden // Schriftart laden
#ifdef _WIN32 #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 #else
QFontDatabase::addApplicationFont (":fonts/fonts/n019003l.pfb"); 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 #endif
QApplication::setFont(tmpFont); QApplication::setFont(tmpFont);
@@ -65,6 +76,23 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
setupUi(this); 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! //pixmapCardsLabel erstellen und ins Layout einfügen!
pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_5); pixmapLabel_cardBoard0 = new MyCardsPixmapLabel(frame_5);
pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0")); pixmapLabel_cardBoard0->setObjectName(QString::fromUtf8("pixmapLabel_cardBoard0"));
@@ -437,8 +465,8 @@ void mainWindowImpl::callNewGameDialog() {
//restliche Singleshots killen!!! //restliche Singleshots killen!!!
stopTimer(); stopTimer();
label_Pot->setText("<p align='center'><span style='font-size:x-large; font-weight:bold'>Pot Total</span></p>"); label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
label_Sets->setText("<p align='center'><span style='font-size:medium; font-weight:bold'>Sets:</span></p>"); label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
//Tools und Board aufhellen und enablen //Tools und Board aufhellen und enablen
@@ -470,8 +498,8 @@ void mainWindowImpl::callNewGameDialog() {
//restliche Singleshots killen!!! //restliche Singleshots killen!!!
stopTimer(); stopTimer();
label_Pot->setText("<p align='center'><span style='font-size:x-large; font-weight:bold'>Pot Total</span></p>"); label_Pot->setText("<p align='center'><span style='font-weight:bold'>Pot Total</span></p>");
label_Sets->setText("<p align='center'><span style='font-size:medium; font-weight:bold'>Sets:</span></p>"); label_Sets->setText("<p align='center'><span style='font-weight:bold'>Sets:</span></p>");
// debugMode = v->checkBox_debugMode->isChecked(); // debugMode = v->checkBox_debugMode->isChecked();
@@ -720,7 +748,7 @@ void mainWindowImpl::refreshChangePlayer() {
void mainWindowImpl::refreshPot() { void mainWindowImpl::refreshPot() {
textLabel_Sets->setText("<p align='left'>"+QString::number(actualHand->getBoard()->getSets(),10)+" $</p>"); textLabel_Sets->setText("<p align='left'>"+QString::number(actualHand->getBoard()->getSets(),10)+" $</p>");
textLabel_Pot->setText("<p align='center'><span style='font-size:large; font-weight:bold'>"+QString::number(actualHand->getBoard()->getPot(),10)+" $</p>"); textLabel_Pot->setText("<p align='center'><span style='font-weight:bold'>"+QString::number(actualHand->getBoard()->getPot(),10)+" $</span></p>");
} }
@@ -1641,7 +1669,7 @@ void mainWindowImpl::nextRoundCleanGui() {
tempPalette.setColor(QPalette::Window, active); tempPalette.setColor(QPalette::Window, active);
frame_Pot->setPalette(tempPalette); frame_Pot->setPalette(tempPalette);
textLabel_handLabel->setText("<p align='center'><span style='font-size:14pt; font-weight:bold'> </span></p>"); textLabel_handLabel->setText("");
tempPalette = frame_handLabel->palette(); tempPalette = frame_handLabel->palette();
tempPalette.setColor(QPalette::Window, active); tempPalette.setColor(QPalette::Window, active);
src/gui/qt/mainwindow/startsplash/startsplash.cpp
+10 -3
View File
@@ -50,11 +50,18 @@ void StartSplash::paintEvent(QPaintEvent * event) {
QPainter painter(this); QPainter painter(this);
#ifdef _WIN32 #ifdef _WIN32
QFont welcomeFont("Times New Roman",29); QFont welcomeFont;
welcomeFont.setFamily("Times New Roman");
welcomeFont.setPixelSize(42);
#else #else
QFont welcomeFont("Century Schoolbook L",29); QFont welcomeFont;
welcomeFont.setFamily("Century Schoolbook L");
welcomeFont.setPixelSize(35);
#endif #endif
QFont haveFont("Andy MT",30); QFont haveFont;
haveFont.setFamily("Andy MT");
haveFont.setPixelSize(36);
QPixmap logo(":/graphics/graphics/logo-140-100.png"); QPixmap logo(":/graphics/graphics/logo-140-100.png");
if(frameNo >= 52 && frameNo < 65) { if(frameNo >= 52 && frameNo < 65) {