1 files changed, 10 insertions, 4 deletions

diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index c747dfd..37e7d0d 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -51,18 +51,18 @@
 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( "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() ) );
@@ -104,23 +104,25 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     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() ) );
+    //mPopUp->insertSeparator();
+    //mPopUp->insertItem( "Simulate", this, SLOT ( simulate() ) );
  
     mPopUp->resize( mPopUp->sizeHint()  );
     mPlayBeeps = 60;
     mBeepPopUp->setItemChecked ( mPlayBeeps, true );
     connect ( mBeepPopUp, SIGNAL( activated ( int )  ), this, SLOT (slotPlayBeep( int ) ) );
     connect ( mTimerPopUp, SIGNAL( activated ( int )  ), this, SLOT (confTimer( int ) ) );
     connect ( mTimerPopUp, SIGNAL(aboutToShow()  ), this, SLOT ( showTimer( ) ) ); 
     connect ( mSoundPopUp, SIGNAL( activated ( int )  ), this, SLOT (confSound( int ) ) );
@@ -251,16 +253,20 @@ void  SimpleAlarmDaemonImpl::confSound( int num )
     } else {
         wavAlarm = true;
         mSoundPopUp->setItemChecked ( 0, false );
         mSoundPopUp->setItemChecked ( 1, true );
     }
 }
 void  SimpleAlarmDaemonImpl::slotPlayBeep( int num )
 {
+    if ( num == 1000 ) {
+        simulate();
+        return;
+    }
     mBeepPopUp->setItemChecked ( mPlayBeeps,false );
     mPlayBeeps = num;
     mBeepPopUp->setItemChecked ( mPlayBeeps, true );
 }
 
 void SimpleAlarmDaemonImpl::recieve( const QCString& msg, const QByteArray&  )
 {
     //qDebug("SimpleAlarmDaemonImpl::ALARM RECEIVED! %s", msg.data());