summaryrefslogtreecommitdiff
authorcniehaus <cniehaus>2003-05-18 12:17:12 (UTC)
committer cniehaus <cniehaus>2003-05-18 12:17:12 (UTC)
commit76cc1bf740e9134f44a1341d8b01cc9f543a4cd4 (patch) (side-by-side diff)
treed44ebab74e1d0b59443cb9293d060f417ca8b65b
parent39860593d3de12f70a083cdb9b86adca7b98fdfb (diff)
downloadopie-76cc1bf740e9134f44a1341d8b01cc9f543a4cd4.zip
opie-76cc1bf740e9134f44a1341d8b01cc9f543a4cd4.tar.gz
opie-76cc1bf740e9134f44a1341d8b01cc9f543a4cd4.tar.bz2
frontport to HEAD
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index ab71463..85a46b7 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -160,24 +160,26 @@ void MainWindow::reject()
qApp->quit();
}
void MainWindow::runNTP()
{
if ( !ntpDelayElapsed() && ntpInteractive )
{
QString msg = tr( "You asked for a delay of " );
msg.append( QString::number( ntpDelay ) );
msg.append( tr( " minutes, but only " ) );
msg.append( QString::number( _lookupDiff / 60 ) );
msg.append( tr(" minutes elapsed since last lookup.<br>Continue?") );
+
+ 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 ) );
switch (
QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
)
{
case QMessageBox::Yes: break;
case QMessageBox::No: return;
default: return;
}
}
QString srv = settingsTab->ntpServer();
@@ -332,26 +334,25 @@ void MainWindow::slotNtpFinished( OProcess *p )
QString _sec = "sec";
QRegExp _reOffset = QRegExp( _offset );
QRegExp _reEndOffset = QRegExp( _sec );
int posOffset = _reOffset.match( ntpOutput );
int posEndOffset = _reEndOffset.match( ntpOutput, posOffset );
posOffset += _offset.length() + 1;
QString diff = ntpOutput.mid( posOffset, posEndOffset - posOffset - 1 );
float timeShift = diff.toFloat();
if ( timeShift == 0.0 )
return;
int secsSinceLast = time - lastLookup;
- output = QString::number( timeShift );
- output.append( tr( " seconds" ) );
+ output = tr( "%1 seconds").arg(QString::number( timeShift ));
// Display information on time server tab
if ( ntpTabEnabled )
{
ntpTab->setTimeShift( output );
ntpTab->setNewTime( dt.toString() );
}
if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay )
{
QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) );
config.setGroup( grpname );