combos update sys

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
@@ -21,49 +21,49 @@
 
 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);
 	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()));
-
+  slotCheckNtp(-1);
 //  slotRunNtp();
   readLookups();
 }
 
 Ntp::~Ntp()
 {
 	Config cfg("ntp",Config::User);
   cfg.setGroup("settings");
   cfg.writeEntry("ntpServer", LineEditNtpSrv->text());
   cfg.writeEntry( "minLookupDiff", SpinBoxMinDelay->value() );
 }
 
 
 void Ntp::slotRunNtp()
 {
 	TextLabelStartTime->setText(QDateTime::currentDateTime().toString());
 	ntpProcess->clearArguments();
 	*ntpProcess << "ntpdate" << LineEditNtpSrv->text();
 	bool ret = ntpProcess->start(OProcess::NotifyOnExit,OProcess::AllOutput);
   if ( !ret ) {
      qDebug("Error while executing ntp");
   }
 }
 
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
@@ -1,10 +1,11 @@
 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
 Depends: opie-base ($QPE_VERSION), ntpdate
 Description: ntp ( Network  Time  Protocol) gui
 This utility syncs system time with a atomic timerserver via internet
\ No newline at end of file
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
@@ -171,53 +171,67 @@ SetDateTime::SetDateTime(QWidget *parent, const char *name, WFlags f )
         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 );
 
     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()
 {
     tz->setFocus();
     // 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)" );
@@ -226,88 +240,96 @@ void  SetDateTime::commitTime()
     // 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)
 {
 	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();
+}
+
+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)" );
     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;
 
 }
 
 void SetDateTime::tzChange( const QString &tz )
 {
+	qDebug("SetDateTime::tzChange");
     // 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 );
 
@@ -409,48 +431,49 @@ void SetTime::show12hourTime( int on )
 
     } 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 )
 {
+	qDebug("SetTime::slotTzChange");
     // 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 {
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
@@ -53,44 +53,46 @@ protected slots:
     void checkedPM( int );
 
 protected:
     int hour;
     int minute;
     bool use12hourTime;
     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(int i=0);
 
 protected:
    	void  setTime(QDateTime dt);
+    void writeSettings();
 
     SetTime *timeButton;
     DateButton *dateButton;
     TimeZoneSelector *tz;
     QComboBox *weekStartCombo;
     QComboBox *ampmCombo;
     QComboBox *dateFormatCombo;
     QComboBox *clockAppletCombo;
     QPushButton *ButtonSetTime;
     QLabel *TextLabelMainPredTime;
 
     DateFormat date_formats[4];
 };
 
 
 #endif