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
@@ -238,54 +238,58 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
     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 )
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -54,32 +54,37 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *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 );
@@ -300,59 +305,59 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
         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 );
 }
 
 
@@ -629,33 +634,33 @@ void SimpleAlarmDaemonImpl::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");
 
 }