From 4c671979117dc8ec75c91ce543c7039730530a63 Mon Sep 17 00:00:00 2001 From: tille Date: Tue, 25 Jun 2002 20:10:42 +0000 Subject: working --- diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index 87b20ec..4a7959e 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -3,7 +3,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -22,32 +24,35 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl ) { Config cfg("ntp",Config::User); cfg.setGroup("settings"); - _maxOffset = cfg.readNumEntry("maxOffset",5); - _minLookupDiff = cfg.readNumEntry("minLookupDiff",10); - LineEditNtpServer->setText( cfg.readEntry("ntpServer") ); +// _maxOffset = cfg.readNumEntry("maxOffset",5); +// _minLookupDiff = cfg.readNumEntry("minLookupDiff",10); + SpinBoxMinDelay->setValue( cfg.readNumEntry("minLookupDiff",10) ); + SpinBoxMinDelay->setMinValue( 7 ); + LineEditNtpSrv->setText( cfg.readEntry("ntpServer", tr("time.fu-berlin.de")) ); ntpProcess = new OProcess( ); + + QSocket *ntpSock = new QSocket( this ); + ntpSock->connectToHost( LineEditNtpSrv->text() ,123); + connect( ntpSock, SIGNAL( error(int) ), + SLOT(slotCheckNtp(int)) ); + 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())); -// _nextCorrection = new QTimer( this ); -// connect( _nextCorrection, SIGNAL(timeout()), SLOT(correctClock()) ); - slotRunNtp(); + +// slotRunNtp(); readLookups(); } Ntp::~Ntp() { - -} - -void Ntp::accept() -{ Config cfg("ntp",Config::User); cfg.setGroup("settings"); - cfg.writeEntry("ntpServer", LineEditNtpServer->text()); + cfg.writeEntry("ntpServer", LineEditNtpSrv->text()); + cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() ); } @@ -55,7 +60,7 @@ void Ntp::slotRunNtp() { TextLabelStartTime->setText(QDateTime::currentDateTime().toString()); ntpProcess->clearArguments(); - *ntpProcess << "ntpdate" << LineEditNtpServer->text(); + *ntpProcess << "ntpdate" << LineEditNtpSrv->text(); bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput); if ( !ret ) { qDebug("Error while executing ntp"); @@ -69,7 +74,7 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen) lineStr=lineStr.left(buflen); if (lineStr!=lineStrOld) { -// outPut->append(lineStr); + MultiLineEditntpOutPut->append(lineStr); _ntpOutput += lineStr; } lineStrOld = lineStr; @@ -90,7 +95,7 @@ void Ntp::ntpFinished(OProcess*) if (timeShift == 0.0) return; int secsSinceLast = time - lastLookup; TextLabelNewTime->setText(QDateTime::currentDateTime().toString()); - if ( lastLookup > 0 && secsSinceLast > 60*_minLookupDiff) + if ( lastLookup > 0 && secsSinceLast > 60*24* SpinBoxMinDelay->value()) { lookupCount++; cfg.writeEntry("count",lookupCount); @@ -151,12 +156,12 @@ void Ntp::readLookups() qDebug("lookupCount = %i",lookupCount); TableLookups->setNumCols( 3 ); TableLookups->setNumRows( lookupCount); - TableLookups->horizontalHeader()->setLabel(2,"secsSinceLast"); - TableLookups->horizontalHeader()->setLabel(1,"timeShift"); + TableLookups->horizontalHeader()->setLabel(1,"secsSinceLast"); + TableLookups->horizontalHeader()->setLabel(2,"timeShift"); TableLookups->horizontalHeader()->setLabel(0,"shift/s"); - int cw = TableLookups->width()/4; + int cw = 50;//TableLookups->width()/4; qDebug("column width %i",cw); - TableLookups->setColumnWidth( 0, cw ); + TableLookups->setColumnWidth( 0, cw+30 ); TableLookups->setColumnWidth( 1, cw ); TableLookups->setColumnWidth( 2, cw ); for (int i=0; i < lookupCount; i++) @@ -164,13 +169,13 @@ void Ntp::readLookups() 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); +// qDebug("%i last %f",i,last); +// qDebug("%i shift %f",i,shift); shiftPerSec = shift / last; _shiftPerSec += shiftPerSec; TableLookups->setText( i,0,QString::number(shiftPerSec)); - TableLookups->setText( i,1,QString::number(shift)); - TableLookups->setText( i,2,QString::number(last)); + TableLookups->setText( i,2,QString::number(shift)); + TableLookups->setText( i,1,QString::number(last)); } _shiftPerSec /= lookupCount+1; TextLabelShift->setText(QString::number(_shiftPerSec)); @@ -185,7 +190,27 @@ void Ntp::preditctTime() setenv( "TZ", tz->currentZone(), 1 ); int now = TimeConversion::toUTC( QDateTime::currentDateTime() ); int corr = int((now - lastTime) * _shiftPerSec); - QDateTime dt = QDateTime::currentDateTime().addSecs(corr); - setTime(dt); - TextLabelPredTime->setText(dt.toString()); + predictedTime = QDateTime::currentDateTime().addSecs(corr); + TextLabelPredTime->setText(predictedTime.toString()); + TextLabelMainPredTime->setText(predictedTime.toString()); +} + +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()) ); + }else{ + preditctTime(); + ButtonSetTime->setText( tr("Predict time") ); + connect( ButtonSetTime, SIGNAL(clicked()), SLOT(setPredictTime()) ); + }; } diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h index d2e238d..284ae27 100644 --- a/noncore/settings/netsystemtime/ntp.h +++ b/noncore/settings/netsystemtime/ntp.h @@ -2,7 +2,6 @@ #define NTP_H #include "settime.h" #include -#include class OProcess; class QString; @@ -16,17 +15,14 @@ public: Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~Ntp(); - OProcess *ntpProcess; - protected: - virtual void accept(); + QDateTime predictedTime; + private: QString _ntpOutput; - int _maxOffset; float _shiftPerSec; -// QTimer *_nextCorrection; - int _minLookupDiff; + OProcess *ntpProcess; float getTimeShift(); void readLookups(); @@ -34,8 +30,9 @@ private slots: void slotRunNtp(); void getNtpOutput(OProcess *proc, char *buffer, int buflen); void ntpFinished(OProcess*); -// void correctClock(); void preditctTime(); + void slotCheckNtp(int); + void setPredictTime(); }; #endif diff --git a/noncore/settings/netsystemtime/ntpbase.ui b/noncore/settings/netsystemtime/ntpbase.ui index ccae5bf..e444065 100644 --- a/noncore/settings/netsystemtime/ntpbase.ui +++ b/noncore/settings/netsystemtime/ntpbase.ui @@ -1,7 +1,7 @@ NtpBase - QDialog + QWidget name NtpBase @@ -11,7 +11,7 @@ 0 0 - 280 + 276 337 @@ -247,39 +247,15 @@ - QLayoutWidget + QMultiLineEdit name - Layout6 + MultiLineEditntpOutPut + + + wordWrap + WidgetWidth - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - TextLabel7 - - - text - NTP Server: - - - - QLineEdit - - name - LineEditNtpServer - - - @@ -293,7 +269,7 @@ title - Auto + Predict @@ -426,6 +402,135 @@ frameShadow Raised + + + margin + 11 + + + spacing + 6 + + + QLayoutWidget + + name + Layout6 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLayoutWidget + + name + Layout6 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + TextLabel7_2 + + + text + NTP Server: + + + + QLineEdit + + name + LineEditNtpSrv + + + + + + QLayoutWidget + + name + Layout5 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + TextLabel1_2 + + + text + Min. delay: + + + + QSpinBox + + name + SpinBoxMinDelay + + + + QLabel + + name + TextLabel2 + + + text + minutes + + + + + + + diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 01268c9..2cef6e8 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp @@ -60,6 +60,15 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 ); QVBoxLayout *vb2 = new QVBoxLayout( FrameSetTime, 5 ); + TextLabelMainPredTime = new QLabel( FrameSystemTime ); + vb->addWidget( TextLabelMainPredTime, 1, 0 ); + ButtonSetTime = new QPushButton( FrameSystemTime ); + vb->addWidget( ButtonSetTime, 1, 0 ); + + QFrame *hline = new QFrame( FrameSystemTime ); + hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); + vb->addWidget( hline ); + QHBoxLayout *hb = new QHBoxLayout( vb, -1, "timezone layout" ); QLabel *lblZone = new QLabel( tr( "Time Zone" ), FrameSystemTime, "timezone label" ); @@ -82,7 +91,7 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); vb2->addItem( spacer ); - QFrame *hline = new QFrame( FrameSystemTime ); + hline = new QFrame( FrameSystemTime ); hline->setFrameStyle( QFrame::HLine | QFrame::Sunken ); vb->addWidget( hline ); @@ -92,7 +101,6 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) QHBoxLayout *hb1 = new QHBoxLayout( vb ); QLabel *l = new QLabel( tr("Time format"), FrameSystemTime ); - // l->setAlignment( AlignRight | AlignVCenter ); hb1->addWidget( l, 1 ); @@ -177,16 +185,16 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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( PushButtonSetManualTime, SLOT(clicked()), - SLOT(commitTime())); -// dl = new QPEDialogListener(this); } -void SetDateTime::accept() +SetDateTime::~SetDateTime() { Config config("qpe"); @@ -264,13 +272,6 @@ void SetDateTime::setTime(QDateTime dt) QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); enableScreenSaver << -1 << -1 << -1; - // QDialog::accept(); -} - -void SetDateTime::done(int r) -{ -// QDialog::done(r); - close(); } void SetDateTime::tzChange( const QString &tz ) diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h index 729bf4b..60423e7 100644 --- a/noncore/settings/netsystemtime/settime.h +++ b/noncore/settings/netsystemtime/settime.h @@ -33,7 +33,6 @@ class QLabel; class TimeZoneSelector; class DateBookMonth; class QComboBox; -//class QPEDialogListener; class SetTime : public QWidget { @@ -69,16 +68,15 @@ class SetDateTime : public NtpBase Q_OBJECT public: SetDateTime( QWidget *parent=0, const char *name=0, WFlags f=0 ); + ~SetDateTime(); protected slots: + void commitTime(); void tzChange( const QString &tz ); void formatChanged(int); protected: - void commitTime(); void setTime(QDateTime dt); - virtual void accept(); - virtual void done(int); SetTime *timeButton; DateButton *dateButton; @@ -87,8 +85,8 @@ protected: QComboBox *ampmCombo; QComboBox *dateFormatCombo; QComboBox *clockAppletCombo; - -// QPEDialogListener *dl; + QPushButton *ButtonSetTime; + QLabel *TextLabelMainPredTime; DateFormat date_formats[4]; }; -- cgit v0.9.0.2