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
@@ -250,10 +250,16 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
     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 ;
@@ -268,12 +274,10 @@ bool AlarmDialog::eventNotification( QString mess, int replay ,  QString fn, boo
 }
 
 void AlarmDialog::forceRepaint()
 {
-   
-    showNormal();
     setActiveWindow();
-    raise(); 
+    repaint();
     mSuspendSpin->setFocus();
     playSoundTimer->start( 1000, true );
 
 }
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index a0ac232..8ea8a73 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -66,8 +66,13 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     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 ); 
@@ -312,9 +317,9 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
             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() );
@@ -338,9 +343,9 @@ void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
     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 );
      
 }
 
@@ -641,9 +646,9 @@ 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 );
 }