summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp77
-rw-r--r--noncore/settings/netsystemtime/ntp.h13
-rw-r--r--noncore/settings/netsystemtime/ntpbase.ui171
-rw-r--r--noncore/settings/netsystemtime/settime.cpp27
-rw-r--r--noncore/settings/netsystemtime/settime.h10
5 files changed, 212 insertions, 86 deletions
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
@@ -2,9 +2,11 @@
#include <qpushbutton.h>
#include <qregexp.h>
#include <qtable.h>
#include <qlabel.h>
+#include <qsocket.h>
#include <qlineedit.h>
+#include <qspinbox.h>
#include <qmultilineedit.h>
#include <opie/oprocess.h>
#include <qpe/config.h>
#include <qpe/global.h>
@@ -21,42 +23,45 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
: SetDateTime( parent, name, 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() );
}
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");
}
@@ -68,9 +73,9 @@ void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
lineStr = buffer;
lineStr=lineStr.left(buflen);
if (lineStr!=lineStrOld)
{
-// outPut->append(lineStr);
+ MultiLineEditntpOutPut->append(lineStr);
_ntpOutput += lineStr;
}
lineStrOld = lineStr;
}
@@ -89,9 +94,9 @@ void Ntp::ntpFinished(OProcess*)
float timeShift = getTimeShift();
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);
cfg.setGroup("lookup_"+QString::number(lookupCount));
@@ -150,28 +155,28 @@ void Ntp::readLookups()
float last, shift, shiftPerSec;
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++)
{
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));
}
@@ -184,8 +189,28 @@ void Ntp::preditctTime()
int lastTime = cfg.readNumEntry("time",0);
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
@@ -1,9 +1,8 @@
#ifndef NTP_H
#define NTP_H
#include "settime.h"
#include <qdatetime.h>
-#include <qtimer.h>
class OProcess;
class QString;
@@ -15,27 +14,25 @@ class Ntp : public SetDateTime
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();
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,8 +1,8 @@
<!DOCTYPE UI><UI>
<class>NtpBase</class>
<widget>
- <class>QDialog</class>
+ <class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>NtpBase</cstring>
</property>
@@ -10,9 +10,9 @@
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>280</width>
+ <width>276</width>
<height>337</height>
</rect>
</property>
<property stdset="1">
@@ -246,41 +246,17 @@
</spacer>
</vbox>
</widget>
<widget row="1" column="0" >
- <class>QLayoutWidget</class>
+ <class>QMultiLineEdit</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout6</cstring>
+ <cstring>MultiLineEditntpOutPut</cstring>
+ </property>
+ <property stdset="1">
+ <name>wordWrap</name>
+ <enum>WidgetWidth</enum>
</property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel7</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>NTP Server:</string>
- </property>
- </widget>
- <widget>
- <class>QLineEdit</class>
- <property stdset="1">
- <name>name</name>
- <cstring>LineEditNtpServer</cstring>
- </property>
- </widget>
- </hbox>
</widget>
</grid>
</widget>
</grid>
@@ -292,9 +268,9 @@
<cstring>tab</cstring>
</property>
<attribute>
<name>title</name>
- <string>Auto</string>
+ <string>Predict</string>
</attribute>
<grid>
<property stdset="1">
<name>margin</name>
@@ -425,8 +401,137 @@
<property stdset="1">
<name>frameShadow</name>
<enum>Raised</enum>
</property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout6</cstring>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <spacer row="2" column="0" >
+ <property>
+ <name>name</name>
+ <cstring>Spacer2</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget row="1" column="0" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout6</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel7_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>NTP Server:</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>LineEditNtpSrv</cstring>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <widget row="0" column="0" >
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout5</cstring>
+ </property>
+ <hbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Min. delay:</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QSpinBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>SpinBoxMinDelay</cstring>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>minutes</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </grid>
+ </widget>
+ </grid>
</widget>
</grid>
</widget>
<widget>
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
@@ -59,8 +59,17 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
// QVBoxLayout *vb = new QVBoxLayout( this, 5 );
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" );
lblZone->setMaximumSize( lblZone->sizeHint() );
@@ -81,9 +90,9 @@ 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 );
Config config("qpe");
@@ -91,9 +100,8 @@ 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 );
ampmCombo = new QComboBox( FrameSystemTime );
@@ -176,18 +184,18 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
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( PushButtonSetManualTime, SLOT(clicked()),
- SLOT(commitTime()));
-// dl = new QPEDialogListener(this);
}
-void SetDateTime::accept()
+SetDateTime::~SetDateTime()
{
Config config("qpe");
config.setGroup( "Time" );
@@ -263,15 +271,8 @@ void SetDateTime::setTime(QDateTime dt)
// Restore screensaver
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
@@ -32,9 +32,8 @@ class QSpinBox;
class QLabel;
class TimeZoneSelector;
class DateBookMonth;
class QComboBox;
-//class QPEDialogListener;
class SetTime : public QWidget
{
Q_OBJECT
@@ -68,28 +67,27 @@ 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;
TimeZoneSelector *tz;
QComboBox *weekStartCombo;
QComboBox *ampmCombo;
QComboBox *dateFormatCombo;
QComboBox *clockAppletCombo;
-
-// QPEDialogListener *dl;
+ QPushButton *ButtonSetTime;
+ QLabel *TextLabelMainPredTime;
DateFormat date_formats[4];
};