21 files changed, 29 insertions, 127 deletions

diff --git a/korganizer/kdatenavigator.cpp b/korganizer/kdatenavigator.cpp
index 5aa1c9b..6697602 100644
--- a/korganizer/kdatenavigator.cpp
+++ b/korganizer/kdatenavigator.cpp
@@ -140,21 +140,19 @@ QFont KDateNavigator::yourFontHint( QSize si , bool *b)
         QSize sh = sizeHintTwoButtons( 2 );
         //qDebug("fp %d %d %d %d %d", fontPoint,   si.width() , sh.width() ,   si.height() , sh.height()                 );
         if ( si.width()  > sh.width() &&   si.height()  > sh.height()) {
             if (  si.width()  / sh.width() == 1 ) {
                 if (  si.width() < sizeHintTwoButtons( 4 ).width())
                     continue;
             }
             *b = true;
-            //qDebug("fooooooooooooooooooooooouuuuund ");
             break;
         }
     }
-    //qDebug("returnnnnnnnnnnnnnnnnnnn %d", fo.pointSize() );
     return fo;
 }
 QSize KDateNavigator::sizeHint() const
 {
     QFontMetrics fm ( font() );
     QSize day =  daymatrix->sizeHint();
     QSize nav =  mNavigatorBar->sizeHint();
     int wid = fm.width( "30") + day.width()+3;
@@ -363,17 +361,17 @@ void KDateNavigator::updateConfig()
     headings[i]->setText( dayName );
   }
   updateDates();
   updateView();
 }
 
 void KDateNavigator::setShowWeekNums(bool enabled)
 {
-    qDebug("KDateNavigator::setShowWeekNums***************************** ");
+   
   m_bShowWeekNums = enabled;
   for(int i=0; i<6; i++) {
     if(enabled)
       weeknos[i]->show();
     else
       weeknos[i]->hide();
   }
   resize(size());
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b43c40e..b5a4199 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -911,17 +911,17 @@ void KOAgendaView::updateView()
 */
 void KOAgendaView::updateConfig()
 {
     if ( mBlockUpdating )
         return;
     if ( mAgenda->height() > 96 * KOPrefs::instance()->mHourSize ) {
         int old = KOPrefs::instance()->mHourSize;
         KOPrefs::instance()->mHourSize = mAgenda->height()/96 +1;
-        qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
+        //qDebug("KOPrefs::instance()->mHourSize adjusted %d to  %d ", old,KOPrefs::instance()->mHourSize );
     }
 
 
     // update config for children
     mTimeLabels->updateConfig();
     mAgenda->storePosition();
     mAgenda->updateConfig();
     mAllDayAgenda->updateConfig();
@@ -1159,20 +1159,20 @@ void KOAgendaView::fillAgenda()
                 if (event->recurrence()->doesRecur()) {
                     if (event->isMultiDay() ) {
                         endX = endX - beginX;// endX is now number of days
                         if ( event->recursOn( currentDate ) ) {
                             endX +=  curCol;
                             beginX = curCol;
                             mAllDayAgenda->insertAllDayItem(event,currentDate,beginX,endX);
                         } else {
-                            qDebug("days %d %s",endX , currentDate.toString().latin1());
+                            //qDebug("days %d %s",endX , currentDate.toString().latin1());
                             QDate dateit = currentDate.addDays( -endX );
                             if ( event->recursOn( dateit ) ) {
-                                qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
+                                //qDebug("found %d %d %d %s", endX,curCol, curCol-endX ,dateit.toString().latin1()  );
                                 if ( curCol-endX < 0 ) {
                                     mAllDayAgenda->insertAllDayItem(event,currentDate,0,curCol);
                                 }
                             }
                         }
                     } else {
                         mAllDayAgenda->insertAllDayItem(event,currentDate,curCol,curCol);
                     }
diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp
index ecca374..17a1d13 100644
--- a/korganizer/kodaymatrix.cpp
+++ b/korganizer/kodaymatrix.cpp
@@ -492,17 +492,16 @@ void KODayMatrix::updateViewTimed()
         QPtrList<Event> eventlist = mCalendar->events(days[i]);
         Event *event;
         int numEvents = eventlist.count();
         QString holiStr = "";
         bDays.clearBit(i);
         hDays.clearBit(i);
         eDays.clearBit(i);
         for(event=eventlist.first();event != 0;event=eventlist.next()) {
-            qDebug("FFFFFFFFFFFFFFFFFFFFFFFFF ");
             ushort recurType = event->recurrence()->doesRecur();
             if ((recurType == Recurrence::rDaily && !KOPrefs::instance()->mDailyRecur) ||
                 (recurType == Recurrence::rWeekly && !KOPrefs::instance()->mWeeklyRecur)) {
                 numEvents--;
             }
             if ( event->isHoliday()) {
                 hDays.setBit(i);
                 if ( !holiStr.isEmpty() )
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 9df76e7..0045b7f 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -227,17 +227,17 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
     //     mAlarmSoundButton->hide();
     //     mAlarmProgramButton->hide();
     //   }
 }
 
 void KOEditorGeneral::pickAlarmSound()
 {
 
-    qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
+    //qDebug("KOEditorGeneral::pickAlarmSound() %d",mAlarmSoundButton->isOn() );
     
     bool oldState = mAlarmSoundButton->isOn();
    
     QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
                                                   i18n("*.wav|Wav Files"), 0));
     if (!fileName.isEmpty()) {
         mAlarmSound = fileName;
         QToolTip::remove(mAlarmSoundButton);
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index 01c5773..47e73dd 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -934,41 +934,41 @@ void KOEditorRecurrence::readEvent(Incidence *event)
       mMonthly->setByDay( day );
 
       mMonthly->setFrequency( f );
 
       break;
     case Recurrence::rYearlyMonth:
         {
         recurrenceType = RecurrenceChooser::Yearly;
-            qDebug("Recurrence::rYearlyMonth: ");
+        //qDebug("Recurrence::rYearlyMonth: ");
             day = event->dtStart().date().day(); 
             rmd = r->yearNums();
             if ( rmd.count() > 0 )
                 month = *rmd.first();
             else
                 month = event->dtStart().date().month() ;
             mYearly->setByMonth( month, day );
 #if 0
-            qDebug("2day = %d ",day );
+            //qDebug("2day = %d ",day );
             QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
             int month;
             if ( !monthlist.isEmpty() ) {
                 month =  monthlist.first()->rPos ;
             } else {
                 month = event->dtStart().date().month() ;
             }
             mYearly->setByMonth( day, month );
 #endif
             mYearly->setFrequency( f );
         }
 
       break;
     case Recurrence::rYearlyDay:
-        qDebug("Recurrence::rYearlyDay: ");
+        //qDebug("Recurrence::rYearlyDay: ");
         recurrenceType = RecurrenceChooser::Yearly;
         mYearly->setByDay( event->dtStart().date().dayOfYear() );
         mYearly->setFrequency( f );
         break;
     default:
         setDefaults( event->dtStart(), dtEnd, true );
       break;
   }
@@ -1016,17 +1016,17 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
       QBitArray days = mWeekly->days();
       int j;
       bool found = false;
       for (j = 0; j < 7 ; ++j ) {
           found |=days.at(j);
       }
       if ( !found ) {
           days.setBit( event->dtStart().date().dayOfWeek()-1);
-          qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
+          //qDebug("bit set %d ", event->dtStart().date().dayOfWeek()-1);
       }
       if ( duration != 0 ) r->setWeekly( freq, days, duration );
       else r->setWeekly( freq, days, endDate );
     } else if ( recurrenceType == RecurrenceChooser::Monthly ) {
       int freq = mMonthly->frequency();
       if ( mMonthly->byPos() ) {
         int pos = mMonthly->count();
 
@@ -1046,17 +1046,17 @@ void KOEditorRecurrence::writeEvent( Incidence *event )
         if ( duration != 0 ) {
           r->setMonthly( Recurrence::rMonthlyDay, freq, duration );
         } else {
           r->setMonthly( Recurrence::rMonthlyDay, freq, endDate );
         }
         r->addMonthlyDay( day );
       }
     } else if ( recurrenceType == RecurrenceChooser::Yearly ) {
-        qDebug("RecurrenceChooser::Yearly ");
+        //qDebug("RecurrenceChooser::Yearly ");
       int freq = mYearly->frequency();
       if ( mYearly->byDay() ) {
           if ( duration != 0 ) {
               r->setYearly( Recurrence::rYearlyDay, freq, duration );
           } else {
               r->setYearly( Recurrence::rYearlyDay, freq, endDate );
           }
           r->addYearlyNum( event->dtStart().date().dayOfYear() );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index fefc778..f39b5e1 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -94,19 +94,17 @@ void KOEventViewer::printMe()
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
 
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 
 }
 void KOEventViewer::setSource(const QString& n)
@@ -162,21 +160,19 @@ void KOEventViewer::setSource(const QString& n)
     //requestNameEmailUidListFromKAPI("QPE/Application/kopi", this->name() /* name is here the unique uid*/);
   // the result should now arrive through method insertAttendees
     //QString uid = "uid:"+(*it).uid();
 #endif
     if ( n.left(6) == "mailto" ) {
         // qDebug("KOEventViewer::setSource %s ", n.mid(7).latin1());
 #ifndef DESKTOP_VERSION
         if ( n.mid(7,3) == "ALL" ) {
-            qDebug("all ");
             mailToAttendees( true );
         } else if ( n.mid(7,4) == "RSVP"  ) {
             mailToAttendees( false );
-            qDebug("rsvp ");
         } else {
         QCopEnvelope e("QPE/Application/ompi", "newMail(QString)" );
         e << n.mid(7);
         }
 #endif
 
     }
 
diff --git a/korganizer/koglobals.cpp b/korganizer/koglobals.cpp
index 8016034..9ece77f 100644
--- a/korganizer/koglobals.cpp
+++ b/korganizer/koglobals.cpp
@@ -27,33 +27,20 @@
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 
 #include <kcalendarsystem.h>
 
-#ifndef KORG_NOKALARMD
-#include "kalarmdclient.h"
-#endif
-#include "simplealarmclient.h"
 
 #include "koglobals.h"
 #include "koprefs.h"
 
-class NopAlarmClient : public AlarmClient
-{
-  public:
-    void startDaemon() {}
-    bool setCalendars( const QStringList & ) { return false; }
-    bool addCalendar( const QString & ) { return false; }
-    bool removeCalendar( const QString & ) { return false; }
-    bool reloadCalendar( const QString & ) { return false; }
-};
 
 KOGlobals *KOGlobals::mSelf = 0;
 
 KOGlobals *KOGlobals::self()
 {
   if (!mSelf) {
     mSelf = new KOGlobals;
   }
@@ -63,55 +50,39 @@ KOGlobals *KOGlobals::self()
 
 KOGlobals::KOGlobals()
 {
   KConfig *cfg = KOGlobals::config();
 
   cfg->setGroup("General");
   mCalendarSystem = KGlobal::locale()->calendar();
 
-  cfg->setGroup("AlarmDaemon");
-  QString alarmClient = cfg->readEntry( "Daemon", "kalarmd" );
-  if ( alarmClient == "simple" ) {
-    mAlarmClient = new SimpleAlarmClient;
-#ifndef KORG_NOKALARMD
-  } else if ( alarmClient == "kalarmd" ) {
-    mAlarmClient = new KalarmdClient;
-#endif
-  } else {
-    mAlarmClient = new NopAlarmClient;
-  }
 }
 
 KConfig* KOGlobals::config()
 {
   static KConfig *mConfig = 0;
   if (!mConfig) {
       KOPrefs *p = KOPrefs::instance();
       mConfig = p->getConfig();
       //mConfig = new KConfig( locateLocal( "config", "korganizerrc" ) );
   }
   return mConfig;
 }
 
 KOGlobals::~KOGlobals()
 {
-  delete mAlarmClient;
+  
 }
 
 const KCalendarSystem *KOGlobals::calendarSystem() const
 {
   return mCalendarSystem;
 }
 
-AlarmClient *KOGlobals::alarmClient() const
-{
-  return mAlarmClient;
-}
-
 void KOGlobals::fitDialogToScreen( QWidget *wid, bool force )
 {
   bool resized = false;
 
   int w = wid->frameSize().width();
   int h = wid->frameSize().height();  
 
   QRect desk = KGlobalSettings::desktopGeometry(wid);
diff --git a/korganizer/koglobals.h b/korganizer/koglobals.h
index 357ff5f..b3ff67b 100644
--- a/korganizer/koglobals.h
+++ b/korganizer/koglobals.h
@@ -38,22 +38,19 @@ class KOGlobals
 
     static void fitDialogToScreen( QWidget *widget, bool force=false );
     static KConfig *config();
 
     static bool reverseLayout();
 
     const KCalendarSystem *calendarSystem() const;
 
-    AlarmClient *alarmClient() const;
-
   protected:
     KOGlobals();
     ~KOGlobals();
     
   private:
     static KOGlobals *mSelf;
     
-    const KCalendarSystem *mCalendarSystem;    
-    AlarmClient *mAlarmClient;
+    const KCalendarSystem *mCalendarSystem;  
 };
 
 #endif
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp
index 51df123..9813a80 100644
--- a/korganizer/koincidenceeditor.cpp
+++ b/korganizer/koincidenceeditor.cpp
@@ -37,17 +37,16 @@
 
 #include <libkdepim/categoryselectdialog.h>
 #include <libkdepim/kinputdialog.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icalformat.h>
 
 #include "koprefs.h"
-#include "koglobals.h"
 
 #include "koincidenceeditor.h"
 
 KOIncidenceEditor::KOIncidenceEditor( const QString &caption, 
                                       Calendar *calendar, QWidget *parent ) :
     KDialogBase( Tabbed, caption, Ok | Apply | Cancel |/* Default | */User1, Ok,
                parent, caption, true, false ),
   mSaveTemplateDialog( 0 )
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 341f473..e1b393d 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -326,16 +326,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 
     readSettings(KOGlobals::config(),"KOListView Layout");
 }
 
 KOListView::~KOListView()
 {
     delete mPopupMenu;
 }
+
 QString KOListView::getWhatsThisText(QPoint p)
 {
     KOListViewItem* item = ( KOListViewItem* ) mListView->itemAt( p );
     if ( item )
         return KIncidenceFormatter::instance()->getFormattedText( item->data(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
@@ -423,16 +424,17 @@ void  KOListView::setAlarm()
         item = sel.next();
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
     topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count )  );
     qDebug("KO: Set alarm for %d items", count);
     calendar()->reInitAlarmSettings();
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::setCategories( bool removeOld )
 {
    
     KPIM::CategorySelectDialog* csd = new KPIM::CategorySelectDialog( KOPrefs::instance(), 0 );
     if (! csd->exec()) { 
         delete csd;
         return;
@@ -470,16 +472,17 @@ void KOListView::setCategories( bool removeOld )
             inc->setCategories( itemList.join(",") );
         }
         temp = item;
         item = sel.next();
         mUidDict.remove( inc->uid() ); 
         delete temp;;
         addIncidence( inc );
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 
 void KOListView::beamSelected()
 {
     int icount = 0;
     QPtrList<Incidence> delSel ;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
@@ -694,16 +697,17 @@ void KOListView::writeToFile( bool iCal )
                 VCalFormat format;
                 format.save( &cal, fn );
             }
             mes = i18n("KO/Pi:Saved %1").arg(fn );
             KOPrefs::instance()->mLastSaveFile = fn;
             topLevelWidget()->setCaption(mes); 
         }
     }
+    QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
 }
 void KOListView::deleteAll()
 {
     int icount = 0;
     QPtrList<Incidence> delSel ;
     QListViewItem *item  = mListView->firstChild ();
     while ( item ) {
         if ( item->isSelected() ) {
@@ -824,18 +828,21 @@ void KOListView::showDates()
 {
     showDates(true);
 }
 
 void KOListView::hideDates()
 {
     showDates(false);
 }
+
 void KOListView::resetFocus()
-{
+{ 
+    topLevelWidget()->setActiveWindow();
+    topLevelWidget()->raise();
     mListView->setFocus();
 }
 void KOListView::updateView()
 {
     mListView->setFocus();
     if ( mListView->firstChild () )
         mListView->setCurrentItem( mListView->firstChild () );
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index bb0e23e..eb5bb6e 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -254,22 +254,22 @@ class KOListView : public KOEventView
                               const QDate &, const QDate &);
     
     void readSettings(KConfig *config, QString setting = "KOListView Layout");
     void writeSettings(KConfig *config, QString setting = "KOListView Layout");
     void updateList();
     void setStartDate(const QDate &start);
     int count();
     QString getWhatsThisText(QPoint p);
-    void resetFocus();
  signals:
     void signalNewEvent();
     void beamIncidenceList(QPtrList<Incidence>);
 
   public slots:
+    void resetFocus();
     virtual void updateView();
     virtual void showDates(const QDate &start, const QDate &end);
     virtual void showEvents(QPtrList<Event> eventList);
     void clearSelection();
     void allSelection();
 
     void clear();
     void beamDone( Ir *ir );
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 2b7e41f..843526d 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -282,39 +282,35 @@ MonthViewItem::MonthViewItem( Incidence *incidence, QDate qd, const QString & s)
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false;
     mdayPos = 0;
     isWeekItem = KOPrefs::instance()->mMonthViewWeek;
-    //qDebug("NEWWWWWWWWWWWWW ");
 }
 void MonthViewItem::recycle( Incidence *incidence, QDate qd, const QString & s)
 {
     setText( s );
     mMultiday = 0; 
     mIncidence = incidence;
     mDate = qd;
     mRecur = false;
     mAlarm = false;
     mReply = false;
     mInfo = false; 
     mdayPos = 0;
-    //qDebug("recucleeeeeeeeeeeeeeeee ");
 }
 
 void MonthViewItem::paint(QPainter *p)
 {
     if ( mblockRepaint ) {
-        //qDebug("block ");
         return;
     }
-    //qDebug("NON block ");
 #if QT_VERSION >= 0x030000
     bool sel = isSelected();
 #else
     bool sel = selected();
 #endif 
 
 
     if (KOPrefs::instance()->mMonthViewUsesCategoryColor)
@@ -455,17 +451,16 @@ int MonthViewItem::width(const QListBox *lb) const
         }
         if( mMultiday ) {
             x += size+1+2+size/2;
         }
         return( x + lb->fontMetrics().width( text() ) + 1 );
     }
     if ( ! lb )
         return 10;
-    //qDebug("ret wid %d ", lb->width());
     return lb->width();
 }
 
 
 MonthViewCell::MonthViewCell( KOMonthView *parent,QWidget* par )
     : KNoScrollListBox( par ),
       mMonthView( parent )
 {
@@ -607,22 +602,17 @@ void MonthViewCell::startUpdateCell()
         mitem->setBlockRepaint( true );
         mitem = (MonthViewItem *)mitem->next();
     }
     if ( mAvailItemList.count() > 20 ) {
         mAvailItemList.setAutoDelete( true );
         mAvailItemList.clear();
         mAvailItemList.setAutoDelete( false );
     }
-    /*    
-          if ( !isVisible() ){
-          return;
-          }
-    */
-    // qDebug("MonthViewCell::updateCell() ");
+   
     setPrimary( mDate.month()%2 );
     setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
     if ( mDate == QDate::currentDate()  ) {
         setLineWidth( 3 );
     } else {
         setLineWidth( 1 );
     }
     MonthViewItem* CurrentAvailItem = (MonthViewItem*) firstItem ();
@@ -866,17 +856,16 @@ void MonthViewCell::finishUpdateCell()
     //setMyPalette(); 
     setMyPalette();
   
     resizeEvent( 0 ); 
 
 }
 void MonthViewCell::updateCell()
 {
-    //qDebug("MonthViewCell::updateCell() ");
     if ( !mMonthView->isUpdatePossible() )
         return;
     startUpdateCell();
     //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
     QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
     Event *event;
     for( event = events.first(); event; event = events.next() ) { // for event
         insertEvent(event);
@@ -1048,17 +1037,16 @@ void MonthViewCell::showDay()
 void MonthViewCell::newEvent()
 {
     QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
     emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
     mMonthView->setSelectedCell( this );
-    qDebug("CELL ");
     if ( item == 0 ) {
         QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
         emit newEventSignal( dt );
         return;
     }
 
 }
 
diff --git a/korganizer/korganizer.pro b/korganizer/korganizer.pro
index 1a81c7d..d88c300 100644
--- a/korganizer/korganizer.pro
+++ b/korganizer/korganizer.pro
@@ -130,17 +130,16 @@ HEADERS += datenavigatorcontainer.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
  ../kalarmd/alarmdialog.h \
 
 
 SOURCES += datenavigatorcontainer.cpp \ 
@@ -190,17 +189,16 @@ filteredit_base.cpp \
  mainwindow.cpp \
  navigatorbar.cpp \
  outgoingdialog.cpp \
  outgoingdialog_base.cpp \
  publishdialog.cpp \
  publishdialog_base.cpp \
  savetemplatedialog.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
 
 HEADERS += calprintbase.h calprinter.h calprintplugins.h cellitem.h
 INTERFACES += calprintdayconfig_base.ui \
               calprintmonthconfig_base.ui \
diff --git a/korganizer/korganizerE.pro b/korganizer/korganizerE.pro
index 91b5a01..553c265 100644
--- a/korganizer/korganizerE.pro
+++ b/korganizer/korganizerE.pro
@@ -80,17 +80,16 @@ HEADERS = datenavigatorcontainer.h \
  mainwindow.h \
  navigatorbar.h \
  outgoingdialog.h \
  outgoingdialog_base.h \
  publishdialog.h \
  publishdialog_base.h \
  savetemplatedialog.h \
  searchdialog.h \
- simplealarmclient.h \
  statusdialog.h \
  timeline.h \
  timespanview.h \
  version.h \
  ../kalarmd/alarmdialog.h
 
 SOURCES = datenavigatorcontainer.cpp \
  filteredit_base.cpp \
@@ -139,14 +138,13 @@ SOURCES = datenavigatorcontainer.cpp \
  mainwindow.cpp \
  navigatorbar.cpp \
  outgoingdialog.cpp \
  outgoingdialog_base.cpp \
  publishdialog.cpp \
  publishdialog_base.cpp \
  savetemplatedialog.cpp \
  searchdialog.cpp \
- simplealarmclient.cpp \
  statusdialog.cpp \
  timeline.cpp \
  timespanview.cpp \
  ../kalarmd/alarmdialog.cpp
 
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index dd2c081..0a608dc 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -703,29 +703,23 @@ void KOTodoView::updateView()
                   incidence = incidence->relatedTo();
               }
           } else 
               incidence = 0;
       }
       if ( next )
           todo = todoList.next();
   }
