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
@@ -44,3 +44,3 @@ Ntp::Ntp( QWidget* parent,  const char* name, WFlags fl )
   connect(PushButtonPredict, SIGNAL(clicked()), this, SLOT(preditctTime()));
-
+  slotCheckNtp(-1);
 //  slotRunNtp();
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
@@ -4,2 +4,3 @@ Section: opie/settings
 Depends: ntpdate
+Conflicts: opie-systemtime
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
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
@@ -194,2 +194,11 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
                        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 ) ));
 }
@@ -198,3 +207,8 @@ SetDateTime::~SetDateTime()
 {
+        writeSettings();
+
+}
 
+void SetDateTime::writeSettings()
+{
     Config config("qpe");
@@ -249,2 +263,8 @@ void  SetDateTime::setTime(QDateTime dt)
   Global::writeHWClock();
+}
+
+void SetDateTime::updateSystem(int i)
+{
+        qDebug("SetDateTime::updateSystem(int %i)",i);
+         writeSettings();
   // since time has changed quickly load in the datebookdb
@@ -252,3 +272,3 @@ void  SetDateTime::setTime(QDateTime dt)
   // (example re-trigger alarms for when we travel back in time)
-  DateBookDB db;
+ // DateBookDB db;
 
@@ -278,2 +298,3 @@ void SetDateTime::tzChange( const QString &tz )
 {
+        qDebug("SetDateTime::tzChange");
     // set the TZ get the time and leave gracefully...
@@ -289,2 +310,3 @@ void SetDateTime::tzChange( const QString &tz )
     dateButton->setDate( d );
+    updateSystem();
 }
@@ -432,2 +454,3 @@ void SetTime::slotTzChange( const QString &tz )
 {
+        qDebug("SetTime::slotTzChange");
     // set the TZ get the time and leave gracefully...
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
@@ -76,2 +76,3 @@ protected slots:
     void formatChanged(int);
+                void updateSystem(int i=0);
 
@@ -79,2 +80,3 @@ protected:
            void  setTime(QDateTime dt);
+    void writeSettings();