summaryrefslogtreecommitdiff
authortille <tille>2002-11-16 17:42:37 (UTC)
committer tille <tille>2002-11-16 17:42:37 (UTC)
commit0861a25d4f28be8a3ba794eafca9f29eac3cc7c1 (patch) (side-by-side diff)
tree0e78a2019fa62f803f6d61683b0daaeb4e810fd7
parent55f437bb3caaeec328bce4e2d00818780f1b4aa2 (diff)
downloadopie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.zip
opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.gz
opie-0861a25d4f28be8a3ba794eafca9f29eac3cc7c1.tar.bz2
first try to revert timezones on reject...
... not working i am too stupid ;)
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/TODO1
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp11
-rw-r--r--noncore/settings/netsystemtime/ntp.h1
-rw-r--r--noncore/settings/netsystemtime/settime.cpp9
-rw-r--r--noncore/settings/netsystemtime/settime.h2
5 files changed, 16 insertions, 8 deletions
diff --git a/noncore/settings/netsystemtime/TODO b/noncore/settings/netsystemtime/TODO
index fb003a2..c6106c3 100644
--- a/noncore/settings/netsystemtime/TODO
+++ b/noncore/settings/netsystemtime/TODO
@@ -1,3 +1,2 @@
-- handle hour > 24 in SetTime::slotClockTick
- improve tz setting
atm the tz gets written to the system as soon as changed...
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 53dbe46..551cedc 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -34,393 +34,402 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
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",720) );
SpinBoxNtpDelay->setValue( cfg.readNumEntry("ntpRefreshFreq",1440) );
ComboNtpSrv->setCurrentItem( cfg.readNumEntry("ntpServer", 0) );
//make tab order
TabWidgetMain->removePage( tabMain );
TabWidgetMain->removePage( tabManualSetTime );
TabWidgetMain->removePage( TabSettings );
TabWidgetMain->removePage( tabPredict );
TabWidgetMain->removePage( tabNtp );
TabWidgetMain->insertTab( tabMain, tr( "Main" ) );
TabWidgetMain->insertTab( TabSettings, tr( "Settings" ) );
TabWidgetMain->insertTab( tabPredict, tr( "Predict" ) );
TabWidgetMain->insertTab( tabNtp, tr( "NTP" ) );
NtpBaseLayout->addWidget( TabWidgetMain, 0, 0 );
bool advMode = cfg.readBoolEntry("advancedFeatures", false );
showAdvancedFeatures(advMode);
CheckBoxAdvSettings->setChecked( advMode );
connect( CheckBoxAdvSettings, SIGNAL( toggled( bool ) ),
SLOT( showAdvancedFeatures( bool ) ) );
makeChannel();
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(slotButtonRunNtp()));
connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
connect(PushButtonSetPredTime, SIGNAL(clicked()), this, SLOT(setPredictTime()));
slotCheckNtp(-1);
readLookups();
}
Ntp::~Ntp()
{
delete ntpProcess;
}
void Ntp::saveConfig(){
int srvCount = ComboNtpSrv->count();
bool serversChanged = true;
QString edit = ComboNtpSrv->currentText();
for (int i = 0; i < srvCount; i++){
if ( edit == ComboNtpSrv->text(i)) serversChanged = false;
}
if (serversChanged){
Config ntpSrvs("/etc/ntpservers",Config::File);
ntpSrvs.setGroup("servers");
ntpSrvs.writeEntry("count", srvCount);
for (int i = 0; i < srvCount; i++){
qDebug("ntpSrvs[%i/%i]=%s",i,srvCount,ComboNtpSrv->text(i).latin1());
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() );
cfg.writeEntry( "advancedFeatures", CheckBoxAdvSettings->isChecked() );
}
bool Ntp::ntpDelayElapsed()
{
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
_lookupDiff = TimeConversion::toUTC(QDateTime::currentDateTime()) - cfg.readNumEntry("time",0);
if (_lookupDiff < 0) return true;
int i =_lookupDiff - (SpinBoxNtpDelay->value()*60);
return i > -60;
}
QString Ntp::getNtpServer()
{
return ComboNtpSrv->currentText();
}
void Ntp::slotButtonRunNtp()
{
_interactive = true;
slotRunNtp();
}
void Ntp::slotTimerRunNtp()
{
_interactive = false;
slotRunNtp();
}
void Ntp::slotRunNtp()
{
if ( !ntpDelayElapsed() && CheckBoxAdvSettings->isChecked() )
{
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 lookup.")+
"<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 ) {
QMessageBox::critical(this, tr("ntp error"),
tr("Error while getting time form network!"));
qDebug("Error while executing ntpdate");
ntpOutPut( tr("Error while executing ntpdate"));
}
}
void Ntp::getNtpOutput(OProcess *proc, char *buffer, int buflen)
{
if (! proc ) qDebug("Ntp::getNtpOutput OProcess is null");
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())
{
if ( isVisible() && _interactive ){
QMessageBox::critical(this, tr("ntp error"),tr("Error while getting time form\n server")+getNtpServer()+"\n"+_ntpOutput );
}
// slotCheckNtp(-1);
return;
}
Config cfg("ntp",Config::User);
cfg.setGroup("lookups");
int lastLookup = cfg.readNumEntry("time",0);
int lookupCount = cfg.readNumEntry("count",0);
bool lastNtp = cfg.readBoolEntry("lastNtp",false);
int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
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 ( lastNtp && lastLookup > 0 && secsSinceLast > 60* SpinBoxMinLookupDelay->value())
{
cfg.setGroup("lookup_"+QString::number(lookupCount));
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));
cfg.setGroup("lookups");
cfg.writeEntry("count",lookupCount);
cfg.writeEntry("lastNtp",true);
}
}
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 = 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 );
_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()
{
qDebug("Ntp::setPredictTime");
preditctTime();
timeButton->setTime( predictedTime );
}
void Ntp::slotCheckNtp(int i)
{
qDebug(" Ntp::slotCheckNtp(%i)",i);
if (i == 0)
{
// TextLabelMainPredTime->hide();
ButtonSetTime->setText( tr("Get time from network") );
connect( ButtonSetTime, SIGNAL(clicked()), SLOT(slotButtonRunNtp()) );
if ( ntpDelayElapsed() )
{
slotRunNtp();
disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotProbeNtpServer()) );
connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotTimerRunNtp()) );
}else{
disconnect(ntpTimer, SIGNAL( timeout() ), this, SLOT(slotTimerRunNtp()) );
connect(ntpTimer, SIGNAL( timeout() ), SLOT(slotProbeNtpServer()) );
}
}else{
preditctTime();
ButtonSetTime->setText( tr("Set predicted time: ")+predictedTime.toString() );
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()
{
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(Ntp) "+msg+" "+QCString(arg));
if ( msg == "ntpLookup(QString)" )
{
_interactive = false;
slotRunNtp();
}
if ( msg == "setPredictedTime(QString)" )
{
setPredictTime();
}else{
qDebug("Ntp::receive: Huh what do ya want");
}
}
void Ntp::setDocument(const QString &fileName)
{
qDebug("Ntp::setDocument( %s )",fileName.latin1());
}
void Ntp::showAdvancedFeatures(bool advMode)
{
if (advMode) {
TabWidgetMain->addTab( tabPredict, tr( "Predict" ) );
TabWidgetMain->addTab( tabNtp, tr( "NTP" ) );
TextLabel1_2_2->show();
TextLabel2_3->show();
TextLabel3_3_2->show();
TextLabel1_2->show();
SpinBoxMinLookupDelay->show();
TextLabel2->show();
TextLabel3_3->show();
SpinBoxNtpDelay->show();
Line1->show();
}else{
TabWidgetMain->removePage( tabPredict );
TabWidgetMain->removePage( tabNtp );
TextLabel1_2_2->hide();
TextLabel2_3->hide();
TextLabel3_3_2->hide();
TextLabel1_2->hide();
SpinBoxMinLookupDelay->hide();
TextLabel2->hide();
TextLabel3_3->hide();
SpinBoxNtpDelay->hide();
Line1->hide();
};
TabWidgetMain->show();
}
void Ntp::accept( ){
- qDebug("accepted");
+ qDebug("saving");
//SetTimeDate
commitTime();
writeSettings();
updateSystem();
// Ntp
saveConfig();
qApp->quit();
} \ No newline at end of file
+
+void Ntp::reject( ){
+ qDebug("_oldTimeZone %s",_oldTimeZone.latin1());
+ if (!_oldTimeZone.isEmpty()){
+ qDebug("reverting timezone");
+ tzChange(_oldTimeZone);
+ commitTime();
+ }
+} \ No newline at end of file
diff --git a/noncore/settings/netsystemtime/ntp.h b/noncore/settings/netsystemtime/ntp.h
index a4573f8..150140e 100644
--- a/noncore/settings/netsystemtime/ntp.h
+++ b/noncore/settings/netsystemtime/ntp.h
@@ -1,57 +1,58 @@
#ifndef NTP_H
#define NTP_H
#include "settime.h"
#include <qdatetime.h>
class OProcess;
class QString;
class QTimer;
class QSocket;
class QCopChannel;
class Ntp : public SetDateTime
{
Q_OBJECT
public:
Ntp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
~Ntp();
public slots:
void setDocument (const QString &);
protected:
virtual void accept( );
+ virtual void reject( );
QDateTime predictedTime;
void makeChannel();
protected slots:
void receive(const QCString &msg, const QByteArray &arg);
private:
QString _ntpOutput;
float _shiftPerSec;
int _lookupDiff;
OProcess *ntpProcess;
QTimer *ntpTimer;
QSocket *ntpSock;
QCopChannel *channel;
bool _interactive;
float getTimeShift();
void readLookups();
void ntpOutPut(QString);
bool ntpDelayElapsed();
QString getNtpServer();
void saveConfig();
private slots:
void slotTimerRunNtp();
void slotButtonRunNtp();
void slotRunNtp();
void getNtpOutput(OProcess *proc, char *buffer, int buflen);
void ntpFinished(OProcess*);
void preditctTime();
void slotCheckNtp(int);
void setPredictTime();
void showAdvancedFeatures(bool);
void slotProbeNtpServer();
void slotNtpDelayChanged(int);
};
#endif
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 36166ae..6a28989 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -1,534 +1,533 @@
/**********************************************************************
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#include "settime.h"
#include <qpe/alarmserver.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
#include <qpe/datebookdb.h>
#include <qpe/datebookmonth.h>
#include <qpe/global.h>
#include <qpe/resource.h>
#include <qpe/timeconversion.h>
#include <qpe/tzselect.h>
#include <qpe/timestring.h>
#include <qpe/qpedialog.h>
#if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
#include <qpe/qcopenvelope_qws.h>
#endif
#include <qtimer.h>
#include <qbuttongroup.h>
#include <qcheckbox.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qradiobutton.h>
#include <qspinbox.h>
#include <qtoolbutton.h>
#include <qwindowsystem_qws.h>
#include <qcombobox.h>
#include <sys/time.h>
#include <time.h>
#include <stdlib.h>
#include <stdio.h>
SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
: NtpBase( parent, name, true, f )
{
setCaption( tr("System Time") );
-
+ _oldTimeZone="";
QVBoxLayout *vb = new QVBoxLayout( FrameSystemTime, 5 );
// TextLabelMainPredTime = new QLabel( FrameSystemTime );
// vb->addWidget( TextLabelMainPredTime, 1, 0 );
timeButton = new SetTime( FrameSystemTime );
vb->addWidget( timeButton );
QHBoxLayout *db = new QHBoxLayout( vb );
QLabel *dateLabel = new QLabel( tr("Date"), FrameSystemTime );
db->addWidget( dateLabel, 1 );
dateButton = new DateButton( TRUE, FrameSystemTime );
db->addWidget( dateButton, 2 );
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() );
hb->addWidget( lblZone );
tz = new TimeZoneSelector( FrameSystemTime, "Timezone choices" );
tz->setMinimumSize( tz->sizeHint() );
hb->addWidget( tz );
hline = new QFrame( FrameSystemTime );
hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
vb->addWidget( hline );
QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding );
vb->addItem( spacer );
Config config("qpe");
config.setGroup( "Time" );
QHBoxLayout *hb1 = new QHBoxLayout( vb );
QLabel *l = new QLabel( tr("Time format"), FrameSystemTime );
hb1->addWidget( l, 1 );
ampmCombo = new QComboBox( FrameSystemTime );
ampmCombo->insertItem( tr("24 hour"), 0 );
ampmCombo->insertItem( tr("12 hour"), 1 );
hb1->addWidget( ampmCombo, 2 );
int show12hr = config.readBoolEntry("AMPM") ? 1 : 0;
ampmCombo->setCurrentItem( show12hr );
timeButton->show12hourTime( show12hr );
connect(ampmCombo, SIGNAL(activated(int)),
timeButton, SLOT(show12hourTime(int)));
QHBoxLayout *hb2 = new QHBoxLayout( vb );
l = new QLabel( tr("Weeks start on" ), FrameSystemTime );
//l->setAlignment( AlignRight | AlignVCenter );
hb2->addWidget( l, 1 );
weekStartCombo = new QComboBox( FrameSystemTime );
weekStartCombo->insertItem( tr("Sunday"), 0 );
weekStartCombo->insertItem( tr("Monday"), 1 );
hb2->addWidget( weekStartCombo, 2 );
int startMonday = config.readBoolEntry("MONDAY") ? 1 : 0;
dateButton->setWeekStartsMonday( startMonday );
weekStartCombo->setCurrentItem( startMonday );
connect( weekStartCombo, SIGNAL( activated(int)),
dateButton, SLOT(setWeekStartsMonday(int)));
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 );
// hline = new QFrame( FrameSystemTime );
// hline->setFrameStyle( QFrame::HLine | QFrame::Sunken );
// vb->addWidget( hline );
//
// ButtonSetTime = new QPushButton( FrameSystemTime );
// vb->addWidget( ButtonSetTime, 1, 0 );
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()
{
}
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;
//QCopEnvelope timeApplet( "QPE/TaskBar", "reloadApplets()" );
//timeApplet << "";
// Restore screensaver
QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
enableScreenSaver << -1 << -1 << -1;
}
void SetDateTime::updateSystem()
{
// 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()");
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" );
+ _oldTimeZone = getenv( "TZ" );
setenv( "TZ", tz, 1 );
QDate d = QDate::currentDate();
// reset the time.
- if ( !strSave.isNull() ) {
- setenv( "TZ", strSave, 1 );
+ if ( !_oldTimeZone.isNull() ) {
+ setenv( "TZ", _oldTimeZone, 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 )
{
clock = new QTimer(this, "clock" );
connect(clock, SIGNAL( timeout() ), SLOT(slotClockTick()) );
clock->start( 1000 * 60 );
use12hourTime = FALSE;
_time = QDateTime::currentDateTime();
hour = _time.time().hour();
minute = _time.time().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 );
hb2->addWidget( l );
sbMin = new QSpinBox( this );
sbMin->setMinValue( 0 );
sbMin->setMaxValue( 59 );
sbMin->setWrapping(TRUE);
sbMin->setValue( minute );
sbMin->setMinimumWidth( 30 );
connect( sbMin, SIGNAL(valueChanged(int)), this, SLOT(minuteChanged(int)) );
hb2->addWidget( sbMin );
hb2->addStretch( 1 );
ampm = new QComboBox( this );
ampm->insertItem( tr("AM"), ValueAM );
ampm->insertItem( tr("PM"), ValuePM );
connect( ampm, SIGNAL(activated(int)), this, SLOT(checkedPM(int)) );
hb2->addWidget( ampm );
hb2->addStretch( 1 );
}
QTime SetTime::time() const
{
return QTime( hour, minute, 0 );
}
void SetTime::hourChanged( int value )
{
if(use12hourTime) {
int realhour = value;
if (realhour == 12)
realhour = 0;
if (ampm->currentItem() == ValuePM )
realhour += 12;
hour = realhour;
} else
hour = value;
}
void SetTime::minuteChanged( int value )
{
minute = value;
}
void SetTime::show12hourTime( int on )
{
use12hourTime = on;
ampm->setEnabled(on);
int show_hour = hour;
if ( on ) {
/* this might change the value of hour */
sbHour->setMinValue(1);
sbHour->setMaxValue( 12 );
/* so use one we saved earlier */
if (show_hour >= 12) {
show_hour -= 12;
ampm->setCurrentItem( ValuePM );
} else {
ampm->setCurrentItem( ValueAM );
}
if (show_hour == 0)
show_hour = 12;
} else {
sbHour->setMinValue( 0 );
sbHour->setMaxValue( 23 );
}
sbHour->setValue( show_hour );
}
void SetTime::checkedPM( int c )
{
int show_hour = sbHour->value();
if (show_hour == 12)
show_hour = 0;
if ( c == ValuePM )
show_hour += 12;
hour = show_hour;
}
void SetTime::slotTzChange( const QString &tz )
{
// set the TZ get the time and leave gracefully...
QString strSave;
strSave = getenv( "TZ" );
setenv( "TZ", tz, 1 );
QTime t = QTime::currentTime();
// reset the time.
if ( !strSave.isNull() ) {
setenv( "TZ", strSave, 1 );
}
// just set the spinboxes and let it propage through
if(use12hourTime) {
int show_hour = t.hour();
if (t.hour() >= 12) {
show_hour -= 12;
ampm->setCurrentItem( ValuePM );
} else {
ampm->setCurrentItem( ValueAM );
}
if (show_hour == 0)
show_hour = 12;
sbHour->setValue( show_hour );
} else {
sbHour->setValue( t.hour() );
}
sbMin->setValue( t.minute() );
}
void SetTime::setTime( QDateTime dt )
{
_time = dt;
QTime t = dt.time();
// just set the spinboxes and let it propage through
if(use12hourTime) {
int show_hour = t.hour();
if (t.hour() >= 12) {
show_hour -= 12;
ampm->setCurrentItem( ValuePM );
} else {
ampm->setCurrentItem( ValueAM );
}
if (show_hour == 0)
show_hour = 12;
sbHour->setValue( show_hour );
} else {
sbHour->setValue( t.hour() );
}
sbMin->setValue( t.minute() );
}
void SetTime::slotClockTick()
{
setTime( _time.addSecs(60) );
qDebug("SetTime::slotClockTick %s",_time.toString().latin1());
}
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 3c3a162..58d1006 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -1,102 +1,102 @@
/**********************************************************************
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef SYSTEM_TIME_H
#define SYSTEM_TIME_H
#include <qdatetime.h>
#include <qdialog.h>
#include <qpe/timestring.h>
#include "ntpbase.h"
class QToolButton;
class QSpinBox;
class QLabel;
class TimeZoneSelector;
class DateBookMonth;
class QComboBox;
class SetTime : public QWidget
{
Q_OBJECT
public:
SetTime( QWidget *parent=0, const char *name=0 );
QTime time() const;
void setTime( QDateTime );
public slots:
void slotTzChange( const QString& tz );
void show12hourTime( int );
protected slots:
void slotClockTick();
void hourChanged( int value );
void minuteChanged( int value );
void checkedPM( int );
protected:
int hour;
int minute;
bool use12hourTime;
QDateTime _time;
QTimer *clock;
QComboBox *ampm;
QSpinBox *sbHour;
QSpinBox *sbMin;
};
class DateButton;
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);
void updateSystem();
protected:
void setTime(QDateTime dt);
void writeSettings();
SetTime *timeButton;
DateButton *dateButton;
TimeZoneSelector *tz;
+ QString _oldTimeZone;
QComboBox *weekStartCombo;
QComboBox *ampmCombo;
QComboBox *dateFormatCombo;
QComboBox *clockAppletCombo;
QPushButton *ButtonSetTime;
- // QLabel *TextLabelMainPredTime;
DateFormat date_formats[4];
};
#endif