-//   qDebug("again .... ");
-//   for(todo = todoList.first(); todo; todo = todoList.next()) {
-      
-//       qDebug("yytodo %s ", todo->summary().latin1());
-//   }
-  //qDebug("for  ");
+
   for(todo = todoList.first(); todo; todo = todoList.next()) {
       if (!mTodoMap.contains(todo)  && checkTodo( todo ) )
       {
       insertTodoItem(todo);
     }
   }
-  //qDebug("for end ");
   // Restore opened/closed state
   mTodoListView->blockSignals( true );
   if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() );
   mTodoListView->blockSignals( false );
   resetCurrentItem();
   processSelectionChange();
 }
 
@@ -907,17 +901,16 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 {
 #ifndef KORG_NOPRINTER
   calPrinter->preview(CalPrinter::Todolist, fd, td);
 #endif
 }
 
 void KOTodoView::editItem(QListViewItem *item )
 {
-    // qDebug("editItem(QListViewItem *item ) ");
   emit editTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
 void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 {
   emit showTodoSignal(((KOTodoViewItem *)item)->todo());
 }
 
@@ -1091,17 +1084,17 @@ void KOTodoView::changedCategories(int index)
 void KOTodoView::itemDoubleClicked(QListViewItem *item)
 {
     if ( pendingSubtodo != 0 ) {
         topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
     }
     pendingSubtodo = 0;
     //int row = mTodoListView->header()->sectionAt ( mTodoListView->header()->mapFromGlobal( QCursor::pos()).x() );
     int row = mTodoListView->header()->sectionAt ( mTodoListView->viewportToContents(mTodoListView->viewport()->mapFromGlobal( QCursor::pos())) .x() );
-    qDebug("ROW %d ", row);
+    //qDebug("ROW %d ", row);
     if (!item) {
         newTodo();
         return;
     } else {
         if ( row == 2 || row == 1 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
@@ -1165,35 +1158,17 @@ void KOTodoView::itemClicked(QListViewItem *item)
       } else {
           Todo* newParent = todoItem->todo();
           Todo* newSub = pendingSubtodo->todo();
           pendingSubtodo = 0;
           emit reparentTodoSignal( newParent,newSub  );
           return;
       }
   }
-#if 0
-  // handled by the item itself
-  bool completed = todoItem->todo()->isCompleted();  // Completed or not?
-  qDebug("com %d ",completed );
-  qDebug("itemclicked ");
-  if (todoItem->isOn()) {
-      qDebug("on ");
-    if (!completed) {
-        qDebug("set true ");
-      todoItem->todo()->setCompleted(QDateTime::currentDateTime());
-    }
-  } else {
-      qDebug("not on ");
-    if (completed) {
-        qDebug("set false ");
-      todoItem->todo()->setCompleted(false);
-    }
-  }
-#endif
+
 }
 
 void KOTodoView::setDocumentId( const QString &id )
 {
 
   mDocPrefs->setDoc( id );
 }
 
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index f1f2dd2..3aa9b6c 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -545,25 +545,17 @@ void KOViewManager::showWorkWeekView()
     globalFlagBlockLabel = 0;
     mMainView->dateNavigator()->selectWorkWeek();
     mCurrentAgendaView = 5 ;
    
 }
 
 void KOViewManager::showWeekView()
 {
-    /*
-      globalFlagBlockAgenda = 2;
-      qDebug("4globalFlagBlockAgenda = 2; ");
-      //globalFlagBlockPainting = true;
-      mMainView->dateNavigator()->selectWeek();
-      showAgendaView();
-    */
-
-
+   
     mCurrentAgendaView = mMainView->dateNavigator()->selectedDates().count();
     mFlagShowNextxDays = false;
     globalFlagBlockAgenda = 1;
     globalFlagBlockLabel = 1;
     if ( mCurrentAgendaView != 7 )
         mCurrentAgendaView = -1;
     showAgendaView();
     qApp->processEvents();  
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 8473db9..65d8ac3 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -79,19 +79,17 @@ void WhatsNextTextBrowser::printMe()
     dy  = (float)(m.height()) / (float)contentsHeight ();
     float scale;
     // scale to fit the width or height of the paper
     if ( dx < dy )
         scale = dx;
     else
         scale = dy;
     p.translate( m.width()/10,0 );
-    qDebug("Scale: %f ", scale );
     if ( scaleval == 2 ||  scaleval == 1 && scale < 1.0 ) {
-        qDebug("SCALE ");
         p.scale( scale, scale );
     }
     drawContents ( &p, 0,0,  contentsWidth (),  contentsHeight () ); 
     p.end();
 #endif  
 }
 
 KOWhatsNextView::KOWhatsNextView(Calendar *calendar, QWidget *parent,
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 61a0931..df9b2fc 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -332,28 +332,26 @@ void KOTimeEdit::keyPressEvent(QKeyEvent *e)
   // rest
   case Key_Prior:
     subTime(QTime(1,0,0));
     break;
   case Key_Next:
     addTime(QTime(1,0,0));
     break;
   case Key_Backspace:
-      qDebug("+++++++++++back ");
       if ( cpos >  0) {
           if ( cpos == 3 )
               --cpos;
           if ( cpos > 5)
               cpos = 5;
           text.at( cpos-1 ) = '0';
           lineEdit()->setText( text );
           lineEdit()->setCursorPosition(--cpos);
           setSelect ( cpos , 1 );
       changedText();
-      qDebug("---------back ");
       }
     break;
   } // switch arrows
 
   // if cursor at string end, alltext market and keyEvent don't ArrowLeft -> deselect and cpos
   if( cpos > 4 && lineEdit()->markedText().length() == 5 && e->key() != Key_Left ) {
       lineEdit()->deselect();
       cpos = 0;
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 8e5d108..95bef66 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -55,17 +55,16 @@
 #include "kstandarddirs.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "ktoolbar.h"
 #include "klocale.h"
 #include "kconfig.h"
-#include "simplealarmclient.h"
 #include "externalapphandler.h"
 
 using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #ifdef _OL_IMPORT_
 #include "koimportoldialog.h"
@@ -280,17 +279,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
     //mView->setMaximumSize( splash->size() );
     //mView->resize( splash->size() );
     //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
     mView->readSettings();
     bool newFile = false;
     if( !QFile::exists( defaultFileName() ) ) {
         QFileInfo finfo ( defaultFileName() );
         QString oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/Applications/korganizer/mycalendar.ics");
-        qDebug("oldfile %s ", oldFile.latin1());
         QString message = "You are starting KO/Pi for the\nfirst time after updating to a\nversion >= 1.9.1. The location of the\ndefault calendar file has changed.\nA mycalendar.ics file was detected\nat the old location.\nThis file will be loaded now\nand stored at the new location!\n(Config file location has changed, too!)\nPlease read menu Help-What's New!\n";
         finfo.setFile( oldFile );
         if (finfo.exists() ) {
             KMessageBox::information( this, message);
             mView->openCalendar( oldFile );
             qApp->processEvents();
         } else {
             oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
@@ -413,23 +411,23 @@ bool MainWindow::beamReceiveEnabled()
 }
 
 void MainWindow::toggleBeamReceive()
 {
     if ( mBRdisabled  )
         return;
 #ifndef DESKTOP_VERSION
     if ( infrared ) {
-        qDebug("disable BeamReceive ");
+        qDebug("KO: Disable BeamReceive ");
         delete infrared;
         infrared = 0;
         brAction->setOn(false);
         return;
     } 
-    qDebug("enable BeamReceive ");
+    qDebug("KO: Enable BeamReceive ");
     brAction->setOn(true);
     infrared = new QCopChannel("QPE/Application/datebook",this, "channel" ) ;   
     QObject::connect( infrared, SIGNAL (received ( const QCString &, const QByteArray & )),this, SLOT(recieve(  const QCString&, const QByteArray& )));
 #endif
 }
 void MainWindow::showMaximized () 
 {
 #ifndef DESKTOP_VERSION
diff --git a/korganizer/mainwindow.h b/korganizer/mainwindow.h
index f2a6c60..45ed04d 100644
--- a/korganizer/mainwindow.h
+++ b/korganizer/mainwindow.h
@@ -5,17 +5,16 @@
 #include <qtimer.h>
 #include <qdict.h>
 #include <qfile.h>
 #include <qmenubar.h>
 #include <qtextstream.h>
 #include <qregexp.h>
 
 #include <libkcal/incidence.h>
-#include "simplealarmclient.h"
 #include <ksyncmanager.h>
 #ifndef DESKTOP_VERSION
 #include <qcopchannel_qws.h> 
 #endif
 class QAction;
 class CalendarView;
 class KSyncProfile;
 #ifdef DESKTOP_VERSION
@@ -26,23 +25,16 @@ class KSyncProfile;
 class QPEToolBar;
 class QPEMenuBar;
 
 
 namespace KCal {
 class CalendarLocal;
 }
 
-class KOMenuBar : public QMenuBar
-{
-  public:
-    KOMenuBar(   QWidget *parent=0  ): QMenuBar (parent ) {;}
-        QSize sizeHint () const{ qDebug("sizejint ");return QSize ( 40,25 );}
-};
-
 using namespace KCal;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
   public:
     MainWindow( QWidget *parent = 0, const char *name = 0, QString command = "");
     ~MainWindow();
@@ -159,17 +151,16 @@ class MainWindow : public QMainWindow
     QAction *mCancelAction;
 
     QAction *mToggleNav;
     QAction *mToggleFilter;
     QAction *mToggleAllday;
     QAction *actionFilterMenuTB;
 
     void closeEvent( QCloseEvent* ce );
-    SimpleAlarmClient mAlarmClient;
     QTimer mSaveTimer;
     //bool mBlockSaveFlag;
     bool mCalendarModifiedFlag;
     QPixmap loadPixmap( QString );
 };
 
 
 #endif
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index 7a945e3..de65b53 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -440,21 +440,20 @@ void SearchDialog::search(const QRegExp &re)
     }
 
 }
 
 void SearchDialog::keyPressEvent ( QKeyEvent *e) 
 {
     switch ( e->key() ) {
     case Qt::Key_Escape:
-        hide();
+        close();
         break;
     case Qt::Key_F:
         if ( e->state() == Qt::ControlButton ) {
-            qDebug("full ");
 
         }
         break;
     case Qt::Key_Return:
     case Qt::Key_Enter:
         doSearch();
         break;