| -rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp index 486257f..01d9a98 100644 --- a/noncore/settings/netsystemtime/mainwindow.cpp +++ b/noncore/settings/netsystemtime/mainwindow.cpp @@ -70,14 +70,14 @@ MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) ); mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) ); mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) ); mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) ); Config config( "ntp" ); config.setGroup( "settings" ); - slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) ); - slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) ); + slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", false ) ); + slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", false ) ); mainWidget->setCurrentTab( tr( "Time" ) ); layout->addWidget( mainWidget ); connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(slotQCopReceive(const QCString&,const QByteArray&)) ); @@ -125,16 +125,16 @@ void MainWindow::accept() { QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); disableScreenSaver << 0 << 0 << 0; } // Update the systemtime - timeTab->saveSettings( TRUE ); + timeTab->saveSettings( true ); // Save format options - formatTab->saveSettings( TRUE ); + formatTab->saveSettings( true ); // Save settings options settingsTab->saveSettings(); // 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). @@ -148,16 +148,16 @@ void MainWindow::accept() qApp->quit(); } void MainWindow::reject() { // Reset time settings - timeTab->saveSettings( FALSE ); + timeTab->saveSettings( false ); // Send notifications but do not save settings - formatTab->saveSettings( FALSE ); + formatTab->saveSettings( false ); // Exit app qApp->quit(); } void MainWindow::runNTP() @@ -182,16 +182,16 @@ void MainWindow::runNTP() if ( ntpTabEnabled ) { ntpTab->setStartTime( QDateTime::currentDateTime().toString() ); QString output = tr( "Running:\nntpdate " ); output.append( srv ); ntpTab->addNtpOutput( output ); + ntpTab->setNTPBtnEnabled( false ); } // Disable set time buttons & change app caption to indicate time update is happening - ntpTab->setNTPBtnEnabled( false ); timeTab->setNTPBtnEnabled( false ); setCaption( tr( "Retrieving time from network..." ) ); if ( !ntpProcess ) { ntpProcess = new OProcess(); @@ -207,16 +207,18 @@ void MainWindow::runNTP() *ntpProcess << "ntpdate" << srv; bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); if ( !ret ) { QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) ); if ( ntpTabEnabled ) + { ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) ); + ntpTab->setNTPBtnEnabled( true ); + } // Re-enable set time buttons & change app caption to indicate time update is happening - ntpTab->setNTPBtnEnabled( true ); timeTab->setNTPBtnEnabled( true ); setCaption( tr( "SystemTime" ) ); } } bool MainWindow::ntpDelayElapsed() @@ -276,19 +278,19 @@ void MainWindow::slotDisplayPredictTab( bool display ) display ? mainWidget->addTab( predictTab, "netsystemtime/predicttab", tr( "Predict" ) ) : mainWidget->removePage( predictTab ); } void MainWindow::slotGetNTPTime() { - ntpInteractive = TRUE; + ntpInteractive = true; runNTP(); } void MainWindow::slotTimerGetNTPTime() { - ntpInteractive = FALSE; + ntpInteractive = false; runNTP(); } void MainWindow::slotProbeNTPServer() { ntpSock->connectToHost( settingsTab->ntpServer(), 123 ); @@ -306,12 +308,13 @@ void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen ) void MainWindow::slotNtpFinished( OProcess *p ) { QString output; QDateTime dt = QDateTime::currentDateTime(); // Re-enable set time buttons & change app caption to indicate time update is happening + if ( ntpTabEnabled ) ntpTab->setNTPBtnEnabled( true ); timeTab->setNTPBtnEnabled( true ); setCaption( tr( "SystemTime" ) ); // Verify run was successful if ( p->exitStatus() != 0 || !p->normalExit() ) @@ -331,13 +334,13 @@ void MainWindow::slotNtpFinished( OProcess *p ) // Write out lookup information Config config( "ntp" ); config.setGroup( "lookups" ); int lastLookup = config.readNumEntry( "time", 0 ); int lookupCount = config.readNumEntry( "count", 0 ); - bool lastNtp = config.readBoolEntry( "lastNtp", FALSE ); + bool lastNtp = config.readBoolEntry( "lastNtp", false ); int time = TimeConversion::toUTC( QDateTime::currentDateTime() ); config.writeEntry( "time", time ); // Calculate new time/time shift QString _offset = "offset"; QString _sec = "sec"; @@ -368,13 +371,13 @@ void MainWindow::slotNtpFinished( OProcess *p ) lookupCount++; predictTab->setShiftPerSec( (int)(timeShift / secsSinceLast) ); config.writeEntry( "secsSinceLast", secsSinceLast ); config.writeEntry( "timeShift", QString::number( timeShift ) ); config.setGroup( "lookups" ); config.writeEntry( "count", lookupCount ); - config.writeEntry( "lastNtp", TRUE ); + config.writeEntry( "lastNtp", true ); } } void MainWindow::slotNTPDelayChanged( int delay ) { ntpTimer->changeInterval( delay * 1000 * 60 ); |