summaryrefslogtreecommitdiffabout
path: root/kalarmd/simplealarmdaemonimpl.cpp
Side-by-side diff
Diffstat (limited to 'kalarmd/simplealarmdaemonimpl.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 141a9ce..15eff28 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -629,26 +629,39 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
}
else {
mess += mTimerPopUp->text( minutes );
disp = mTimerPopUp->text( minutes );
mRunningTimerText = mTimerPopUp->text( minutes );
minutes -= 10;
}
}
//minutes = 1;
mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
timerMesssage = mess;
+ QString timerDuration ;
+ if ( minutes < 60 ) {
+ timerDuration = QString::number( minutes ) + " min";
+ } else {
+ if ( minutes % 60 ) {
+ timerDuration = QString::number( minutes/60 ) +":";
+ minutes = minutes%60;
+ if ( minutes < 10 ) timerDuration += "0";
+ timerDuration += QString::number( minutes ) + " h";
+ }
+ else
+ timerDuration = QString::number( minutes / 60 )+ " hours";
+ }
AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
- mTimerStartLabel->setText( disp + "\n\nTimer started!" );
+ mTimerStartLabel->setText( disp + "\n\n" + timerDuration +"\n\nTimer started!" );
int w = mTimerStartLabel->sizeHint().width()+20;
int h = mTimerStartLabel->sizeHint().height()+40 ;
int dw = QApplication::desktop()->width();
int dh = QApplication::desktop()->height();
mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
mTimerStartLabel->show();
QTimer::singleShot( 4000, mTimerStartLabel, SLOT ( hide() ) );
mTimerTime = 1;
}
void SimpleAlarmDaemonImpl::confFontSize( int size )
{