wn

2 files changed, 16 insertions, 7 deletions

diff --git a/kalarmd/alarmdialog.cpp b/kalarmd/alarmdialog.cpp
index ddb125a..18ce9da 100644
--- a/kalarmd/alarmdialog.cpp
+++ b/kalarmd/alarmdialog.cpp
@@ -206,118 +206,122 @@ void AlarmDialog::slotSuspend()
    mess +=mMessage->text();
 #ifndef DESKTOP_VERSION
    if ( mServerNotification )
        AlarmServer::addAlarm ( nextA,"koalarm",mess.latin1());
 #endif 
     emit addAlarm( nextA , mess  );  
    slotOk();
 }
 
 void AlarmDialog::setServerNotification( bool b )
 {
     mServerNotification = b;
 }
 int  AlarmDialog::getSuspendTime( )
 {
     return mSuspendSpin->value();
 
 }
 void AlarmDialog::setSuspendTime( int val )
 {
     mSuspendSpin->setValue( val );
 }
 bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, bool playwav, int pause , int suspendtimes)
 {
     if ( mess.left( 9) != "Suspended" )
         mSuspendCounter = suspendtimes;
     mPauseCount = pause;
     mFileName = fn;
     mPlayWav = playwav;
     if ( !QFile::exists( fn ) )
         mFileName = "";
     alarmCounter = 0 ;
     maxAlarmReplay = replay ;
     mStopAlarm = false;
     mSilent = false;
     if ( !mMessage->text().stripWhiteSpace().isEmpty() ) {
         mMissedAlarmsCombo->show();
         QString newItem = mMessage->text().stripWhiteSpace();
         newItem.replace( QRegExp("\n"), QString(" ") );
         mMissedAlarmsCombo->insertItem( newItem );
         mMissedAlarms->setText( "Missed alarms:");
     } else
         mMissedAlarmsCombo->hide();
     mMessage->setText(mess);
     int w = minimumSizeHint().width() ;
     int h = minimumSizeHint().height() ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
+    if ( w < 220 ) w = 220;
+    if ( h < 220 ) h = 220;
     setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-    hide();
+    showNormal();
+    setActiveWindow();
+    raise(); 
+    setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    //hide();
 
 #ifndef _WIN32_
     if (  fd_led > 0 ) {
         statusLED.status =  LED_SALARM_ON ;
         ioctl (fd_led, SHARP_LED_SETSTATUS, &statusLED);
     }
 #endif
     okbut->setDefault( true );
     QTimer::singleShot( 1, this, SLOT ( forceRepaint() ) );
     // playSoundTimer->start( 1000, true );
     return true;
  
 }
 
 void AlarmDialog::forceRepaint()
 {
-   
-    showNormal();
     setActiveWindow();
-    raise(); 
+    repaint();
     mSuspendSpin->setFocus();
     playSoundTimer->start( 1000, true );
 
 }
 void AlarmDialog::spinBoxChanged( int v )
 {
     okbut->setDefault( false );
     mSilent = true;
 }
 
 void  AlarmDialog::playSound ()
 {
     
     if (mStopAlarm )
         return;
     if ( mSilent )
         return;
     //showNormal();
     setActiveWindow();
     //raise(); 
     mSuspendSpin->setFocus();
     if (  alarmCounter < maxAlarmReplay && ! mSilent) {
         ++alarmCounter;
 #ifdef DESKTOP_VERSION
         mPlayWav = true;
 #endif
         if ( !mPlayWav || mFileName.length() < 2 ) {
 
 #ifdef DESKTOP_VERSION
             qDebug("Sound play not possible - file not found");
 #else
             Sound::soundAlarm ();
 #endif
         } else
 
             {
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
                 QSound::play ( mFileName );
 #else
 
                 QString command = "playwave -r 22050 " + mFileName;
                 qDebug("KO: Playing file %s with 22kHz",mFileName.latin1() );
                 int ret = system ( command.latin1() );
                 if ( ret != 0 ) {
                     qDebug("Sound play command failed: %s ",command.latin1() );
                 }
 
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -22,96 +22,101 @@
 */
 
 #include "simplealarmdaemonimpl.h"
 
 #include "alarmdialog.h"
 #include <qpopupmenu.h>
 #include <qapp.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qhbox.h>
 #include <qtimer.h>
 #include <qfile.h>
 #include <qdatetime.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #define protected public
 #include <qspinbox.h>
 #undef protected 
 #include <qtextstream.h> 
 #include <qtopia/qcopenvelope_qws.h> 
 #include <qtopia/alarmserver.h> 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 
 
 SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     : QLabel( parent )
 {
     mAlarmDialog = new AlarmDialog( 0 );
     mPopUp = new QPopupMenu( this );
     mPopUp->insertItem( "What's Next?", this, SLOT ( showWN() ) );
     mPopUp->insertItem( "Next Days!", this, SLOT ( showKO() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Todo List", this, SLOT ( showTodo() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Addresses", this, SLOT ( showAdd() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Edit Journal", this, SLOT ( writeJournal() ) );
     mPopUp->insertItem( "New Event", this, SLOT ( newEvent() ) );
     mPopUp->insertItem( "New Todo", this, SLOT ( newTodo() ) );
     mPopUp->insertItem( "New Mail", this, SLOT ( newMail() ) );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Multi Sync", this, SLOT ( ringSync() ) );
     mTimerPopUp = new QPopupMenu( this );
+    QFont fon = mTimerPopUp->font();
+    int points = (fon.pointSize()*4)/3; 
+    fon.setPointSize(  points );
+    mTimerPopUp->setFont( fon );
+    mPopUp->setFont( fon );
     mBeepPopUp = new QPopupMenu( this );   
     mSoundPopUp = new QPopupMenu( this );   
     mPausePopUp = new QPopupMenu( this );    
     QPopupMenu* savePopUp = new QPopupMenu( this ); 
     savePopUp->insertItem( "Save", 0 );   
     savePopUp->insertItem( "Load", 1 );   
     mSoundPopUp->insertItem( "Buzzer", 0 );   
     mSoundPopUp->insertItem( "Wav file", 1 ); 
     mPausePopUp->insertItem( " 1 sec", 1 );
     mPausePopUp->insertItem( " 2 sec", 2 );
     mPausePopUp->insertItem( " 3 sec", 3 );
     mPausePopUp->insertItem( " 5 sec", 5 );
     mPausePopUp->insertItem( "10 sec", 10 );
     mPausePopUp->insertItem( "30 sec", 30 );
     mPausePopUp->insertItem( " 1 min", 60 );
     mPausePopUp->insertItem( " 5 min", 300 );
     mPausePopUp->insertItem( "10 min", 600 );
     mSuspendPopUp = new QPopupMenu( this );
     mSuspendPopUp->insertItem( "Off", 0 ); 
     mSuspendPopUp->insertItem( " 1x", 1 );   
     mSuspendPopUp->insertItem( " 2x", 2 );   
     mSuspendPopUp->insertItem( " 3x", 3 );  
     mSuspendPopUp->insertItem( " 5x", 5 );  
     mSuspendPopUp->insertItem( "10x", 10 );  
     mSuspendPopUp->insertItem( "20x", 20 );  
     mSuspendPopUp->insertItem( "30x", 30 );    
     mBeepPopUp->insertItem( "Auto  suspend",mSuspendPopUp  );
     mBeepPopUp->insertItem( "Beep interval",mPausePopUp  );
     mBeepPopUp->insertItem( "Replay",mSoundPopUp  );      
     mBeepPopUp->insertItem( "Config",savePopUp  );        
     mBeepPopUp->insertItem( "300", 300 );      
     mBeepPopUp->insertItem( "180", 180 );         
     mBeepPopUp->insertItem( "60", 60 );       
     mBeepPopUp->insertItem( "30", 30 );    
     mBeepPopUp->insertItem( "10", 10 ); 
     mBeepPopUp->insertItem( "3", 3 );   
     mBeepPopUp->insertItem( "1", 1 );   
     mBeepPopUp->insertItem( "Off", 0 ); 
     mBeepPopUp->insertSeparator();
     mBeepPopUp->insertItem( "Simulate", 1000 );
     mBeepPopUp->setCheckable( true );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Play beeps", mBeepPopUp );
     mPopUp->insertSeparator();
     mPopUp->insertItem( "Timer", mTimerPopUp );
     //mPopUp->insertSeparator();
     //mPopUp->insertItem( "Simulate", this, SLOT ( simulate() ) );
  
@@ -268,123 +273,123 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
     //qDebug("SimpleAlarmDaemonImpl::ALARM RECEIVED! %s", msg.data()); 
     QString mess = QString::fromUtf8(msg.data()); 
     mAlarmMessage = mess.mid( 9 ); 
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     QString tempfilename;
     if ( mess.left( 13 )  == "suspend_alarm") {  
         bool error = false;
         int len = mess.mid( 13 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 13, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 13+len+3 );
         //qDebug("suspend file %s ",tempfilename.latin1() );
         startAlarm( mAlarmMessage, filename);
         return;
     }
     if ( mess.left( 11 )  == "timer_alarm") {
         mTimerTime = 0;
         startAlarm( mess.mid( 11 ), filename );
         return;
     } 
     if ( mess.left( 10 )  == "proc_alarm") {
         bool error = false;
         int len = mess.mid( 10 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 10, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( error ) {
             mAlarmMessage = "Procedure Alarm\nError - File not found\n";
             mAlarmMessage += mess.mid( 10+len+3+9 );
         } else {
             //qDebug("-----system command %s ",tempfilename.latin1() );
             if ( vfork () == 0 ) {
                 execl ( tempfilename.latin1(), 0 );
                 return;
             }
-            QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+            QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
             return;
         }
        
         //qDebug("+++++++system command %s ",tempfilename.latin1() );
     }  
     if ( mess.left( 11 )  == "audio_alarm") {
         bool error = false;
         int len = mess.mid( 11 ).find("+++");
         if ( len < 2 )
             error = true;
         else {
             tempfilename = mess.mid( 11, len );
             if ( !QFile::exists( tempfilename  ) )
                 error = true;
         }
         if ( ! error ) {
             filename = tempfilename;
         }
         mAlarmMessage = mess.mid( 11+len+3+9 );
         //qDebug("audio file command %s ",tempfilename.latin1() );
     } 
     if ( mess.left( 9 )  == "cal_alarm") {
         mAlarmMessage = mess.mid( 9 ) ;
     }
     
-    QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+    QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
     startAlarm( mAlarmMessage, filename );
      
 }
 
 int  SimpleAlarmDaemonImpl::getFileNameLen( QString mess  )
 {
     return 0;
 }
 void SimpleAlarmDaemonImpl::startAlarm( QString mess, QString filename )
 {
     //mAlarmDialog->show(); 
     //mAlarmDialog->raise();
     mAlarmDialog->eventNotification( mess, mPlayBeeps, filename, wavAlarm,mPausePlay ,mSuspend );
 }
 
 
 void SimpleAlarmDaemonImpl::fillTimerPopUp()
 {
    
     // qDebug(" timer %d %d ",mTimerPopupConf,  mTimerTime  );
     if ( mTimerPopupConf == mTimerTime ) {
         if ( mTimerTime ) {
             int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer );
             QTime t ( secs/3600, (secs/60)%60,  secs%60  ); 
             mTimerPopUp->changeItem ( 1 , t.toString() + " (countdown)");
         }
         else { 
             QString text = mCustomText.stripWhiteSpace ();
             int in = text.find( " " );
             text = text.left ( in );
             mTimerPopUp->changeItem ( 3,  text );
         }
         return; 
     }
     mTimerPopupConf = mTimerTime;
     mTimerPopUp->clear();
     if ( mTimerTime ) {
         int secs = QDateTime::currentDateTime().secsTo ( mRunningTimer );
         QTime t ( secs/3600, (secs/60)%60,  secs%60  ); 
        
         
         mTimerPopUp->insertItem( "Stop timer "+ mRunningTimerText , 0 ); 
         mTimerPopUp->insertItem( t.toString() + " (countdown)",1); 
         mTimerPopUp->insertItem( mRunningTimer.time().toString() + " (alarm)",2); 
     } else {
 
         QString fileName = QDir::homeDirPath() +"/.kopialarmtimerrc";
         QFile file( fileName );
@@ -597,78 +602,78 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
         }
     }
     //minutes = 1;
 
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.utf8());
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
 { 
     QCopEnvelope e("QPE/Application/kopi", "-writeFileSilent");
     //QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");
 }
 void SimpleAlarmDaemonImpl::newTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newTodo");
 }
 
 void SimpleAlarmDaemonImpl::newEvent()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newEvent");
 
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
  QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
  QCopEnvelope e("QPE/Application/kapi", "raise()");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");
 
 }
 void SimpleAlarmDaemonImpl::newCountdown()
 {
     //recieve("cal_alarm", 10 );
 }
 void SimpleAlarmDaemonImpl::simulate()
 {
-    QTimer::singleShot( 10000, this, SLOT ( writeFile() ) );
+    QTimer::singleShot( 5000, this, SLOT ( writeFile() ) );
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     startAlarm("Alarm simulation", filename );
 }
 void SimpleAlarmDaemonImpl::showKO()
 {
      QCopEnvelope e("QPE/Application/kopi", "-showKO");
     // testing only
     //QCopEnvelope e("QPE/Application/kopi", "nextView()");
 
 }
 void SimpleAlarmDaemonImpl::showTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showTodo");
 
 }
 void SimpleAlarmDaemonImpl::writeJournal()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showJournal");
 
 }
 
 void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
 {
 
     mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
 
 }