This commit is contained in:
+6
-2
@@ -31,10 +31,14 @@ Log::Log(mainWindowImpl* w) : myW(w)
|
|||||||
if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))).exists()) {
|
if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))).exists()) {
|
||||||
|
|
||||||
myLogDir = new QDir(QString::fromStdString(myConfig->readConfigString("LogDir")));
|
myLogDir = new QDir(QString::fromStdString(myConfig->readConfigString("LogDir")));
|
||||||
myLogFile = new QFile(myLogDir->absolutePath()+"pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh:mm:ss")+".html");
|
#ifdef _WIN32
|
||||||
|
myLogFile = new QFile(myLogDir->absolutePath()+"\\pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh:mm:ss")+".html");
|
||||||
|
#else
|
||||||
|
myLogFile = new QFile(myLogDir->absolutePath()+"/pokerth-log-"+QDateTime::currentDateTime().toString("yyyy-MM-dd_hh:mm:ss")+".html");
|
||||||
|
#endif
|
||||||
|
|
||||||
//Logo-Pixmap extrahieren
|
//Logo-Pixmap extrahieren
|
||||||
QPixmap::QPixmap(":graphics/graphics/logo-140-100.png").save(myLogDir->absolutePath()+"logo.png");
|
QPixmap::QPixmap(":graphics/graphics/logo-140-100.png").save(myLogDir->absolutePath()+"/logo.png");
|
||||||
|
|
||||||
myLogFile->open( QIODevice::WriteOnly );
|
myLogFile->open( QIODevice::WriteOnly );
|
||||||
QTextStream stream( myLogFile );
|
QTextStream stream( myLogFile );
|
||||||
|
|||||||
@@ -2708,16 +2708,30 @@
|
|||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" >
|
<layout class="QGridLayout" >
|
||||||
<property name="margin" >
|
<property name="margin" >
|
||||||
<number>2</number>
|
<number>3</number>
|
||||||
</property>
|
</property>
|
||||||
<property name="spacing" >
|
<property name="spacing" >
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item rowspan="2" row="0" column="0" >
|
<item rowspan="2" row="1" column="0" >
|
||||||
|
<widget class="QLabel" name="textLabel_handNumber" >
|
||||||
|
<property name="font" >
|
||||||
|
<font>
|
||||||
|
<pointsize>11</pointsize>
|
||||||
|
<weight>50</weight>
|
||||||
|
<bold>false</bold>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="alignment" >
|
||||||
|
<set>Qt::AlignCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="0" >
|
||||||
<widget class="QLabel" name="textLabel_gameNumber" >
|
<widget class="QLabel" name="textLabel_gameNumber" >
|
||||||
<property name="font" >
|
<property name="font" >
|
||||||
<font>
|
<font>
|
||||||
<pointsize>12</pointsize>
|
<pointsize>11</pointsize>
|
||||||
</font>
|
</font>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment" >
|
<property name="alignment" >
|
||||||
@@ -3989,7 +4003,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>874</width>
|
<width>874</width>
|
||||||
<height>30</height>
|
<height>29</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuSpiel" >
|
<widget class="QMenu" name="menuSpiel" >
|
||||||
|
|||||||
@@ -690,7 +690,9 @@ void mainWindowImpl::highlightRoundLabel(string tempround) {
|
|||||||
frame_handLabel->setPalette(tempPalette);
|
frame_handLabel->setPalette(tempPalette);
|
||||||
|
|
||||||
textLabel_handLabel->setText(round);
|
textLabel_handLabel->setText(round);
|
||||||
textLabel_gameNumber->setText("Hand: "+QString::number(actualHand->getMyID(),10));
|
textLabel_handNumber->setText("Hand: "+QString::number(actualHand->getMyID(),10));
|
||||||
|
textLabel_gameNumber->setText("Game: "+QString::number(actualGame->getMyGameID(),10));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user