From 6a6674d86cfd1737d372db3252fe11f06eb7e9e0 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Mon, 5 Feb 2007 22:33:52 +0000
Subject: [PATCH]

---
 src/gui/qt/log.cpp                       |  8 ++++++--
 src/gui/qt/mainwindow/mainwindow.ui      | 22 ++++++++++++++++++----
 src/gui/qt/mainwindow/mainwindowimpl.cpp |  4 +++-
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/gui/qt/log.cpp b/src/gui/qt/log.cpp
index a03123fd..5293714f 100644
--- a/src/gui/qt/log.cpp
+++ b/src/gui/qt/log.cpp
@@ -31,10 +31,14 @@ Log::Log(mainWindowImpl* w) : myW(w)
 	if(myConfig->readConfigString("LogDir") != "" && QDir::QDir(QString::fromStdString(myConfig->readConfigString("LogDir"))).exists()) { 
 
 		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
-		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 );
 		QTextStream stream( myLogFile );
diff --git a/src/gui/qt/mainwindow/mainwindow.ui b/src/gui/qt/mainwindow/mainwindow.ui
index 5e0f4183..e8a3f8a4 100644
--- a/src/gui/qt/mainwindow/mainwindow.ui
+++ b/src/gui/qt/mainwindow/mainwindow.ui
@@ -2708,16 +2708,30 @@
              </property>
              <layout class="QGridLayout" >
               <property name="margin" >
-               <number>2</number>
+               <number>3</number>
               </property>
               <property name="spacing" >
                <number>0</number>
               </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" >
                 <property name="font" >
                  <font>
-                  <pointsize>12</pointsize>
+                  <pointsize>11</pointsize>
                  </font>
                 </property>
                 <property name="alignment" >
@@ -3989,7 +4003,7 @@
      <x>0</x>
      <y>0</y>
      <width>874</width>
-     <height>30</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuSpiel" >
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index b26e3e72..4fbcd625 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -690,7 +690,9 @@ void mainWindowImpl::highlightRoundLabel(string tempround) {
 		frame_handLabel->setPalette(tempPalette);
 		
 		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));
+
 
 	}