diff -Naur zeiberbude1/src/about.cc zeiberbude/src/about.cc --- zeiberbude1/src/about.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/about.cc 2008-09-03 23:41:08.000000000 +0300 @@ -18,7 +18,9 @@ tab = new QTabWidget(this); lbAuthors = new QLabel(this); lbAuthors->setAlignment(AlignTop); - lbAuthors->setText(tr("Maintainer:\nChristian Toepp ")); + lbAuthors->setText(tr("Maintainer:\nChristian Toepp \n \n") + + tr ("Win32 port & statistic generator:\nGregory Motruk ") + ); lbTranslators = new QLabel(this); lbTranslators->setAlignment(AlignTop); lbTranslators->setText( diff -Naur zeiberbude1/src/computerview.cc zeiberbude/src/computerview.cc --- zeiberbude1/src/computerview.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/computerview.cc 2008-09-04 19:55:50.000000000 +0300 @@ -11,7 +11,7 @@ * * ***************************************************************************/ - +#include #include #include "computerview.hh" #include "icons/play.xpm" @@ -162,7 +162,7 @@ connect (viewHistory, SIGNAL (activated ()), this, SLOT (slotViewHistory ())); viewHistory->addTo (mainMenu); - //viewHistory->setEnabled(false); + viewHistory->setEnabled(true); printCalc = new QAction (tr ("Print Calc"), tr ("PrintCalc"), QAccel::stringToKey ("Ctrl+p"), this); @@ -218,6 +218,7 @@ void computerview::slotBtnStart () { + btnStart->disconnect (); connect (btnStart, SIGNAL (clicked ()), this, SLOT (slotBtnPause ())); btnStart->setPixmap (icoPause); @@ -225,6 +226,17 @@ zbUser->timeStart (); zbUser->setTarif (&(*tfList)[cmbTarif->currentItem ()]); emit started (); + + if (zbUser->countdown && !zbUser->onStartup) { + QTime qctime = QTime::currentTime(); + QDate qcdate = QDate::currentDate(); + + QFile logFile( ZEIBERBUDE_ST ); + logFile.open( IO_WriteOnly | IO_Append ); + QString str = "+" + lbTime->text() + "|" + qctime.toString(Qt::LocalDate) + "|" + qcdate.toString(Qt::LocalDate) + "|" + viewTitle + "\n"; + logFile.writeBlock (str, qstrlen(str)); + logFile.close(); + } } void @@ -256,6 +268,23 @@ setAcceptDrops(true); active = false; emit updateUser(); + + + QTime qctime = QTime::currentTime(); + QDate qcdate = QDate::currentDate(); + + QFile logFile( ZEIBERBUDE_ST ); + logFile.open( IO_WriteOnly | IO_Append ); + + QString str = lbTime->text() + "|" + qctime.toString(Qt::LocalDate) + "|" + qcdate.toString(Qt::LocalDate) + "|" + viewTitle + "\n"; + if (zbUser->countdown) { + str = "-" + str; + } else { + str = "+" + str; + } + logFile.writeBlock (str, qstrlen(str)); + logFile.close(); + } } @@ -300,7 +329,7 @@ { zbUser = new zbuser (dlg->edName->text (), pList, pInfo, - dlg->edCountdown->isChecked (), dlg->edTime->time ()); + dlg->edCountdown->isChecked (), dlg->edTime->time (),0); connect (zbUser, SIGNAL (nameChanged (QString)), this, SLOT (slotNameChanged (QString))); connect (zbUser, SIGNAL (timeChanged (QTime)), this, diff -Naur zeiberbude1/src/mainview.cc zeiberbude/src/mainview.cc --- zeiberbude1/src/mainview.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/mainview.cc 2008-09-04 13:40:34.000000000 +0300 @@ -482,5 +482,5 @@ void mainview::updUser(){ - //zbCfg->writeDb(&parkView,&groups); + zbCfg->writeDb(&parkView,&groups); } diff -Naur zeiberbude1/src/userparkview.cc zeiberbude/src/userparkview.cc --- zeiberbude1/src/userparkview.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/userparkview.cc 2008-09-04 15:20:30.000000000 +0300 @@ -118,7 +118,7 @@ { zbUser = new zbuser (dlg->edName->text (), prods, pInfo, - dlg->edCountdown->isChecked (), dlg->edTime->time ()); + dlg->edCountdown->isChecked (), dlg->edTime->time (),0); connect (zbUser, SIGNAL (nameChanged (QString)), this, SLOT (slotNameChanged (QString))); connect (zbUser, SIGNAL (timeChanged (QTime)), this, diff -Naur zeiberbude1/src/zbconfig.cc zeiberbude/src/zbconfig.cc --- zeiberbude1/src/zbconfig.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/zbconfig.cc 2008-09-04 15:22:22.000000000 +0300 @@ -283,7 +283,7 @@ if(e.attribute("COUNTDOWN") == "1") isCount = true; tme = QTime::fromString(e.attribute("TIME")); - usr = new zbuser(name, products,pInfo,isCount,tme); + usr = new zbuser(name, products,pInfo,isCount,tme,1); n2 = e.firstChild(); while(!n2.isNull()) { @@ -311,10 +311,10 @@ QString cName = e2.attribute("COMP"); name = e2.attribute("NAME"); isCount = false; - if(e.attribute("COUNTDOWN") == "1") - isCount = true; + if(e2.attribute("COUNTDOWN") == "1") + isCount = true; tme = QTime::fromString(e2.attribute("TIME")); - usr = new zbuser(name,products,pInfo,isCount,tme); + usr = new zbuser(name,products,pInfo,isCount,tme,1); QDomNode n3 = e2.firstChild(); while(!n3.isNull()) { diff -Naur zeiberbude1/src/zbuser.cc zeiberbude/src/zbuser.cc --- zeiberbude1/src/zbuser.cc 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/zbuser.cc 2008-09-04 19:55:24.000000000 +0300 @@ -15,11 +15,12 @@ #include "zbuser.hh" zbuser::zbuser (QString name, productList * pList, printInfo * prints, - bool isCountdown, QTime elapsed) + bool isCountdown, QTime elapsed, bool onLoad) { pInfo = prints; userName = name; - prods = pList; + prods = pList; + onStartup = onLoad; startTime = QTime::currentTime (); usedTime = QTime (0, 0, 0); if (elapsed.toString ("hh:mm") != "00:00") @@ -225,11 +226,11 @@ } float test = 0; if (aktTarif->fullDayHours != test - && aktTime.hour () >= aktTarif->fullDayHours) - { - //qDebug("voller tag"); - return aktTarif->fullDay; - } + && aktTime.hour () >= aktTarif->fullDayHours) + { + //qDebug("voller tag"); + return aktTarif->fullDay; + } QTime usTime = QTime (0, 0); QTime hpTime = QTime (0, 0); diff -Naur zeiberbude1/src/zbuser.hh zeiberbude/src/zbuser.hh --- zeiberbude1/src/zbuser.hh 2002-09-09 13:09:33.000000000 +0300 +++ zeiberbude/src/zbuser.hh 2008-09-04 19:55:10.000000000 +0300 @@ -74,7 +74,7 @@ Q_OBJECT public: zbuser (QString name, productList * pList, printInfo * prints, - bool isCountdown, QTime elapsed = QTime::currentTime ()); + bool isCountdown, QTime elapsed = QTime::currentTime (), bool onLoad = 0); ~zbuser (); void timeStart (); void timePause (); @@ -86,6 +86,7 @@ void addPrint (bool color, int count); float calcTarif (); bool isOn (); + bool onStartup; QString name (); userProdList usProdList; QString tarif(); diff -Naur zeiberbude1/zeiberbude.pro zeiberbude/zeiberbude.pro --- zeiberbude1/zeiberbude.pro 2002-09-09 13:09:32.000000000 +0300 +++ zeiberbude/zeiberbude.pro 2008-09-04 14:22:28.000000000 +0300 @@ -7,7 +7,7 @@ CONFIG=qt warn_on release OBJECTS_DIR=.obj MOC_DIR=.moc -DEFINES *= VERSION=\"2.0.4\" +DEFINES *= VERSION=\"2.0.5\" target.path = /usr/local/bin INSTALLS += target @@ -71,10 +71,12 @@ !win32 { DEFINES *= ZEIBERBUDE_RC=\"/usr/local/share/zeiberbude/config.xml\" DEFINES *= ZEIBERBUDE_DB=\"/var/zeiberbude/db.xml\" + DEFINES *= ZEIBERBUDE_ST=\"/var/zeiberbude/statistics.log\" } win32 { DEFINES *= ZEIBERBUDE_RC=\"config.xml\" DEFINES *= ZEIBERBUDE_DB=\"db.xml\" + DEFINES *= ZEIBERBUDE_ST=\"statistics.log\" DEFINES *= QT_DLL }