summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index c1e064c..553e377 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -127,50 +127,51 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
127 connect ( mTimerPopUp, SIGNAL( activated ( int ) ), this, SLOT (confTimer( int ) ) ); 127 connect ( mTimerPopUp, SIGNAL( activated ( int ) ), this, SLOT (confTimer( int ) ) );
128 connect ( mTimerPopUp, SIGNAL(aboutToShow() ), this, SLOT ( showTimer( ) ) ); 128 connect ( mTimerPopUp, SIGNAL(aboutToShow() ), this, SLOT ( showTimer( ) ) );
129 connect ( mSoundPopUp, SIGNAL( activated ( int ) ), this, SLOT (confSound( int ) ) ); 129 connect ( mSoundPopUp, SIGNAL( activated ( int ) ), this, SLOT (confSound( int ) ) );
130 connect ( mPausePopUp, SIGNAL( activated ( int ) ), this, SLOT (confPause( int ) ) ); 130 connect ( mPausePopUp, SIGNAL( activated ( int ) ), this, SLOT (confPause( int ) ) );
131 connect ( mSuspendPopUp, SIGNAL( activated ( int ) ), this, SLOT (confSuspend( int ) ) ); 131 connect ( mSuspendPopUp, SIGNAL( activated ( int ) ), this, SLOT (confSuspend( int ) ) );
132 connect ( savePopUp, SIGNAL( activated ( int ) ), this, SLOT (saveSlot( int ) ) ); 132 connect ( savePopUp, SIGNAL( activated ( int ) ), this, SLOT (saveSlot( int ) ) );
133 mTimerTime = 0; 133 mTimerTime = 0;
134 mCustomText = "Custom Text"; 134 mCustomText = "Custom Text";
135 mCustomMinutes = 7; 135 mCustomMinutes = 7;
136 mTimerPopupConf = 1; 136 mTimerPopupConf = 1;
137 fillTimerPopUp(); 137 fillTimerPopUp();
138 mPausePlay = 0; 138 mPausePlay = 0;
139 confPause( 1 ); 139 confPause( 1 );
140 mSuspend = 0; 140 mSuspend = 0;
141 confSuspend( 0 ); 141 confSuspend( 0 );
142 if ( QApplication::desktop()->width() < 480 ) { 142 if ( QApplication::desktop()->width() < 480 ) {
143 wavAlarm = false; 143 wavAlarm = false;
144 mSoundPopUp->setItemChecked ( 0, true ); 144 mSoundPopUp->setItemChecked ( 0, true );
145 } 145 }
146 else { 146 else {
147 wavAlarm = true; 147 wavAlarm = true;
148 mSoundPopUp->setItemChecked ( 1, true ); 148 mSoundPopUp->setItemChecked ( 1, true );
149 } 149 }
150 saveSlot( 1 ); 150 saveSlot( 1 );
151 mTimerStartLabel = new QLabel( 0 ); 151 mTimerStartLabel = new QLabel( 0, 0, WType_Popup );
152 mTimerStartLabel->setCaption( "Timer started!"); 152 //mTimerStartLabel->setCaption( "Timer started!");
153 mTimerStartLabel->setAlignment ( Qt::AlignCenter ) ;
153 fon = mTimerPopUp->font(); 154 fon = mTimerPopUp->font();
154 fon.setBold( true ); 155 fon.setBold( true );
155 points = (fon.pointSize()*2); 156 points = (fon.pointSize()*2);
156 fon.setPointSize( points ); 157 fon.setPointSize( points );
157 mTimerStartLabel->setFont( fon ); 158 mTimerStartLabel->setFont( fon );
158} 159}
159 160
160SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl() 161SimpleAlarmDaemonImpl::~SimpleAlarmDaemonImpl()
161{ 162{
162 //delete mPopUp; 163 //delete mPopUp;
163 delete mAlarmDialog; 164 delete mAlarmDialog;
164 delete mTimerStartLabel; 165 delete mTimerStartLabel;
165} 166}
166 167
167void SimpleAlarmDaemonImpl::saveSlot( int load ) 168void SimpleAlarmDaemonImpl::saveSlot( int load )
168{ 169{
169 QString fileName = QDir::homeDirPath() +"/.kopialarmrc"; 170 QString fileName = QDir::homeDirPath() +"/.kopialarmrc";
170 //qDebug("save %d ", load ); 171 //qDebug("save %d ", load );
171 QFile file( fileName ); 172 QFile file( fileName );
172 if ( load ) { 173 if ( load ) {
173 if( !QFile::exists( fileName) ) 174 if( !QFile::exists( fileName) )
174 return; 175 return;
175 if (!file.open( IO_ReadOnly ) ) { 176 if (!file.open( IO_ReadOnly ) ) {
176 return ; 177 return ;
@@ -598,56 +599,56 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
598 mCustomMinutes = spinh.value()*60+spinm.value(); 599 mCustomMinutes = spinh.value()*60+spinm.value();
599 if ( mCustomMinutes == 0 ) 600 if ( mCustomMinutes == 0 )
600 mCustomMinutes = 1; 601 mCustomMinutes = 1;
601 if ( mCustomMinutes > 1440 ) 602 if ( mCustomMinutes > 1440 )
602 mCustomMinutes = 1440; 603 mCustomMinutes = 1440;
603 mess += mCustomText; 604 mess += mCustomText;
604 disp = mCustomText; 605 disp = mCustomText;
605 minutes = mCustomMinutes; 606 minutes = mCustomMinutes;
606 mRunningTimerText = mCustomText.stripWhiteSpace (); 607 mRunningTimerText = mCustomText.stripWhiteSpace ();
607 int in = mRunningTimerText.find( " " ); 608 int in = mRunningTimerText.find( " " );
608 mRunningTimerText = mRunningTimerText.left ( in ); 609 mRunningTimerText = mRunningTimerText.left ( in );
609 } 610 }
610 else { 611 else {
611 mess += mTimerPopUp->text( minutes ); 612 mess += mTimerPopUp->text( minutes );
612 disp = mTimerPopUp->text( minutes ); 613 disp = mTimerPopUp->text( minutes );
613 mRunningTimerText = mTimerPopUp->text( minutes ); 614 mRunningTimerText = mTimerPopUp->text( minutes );
614 minutes -= 10; 615 minutes -= 10;
615 } 616 }
616 } 617 }
617 //minutes = 1; 618 //minutes = 1;
618 619
619 mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 ); 620 mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
620 timerMesssage = mess; 621 timerMesssage = mess;
621 AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8()); 622 AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
622 mTimerStartLabel->setText( disp ); 623 mTimerStartLabel->setText( disp + "\n\nTimer started!" );
623 int w = 200; 624 int w = mTimerStartLabel->sizeHint().width()+20;
624 int h = mTimerStartLabel->sizeHint().height() ; 625 int h = mTimerStartLabel->sizeHint().height()+40 ;
625 int dw = QApplication::desktop()->width(); 626 int dw = QApplication::desktop()->width();
626 int dh = QApplication::desktop()->height(); 627 int dh = QApplication::desktop()->height();
627 mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); 628 mTimerStartLabel->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
628 mTimerStartLabel->show(); 629 mTimerStartLabel->show();
629 QTimer::singleShot( 2000, mTimerStartLabel, SLOT ( hide() ) ); 630 QTimer::singleShot( 3000, mTimerStartLabel, SLOT ( hide() ) );
630 mTimerTime = 1; 631 mTimerTime = 1;
631} 632}
632 633
633void SimpleAlarmDaemonImpl::writeFile() 634void SimpleAlarmDaemonImpl::writeFile()
634{ 635{
635 QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent"); 636 QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
636 //QCopEnvelope e("QPE/Application/kopi", "-writeFile"); 637 //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
637} 638}
638void SimpleAlarmDaemonImpl::showWN() 639void SimpleAlarmDaemonImpl::showWN()
639{ 640{
640 QCopEnvelope e("QPE/Application/kopi", "-showWN"); 641 QCopEnvelope e("QPE/Application/kopi", "-showWN");
641} 642}
642void SimpleAlarmDaemonImpl::newTodo() 643void SimpleAlarmDaemonImpl::newTodo()
643{ 644{
644 QCopEnvelope e("QPE/Application/kopi", "-newTodo"); 645 QCopEnvelope e("QPE/Application/kopi", "-newTodo");
645} 646}
646 647
647void SimpleAlarmDaemonImpl::newEvent() 648void SimpleAlarmDaemonImpl::newEvent()
648{ 649{
649 QCopEnvelope e("QPE/Application/kopi", "-newEvent"); 650 QCopEnvelope e("QPE/Application/kopi", "-newEvent");
650 651
651} 652}
652void SimpleAlarmDaemonImpl::newMail() 653void SimpleAlarmDaemonImpl::newMail()
653{ 654{