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
@@ -55,10 +55,10 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     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() ) );
@@ -108,15 +108,17 @@ SimpleAlarmDaemonImpl::SimpleAlarmDaemonImpl( QWidget *parent )
     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 );
@@ -255,8 +257,12 @@ void  SimpleAlarmDaemonImpl::confSound( int num )
     }
 }
 void  SimpleAlarmDaemonImpl::slotPlayBeep( int num )
 {
+    if ( num == 1000 ) {
+        simulate();
+        return;
+    }
     mBeepPopUp->setItemChecked ( mPlayBeeps,false );
     mPlayBeeps = num;
     mBeepPopUp->setItemChecked ( mPlayBeeps, true );
 }