summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/ntp.cpp2
-rw-r--r--noncore/settings/netsystemtime/opie-netsystemtime.control1
-rw-r--r--noncore/settings/netsystemtime/settime.cpp25
-rw-r--r--noncore/settings/netsystemtime/settime.h2
4 files changed, 28 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/ntp.cpp b/noncore/settings/netsystemtime/ntp.cpp
index 4a7959e..b2f192a 100644
--- a/noncore/settings/netsystemtime/ntp.cpp
+++ b/noncore/settings/netsystemtime/ntp.cpp
@@ -42,7 +42,7 @@ Ntp::Ntp( QWidget* parent, const char* name, WFlags fl )
this, SLOT(ntpFinished(OProcess*)));
connect(runNtp, SIGNAL(clicked()), this, SLOT(slotRunNtp()));
connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
-
+ slotCheckNtp(-1);
// slotRunNtp();
readLookups();
}
diff --git a/noncore/settings/netsystemtime/opie-netsystemtime.control b/noncore/settings/netsystemtime/opie-netsystemtime.control
index a5809b0..406d7b0 100644
--- a/noncore/settings/netsystemtime/opie-netsystemtime.control
+++ b/noncore/settings/netsystemtime/opie-netsystemtime.control
@@ -2,6 +2,7 @@ Files: bin/netsystemtime apps/Settings/ntpdatetime.desktop
Priority: optional
Section: opie/settings
Depends: ntpdate
+Conflicts: opie-systemtime
Maintainer: Patrick S. Vogt <tille@handhelds.org>
Architecture: arm
Version: $QPE_VERSION-$SUB_VERSION
diff --git a/noncore/settings/netsystemtime/settime.cpp b/noncore/settings/netsystemtime/settime.cpp
index 2cef6e8..b456012 100644
--- a/noncore/settings/netsystemtime/settime.cpp
+++ b/noncore/settings/netsystemtime/settime.cpp
@@ -192,11 +192,25 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
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() );
@@ -247,10 +261,16 @@ void SetDateTime::setTime(QDateTime dt)
if ( myTv.tv_sec != -1 )
::settimeofday( &myTv, 0 );
Global::writeHWClock();
+}
+
+void SetDateTime::updateSystem(int i)
+{
+ qDebug("SetDateTime::updateSystem(int %i)",i);
+ writeSettings();
// 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;
+ // DateBookDB db;
// set the timezone for everyone else...
QCopEnvelope setTimeZone( "QPE/System", "timeChange(QString)" );
@@ -276,6 +296,7 @@ void SetDateTime::setTime(QDateTime dt)
void SetDateTime::tzChange( const QString &tz )
{
+ qDebug("SetDateTime::tzChange");
// set the TZ get the time and leave gracefully...
QString strSave;
strSave = getenv( "TZ" );
@@ -287,6 +308,7 @@ void SetDateTime::tzChange( const QString &tz )
setenv( "TZ", strSave, 1 );
}
dateButton->setDate( d );
+ updateSystem();
}
void SetDateTime::formatChanged(int i)
@@ -430,6 +452,7 @@ void SetTime::checkedPM( int c )
void SetTime::slotTzChange( const QString &tz )
{
+ qDebug("SetTime::slotTzChange");
// set the TZ get the time and leave gracefully...
QString strSave;
strSave = getenv( "TZ" );
diff --git a/noncore/settings/netsystemtime/settime.h b/noncore/settings/netsystemtime/settime.h
index 60423e7..778cb9c 100644
--- a/noncore/settings/netsystemtime/settime.h
+++ b/noncore/settings/netsystemtime/settime.h
@@ -74,9 +74,11 @@ protected slots:
void commitTime();
void tzChange( const QString &tz );
void formatChanged(int);
+ void updateSystem(int i=0);
protected:
void setTime(QDateTime dt);
+ void writeSettings();
SetTime *timeButton;
DateButton *dateButton;