From 0cc67e0137b35dbd168ab02f0e2c92334da127cd Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Thu, 14 Jun 2007 23:27:13 +0000
Subject: [PATCH]

---
 src/gui/qt/mainwindow/mysetlabel.cpp | 10 ++++++++--
 src/gui/qt/mainwindow/mysetlabel.h   |  5 ++++-
 src/gui/qt/settingsdialog.ui         | 12 +++---------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/gui/qt/mainwindow/mysetlabel.cpp b/src/gui/qt/mainwindow/mysetlabel.cpp
index 3fdd213e..4b370d82 100644
--- a/src/gui/qt/mainwindow/mysetlabel.cpp
+++ b/src/gui/qt/mainwindow/mysetlabel.cpp
@@ -31,7 +31,6 @@ MySetLabel::~MySetLabel()
 
 void MySetLabel::startTimeOutAnimation(int secs) {
 
-	
 	decreaseWidthIntervall = 1;
 
 	timeOutValue = secs;
@@ -55,6 +54,10 @@ void MySetLabel::startTimeOutAnimation(int secs) {
 	}
 
 	waitFrames = 3000/timerIntervall;
+	
+	//start the real timer
+	realTimer.reset();
+	realTimer.start();
 
 // 	std::cout << timerIntervall << endl;
 	timeOutAnimation = TRUE;	
@@ -81,7 +84,10 @@ void MySetLabel::nextTimeOutAnimationFrame() {
 	if(timeOutAnimationWidth >=0) {
 		if(timeOutFrame > waitFrames) { 
 			//save gfx ressources and never play more the 10 pps
-			timeOutAnimationWidth = timeOutAnimationWidth - decreaseWidthIntervall;
+// 			timeOutAnimationWidth = timeOutAnimationWidth - decreaseWidthIntervall;
+			unsigned int realTimerValue = realTimer.elapsed().total_milliseconds();
+			timeOutAnimationWidth = 118-((realTimerValue*118)/(timeOutValue*1000));		
+
 		}
 		timeOutFrame++;
 		update();
diff --git a/src/gui/qt/mainwindow/mysetlabel.h b/src/gui/qt/mainwindow/mysetlabel.h
index 9f7e5cc2..63c1498a 100644
--- a/src/gui/qt/mainwindow/mysetlabel.h
+++ b/src/gui/qt/mainwindow/mysetlabel.h
@@ -16,7 +16,7 @@
 
 #include <QtGui>
 #include <QtCore>
-
+#include <core/boost/timer.hpp>
 
 class mainWindowImpl;
 
@@ -47,6 +47,9 @@ private:
 	mainWindowImpl *myW;
 	QTimer *timeOutAnimationTimer;
 	QTimer *timeOutAnimationKickOnTimer;
+	
+	boost::microsec_timer realTimer;
+
 	bool timeOutAnimation;
 
 	int timeOutAnimationWidth;
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 190524fc..892ef9aa 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -1905,12 +1905,6 @@ p, li { white-space: pre-wrap; }
             </property>
             <item>
              <widget class="QLabel" name="label_27" >
-              <property name="maximumSize" >
-               <size>
-                <width>99</width>
-                <height>16777215</height>
-               </size>
-              </property>
               <property name="text" >
                <string>Store log files for</string>
               </property>
@@ -2023,17 +2017,17 @@ p, li { white-space: pre-wrap; }
               </property>
               <item>
                <property name="text" >
-                <string>every action (high frequent disc access)</string>
+                <string>action (high frequent disc access)</string>
                </property>
               </item>
               <item>
                <property name="text" >
-                <string>every hand (medium disc access)</string>
+                <string>hand (medium disc access)</string>
                </property>
               </item>
               <item>
                <property name="text" >
-                <string>every game (low disc access)</string>
+                <string>game (low disc access)</string>
                </property>
               </item>
              </widget>