summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-05-18 12:21:27 (UTC)
committer cniehaus <cniehaus>2003-05-18 12:21:27 (UTC)
commit34c5b88459bcf5e02deae6b04e8bc17ee0de74c0 (patch) (unidiff)
tree81fa2cd128c8bb75554f6443eec685f65412e2db
parent76cc1bf740e9134f44a1341d8b01cc9f543a4cd4 (diff)
downloadopie-34c5b88459bcf5e02deae6b04e8bc17ee0de74c0.zip
opie-34c5b88459bcf5e02deae6b04e8bc17ee0de74c0.tar.gz
opie-34c5b88459bcf5e02deae6b04e8bc17ee0de74c0.tar.bz2
fix the fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index 85a46b7..2d240ba 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -143,54 +143,48 @@ void MainWindow::accept()
143 // Turn back on the screensaver 143 // Turn back on the screensaver
144 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" ); 144 QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
145 enableScreenSaver << -1 << -1 << -1; 145 enableScreenSaver << -1 << -1 << -1;
146 146
147 // Exit app 147 // Exit app
148 qApp->quit(); 148 qApp->quit();
149} 149}
150 150
151void MainWindow::reject() 151void MainWindow::reject()
152{ 152{
153 // Reset time settings 153 // Reset time settings
154 timeTab->saveSettings( FALSE ); 154 timeTab->saveSettings( FALSE );
155 155
156 // Send notifications but do not save settings 156 // Send notifications but do not save settings
157 formatTab->saveSettings( FALSE ); 157 formatTab->saveSettings( FALSE );
158 158
159 // Exit app 159 // Exit app
160 qApp->quit(); 160 qApp->quit();
161} 161}
162 162
163void MainWindow::runNTP() 163void MainWindow::runNTP()
164{ 164{
165 if ( !ntpDelayElapsed() && ntpInteractive ) 165 if ( !ntpDelayElapsed() && ntpInteractive )
166 { 166 {
167 QString msg = tr( "You asked for a delay of " );
168 msg.append( QString::number( ntpDelay ) );
169 msg.append( tr( " minutes, but only " ) );
170 msg.append( QString::number( _lookupDiff / 60 ) );
171 msg.append( tr(" minutes elapsed since last lookup.<br>Continue?") );
172
173 QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) ); 167 QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
174 168
175 switch ( 169 switch (
176 QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No ) 170 QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
177 ) 171 )
178 { 172 {
179 case QMessageBox::Yes: break; 173 case QMessageBox::Yes: break;
180 case QMessageBox::No: return; 174 case QMessageBox::No: return;
181 default: return; 175 default: return;
182 } 176 }
183 } 177 }
184 178
185 QString srv = settingsTab->ntpServer(); 179 QString srv = settingsTab->ntpServer();
186 180
187 // Send information to time server tab if enabled 181 // Send information to time server tab if enabled
188 if ( ntpTabEnabled ) 182 if ( ntpTabEnabled )
189 { 183 {
190 ntpTab->setStartTime( QDateTime::currentDateTime().toString() ); 184 ntpTab->setStartTime( QDateTime::currentDateTime().toString() );
191 QString output = tr( "Running:\nntpdate " ); 185 QString output = tr( "Running:\nntpdate " );
192 output.append( srv ); 186 output.append( srv );
193 ntpTab->addNtpOutput( output ); 187 ntpTab->addNtpOutput( output );
194 } 188 }
195 189
196 if ( !ntpProcess ) 190 if ( !ntpProcess )