if postinst works, clicking on clockapplet should work too

5 files changed, 34 insertions, 13 deletions

diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 083b50f..830c0c3 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -1,287 +1,287 @@
 #include "ntp.h"
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtimer.h>
 #include <qtable.h>
 #include <qlabel.h>
 #include <qsocket.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qmessagebox.h>
 #include <qmultilineedit.h>
 #include <opie/oprocess.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/timeconversion.h>
 #include <qpe/tzselect.h>
 #include <qpe/timestring.h>
 #include <qpe/qpedialog.h>
 #include <sys/time.h>
 #include <time.h>
 #include <stdlib.h>
 
 
 Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
     : SetDateTime( parent, name, fl )
 {
- 	qDebug("%s", 	         QPEApplication::qpeDir().latin1());
 	Config ntpSrvs(QPEApplication::qpeDir()+"etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ntpSrvs.readNumEntry("count", 0 );
   for (int i = 0; i < srvCount; i++)
   {
 	  ntpSrvs.setGroup(QString::number(i));
    	ComboNtpSrv->insertItem( ntpSrvs.readEntry("name") );
   }
   if ( srvCount==0 ) ComboNtpSrv->insertItem(tr("time.fu-berlin.de"));
 
 	Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
 	SpinBoxMinLookupDelay->setValue( cfg.readNumEntry("minLookupDiff",41) );
 	SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",42) );
   ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
 
   ntpTimer = new QTimer(this);
 
  	ntpProcess = new OProcess( );
   connect( SpinBoxNtpDelay, SIGNAL( valueChanged(int) ),
   					SLOT(slotNtpDelayChanged(int)) );
 
   ntpSock = new QSocket( this );
   connect( ntpSock, SIGNAL( error(int) ),
   					SLOT(slotCheckNtp(int)) );
   slotProbeNtpServer();
 
   connect ( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
   					this, SLOT(getNtpOutput(OProcess*,char*,int)));
   connect ( ntpProcess, SIGNAL(processExited(OProcess*)),
   					this, SLOT(ntpFinished(OProcess*)));
   connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
   connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
   slotCheckNtp(-1);
   readLookups();
 }
 
 Ntp::~Ntp()
 {
 	delete ntpProcess;
 	Config ntpSrvs("/etc/ntpservers",Config::File);
   ntpSrvs.setGroup("servers");
   int srvCount = ComboNtpSrv->count();
   ntpSrvs.writeEntry("count", srvCount);
   for (int i = 0; i < srvCount; i++)
   {
 	  ntpSrvs.setGroup(QString::number(i));
    	ntpSrvs.writeEntry( "name", ComboNtpSrv->text(i) );
   }
 	Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", ComboNtpSrv->currentItem());
   cfg.writeEntry( "minLookupDiff", SpinBoxMinLookupDelay->value() );
  	cfg.writeEntry( "ntpRefreshFreq", SpinBoxNtpDelay->value() );
 }
 
 bool Ntp::ntpDelayElapsed()
 {
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   _lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
   return (_lookupDiff - (SpinBoxNtpDelay->value()*60)) > -60;
 }
 
 QString Ntp::getNtpServer()
 {
 	return ComboNtpSrv->currentText();
 }
 
 void Ntp::slotRunNtp()
 {
   if ( !ntpDelayElapsed() )
   {
   	switch (
    	 QMessageBox::warning(this, tr("Run NTP?"),
      tr("You asked for a delay of ")+SpinBoxNtpDelay->text()+tr(" minutes, but only ")+
      QString::number(_lookupDiff/60)+tr(" minutes elapsed since last loopup.")+
      "<br>"+tr("Rerun NTP?"),
      QMessageBox::Ok,QMessageBox::Cancel)
    	) {
 	    	case QMessageBox::Ok:     break;
   	   	case QMessageBox::Cancel: return;
     	  default: return;
       }
   }
 	TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
   ntpOutPut( tr("Running:")+"\nntpdate "+getNtpServer() );
  	
 	ntpProcess->clearArguments();
 	*ntpProcess << "ntpdate" << getNtpServer();
 	bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntpdate");
      ntpOutPut( tr("Error while executing ntpdate"));
   }
 }
 
 void  Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
 {
   QString lineStr, lineStrOld;
   lineStr = buffer;
   lineStr=lineStr.left(buflen);
   if (lineStr!=lineStrOld)
   {
 	        ntpOutPut(lineStr);
          	_ntpOutput += lineStr;
   }
   lineStrOld = lineStr;
 }
 
 void  Ntp::ntpFinished(OProcess *p)
 {
 	qDebug("p->exitStatus() %i",p->exitStatus());
 	if (p->exitStatus()!=0 || !p->normalExit())
  	{
     slotProbeNtpServer();
    	return;
   }
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lastLookup = cfg.readNumEntry("time",0);
   int lookupCount = cfg.readNumEntry("count",0);
   int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
   cfg.writeEntry("time", time);
   cfg.setGroup("correction");
   cfg.writeEntry("time", time);
  	
   float timeShift = getTimeShift();
   if (timeShift == 0.0) return;
  	int secsSinceLast = time - lastLookup;
   TextLabelNewTime->setText(QDateTime::currentDateTime().toString());
   TextLabelTimeShift->setText(QString::number(timeShift)+tr(" seconds"));
   if ( lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value())
   {
 	  lookupCount++;
    	cfg.writeEntry("count",lookupCount);
 	  cfg.setGroup("lookup_"+QString::number(lookupCount));
     _shiftPerSec =  timeShift / secsSinceLast;
    	qDebug("secs since last lookup %i", secsSinceLast);qDebug("timeshift since last lookup %f", timeShift);qDebug("timeshift since per sec %f", _shiftPerSec);
 		cfg.writeEntry("secsSinceLast",secsSinceLast);
 		cfg.writeEntry("timeShift",QString::number(timeShift));
   }
 }
 
 
 float Ntp::getTimeShift()
 {
 	QString _offset = "offset";
   QString _sec = "sec";
   QRegExp _reOffset = QRegExp(_offset);
   QRegExp _reEndOffset = QRegExp(_sec);
   int posOffset = _reOffset.match( _ntpOutput );
   int posEndOffset = _reEndOffset.match( _ntpOutput, posOffset );
   posOffset += _offset.length() + 1;
   QString diff = _ntpOutput.mid(posOffset, posEndOffset-posOffset-1);
   qDebug("%s", _ntpOutput.latin1());
   qDebug("diff = >%s<",diff.latin1());
   return diff.toFloat();
 }
 
 void Ntp::readLookups()
 {
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
   int lookupCount = cfg.readNumEntry("count",0);
   float last, shift, shiftPerSec;
   qDebug("lookupCount = %i",lookupCount);
   TableLookups->setNumCols( 3 );
   TableLookups->setNumRows( lookupCount);
   TableLookups->horizontalHeader()->setLabel(1,tr("last [h]"));
   TableLookups->horizontalHeader()->setLabel(2,tr("offset [s]"));
   TableLookups->horizontalHeader()->setLabel(0,tr("shift [s/h]"));
-  int cw = 50;//TableLookups->width()/4;
+  int cw = TableLookups->width()/4;
   qDebug("column width %i",cw);
+  cw = 50;
   TableLookups->setColumnWidth( 0, cw+30 );
   TableLookups->setColumnWidth( 1, cw );
   TableLookups->setColumnWidth( 2, cw );
   TableLookups->sortColumn(0, false, true );
  // TableLookups->setSorting( true );
   for (int i=0; i < lookupCount; i++)
   {
 	  cfg.setGroup("lookup_"+QString::number(i));
    	last = cfg.readEntry("secsSinceLast",0).toFloat();
     shift = QString(cfg.readEntry("timeShift",0)).toFloat();
 //   	qDebug("%i last %f",i,last);
 //   	qDebug("%i shift %f",i,shift);
     shiftPerSec =  shift / last;
     _shiftPerSec += shiftPerSec;
-		TableLookups->setText( i,0,QString::number(shiftPerSec*60));
+		TableLookups->setText( i,0,QString::number(shiftPerSec*60*60));
 		TableLookups->setText( i,2,QString::number(shift));
-	  TableLookups->setText( i,1,QString::number(last/60));
+	  TableLookups->setText( i,1,QString::number(last/(60*60)));
   }
-  _shiftPerSec /= lookupCount+1;
-  TextLabelShift->setText(QString::number(_shiftPerSec)+tr(" seconds"));
+  _shiftPerSec /= lookupCount;
+  TextLabelShift->setText(QString::number(_shiftPerSec*60*60)+tr(" s/h"));
 }
 
 void Ntp::preditctTime()
 {
 	Config cfg("ntp",Config::User);
   cfg.setGroup("lookups");
  	int lastTime = cfg.readNumEntry("time",0);
   setenv( "TZ", tz->currentZone(), 1 );
   int now = TimeConversion::toUTC( QDateTime::currentDateTime() );
   int corr = int((now - lastTime) * _shiftPerSec);
   TextLabelEstimatedShift->setText(QString::number(corr)+tr(" seconds"));
   predictedTime = QDateTime::currentDateTime().addSecs(corr);
  	TextLabelPredTime->setText(predictedTime.toString());
   TextLabelMainPredTime->setText(tr("Predicted time:")+"<br><b>"+predictedTime.toString()+"</b>");
 }
 
 void Ntp::setPredictTime()
 {
   preditctTime();
  	setTime( predictedTime );
 }
 
 void Ntp::slotCheckNtp(int i)
 {
 	if (i == 0)
  	{
     TextLabelMainPredTime->hide();
     ButtonSetTime->setText( tr("Get time from network") );
 	  connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotRunNtp()) );
 	 	if ( ntpDelayElapsed() )
    	{
       slotRunNtp();
 	  	disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) );
     	connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotRunNtp()) );
 	  }else{
     	disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotRunNtp()) );
 		  connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
     }
   }else{
 	  preditctTime();
 		ButtonSetTime->setText( tr("Set predicted time") );
   	if (i>0)ntpOutPut(tr("Could not connect to server ")+getNtpServer());
   	connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) );
 	  connect( ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
   }
 }
 
 void Ntp::slotProbeNtpServer()
 {
 	qDebug("Ntp::slotProbeNtpServer()");
 	ntpSock->connectToHost( getNtpServer() ,123);
 }
 
 void Ntp::slotNtpDelayChanged(int delay)
 {
   ntpTimer->changeInterval( delay*1000*60 );
 }
 
 void Ntp::ntpOutPut(QString out)
 {
 	MultiLineEditntpOutPut->append(out);
   MultiLineEditntpOutPut->setCursorPosition(MultiLineEditntpOutPut->numLines() + 1,0,FALSE);
 }
 
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control
index d3290e9..8fd7da5 100644
--- a/noncore/settings/netsystemtime/opie-netsystemtime.control
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.control
@@ -1,11 +1,12 @@
+Packagename: opie-netsystemtime
 Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop etc/ntpservers
 Priority: optional
 Section: opie/settings
 Depends: ntpdate
 Conflicts: opie-systemtime
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION), ntpdate
-Description: ntp ( Network  Time  Protocol) gui
+Description: ntp (Network  Time  Protocol) gui
 This utility syncs system time with a atomic timerserver via internet
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.postinst b/noncore/settings/netsystemtime/opie-netsystemtime.postinst
new file mode 100644
index 0000000..233cd31
--- a/dev/null
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -v
+
+systime=`ipkg status | grep Package | grep -i systemtime | sed  "s/Package://"`
+ipkg remove $pack
+
+cd $QPEDIR/bin/
+ln -s netsystemtime systemtime
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.postrm b/noncore/settings/netsystemtime/opie-netsystemtime.postrm
new file mode 100644
index 0000000..4b2ab7c
--- a/dev/null
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.postrm
@@ -0,0 +1,4 @@
+#!/bin/sh -v
+
+cd $QPEDIR/bin/
+rm systemtime
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 93543cd..e7e604f 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -138,230 +138,239 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
 
     QHBoxLayout *hb3 = new QHBoxLayout( vb );
     l = new QLabel( tr("Date format" ), FrameSystemTime );
     hb3->addWidget( l, 1 );
     dateFormatCombo = new QComboBox( FrameSystemTime );
     hb3->addWidget( dateFormatCombo, 2 );
 
     config.setGroup( "Date" );
     DateFormat df(QChar(config.readEntry("Separator", "/")[0]),
       (DateFormat::Order)config .readNumEntry("ShortOrder", DateFormat::DayMonthYear),
       (DateFormat::Order)config.readNumEntry("LongOrder", DateFormat::DayMonthYear));
 
     int currentdf = 0;
     date_formats[0] = DateFormat('/', DateFormat::MonthDayYear);
     dateFormatCombo->insertItem( tr( date_formats[0].toNumberString()) );
     date_formats[1] = DateFormat('.', DateFormat::DayMonthYear);
     if (df == date_formats[1])
   currentdf = 1;
     dateFormatCombo->insertItem( tr( date_formats[1].toNumberString() ) );
     date_formats[2] = DateFormat('-', DateFormat::YearMonthDay,
       DateFormat::DayMonthYear);
     if (df == date_formats[2])
   currentdf = 2;
     dateFormatCombo->insertItem( tr( date_formats[2].toNumberString() ) ); //ISO8601
     date_formats[3] = DateFormat('/', DateFormat::DayMonthYear);
     if (df == date_formats[3])
   currentdf = 3;
     dateFormatCombo->insertItem( tr( date_formats[3].toNumberString() ) );
 
     dateFormatCombo->setCurrentItem( currentdf );
     dateButton->setDateFormat( df );
 
     connect( dateFormatCombo, SIGNAL( activated(int)),
         SLOT(formatChanged(int)));
 
     QHBoxLayout *hb4 = new QHBoxLayout( vb );
     l = new QLabel( tr("Applet format" ), FrameSystemTime );
     hb4->addWidget( l, 1 );
 
     clockAppletCombo = new QComboBox( FrameSystemTime );
     clockAppletCombo->insertItem( tr("hh:mm"), 0 );
     clockAppletCombo->insertItem( tr("D/M hh:mm"), 1 );
     clockAppletCombo->insertItem( tr("M/D hh:mm"), 2 );
 
     hb4->addWidget( clockAppletCombo, 2 );
     int clockApplet =  config.readNumEntry("ClockApplet",0);
     clockAppletCombo->setCurrentItem( clockApplet );
 
     vb->addStretch( 0 );
 
     QObject::connect( PushButtonSetManualTime, SIGNAL(clicked()),
     									this, SLOT(commitTime()));
 
     QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
                       timeButton, SLOT( slotTzChange( const QString& ) ) );
     QObject::connect( tz, SIGNAL( signalNewTz( const QString& ) ),
                        SLOT( tzChange( const QString& ) ) );
 
     QObject::connect( weekStartCombo, SIGNAL( activated ( int )),
     									SLOT(updateSystem(int ) ));
     QObject::connect( ampmCombo, SIGNAL( activated ( int )),
     									SLOT(updateSystem(int ) ));
     QObject::connect( dateFormatCombo, SIGNAL( activated ( int )),
     									SLOT(updateSystem(int ) ));
     QObject::connect( clockAppletCombo, SIGNAL( activated ( int )),
     									SLOT(updateSystem(int ) ));
 }
 
 SetDateTime::~SetDateTime()
 {
 	writeSettings();
 
 }
 
 void SetDateTime::writeSettings()
 {
     Config config("qpe");
     config.setGroup( "Time" );
     config.writeEntry( "AMPM", ampmCombo->currentItem() );
     config.writeEntry( "MONDAY", weekStartCombo->currentItem() );
     config.setGroup( "Date" );
     DateFormat df = date_formats[dateFormatCombo->currentItem()];
     config.writeEntry( "Separator", QString(df.separator()));
     config.writeEntry( "ShortOrder", df.shortOrder());
     config.writeEntry( "LongOrder", df.longOrder());
     config.writeEntry( "ClockApplet", clockAppletCombo->currentItem() );
 
     Config lconfig("locale");
     lconfig.setGroup( "Location" );
     lconfig.writeEntry( "Timezone", tz->currentZone() );
 
 }
 
 void  SetDateTime::commitTime()
 {
     tz->setFocus();
-    // really turn off the screensaver before doing anything
-    {
-  // Needs to be encased in { } so that it deconstructs and sends
-  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
-  disableScreenSaver << 0 << 0 << 0;
-    }
     // Need to process the QCOP event generated above before proceeding
     qApp->processEvents();
 
     // before we progress further, set our TZ!
     setenv( "TZ", tz->currentZone(), 1 );
     // now set the time...
     QDateTime dt( dateButton->date(), timeButton->time() );
 
     if ( dt.isValid() ) setTime(dt);
 }
 
 void  SetDateTime::setTime(QDateTime dt)
 {
+    // really turn off the screensaver before doing anything
+    {
+  // Needs to be encased in { } so that it deconstructs and sends
+  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+  disableScreenSaver << 0 << 0 << 0;
+    }
 	Config cfg("ntp",Config::User);
   cfg.setGroup("correction");
     int t = TimeConversion::toUTC(dt);
 	  struct timeval myTv;
   	myTv.tv_sec = t;
 	  cfg.writeEntry("time", t );
 	  myTv.tv_usec = 0;
 
   if ( myTv.tv_sec != -1 )
       ::settimeofday( &myTv, 0 );
   Global::writeHWClock();
   // since time has changed quickly load in the datebookdb
   // to allow the alarm server to get a better grip on itself
   // (example re-trigger alarms for when we travel back in time)
   DateBookDB db;
+    // Restore screensaver
+    QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+    enableScreenSaver << -1 << -1 << -1;
 }
 
 void SetDateTime::updateSystem(int i)
 {
+    // really turn off the screensaver before doing anything
+    {
+  // Needs to be encased in { } so that it deconstructs and sends
+  QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
+  disableScreenSaver << 0 << 0 << 0;
+    }
 	qDebug("SetDateTime::updateSystem(int %i)",i);
  	writeSettings();
 
     // set the timezone for everyone else...
     QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
     setTimeZone << tz->currentZone();
 
     // AM/PM setting and notify time changed
     QCopEnvelope setClock( "QPE/System", "clockChange(bool)" );
     setClock << ampmCombo->currentItem();
 
     // Notify everyone what day we prefer to start the week on.
     QCopEnvelope setWeek( "QPE/System", "weekChange(bool)" );
     setWeek << weekStartCombo->currentItem();
 
     // Notify everyone what date format  to use 
     QCopEnvelope setDateFormat( "QPE/System", "setDateFormat(DateFormat)" );
     setDateFormat << date_formats[dateFormatCombo->currentItem()];
 
     // Restore screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
   // since time has changed quickly load in the datebookdb
   // to allow the alarm server to get a better grip on itself
   // (example re-trigger alarms for when we travel back in time)
   DateBookDB db;
 
 }
 
 void SetDateTime::tzChange( const QString &tz )
 {
     // set the TZ get the time and leave gracefully...
     QString strSave;
     strSave = getenv( "TZ" );
     setenv( "TZ", tz, 1 );
 
     QDate d = QDate::currentDate();
     // reset the time.
     if ( !strSave.isNull() ) {
   setenv( "TZ", strSave, 1 );
     }
     dateButton->setDate( d );
     updateSystem();
 }
 
 void SetDateTime::formatChanged(int i)
 {
     dateButton->setDateFormat(date_formats[i]);
 }
 
 static const int ValueAM = 0;
 static const int ValuePM = 1;
 
 
 
 SetTime::SetTime( QWidget *parent, const char *name )
     : QWidget( parent, name )
 {
     use12hourTime = FALSE;
 
     QTime currTime = QTime::currentTime();
     hour = currTime.hour();
     minute = currTime.minute();
 
     QHBoxLayout *hb2 = new QHBoxLayout( this );
     hb2->setSpacing( 3 );
 
     QLabel *l = new QLabel( tr("Hour"), this );
     //    l->setAlignment( AlignRight | AlignVCenter );
     hb2->addWidget( l );
 
     sbHour = new QSpinBox( this );
     sbHour->setMinimumWidth( 30 );
     if(use12hourTime) {
   sbHour->setMinValue(1);
   sbHour->setMaxValue( 12 );
   int show_hour = hour;
   if (hour > 12)
       show_hour -= 12;
   if (show_hour == 0)
       show_hour = 12;
 
   sbHour->setValue( show_hour );
     } else {
   sbHour->setMinValue( 0 );
   sbHour->setMaxValue( 23 );
   sbHour->setValue( hour );
     }
     sbHour->setWrapping(TRUE);
     connect( sbHour, SIGNAL(valueChanged(int)), this, SLOT(hourChanged(int)) );
     hb2->addWidget( sbHour );
 
     hb2->addStretch( 1 );
 
     l = new QLabel( tr("Minute"), this );
     //l->setAlignment( AlignRight | AlignVCenter );