summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index eff96eb..2acfacf 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -63,17 +63,21 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
63 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) ); 63 mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
64 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) ); 64 mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
65 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) ); 65 mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
66 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) ); 66 mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
67 mPopUp->insertSeparator(); 67 mPopUp->insertSeparator();
68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) ); 68 mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
69 mTimerPopUp = new QPopupMenu( this ); 69 mTimerPopUp = new QPopupMenu( this );
70 QFont fon = mTimerPopUp->font(); 70 QFont fon = mTimerPopUp->font();
71 fon.setPointSize( fon.pointSize() *3/2 ); 71 int points = 16;
72 if ( QApplication::desktop()->width() < 480 )
73 points = 12;
74 fon.setPointSize( points );
75 //qDebug("point s %d ", fon.pointSize());
72 mTimerPopUp->setFont( fon ); 76 mTimerPopUp->setFont( fon );
73 mPopUp->setFont( fon ); 77 mPopUp->setFont( fon );
74 mBeepPopUp = new QPopupMenu( this ); 78 mBeepPopUp = new QPopupMenu( this );
75 mSoundPopUp = new QPopupMenu( this ); 79 mSoundPopUp = new QPopupMenu( this );
76 mPausePopUp = new QPopupMenu( this ); 80 mPausePopUp = new QPopupMenu( this );
77 QPopupMenu* savePopUp = new QPopupMenu( this ); 81 QPopupMenu* savePopUp = new QPopupMenu( this );
78 savePopUp->insertItem( "Save", 0 ); 82 savePopUp->insertItem( "Save", 0 );
79 savePopUp->insertItem( "Load", 1 ); 83 savePopUp->insertItem( "Load", 1 );
@@ -307,24 +311,22 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
307 tempfilename = mess.mid( 10, len ); 311 tempfilename = mess.mid( 10, len );
308 if ( !QFile::exists( tempfilename ) ) 312 if ( !QFile::exists( tempfilename ) )
309 error = true; 313 error = true;
310 } 314 }
311 if ( error ) { 315 if ( error ) {
312 mAlarmMessage = "Procedure Alarm\nError - File not found\n"; 316 mAlarmMessage = "Procedure Alarm\nError - File not found\n";
313 mAlarmMessage += mess.mid( 10+len+3+9 ); 317 mAlarmMessage += mess.mid( 10+len+3+9 );
314 } else { 318 } else {
315 {
316 QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
317 }
318 //qDebug("-----system command %s ",tempfilename.latin1() ); 319 //qDebug("-----system command %s ",tempfilename.latin1() );
319 if ( vfork () == 0 ) { 320 if ( vfork () == 0 ) {
320 execl ( tempfilename.latin1(), 0 ); 321 execl ( tempfilename.latin1(), 0 );
321 return; 322 return;
322 } 323 }
324 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
323 return; 325 return;
324 } 326 }
325 327
326 //qDebug("+++++++system command %s ",tempfilename.latin1() ); 328 //qDebug("+++++++system command %s ",tempfilename.latin1() );
327 } 329 }
328 if ( mess.left( 11 ) == "audio_alarm") { 330 if ( mess.left( 11 ) == "audio_alarm") {
329 bool error = false; 331 bool error = false;
330 int len = mess.mid( 11 ).find("+++"); 332 int len = mess.mid( 11 ).find("+++");
@@ -340,17 +342,17 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray& )
340 } 342 }
341 mAlarmMessage = mess.mid( 11+len+3+9 ); 343 mAlarmMessage = mess.mid( 11+len+3+9 );
342 //qDebug("audio file command %s ",tempfilename.latin1() ); 344 //qDebug("audio file command %s ",tempfilename.latin1() );
343 } 345 }
344 if ( mess.left( 9 ) == "cal_alarm") { 346 if ( mess.left( 9 ) == "cal_alarm") {
345 mAlarmMessage = mess.mid( 9 ) ; 347 mAlarmMessage = mess.mid( 9 ) ;
346 } 348 }
347 349
348 writeFile(); 350 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
349 startAlarm( mAlarmMessage, filename ); 351 startAlarm( mAlarmMessage, filename );
350 352
351} 353}
352 354
353int SimpleAlarmDaemonImpl::getFileNameLen( QString mess ) 355int SimpleAlarmDaemonImpl::getFileNameLen( QString mess )
354{ 356{
355 return 0; 357 return 0;
356} 358}
@@ -643,17 +645,17 @@ void SimpleAlarmDaemonImpl::ringSync()
643 645
644} 646}
645void SimpleAlarmDaemonImpl::newCountdown() 647void SimpleAlarmDaemonImpl::newCountdown()
646{ 648{
647 //recieve("cal_alarm", 10 ); 649 //recieve("cal_alarm", 10 );
648} 650}
649void SimpleAlarmDaemonImpl::simulate() 651void SimpleAlarmDaemonImpl::simulate()
650{ 652{
651 writeFile(); 653 QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
652 QString filename = getenv("QPEDIR") ; 654 QString filename = getenv("QPEDIR") ;
653 filename += "/pics/kdepim/korganizer/koalarm.wav"; 655 filename += "/pics/kdepim/korganizer/koalarm.wav";
654 startAlarm("Alarm simulation", filename ); 656 startAlarm("Alarm simulation", filename );
655} 657}
656void SimpleAlarmDaemonImpl::showKO() 658void SimpleAlarmDaemonImpl::showKO()
657{ 659{
658 QCopEnvelope e("QPE/Application/kopi", "-showKO"); 660 QCopEnvelope e("QPE/Application/kopi", "-showKO");
659 // testing only 661 // testing only