| -rw-r--r-- | noncore/settings/netsystemtime/ntp.cpp | 10 | ||||
| -rw-r--r-- | noncore/settings/netsystemtime/settime.cpp | 6 |
2 files changed, 10 insertions, 6 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp index 2b779fa..15dae93 100644 --- a/noncore/settings/netsystemtime/ntp.cpp +++ b/noncore/settings/netsystemtime/ntp.cpp @@ -217,109 +217,113 @@ void Ntp::readLookups() TableLookups->setColumnWidth( 1, cw ); TableLookups->setColumnWidth( 2, cw ); TableLookups->sortColumn(0, false, true ); // TableLookups->setSorting( true ); _shiftPerSec = 0; 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(); shiftPerSec = shift / last; qDebug("%i shift %f",i,shiftPerSec); _shiftPerSec += shiftPerSec; TableLookups->setText( i,0,QString::number(shiftPerSec*60*60)); TableLookups->setText( i,2,QString::number(shift)); TableLookups->setText( i,1,QString::number(last/(60*60))); } _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); cfg.writeEntry("lastNtp",true); 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); } void Ntp::makeChannel() { channel = new QCopChannel( "QPE/Application/netsystemtime", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); } void Ntp::receive(const QCString &msg, const QByteArray &arg) { - qDebug("QCop "+msg+" "+QCString(arg)); - if ( msg == "open(QString)" ) + qDebug("QCop(Ntp) "+msg+" "+QCString(arg)); + if ( msg == "ntpLookup(QString)" ) { - // qApp->exec(); + slotRunNtp(); + } + if ( msg == "setPredictedTime(QString)" ) + { + setPredictTime(); }else{ qDebug("Ntp::receive: Huh what do ya want"); } } void Ntp::setDocument(const QString &fileName) { }
\ No newline at end of file diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp index 9c5323a..b0fcb74 100644 --- a/noncore/settings/netsystemtime/settime.cpp +++ b/noncore/settings/netsystemtime/settime.cpp @@ -175,195 +175,195 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f ) 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() { Config cfg("ntp",Config::User); cfg.setGroup("lookups"); cfg.writeEntry("lastNtp",false); tz->setFocus(); // 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; + // 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 ); |