-rw-r--r-- | noncore/tools/clock/clock.cpp | 7 | ||||
-rw-r--r-- | noncore/tools/euroconv/main.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index 41c99a8..ecbf12f 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp | |||
@@ -424,44 +424,45 @@ void Clock::alarmOn() | |||
424 | QDate d = QDate::currentDate(); | 424 | QDate d = QDate::currentDate(); |
425 | QTime tm( ( int ) hour, ( int ) minute, 0 ); | 425 | QTime tm( ( int ) hour, ( int ) minute, 0 ); |
426 | qDebug( "Time set " + tm.toString() ); | 426 | qDebug( "Time set " + tm.toString() ); |
427 | QTime t = QTime::currentTime(); | 427 | QTime t = QTime::currentTime(); |
428 | if ( t > tm ) | 428 | if ( t > tm ) |
429 | d = d.addDays( 1 ); | 429 | d = d.addDays( 1 ); |
430 | int warn = 0; | 430 | int warn = 0; |
431 | QDateTime whenl( d, tm ); | 431 | QDateTime whenl( d, tm ); |
432 | when = whenl; | 432 | when = whenl; |
433 | AlarmServer::addAlarm( when, | 433 | AlarmServer::addAlarm( when, |
434 | "QPE/Application/clock", | 434 | "QPE/Application/clock", |
435 | "alarm(QDateTime,int)", warn ); | 435 | "alarm(QDateTime,int)", warn ); |
436 | setCaption( "Alarm set: " + whenl.toString() ); | 436 | // setCaption( "Alarm set: " + whenl.toString() ); |
437 | setCaption( tr("Alarm set: %1" ).arg(whenl.toString()) ); | ||
437 | } | 438 | } |
438 | 439 | ||
439 | void Clock::alarmOff() | 440 | void Clock::alarmOff() |
440 | { | 441 | { |
441 | int warn = 0; | 442 | int warn = 0; |
442 | bSound = FALSE; | 443 | bSound = FALSE; |
443 | AlarmServer::deleteAlarm( when, | 444 | AlarmServer::deleteAlarm( when, |
444 | "QPE/Application/clock", | 445 | "QPE/Application/clock", |
445 | "alarm(QDateTime,int)", warn ); | 446 | "alarm(QDateTime,int)", warn ); |
446 | qDebug( "Alarm Off " + when.toString() ); | 447 | qDebug( "Alarm Off " + when.toString() ); |
447 | setCaption( "Clock" ); | 448 | setCaption( tr("Clock") ); |
448 | } | 449 | } |
449 | 450 | ||
450 | void Clock::clearTimer() | 451 | void Clock::clearTimer() |
451 | { | 452 | { |
452 | alarmOffBtn->setText( tr( "Alarm Is Off" ) ); | 453 | alarmOffBtn->setText( tr( "Alarm Is Off" ) ); |
453 | alarmBool = FALSE; | 454 | alarmBool = FALSE; |
454 | snoozeBtn->hide(); | 455 | snoozeBtn->hide(); |
455 | setCaption( "Clock" ); | 456 | setCaption( tr("Clock") ); |
456 | } | 457 | } |
457 | 458 | ||
458 | void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) | 459 | void Clock::appMessage( const QCString& msg, const QByteArray& /*data*/ ) |
459 | { | 460 | { |
460 | int stopTimer = 0; | 461 | int stopTimer = 0; |
461 | int timerStay = 5000; | 462 | int timerStay = 5000; |
462 | bSound = TRUE; | 463 | bSound = TRUE; |
463 | qDebug( "Message received in clock" ); | 464 | qDebug( "Message received in clock" ); |
464 | if ( msg == "alarm(QDateTime,int)" ) | 465 | if ( msg == "alarm(QDateTime,int)" ) |
465 | { | 466 | { |
466 | Config config( "qpe" ); | 467 | Config config( "qpe" ); |
467 | config.setGroup( "Time" ); | 468 | config.setGroup( "Time" ); |
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp index 2d97f4e..7d69535 100644 --- a/noncore/tools/euroconv/main.cpp +++ b/noncore/tools/euroconv/main.cpp | |||
@@ -22,18 +22,18 @@ | |||
22 | 22 | ||
23 | 23 | ||
24 | 24 | ||
25 | int main( int argc, char **argv ) { | 25 | int main( int argc, char **argv ) { |
26 | 26 | ||
27 | QPEApplication app( argc, argv ); | 27 | QPEApplication app( argc, argv ); |
28 | 28 | ||
29 | QVBox *layout = new QVBox(0, "fond"); | 29 | QVBox *layout = new QVBox(0, "fond"); |
30 | 30 | ||
31 | LCDDisplay lcd (layout, "lcd"); | 31 | LCDDisplay lcd (layout, "lcd"); |
32 | KeyPad num(&lcd, layout, "keypad"); | 32 | KeyPad num(&lcd, layout, "keypad"); |
33 | app.setMainWidget(layout); | 33 | app.setMainWidget(layout); |
34 | layout->setCaption("Euroconv"); | 34 | layout->setCaption( QObject::tr("Euroconv") ); |
35 | layout->showMaximized (); | 35 | layout->showMaximized (); |
36 | layout->show(); | 36 | layout->show(); |
37 | return app.exec(); | 37 | return app.exec(); |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp index 21de4d2..49f6355 100644 --- a/noncore/tools/formatter/formatter.cpp +++ b/noncore/tools/formatter/formatter.cpp | |||
@@ -391,25 +391,26 @@ void FormatterApp::deviceComboSelected(int index) { | |||
391 | long totalMb = total/1024; | 391 | long totalMb = total/1024; |
392 | long avail = (*it)->availBlocks() * mult / div; | 392 | long avail = (*it)->availBlocks() * mult / div; |
393 | long availMb = avail/1024; | 393 | long availMb = avail/1024; |
394 | long used = total - avail; | 394 | long used = total - avail; |
395 | long usedMb = used/1024; | 395 | long usedMb = used/1024; |
396 | totalS.sprintf(tr("Total: %1 kB ( %d mB)\n").arg( total ), totalMb ); | 396 | totalS.sprintf(tr("Total: %1 kB ( %d mB)\n").arg( total ), totalMb ); |
397 | usedS.sprintf(tr("Used: %1 kB ( %d mB)\n").arg(used) ,usedMb); | 397 | usedS.sprintf(tr("Used: %1 kB ( %d mB)\n").arg(used) ,usedMb); |
398 | avS.sprintf( tr("Available: %1 kB ( %d mB)").arg(avail), availMb ); | 398 | avS.sprintf( tr("Available: %1 kB ( %d mB)").arg(avail), availMb ); |
399 | } | 399 | } |
400 | } | 400 | } |
401 | fsType = getFileSystemType((const QString &)selectedText); | 401 | fsType = getFileSystemType((const QString &)selectedText); |
402 | 402 | ||
403 | TextLabel5->setText(tr("Type: %1\nFormatted with %1\n%1, %1, %1").arg( nameS).arg( fsType).arg(totalS).arg( usedS).arg( avS )); | 403 | TextLabel5->setText(tr("Type: %1\nFormatted with %2\n%3, %4, %5").arg( nameS).arg( fsType).arg(totalS).arg( usedS).arg( avS )); |
404 | TextLabel5->setTextFormat( Qt::RichText ); | ||
404 | // storageComboSelected(0); | 405 | // storageComboSelected(0); |
405 | } | 406 | } |
406 | 407 | ||
407 | void FormatterApp::cleanUp() { | 408 | void FormatterApp::cleanUp() { |
408 | 409 | ||
409 | } | 410 | } |
410 | 411 | ||
411 | 412 | ||
412 | void FormatterApp::editFstab() { | 413 | void FormatterApp::editFstab() { |
413 | QCopEnvelope e("QPE/Application/textedit","setDocument(QString)"); | 414 | QCopEnvelope e("QPE/Application/textedit","setDocument(QString)"); |
414 | e << (const QString &)"/etc/fstab"; | 415 | e << (const QString &)"/etc/fstab"; |
415 | } | 416 | } |