1 files changed, 258 insertions, 242 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 6c0aa9b..4b00062 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -8,23 +8,24 @@
 #include <qlineedit.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qapp.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
-#include <qwmatrix.h> 
+#include <qmap.h>
-#include <qtextbrowser.h> 
+#include <qwmatrix.h>
-#include <qtextstream.h> 
+#include <qtextbrowser.h>
+#include <qtextstream.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/global.h>
 #include <qpe/qpemenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
-#include <qtopia/alarmserver.h> 
+#include <qtopia/alarmserver.h>
-#include <qtopia/qcopenvelope_qws.h> 
+#include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #include <qapplication.h>
 //#include <resource.h>
@@ -48,13 +49,15 @@
 #include "kfiledialog.h"
 #include "koglobals.h"
 #include "kglobal.h"
 #include "klocale.h"
 #include "kconfig.h"
 #include "simplealarmclient.h"
-using namespace KCal; 
+#include "externalapphandler.h"
+using namespace KCal;
 #ifndef _WIN32_
 #include <unistd.h>
 #else
 #include "koimportoldialog.h"
 #endif
 #include "mainwindow.h"
@@ -63,27 +66,27 @@ int globalFlagBlockStartup;
 MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    QMainWindow( parent, name )
 {
 #ifdef DESKTOP_VERSION
    setFont( QFont("Arial"), 14 );
-#endif 
+#endif
    //QString confFile = KStandardDirs::appDir() + "config/korganizerrc";
    QString confFile = locateLocal("config","korganizerrc");
-    QFileInfo finf ( confFile ); 
+    QFileInfo finf ( confFile );
    bool showWarning =  !finf.exists();
    setIcon(SmallIcon( "ko24" )  );
    mBlockAtStartup = true;
    mFlagKeyPressed = false;
    setCaption("KOrganizer/Pi");
    KOPrefs *p = KOPrefs::instance();
   //  if ( QApplication::desktop()->height() > 480 ) {
 //         if ( p->mHourSize == 4 )
 //             p->mHourSize = 6;
-//     }  
+//     }
    if ( p->mHourSize >  18 )
        p->mHourSize = 18;
    QMainWindow::ToolBarDock tbd;
    if ( p->mToolBarHor ) {
        if ( p->mToolBarUp )
            tbd = Bottom;
@@ -99,29 +102,29 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    if ( KOPrefs::instance()->mUseAppColors )
        QApplication::setPalette( QPalette (KOPrefs::instance()->mAppColor1, KOPrefs::instance()->mAppColor2), true );
    globalFlagBlockStartup = 1;
    iconToolBar = new QPEToolBar( this );
    addToolBar (iconToolBar , tbd );
    mBlockSaveFlag = false;
-    mCalendarModifiedFlag = false;  
+    mCalendarModifiedFlag = false;
- 
    QLabel* splash  = new QLabel(i18n("KO/Pi is starting ... "), this );
    splash->setAlignment ( AlignCenter );
    setCentralWidget( splash );
 #ifndef DESKTOP_VERSION
    showMaximized();
 #endif
    //qDebug("Mainwidget x %d y %d w %d  h %d",  x(), y(), width(), height ());
    setDefaultPreferences();
    mCalendar = new CalendarLocal();
    mView = new CalendarView( mCalendar, this,"mCalendar " );
    mView->hide();
    //mView->resize(splash->size() );
-    initActions(); 
+    initActions();
 #ifndef DESKTOP_VERSION
-    iconToolBar->show(); 
+    iconToolBar->show();
    qApp->processEvents();
 #endif
    //qDebug("Splashwidget x %d y %d w %d  h %d", splash-> x(), splash->y(), splash->width(),splash-> height ());
    int vh = height() ;
    int vw = width();
    //qDebug("Toolbar hei %d ",iconToolBar->height() );
@@ -130,13 +133,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    } else {
        vw -= iconToolBar->height();
    }
    //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(); 
+    mView->readSettings();
    bool oldOpened = false;
    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());
@@ -145,18 +148,18 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
        if (finfo.exists() ) {
            KMessageBox::information( this, message);
            mView->openCalendar( oldFile );
            qApp->processEvents();
        } else {
            oldFile = QDir::convertSeparators(  QDir::homeDirPath()+"/korganizer/mycalendar.ics");
-            finfo.setFile( oldFile ); 
+            finfo.setFile( oldFile );
            if (finfo.exists() ) {
                KMessageBox::information( this, message);
                mView->openCalendar( oldFile );
                qApp->processEvents();
-            } 
+            }
        }
        mView->saveCalendar( defaultFileName() );
        newFile = true;
    }
    QTime neededSaveTime = QDateTime::currentDateTime().time();
@@ -172,71 +175,74 @@ MainWindow::MainWindow( QWidget *parent, const char *name, QString msg) :
    }
    processIncidenceSelection( 0 );
    connect( mView, SIGNAL( incidenceSelected( Incidence * ) ),
             SLOT( processIncidenceSelection( Incidence * ) ) );
    connect( mView, SIGNAL( modifiedChanged( bool ) ),
             SLOT( slotModifiedChanged( bool ) ) );
-   
    connect( &mSaveTimer, SIGNAL( timeout() ), SLOT( save() ) );
    mView->setModified( false );
    mBlockAtStartup = false;
    mView->setModified( false );
    setCentralWidget( mView );
    globalFlagBlockStartup = 0;
    mView->show();
-    delete splash; 
+    delete splash;
    if ( newFile )
        mView->updateConfig();
    // qApp->processEvents();
    //qDebug("MainView x %d y %d w %d  h %d",  mView->x(),mView-> y(), mView->width(), mView->height ());
-    fillSyncMenu(); 
+    fillSyncMenu();
    mView->viewManager()->agendaView()->setStartHour( KOPrefs::instance()->mDayBegins  );
    if ( showWarning ) {
-        KMessageBox::information( this, 
+        KMessageBox::information( this,
                         "You are starting KO/Pi for the first time.\nPlease read menu: Help-What's New,\nif you did an update!\nPlease choose your timezone in the \nConfigure Dialog TAB Time Zone!\nPlease choose your language\nin the TAB Locale!\nYou get the Configure Dialog\nvia Menu: Actions - Configure....\nClick OK to show the Configure Dialog!\n", "KO/Pi information");
        qApp->processEvents();
        mView->dialogManager()->showSyncOptions();
    }
+  //US listen for result adressed from Ka/Pi
+  connect(qApp, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 }
 MainWindow::~MainWindow()
 {
    //qDebug("MainWindow::~MainWindow() ");
-    //save toolbar location 
+    //save toolbar location
-  
-    delete mCalendar;  
+    delete mCalendar;
    delete KOPrefs::instance();
    delete KIncidenceFormatter::instance();
-   
-   
 }
 void MainWindow::closeEvent( QCloseEvent* ce )
 {
-  
-    
-    
    if ( ! KOPrefs::instance()->mAskForQuit ) {
        saveOnClose();
        ce->accept();
        return;
    }
    switch( QMessageBox::information( this, "KO/Pi",
                                      i18n("Do you really want\nto close KO/Pi?"),
-                                      i18n("Close"), i18n("No"), 
+                                      i18n("Close"), i18n("No"),
                                      0, 0 ) ) {
    case 0:
        saveOnClose();
        ce->accept();
        break;
    case 1:
-        ce->ignore(); 
+        ce->ignore();
        break;
    case 2:
-       
    default:
        break;
    }
 }
@@ -245,33 +251,43 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 {
    QDataStream stream( data, IO_ReadOnly );
    // QMessageBox::about( this, "About KOrganizer/Pi", "*" +msg +"*" );
    //QString datamess;
    //qDebug("message ");
    qDebug("KO: QCOP message received: %s ", cmsg.data()  );
+    if ( cmsg == "-writeFile" ) {
+        // I made from the "-writeFile" an "-writeAlarm"
+        mView->viewManager()->showWhatsNextView();
+        mCalendar->checkAlarmForIncidence( 0, true);
+        showMaximized();
+        raise();
+        return;
+    }
    if ( cmsg == "-writeFile" ) {
        // I made from the "-writeFile" an "-writeAlarm"
-        mView->viewManager()->showWhatsNextView(); 
+        mView->viewManager()->showWhatsNextView();
        mCalendar->checkAlarmForIncidence( 0, true);
        showMaximized();
        raise();
        return;
-       
    }
    if ( cmsg == "-writeFileSilent" ) {
        // I made from the "-writeFile" an "-writeAlarm"
-        // mView->viewManager()->showWhatsNextView(); 
+        // mView->viewManager()->showWhatsNextView();
        mCalendar->checkAlarmForIncidence( 0, true);
        //showMaximized();
        //raise();
        hide();
        return;
    }
    if ( cmsg == "-newCountdown" ) {
        qDebug("newCountdown ");
-       
    }
    QString msg ;
    QString allmsg = cmsg;
    while ( allmsg.length() > 0 ) {
        int nextC = allmsg.find( "-", 1 );
        if ( nextC == -1 ) {
@@ -284,14 +300,14 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
        //qDebug("msg: %s  all: %s ", msg.latin1(), allmsg.latin1() );
        if ( msg == "-newEvent" ) {
            mView->newEvent();
        }
        if ( msg == "-newTodo" ) {
            mView->newTodo();
-            
-        } 
+        }
        if ( msg == "-showWN" ) {
            mView->viewManager()->showWhatsNextView();
        }
        if ( msg == "-showTodo" ) {
            mView->viewManager()->showTodoView();
        }
@@ -320,17 +336,17 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
        }
        else if ( msg == "-showKO" ) {
            mView->viewManager()->showNextXView();
        }
        else if ( msg == "-showWNext" || msg == "nextView()" ) {
            mView->viewManager()->showWhatsNextView();
-        } 
+        }
        else if ( msg == "-showNextXView" ) {
            mView->viewManager()->showNextXView();
        }
-        
    }
    showMaximized();
    raise();
 }
@@ -348,178 +364,178 @@ void MainWindow::initActions()
    //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
    QPopupMenu *viewMenu = new QPopupMenu( this );
    QPopupMenu *actionMenu = new QPopupMenu( this );
    QPopupMenu *importMenu = new QPopupMenu( this );
    selectFilterMenu = new QPopupMenu( this );
-    selectFilterMenu->setCheckable( true ); 
+    selectFilterMenu->setCheckable( true );
    syncMenu = new QPopupMenu( this );
    configureAgendaMenu = new QPopupMenu( this );
    configureToolBarMenu = new QPopupMenu( this );
    QPopupMenu *helpMenu = new QPopupMenu( this );
    if ( KOPrefs::instance()->mShowFullMenu ) {
        QMenuBar *menuBar1;
        menuBar1 = menuBar();
        menuBar1->insertItem( i18n("File"), importMenu );
        menuBar1->insertItem( i18n("View"), viewMenu );
        menuBar1->insertItem( i18n("Actions"), actionMenu );
        menuBar1->insertItem( i18n("Synchronize"), syncMenu );
-        menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  ); 
+        menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
-        //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); 
+        //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
-        menuBar1->insertItem( i18n("Filter"),selectFilterMenu  ); 
+        menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
-        menuBar1->insertItem( i18n("Help"), helpMenu );  
+        menuBar1->insertItem( i18n("Help"), helpMenu );
-    } else { 
+    } else {
        QPEMenuBar *menuBar1;
        menuBar1 = new QPEMenuBar( iconToolBar );
        QPopupMenu *menuBar = new QPopupMenu( this );
        menuBar1->insertItem( i18n("ME"), menuBar);
        menuBar->insertItem( i18n("File"), importMenu );
        menuBar->insertItem( i18n("View"), viewMenu );
        menuBar->insertItem( i18n("Actions"), actionMenu );
        menuBar->insertItem( i18n("Synchronize"), syncMenu );
-        menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  ); 
+        menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
-        menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );  
+        menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
-        menuBar->insertItem( i18n("Filter"),selectFilterMenu  ); 
+        menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
-        menuBar->insertItem( i18n("Help"), helpMenu );  
+        menuBar->insertItem( i18n("Help"), helpMenu );
-        //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); 
+        //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
        menuBar1->setMaximumSize( menuBar1->sizeHint( ));
    }
    connect ( syncMenu, SIGNAL( activated ( int )  ), this, SLOT (slotSyncMenu( int ) ) );
    connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
    connect ( selectFilterMenu, SIGNAL( aboutToShow ()  ), this, SLOT (fillFilterMenu() ) );
    // ******************
    QAction *action;
    QIconSet icon;
    // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
    configureToolBarMenu->setCheckable( true );
-    QString pathString = ""; 
+    QString pathString = "";
    if ( !p->mToolBarMiniIcons ) {
-    if ( QApplication::desktop()->width() < 480 ) 
+    if ( QApplication::desktop()->width() < 480 )
        pathString += "icons16/";
    } else
        pathString += "iconsmini/";
    configureAgendaMenu->setCheckable( true );
-    configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 ); 
+    configureAgendaMenu->insertItem(i18n("Toggle Allday"), 1 );
-    configureAgendaMenu->insertSeparator(); 
+    configureAgendaMenu->insertSeparator();
-    configureAgendaMenu->insertItem(i18n("Tiny"), 4 ); 
+    configureAgendaMenu->insertItem(i18n("Tiny"), 4 );
    configureAgendaMenu->insertItem(i18n("Small"), 6 );
    configureAgendaMenu->insertItem(i18n("Medium"), 8 );
-    configureAgendaMenu->insertItem(i18n("Normal"), 10 );  
+    configureAgendaMenu->insertItem(i18n("Normal"), 10 );
-    configureAgendaMenu->insertItem(i18n("Large"), 12 );  
+    configureAgendaMenu->insertItem(i18n("Large"), 12 );
-    configureAgendaMenu->insertItem(i18n("Big"), 14 );    
+    configureAgendaMenu->insertItem(i18n("Big"), 14 );
-    configureAgendaMenu->insertItem(i18n("Bigger"), 16 );   
+    configureAgendaMenu->insertItem(i18n("Bigger"), 16 );
-    configureAgendaMenu->insertItem(i18n("Biggest"), 18 );   
+    configureAgendaMenu->insertItem(i18n("Biggest"), 18 );
-    //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  ); 
+    //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
-    
-    icon = loadPixmap( pathString + "configure" );  
+    icon = loadPixmap( pathString + "configure" );
    action = new QAction( i18n("Configure"),icon, i18n("Configure..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( edit_options() ) );
    actionMenu->insertSeparator();
-    icon = loadPixmap( pathString + "newevent" ); 
+    icon = loadPixmap( pathString + "newevent" );
-    configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); 
+    configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
-    configureToolBarMenu->insertSeparator(); 
+    configureToolBarMenu->insertSeparator();
    configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
    QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
    ne_action->addTo( actionMenu );
    connect( ne_action, SIGNAL( activated() ),
             mView, SLOT( newEvent() ) );
-    icon = loadPixmap( pathString + "newtodo" ); 
+    icon = loadPixmap( pathString + "newtodo" );
-    configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 ); 
+    configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
    QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
    nt_action->addTo( actionMenu );
    connect( nt_action, SIGNAL( activated() ),
             mView, SLOT( newTodo() ) );
-    icon = loadPixmap( pathString + "navi" ); 
+    icon = loadPixmap( pathString + "navi" );
    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( toggleDateNavigatorWidget() ) );
-    icon = loadPixmap( pathString + "filter" ); 
+    icon = loadPixmap( pathString + "filter" );
    action = new QAction( i18n("Toggle FilterView"), icon, i18n("Toggle FilterView"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( toggleFilter() ) );
-  
    viewMenu->insertSeparator();
    icon = loadPixmap( pathString + "picker" );
    action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( showDatePicker() ) );
    action->addTo( iconToolBar  );
    viewMenu->insertSeparator();
-    icon = loadPixmap( pathString + "list" );  
+    icon = loadPixmap( pathString + "list" );
-    configureToolBarMenu->insertItem(icon, i18n("List View"), 30 ); 
+    configureToolBarMenu->insertItem(icon, i18n("List View"), 30 );
    QAction* showlist_action = new QAction( i18n("List View"), icon, i18n("List View"), 0, this );
    showlist_action->addTo( viewMenu );
    connect( showlist_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showListView() ) );
-    icon = loadPixmap( pathString + "day" );  
+    icon = loadPixmap( pathString + "day" );
-    configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 ); 
+    configureToolBarMenu->insertItem(icon, i18n("Day View"), 40 );
    QAction* day1_action = new QAction( i18n("Day View"), icon, i18n("Day View"), 0, this );
    day1_action->addTo( viewMenu );
    //  action->addTo( toolBar );
    connect( day1_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showDayView() ) );
-    icon = loadPixmap( pathString + "workweek" ); 
+    icon = loadPixmap( pathString + "workweek" );
-    configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );  
+    configureToolBarMenu->insertItem(icon, i18n("Work Week"), 50 );
    QAction* day5_action = new QAction( i18n("Work Week"), icon, i18n("Work Week"), 0, this );
    day5_action->addTo( viewMenu );
    connect( day5_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showWorkWeekView() ) );
    icon = loadPixmap( pathString + "week" );
-    configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );    
+    configureToolBarMenu->insertItem(icon, i18n("Week"), 60 );
    QAction* day7_action = new QAction( i18n("Week"), icon, i18n("Week"), 0, this );
    day7_action->addTo( viewMenu );
    connect( day7_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showWeekView() ) );
-    icon = loadPixmap( pathString + "month" ); 
+    icon = loadPixmap( pathString + "month" );
-    configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );  
+    configureToolBarMenu->insertItem(icon, i18n("Month"), 70 );
    QAction* month_action = new QAction( i18n("Month"), icon, i18n("Month"), 0, this );
    month_action->addTo( viewMenu );
    connect( month_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showMonthView() ) );
-    icon = loadPixmap( pathString + "todo" );  
+    icon = loadPixmap( pathString + "todo" );
-    configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );  
+    configureToolBarMenu->insertItem(icon, i18n("Todo View"), 80 );
    QAction* todoview_action = new QAction( i18n("Todo View"), icon, i18n("Todo View"), 0, this );
    todoview_action->addTo( viewMenu );
    connect( todoview_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showTodoView() ) );
-    icon = loadPixmap( pathString + "journal" );  
+    icon = loadPixmap( pathString + "journal" );
-    configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );  
+    configureToolBarMenu->insertItem(icon, i18n("Journal"), 90 );
    QAction* viewjournal_action = new QAction( i18n("Journal"), icon, i18n("Journal"), 0, this );
    viewjournal_action->addTo( viewMenu );
    connect( viewjournal_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showJournalView() ) );
-    icon = loadPixmap( pathString + "xdays" );  
+    icon = loadPixmap( pathString + "xdays" );
-    configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 );  
+    configureToolBarMenu->insertItem(icon, i18n("Next days"), 100,4 );
    QAction* xdays_action = new QAction( i18n("Next days"), icon, i18n("Next days"), 0, this );
    xdays_action->addTo( viewMenu );
    connect( xdays_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showNextXView() ) );
-    icon = loadPixmap( pathString + "whatsnext" );  
+    icon = loadPixmap( pathString + "whatsnext" );
-    configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 );  
+    configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110, 4 );
-    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this ); 
+    QAction* whatsnext_action = new QAction( i18n("What's Next"), icon, i18n("What's Next"), 0, this );
    whatsnext_action->addTo( viewMenu );
    connect( whatsnext_action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showWhatsNextView() ) );
-   
 #if 0
    action = new QAction( "view_timespan", "Time Span", 0, this );
    action->addTo( viewMenu );
    connect( action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif
@@ -551,30 +567,30 @@ void MainWindow::initActions()
    action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
                          this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
-    icon = loadPixmap( pathString + "search" );  
+    icon = loadPixmap( pathString + "search" );
    QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
-    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);  
+    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 4);
    search_action->addTo( actionMenu );
    connect( search_action, SIGNAL( activated() ),
             mView->dialogManager(), SLOT( showSearchDialog() ) );
-    icon = loadPixmap( pathString + "today" );  
+    icon = loadPixmap( pathString + "today" );
-    configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);  
+    configureToolBarMenu->insertItem(icon, i18n("Go to Today"), 130);
    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
    today_action->addTo( actionMenu );
    connect( today_action, SIGNAL( activated() ),
             mView, SLOT( goToday() ) );
    if ( KOPrefs::instance()->mShowFullMenu ) {
        actionMenu->insertSeparator();
-        actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu ); 
+        actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
-        
    }
    // actionMenu->insertSeparator();
    action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
@@ -626,26 +642,26 @@ void MainWindow::initActions()
 #ifndef DESKTOP_VERSION
    importMenu->insertSeparator();
    action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
-   
    action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
 #else
- importMenu->insertSeparator(); 
+ importMenu->insertSeparator();
- icon = loadPixmap( pathString + "print" ); 
+ icon = loadPixmap( pathString + "print" );
    action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printCal() ) );
-    
-    icon = loadPixmap( pathString + "print" ); 
+    icon = loadPixmap( pathString + "print" );
    action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printSel() ) );
 #endif
    importMenu->insertSeparator();
@@ -654,65 +670,65 @@ void MainWindow::initActions()
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), this, SLOT( save() ) );
    action = new QAction( "beam all", i18n("Exit (+save)"), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), this, SLOT( close() ) );
-   
    //menuBar->insertItem( "Configure",configureMenu );
    //configureMenu->insertItem( "Toolbar",configureToolBarMenu  );
-    icon = loadPixmap( "korganizer/korganizer" ); 
+    icon = loadPixmap( "korganizer/korganizer" );
    action = new QAction( "Keys + Colors", i18n("Keys + Colors..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( keyBindings() ) );   
+             SLOT( keyBindings() ) );
    action = new QAction( "featureHowto", i18n("Features + hints..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( features() ) ); 
+             SLOT( features() ) );
    action = new QAction( "Auto saving", i18n("Auto saving..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( aboutAutoSaving() ) ); 
+             SLOT( aboutAutoSaving() ) );
    action = new QAction( "Problemd", i18n("Known Problems..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( aboutKnownBugs() ) );  
+             SLOT( aboutKnownBugs() ) );
    action = new QAction( "Translate Howto", i18n("User translation..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( usertrans() ) ); 
+             SLOT( usertrans() ) );
    action = new QAction( "Sync Howto", i18n("Sync HowTo..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( synchowto() ) ); 
+             SLOT( synchowto() ) );
    action = new QAction( "Whats New", i18n("What's new?"), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( whatsNew() ) );
    action = new QAction( "Frequently asked questions", i18n("FAQ..."), 0,this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
-             SLOT( faq() ) ); 
+             SLOT( faq() ) );
-    
    action = new QAction( "about", i18n("About..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( about() ) );
    action = new QAction( "licence", i18n("Licence..."), 0, this );
    action->addTo( helpMenu );
    connect( action, SIGNAL( activated() ),
             SLOT( licence() ) );
    //menuBar->insertSeparator();
    // ******************************************************
-    // menubar icons 
+    // menubar icons
-    
-    
-    iconToolBar->setHorizontalStretchable (true ); 
+    iconToolBar->setHorizontalStretchable (true );
    //menuBar->insertItem( iconToolBar );
    //xdays_action
    if (p-> mShowIconNewEvent)
        ne_action->addTo( iconToolBar  );
    if (p->mShowIconNewTodo )
        nt_action->addTo( iconToolBar  );
@@ -734,48 +750,48 @@ void MainWindow::initActions()
        month_action->addTo( iconToolBar  );
    if (p-> mShowIconTodoview)
        todoview_action->addTo( iconToolBar  );
    if (p-> mShowIconJournal)
        viewjournal_action->addTo( iconToolBar  );
    icon = loadPixmap( pathString + "2leftarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);  
+    configureToolBarMenu->insertItem(icon, i18n("Prev. month"), 200, 14);
    if (p-> mShowIconBackFast) {
        action = new QAction( i18n("Prev. month"), icon, i18n("Prev. month"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goPreviousMonth() ) );
        action->addTo( iconToolBar  );
    }
    icon = loadPixmap( pathString + "1leftarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);  
+    configureToolBarMenu->insertItem(icon, i18n("Go backward"), 210,15);
    if (p-> mShowIconBack) {
        action = new QAction( i18n("Go backward"), icon, i18n("Go backward"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goPrevious() ) );
        action->addTo( iconToolBar  );
    }
-    if (p-> mShowIconToday) 
+    if (p-> mShowIconToday)
        today_action->addTo( iconToolBar  );
    icon = loadPixmap( pathString + "1rightarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220); 
+    configureToolBarMenu->insertItem(icon, i18n("Go forward"), 220);
    if (p-> mShowIconForward) {
        action = new QAction( i18n("Go forward"), icon, i18n("Go forward"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goNext() ) );
        action->addTo( iconToolBar  );
    }
    icon = loadPixmap( pathString + "2rightarrowB" );
-    configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);  
+    configureToolBarMenu->insertItem(icon, i18n("Next month"), 230);
    if (p-> mShowIconForwardFast) {
        action = new QAction( i18n("Next month"), icon, i18n("Next month"),0 , this );
        connect( action, SIGNAL( activated() ),
                 mView, SLOT( goNextMonth() ) );
        action->addTo( iconToolBar  );
    }
-  
-   
-    configureToolBarMenu->insertItem(i18n("What's This?"), 300); 
+    configureToolBarMenu->insertItem(i18n("What's This?"), 300);
    if (p-> mShowIconNewEvent)
        configureToolBarMenu->setItemChecked( 10, true );
    if (p->mShowIconNewTodo )
        configureToolBarMenu->setItemChecked( 20, true );
    if (p-> mShowIconSearch)
@@ -791,16 +807,16 @@ void MainWindow::initActions()
    if (p-> mShowIconMonth)
        configureToolBarMenu->setItemChecked( 70, true );
    if (p-> mShowIconTodoview)
        configureToolBarMenu->setItemChecked( 80, true );
    if (p-> mShowIconBackFast)
        configureToolBarMenu->setItemChecked( 200, true );
-    if (p-> mShowIconBack) 
+    if (p-> mShowIconBack)
        configureToolBarMenu->setItemChecked( 210, true );
    if (p-> mShowIconToday)
-        configureToolBarMenu->setItemChecked( 130, true ); 
+        configureToolBarMenu->setItemChecked( 130, true );
    if (p-> mShowIconForward)
        configureToolBarMenu->setItemChecked( 220, true );
    if (p-> mShowIconForwardFast)
        configureToolBarMenu->setItemChecked( 230, true );
    if (p-> mShowIconNextDays)
        configureToolBarMenu->setItemChecked( 100, true );
@@ -816,13 +832,13 @@ void MainWindow::initActions()
    if (!p-> mShowIconStretch)
        iconToolBar->setStretchableWidget ( dummy ) ;
    else
        configureToolBarMenu->setItemChecked( 5, true );
    if (p-> mShowIconWhatsThis)
        QWhatsThis::whatsThisButton (  iconToolBar );
-    connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) ); 
+    connect( configureToolBarMenu, SIGNAL( activated( int ) ),this,  SLOT(configureToolBar( int ) ) );
    configureAgenda( p->mHourSize );
    connect( configureAgendaMenu, SIGNAL( activated( int ) ),this,  SLOT(configureAgenda( int ) ) );
 }
 void MainWindow::fillSyncMenu()
 {
    syncMenu->clear();
@@ -847,13 +863,13 @@ void MainWindow::fillSyncMenu()
        temp->setName( prof[2] );
        temp->writeConfig(&config);
        config.setGroup("General");
        config.writeEntry("SyncProfileNames",prof);
        config.writeEntry("ExternSyncProfiles","Sharp_DTM");
        config.sync();
-        delete temp; 
+        delete temp;
    }
    KOPrefs::instance()->mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
    KOPrefs::instance()->mSyncProfileNames = prof;
    int i;
    for ( i = 0; i < prof.count(); ++i ) {
@@ -863,20 +879,20 @@ void MainWindow::fillSyncMenu()
    }
    QDir app_dir;
    if ( !app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
        syncMenu->setItemEnabled( false , 1000 );
    }
    mView->setupExternSyncProfiles();
-} 
+}
 int MainWindow::ringSync()
 {
    int syncedProfiles = 0;
-    int i;  
+    int i;
    QTime timer;
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
    QStringList syncProfileNames = KOPrefs::instance()->mSyncProfileNames;
    KSyncProfile* temp = new KSyncProfile ();
    KOPrefs::instance()->mAskForPreferences = false;
    for ( i = 0; i < syncProfileNames.count(); ++i ) {
        mCurrentSyncProfile = i;
        temp->setName(syncProfileNames[mCurrentSyncProfile]);
@@ -891,50 +907,50 @@ int MainWindow::ringSync()
            mView->setSyncDevice(syncProfileNames[i] );
            mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
            if ( i == 0 ) {
                syncSharp();
            } else {
                if ( temp->getIsLocalFileSync() ) {
-                    if ( syncWithFile( temp->getRemoteFileName( ), true ) ) 
+                    if ( syncWithFile( temp->getRemoteFileName( ), true ) )
                        KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
                } else {
                    if (  temp->getIsPhoneSync() ) {
                        KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                        KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                        KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
                        syncPhone();
                    } else
                        syncRemote( temp, false );
-                    
                }
            }
            timer.start();
            setCaption(i18n("Multiple sync in progress ... please wait!") );
            while ( timer.elapsed () < 2000 ) {
                qApp->processEvents();
 #ifndef _WIN32_
                sleep (1);
 #endif
            }
- 
        }
    }
    delete temp;
    return syncedProfiles;
-} 
+}
 void MainWindow::multiSync( bool askforPrefs  )
 {
    if (mBlockSaveFlag)
        return;
-    mBlockSaveFlag = true;   
+    mBlockSaveFlag = true;
    QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
-                                   i18n("Yes"), i18n("No"), 
+                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 ) {
        mBlockSaveFlag = false;
        setCaption(i18n("Aborted! Nothing synced!"));
        return;
    }
    mView->setSyncDevice(i18n("Multiple profiles") );
@@ -947,13 +963,13 @@ void MainWindow::multiSync( bool askforPrefs  )
    qApp->processEvents();
    int num = ringSync() ;
    if (  num > 1 )
        ringSync();
    mBlockSaveFlag = false;
    if ( num )
-        save(); 
+        save();
    if ( num )
        setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
    else
        setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
    return;
 }
@@ -962,25 +978,25 @@ void MainWindow::slotSyncMenu( int action )
    //qDebug("syncaction %d ", action);
    if ( action == 0 ) {
        confSync();
        return;
-    } 
+    }
-    if ( action == 1 ) { 
+    if ( action == 1 ) {
        multiSync( true );
        return;
-    } 
+    }
    if (mBlockSaveFlag)
        return;
    mBlockSaveFlag = true;
    mCurrentSyncProfile = action - 1000 ;
    mView->setSyncDevice(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile] );
    mView->setSyncName( KOPrefs::instance()->mLocalMachineName );
-    KConfig config ( locateLocal( "config","syncprofilesrc"  ) ); 
+    KConfig config ( locateLocal( "config","syncprofilesrc"  ) );
    KSyncProfile* temp = new KSyncProfile ();
    temp->setName(KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
    temp->readConfig(&config);
    KOPrefs::instance()->mAskForPreferences = temp->getAskForPreferences();
    KOPrefs::instance()->mSyncAlgoPrefs = temp->getSyncPrefs();
    KOPrefs::instance()->mWriteBackFile = temp->getWriteBackFile();
@@ -994,13 +1010,13 @@ void MainWindow::slotSyncMenu( int action )
    } else if ( action == 1002 ) {
        quickSyncLocalFile();
    } else if ( action >= 1003  ) {
        if ( temp->getIsLocalFileSync() ) {
-            if ( syncWithFile( temp->getRemoteFileName( ), false ) ) 
+            if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                KOPrefs::instance()->mLastSyncedLocalFile = temp->getRemoteFileName();
        } else {
            if (  temp->getIsPhoneSync() ) {
                KOPrefs::instance()->mPhoneDevice = temp->getPhoneDevice( ) ;
                KOPrefs::instance()->mPhoneConnection = temp->getPhoneConnection( );
                KOPrefs::instance()->mPhoneModel = temp->getPhoneModel( );
@@ -1032,33 +1048,33 @@ void MainWindow::displayText( QString text ,QString cap  )
    QDialog dia( this, "name", true ); ;
    dia.setCaption( cap );
    QVBoxLayout* lay = new QVBoxLayout( &dia );
    lay->setSpacing( 3 );
    lay->setMargin( 3 );
    QTextBrowser tb ( &dia );
-    lay->addWidget( &tb ); 
+    lay->addWidget( &tb );
    tb.setText( text );
 #ifdef DESKTOP_VERSION
    dia.resize( 640, 480);
 #else
    dia.showMaximized();
 #endif
    dia.exec();
 }
 void MainWindow::displayFile( QString fn, QString cap )
 {
 QString fileName =  resourcePath() + fn;
- QString text; 
+ QString text;
    QFile file( fileName );
    if (!file.open( IO_ReadOnly ) ) {
        return ;
-        
-    } 
+    }
    QTextStream ts( &file );
    text = ts.read();
-    file.close();  
+    file.close();
    displayText( text, cap);
 }
 void MainWindow::features()
 {
    displayFile( "featuresKOPI.txt",i18n("KO/Pi Features and hints") );
@@ -1075,13 +1091,13 @@ void MainWindow::usertrans()
 #include <libkcal/todo.h>
 #include <libkcal/incidence.h>
 #endif
 void MainWindow::synchowto()
 {
 #if 0
-    QPtrList<Incidence> er = mCalendar->rawIncidences(); 
+    QPtrList<Incidence> er = mCalendar->rawIncidences();
    Incidence* inR = er.first();
    VCalFormat vf;
    QString strout;
    while ( inR ) {
        if ( inR->type() == "Todo" )
            strout = vf.todoToString( (Todo *)  inR );
@@ -1089,13 +1105,13 @@ void MainWindow::synchowto()
            strout = vf.eventToString( (Event *)  inR );
        qDebug("incidence: \n%s\n ente\n\n",strout.latin1() );
        inR =  er.next();
    }
 #endif
    displayFile( "howtoSYNC.txt",i18n("KO/Pi Synchronization HowTo") );
-}   
+}
 void  MainWindow::faq()
 {
    displayFile( "kopiFAQ.txt",i18n("KO/Pi FAQ") );
 }
 void  MainWindow::whatsNew()
@@ -1112,13 +1128,13 @@ void MainWindow::about()
 {
    QString version;
 #include <../version>
    QMessageBox::about( this, i18n("About KOrganizer/Pi"),
                        i18n("KOrganizer/Platform-independent\n") +
                        "(KO/Pi) " + version + " - " +
-                      
 #ifdef DESKTOP_VERSION
                        i18n("Desktop Edition\n") +
 #else
                        i18n("PDA-Edition\nfor: Zaurus 5x00 / 7x0 / 8x0\n") +
 #endif
                        i18n("(c) 2004 Lutz Rogowski\nEmail:lutz@pi-sync.net\nKO/Pi is based on KOrganizer\n(c) 2002,2003 Cornelius Schumacher\nEmail: schumacher@kde.org\nKOrganizer/Pi is licensed\nunder the GPL.\nKO/Pi can be compiled for\nLinux, Zaurus-PDA and Windows\nwww.korganizer.org\nwww.pi-sync.net\n") );
@@ -1172,26 +1188,26 @@ void MainWindow::keyBindings()
        i18n("<p><b>Blue</b>: Recurrent event.([r] in Whats'Next view)</p>\n")+
        i18n("<p><b>Dark green</b>: Information(description) available.([i] in WN view)</p>\n")+
        i18n("<p><b>Black</b>: Event/todo with attendees. You are the organizer!</p>\n")+
        i18n("<p><b>Dark yellow</b>:  Event/todo with attendees.</p>\n") +
        i18n("<p><b>White</b>: Item readonly</p>\n");
   displayText( text, cap);
-  
 }
 void MainWindow::aboutAutoSaving()
 {
    QMessageBox* msg;
    msg = new QMessageBox(  i18n("Auto Saving in  KOrganizer/Pi"),
                            i18n("After changing something, the data is\nautomatically saved to the file\n~/kdepim/apps/korganizer/mycalendar.ics\nafter (configureable) three minutes.\nFor safety reasons there is  one autosaving\nafter 10 minutes (of idle time) again. The \ndata is saved automatically when closing KO/Pi\nYou can create a backup file \nwith: File - Save Calendar Backup\n"), QMessageBox::NoIcon,
                            QMessageBox::Ok,
                            QMessageBox::NoButton,
                            QMessageBox::NoButton);
    msg->exec();
    delete msg;
-  
-                          
 }
 void MainWindow::aboutKnownBugs()
 {
    QMessageBox* msg;
    msg = new QMessageBox(  i18n("Known Problems in  KOrganizer/Pi"),
                            i18n("1) Importing *.vcs or *.ics files from\nother applications may not work properly,\nif there are events with properties\nKO/Pi does not support.\n")+
@@ -1202,61 +1218,61 @@ void MainWindow::aboutKnownBugs()
                            QMessageBox::NoIcon,
                            QMessageBox::Ok,
                            QMessageBox::NoButton,
                            QMessageBox::NoButton);
    msg->exec();
    delete msg;
-  
 }
 QString MainWindow::defaultFileName()
 {
    return locateLocal( "data", "korganizer/mycalendar.ics" );
 }
 void MainWindow::processIncidenceSelection( Incidence *incidence )
 {
    if ( !incidence ) {
        enableIncidenceActions( false );
-  
-        mNewSubTodoAction->setEnabled( false );  
+        mNewSubTodoAction->setEnabled( false );
        setCaptionToDates();
        return;
-        
    }
- 
    //KGlobal::locale()->formatDateTime(nextA, true);
    QString startString = "";
-    if ( incidence->type() != "Todo" ) { 
+    if ( incidence->type() != "Todo" ) {
-        if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) { 
+        if ( incidence->dtStart().date() < incidence->dtEnd().date()   ) {
            if ( incidence->doesFloat() ) {
-            startString += ": "+incidence->dtStartDateStr( true ); 
+            startString += ": "+incidence->dtStartDateStr( true );
-            startString += " --- "+((Event*)incidence)->dtEndDateStr( true ); 
+            startString += " --- "+((Event*)incidence)->dtEndDateStr( true );
            } else {
-            startString = ": "+incidence->dtStartStr(true); 
+            startString = ": "+incidence->dtStartStr(true);
            startString += " --- "+((Event*)incidence)->dtEndStr(true);
            }
-      
        } else {
            if ( incidence->dtStart().time() != incidence->dtEnd().time() )
                startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                    "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-            startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true); 
+            startString +=" "+KGlobal::locale()->formatDate( incidence->dtStart().date(), true);
        }
-       
    }
-    else 
+    else
        startString = i18n(": (Prio ") +QString::number( (( KCal::Todo*)incidence)->priority() ) +") "+QString::number( (( KCal::Todo*)incidence)->percentComplete() ) +i18n("\% completed");
    if ( !incidence->location().isEmpty() )
        startString += " (" +incidence->location()+")";
    setCaption( incidence->summary()+startString);
-   
    enableIncidenceActions( true );
-  
    if ( incidence->type() == "Event" ) {
        mShowAction->setText( i18n("Show Event...") );
        mEditAction->setText( i18n("Edit Event...") );
        mDeleteAction->setText( i18n("Delete Event...") );
        mNewSubTodoAction->setEnabled( false );
@@ -1289,22 +1305,22 @@ void MainWindow::importOL()
      id->exec();
      delete id;
      mView->updateView();
 #endif
 }
 void MainWindow::importBday()
-{ 
+{
    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                       i18n("When importing birthdays twice\nduplicated events will be ignored,\nif the event has not been\nchanged in KO/Pi!\n"),
                                       i18n("Import!"), i18n("Cancel"), 0,
                                       0, 1 );
    if ( result == 0 ) {
        mView->importBday();
-       
    }
-   
 }
 void MainWindow::importQtopia()
 {
 #ifndef DESKTOP_VERSION
    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
@@ -1320,15 +1336,15 @@ void MainWindow::importQtopia()
 #else
    int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                       i18n("Not supported \non desktop!\n"),
                                       i18n("Ok"), i18n("Cancel"), 0,
                                       0, 1 );
-#endif 
+#endif
 }
- 
 void MainWindow::saveOnClose()
 {
    KOPrefs *p = KOPrefs::instance();
    p->mToolBarHor = ( iconToolBar->orientation () == Qt:: Horizontal );
    p->mToolBarUp = iconToolBar->x() > width()/2 ||
        iconToolBar->y() > height()/2;
@@ -1338,26 +1354,26 @@ void MainWindow::saveOnClose()
 }
 void MainWindow::slotModifiedChanged( bool changed )
 {
    if ( mBlockAtStartup )
        return;
    int msec;
-    // we store the changes after 1 minute, 
+    // we store the changes after 1 minute,
    // and for safety reasons after 10 minutes again
    if ( !mBlockSaveFlag )
        msec = (1000 * 60*KOPrefs::instance()->mAutoSaveInterval) +1000;
    else
        msec = 1000 * 600;
    mSaveTimer.start( msec, true ); // 1 minute
    qDebug("KO: Saving File in %d secs!", msec/1000);
    mCalendarModifiedFlag = true;
 }
 #include <qfileinfo.h>
 void MainWindow::save()
 {
-    if ( mBlockSaveFlag ) 
+    if ( mBlockSaveFlag )
        return;
    bool store = mBlockSaveFlag;
    mBlockSaveFlag = true;
    if ( mView->checkFileVersion( defaultFileName()) ) {
        QTime neededSaveTime = QDateTime::currentDateTime().time();
@@ -1367,26 +1383,26 @@ void MainWindow::save()
        int msNeeded = neededSaveTime.msecsTo( QDateTime::currentDateTime().time() );
        mView->setLoadedFileVersion(QDateTime::currentDateTime());
        qDebug("KO: Needed %d ms for saving.",msNeeded );
        QString savemes;
        savemes.sprintf(i18n("KO/Pi:File Saved. Needed %d sec, %d ms"),(msNeeded/1000)%100,msNeeded%1000  );
-        setCaption(savemes); 
+        setCaption(savemes);
    } else
-        setCaption(i18n("Saving cancelled!")); 
+        setCaption(i18n("Saving cancelled!"));
    mCalendarModifiedFlag = false;
    mBlockSaveFlag = store;
 }
-void MainWindow::keyReleaseEvent ( QKeyEvent * e) 
+void MainWindow::keyReleaseEvent ( QKeyEvent * e)
 {
    if ( !e->isAutoRepeat() ) {
        mFlagKeyPressed = false;
    }
 }
-void MainWindow::keyPressEvent ( QKeyEvent * e ) 
+void MainWindow::keyPressEvent ( QKeyEvent * e )
 {
    qApp->processEvents();
    if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
        e->ignore();
        // qDebug("  ignore  %d",e->isAutoRepeat()  );
        return;
@@ -1415,13 +1431,13 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
        break;
    case Qt::Key_Down:
        mView->viewManager()->agendaView()->scrollOneHourDown();
        break;
    case Qt::Key_Up:
        mView->viewManager()->agendaView()->scrollOneHourUp();
-        break;             
+        break;
    case Qt::Key_I:
        mView->showIncidence();
        break;
    case Qt::Key_Delete:
    case Qt::Key_Backspace:
        mView->deleteIncidence();
@@ -1437,13 +1453,13 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
    case Qt::Key_1:
    case Qt::Key_2:
    case Qt::Key_3:
    case Qt::Key_4:
    case Qt::Key_5:
    case Qt::Key_6:
-    case Qt::Key_7: 
+    case Qt::Key_7:
    case Qt::Key_8:
    case Qt::Key_9:
        pro =  e->key()-48;
        if ( pro == 0 )
            pro = 10;
        if ( e->state() == Qt::ControlButton)
@@ -1456,13 +1472,13 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
    case Qt::Key_Insert:
        mView->newEvent();
        break;
    case Qt::Key_S :
        if ( e->state() == Qt::ControlButton ||  e->state() == Qt::ShiftButton)
            mView->newSubTodo();
-        else 
+        else
            mView->dialogManager()->showSearchDialog();
        break;
    case Qt::Key_Y :
    case Qt::Key_Z :
        mView->viewManager()->showWorkWeekView();
        showSelectedDates = true;
@@ -1473,44 +1489,44 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
        break;
    case Qt::Key_H :
        keyBindings();
        break;
    case Qt::Key_W:
        mView->viewManager()->showWhatsNextView();
-        break; 
+        break;
    case Qt::Key_L:
        mView->viewManager()->showListView();
-        break; 
+        break;
    case Qt::Key_N:
        mView->viewManager()->showNextXView();
        showSelectedDates = true;
-        break; 
+        break;
    case Qt::Key_V:
        mView->viewManager()->showTodoView();
-        break; 
+        break;
    case Qt::Key_C:
        mView->viewManager()->agendaView()->setStartHour( QTime::currentTime ().hour() );
-        break;       
+        break;
    case Qt::Key_P:
        mView->showDatePicker( );
-        break;      
+        break;
-    case Qt::Key_F: 
+    case Qt::Key_F:
        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
            mView->editFilters();
        else
            mView->toggleFilter();
-        break;          
+        break;
    case Qt::Key_X:
        mView->toggleDateNavigatorWidget();
-        break;          
+        break;
    case Qt::Key_Space:
        mView->toggleExpand();
-        break;     
+        break;
    case Qt::Key_A:
        mView->toggleAllDaySize();
-        break; 
+        break;
    case Qt::Key_T:
        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
            mView->newTodo();
        else {
            mView->goToday();
            showSelectedDates = true;
@@ -1519,14 +1535,14 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
    case Qt::Key_J:
        mView->viewManager()->showJournalView();
        break;
    case Qt::Key_B:
        mView->editIncidenceDescription();;
        break;
-        // case Qt::Key_Return:  
+        // case Qt::Key_Return:
-    case Qt::Key_E:  
+    case Qt::Key_E:
        if ( e->state() == Qt::ControlButton||  e->state() == Qt::ShiftButton )
            mView->newEvent();
        else
            mView->editIncidence();
        break;
    case Qt::Key_Plus:
@@ -1536,13 +1552,13 @@ void MainWindow::keyPressEvent ( QKeyEvent * e )
        break;
    case Qt::Key_Minus:
        size = p->mHourSize - 2;
        if ( size >= 4 )
            configureAgenda( size );
        break;
-       
    default:
        e->ignore();
    }
    if ( pro > 0 ) {
        mView->selectFilter(  pro-1 );
@@ -1561,13 +1577,13 @@ void MainWindow::fillFilterMenu()
        selectFilterMenu->insertItem(i18n ( "Turn filter off" ),  0 );
    }
    else {
        selectFilterMenu->insertItem(i18n ( "Turn filter on" ),  0 );
        disable = true;
    }
-    selectFilterMenu->insertSeparator(); 
+    selectFilterMenu->insertSeparator();
    QPtrList<CalFilter> fili = mView->filters();
    CalFilter *curfilter = mView->filterView()->selectedFilter();
    CalFilter *filter = fili.first();
    int iii = 1;
    while(filter) {
        selectFilterMenu->insertItem( filter->name(),  iii );
@@ -1601,34 +1617,34 @@ void MainWindow::configureToolBar( int item  )
    p-> mShowIconDay5= configureToolBarMenu->isItemChecked( 50 );
    p-> mShowIconDay7= configureToolBarMenu->isItemChecked( 60 );
    p-> mShowIconMonth= configureToolBarMenu->isItemChecked( 70 );
    p-> mShowIconTodoview= configureToolBarMenu->isItemChecked( 80 );
    p-> mShowIconBackFast= configureToolBarMenu->isItemChecked( 200 );
    p-> mShowIconBack = configureToolBarMenu->isItemChecked( 210 );
-    p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 ); 
+    p-> mShowIconToday= configureToolBarMenu->isItemChecked( 130 );
    p-> mShowIconForward= configureToolBarMenu->isItemChecked( 220 );
    p-> mShowIconForwardFast= configureToolBarMenu->isItemChecked( 230 );
    p-> mShowIconNextDays= configureToolBarMenu->isItemChecked( 100 );
    p-> mShowIconNext= configureToolBarMenu->isItemChecked( 110 );
    p-> mShowIconJournal= configureToolBarMenu->isItemChecked( 90 );
-    p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 ); 
+    p-> mShowIconWhatsThis= configureToolBarMenu->isItemChecked( 300 );
    // initActions();
 }
 void MainWindow::setCaptionToDates()
 {
    QString selDates;
    selDates = KGlobal::locale()->formatDate(mView->startDate(), true);
    if  (mView->startDate() < mView->endDate() )
        selDates += " - " + KGlobal::locale()->formatDate(mView->endDate(), true);
    setCaption( i18n("Dates: ") + selDates );
-    
 }
 // parameter item == 0: reinit
 void MainWindow::configureAgenda( int item )
-{  
+{
    KOPrefs *p = KOPrefs::instance();
    int i;
    if ( item == 1 ) {
        mView->toggleAllDaySize();
@@ -1646,44 +1662,44 @@ void MainWindow::configureAgenda( int item )
        return;
    p->mHourSize=item;
    mView->viewManager()->agendaView()->updateConfig();
 }
 void  MainWindow::saveCalendar()
-{ 
+{
    QString fn =  KOPrefs::instance()->mLastSaveFile;
    fn =  KFileDialog::getSaveFileName( fn, i18n("Save backup filename"), this );
    if ( fn == "" )
        return;
    QFileInfo info;
    info.setFile( fn );
    QString mes;
    bool createbup = true;
-    if ( info. exists() ) { 
+    if ( info. exists() ) {
        mes =  i18n("Backup file\nalready exists!\nOld backup file from:\n%1\nOverwrite?\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false )) ;
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                           i18n("Overwrite!"), i18n("Cancel"), 0,
                                           0, 1 );
        if ( result != 0 ) {
            createbup = false;
        }
    }
    if ( createbup ) {
-        mView->saveCalendar( fn ); 
+        mView->saveCalendar( fn );
        mes = i18n("KO/Pi:Saved %1").arg(fn);
        KOPrefs::instance()->mLastSaveFile = fn;
        setCaption(mes);
    }
 }
 void  MainWindow::loadCalendar()
 {
-   
    QString fn =   KOPrefs::instance()->mLastLoadFile;
    fn =  KFileDialog::getOpenFileName( fn, i18n("Load backup filename"), this );
-    
    if ( fn == "" )
        return;
    QFileInfo info;
    info.setFile( fn );
    QString mess;
    bool loadbup = true;
@@ -1723,15 +1739,15 @@ void MainWindow::importFile( QString  fn, bool quick )
    bool loadbup = true;
    if ( !info. exists() ) {
        mess =  i18n("Import file \n...%1\ndoes not exist!\nNothing imported!\n").arg(fn.right( 30));
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                           mess );
        return;
-    } 
+    }
    int result = 0;
-    if ( !quick ) { 
+    if ( !quick ) {
        mess = i18n(  "Import file \n...%1\nfrom:\n%2\nDuplicated entries\nwill not be imported!\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                       mess,
                                       "Import", "Cancel", 0,
                                       0, 1 );
    }
@@ -1744,67 +1760,67 @@ void MainWindow::importFile( QString  fn, bool quick )
        }
    }
 }
 void   MainWindow::importIcal()
 {
- 
    QString fn =KOPrefs::instance()->mLastImportFile;
    fn =KFileDialog:: getOpenFileName( fn, i18n("Import filename(*.ics/*.vcs)"), this );
    if ( fn == "" )
        return;
    importFile(  fn, true );
-        
 }
 void MainWindow::exportVCalendar()
 {
    QString fn =  KOPrefs::instance()->mLastVcalFile;
    fn =  KFileDialog::getSaveFileName( fn, i18n("Export vcal filename(*.vcs)"), this );
    if ( fn == "" )
        return;
    QFileInfo info;
    info.setFile( fn );
    QString mes;
    bool createbup = true;
-    if ( info. exists() ) { 
+    if ( info. exists() ) {
        mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                           i18n("Overwrite!"), i18n("Cancel"), 0,
                                           0, 1 );
        if ( result != 0 ) {
            createbup = false;
        }
    }
    if ( createbup ) {
-        if ( mView->exportVCalendar( fn ) ) { 
+        if ( mView->exportVCalendar( fn ) ) {
-            KOPrefs::instance()->mLastVcalFile = fn; 
+            KOPrefs::instance()->mLastVcalFile = fn;
            if ( fn.length() > 20 )
                mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
            else
                mes = i18n("KO/Pi:Exported to %1").arg(fn );
            setCaption(mes);
        }
    }
 }
-#include <qpushbutton.h> 
+#include <qpushbutton.h>
 QString  MainWindow::getPassword( )
-{ 
+{
    QString retfile = "";
-    QDialog dia ( this, "input-dialog", true ); 
+    QDialog dia ( this, "input-dialog", true );
-    QLineEdit lab ( &dia ); 
+    QLineEdit lab ( &dia );
    lab.setEchoMode( QLineEdit::Password );
    QVBoxLayout lay( &dia );
-    lay.setMargin(7); 
+    lay.setMargin(7);
-    lay.setSpacing(7); 
+    lay.setSpacing(7);
    lay.addWidget( &lab);
    dia.setFixedSize( 230,50 );
    dia.setCaption( i18n("Enter password") );
-    QPushButton pb ( "OK",  &dia); 
+    QPushButton pb ( "OK",  &dia);
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
    dia.show();
    int res = dia.exec();
    if ( res )
        retfile = lab.text();
@@ -1841,25 +1857,25 @@ bool  MainWindow::syncWithFile( QString fn , bool quick )
    bool loadbup = true;
    if ( !info. exists() ) {
        mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                           mess );
        return ret;
-    } 
+    }
    int result = 0;
-    if ( !quick ) { 
+    if ( !quick ) {
        mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                                       mess,
                                       i18n("Sync"), i18n("Cancel"), 0,
                                       0, 1 );
-        if ( result ) 
+        if ( result )
            return false;
    }
    if ( KOPrefs::instance()->mAskForPreferences )
-        mView->edit_sync_options(); 
+        mView->edit_sync_options();
    if ( result == 0 ) {
        //qDebug("Now sycing ... ");
        if ( ret = mView->syncCalendar( fn, KOPrefs::instance()->mSyncAlgoPrefs ) )
            setCaption( i18n("Synchronization successful") );
        else
            setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
@@ -1884,35 +1900,35 @@ void MainWindow::quickSyncLocalFile()
 void MainWindow::confSync()
 {
    mView->confSync();
    fillSyncMenu();
    //mView->writeSettings();
-    
 }
 void MainWindow::syncRemote( KSyncProfile* prof,  bool ask)
 {
    QString question;
    if ( ask ) {
    question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
-                                   i18n("Yes"), i18n("No"), 
+                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 )
        return;
    }
    QString command = prof->getPreSyncCommand();
    int fi;
    if ( (fi = command.find("$PWD$")) > 0 ) {
        QString pwd = getPassword();
        command = command.left( fi )+ pwd + command.mid( fi+5 );
-    } 
+    }
    int maxlen = 30;
-    if ( QApplication::desktop()->width() > 320 ) 
+    if ( QApplication::desktop()->width() > 320 )
        maxlen += 25;
    setCaption ( i18n( "Copy remote file to local machine..." ) );
    int fileSize = 0;
    int result = system ( command );
    // 0 : okay
    // 256: no such file or dir
@@ -1925,24 +1941,24 @@ void MainWindow::syncRemote( KSyncProfile* prof,  bool ask)
            len += maxlen +2;
        }
        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
        QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
                                  question,
                                  i18n("Okay!")) ;
-        setCaption ("KO/Pi"); 
+        setCaption ("KO/Pi");
        return;
    }
    setCaption ( i18n( "Copying succeed." ) );
    //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
    if ( syncWithFile( prof->getLocalTempFile(), true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
        if ( KOPrefs::instance()->mWriteBackFile ) {
-            command =  prof->getPostSyncCommand();   
+            command =  prof->getPostSyncCommand();
            setCaption ( i18n( "Writing back file ..." ) );
            result = system ( command );
            qDebug("KO: Writing back file result: %d ", result);
            if ( result != 0 ) {
                setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                return;
@@ -1951,15 +1967,15 @@ void MainWindow::syncRemote( KSyncProfile* prof,  bool ask)
            }
        }
    }
    return;
 }
 void MainWindow::syncSSH()
-{   
+{
    // not used anymore
-    QTime timer; 
+    QTime timer;
    timer.start();
    //qDebug("MainWindow::syncssh() ");
    KOPrefs *p = KOPrefs::instance();
    QString localFile =  p->mLocalTempFile;
    QString remoteIP = p->mRemoteIP;
    QString remoteUser = p->mRemoteUser;
@@ -1968,26 +1984,26 @@ void MainWindow::syncSSH()
        remoteUser += ":" + p->mRemotePassWd;
    QString question = i18n("Do you really want\nto remote sync?\n \n") +
        i18n("IP: " ) +remoteIP  +"\n" +
        i18n("User: " ) + remoteUser +"\n" ;
    int maxlen = 30;
-    if ( QApplication::desktop()->width() > 320 ) 
+    if ( QApplication::desktop()->width() > 320 )
        maxlen += 25;
    if ( remoteFile.length() > maxlen )
        question  +=   i18n("Remote file:\n..." ) + remoteFile.right(maxlen) +"\n";
    else
        question  +=   i18n("Remote file:\n " ) + remoteFile +"\n";
    if ( localFile.length() > maxlen )
        question  +=   i18n("Local temp file:\n..." ) + localFile.right(maxlen) +"\n";
    else
        question  +=   i18n("Local temp file:\n " ) + localFile +"\n";
-        
    if ( QMessageBox::information( this, i18n("KO/Pi Sync"),
                                   question,
-                                   i18n("Yes"), i18n("No"), 
+                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 )
        return;
    // if ( !p->mUsePassWd ) {
    //         QString pass = getPassword();
    //         if ( pass.length() > 0 )
    //             remoteUser += ":" + pass;
@@ -2007,39 +2023,39 @@ void MainWindow::syncSSH()
            len += maxlen +2;
        }
        question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
        QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
                                  question,
                                  i18n("Okay!")) ;
-        setCaption ("KO/Pi"); 
+        setCaption ("KO/Pi");
        return;
    }
    setCaption ( i18n( "Copying succeed." ) );
    //mView->setSyncDevice("ssh-scp" );
    if ( syncWithFile(localFile , true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
        if ( KOPrefs::instance()->mWriteBackFile ) {
-            command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ;   
+            command = "scp " + localFile +" " +remoteUser + "@" + remoteIP +":" + remoteFile ;
            setCaption ( i18n( "Writing back file ..." ) );
            result = system ( command );
            if ( result != 0 ) {
                int len = maxlen;
                while ( len <  command.length() ) {
                    command.insert( len , "\n" );
                    len += maxlen +2;
                }
                question = i18n("Sorry, the copy back command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (command) ;
                QMessageBox::information( this, i18n("KO/Pi Sync - ERROR"),
                                          question,
                                          i18n("Okay!")) ;
-                setCaption ("KO/Pi"); 
+                setCaption ("KO/Pi");
                return;
            } else {
                setCaption ( i18n( "Syncronization sucessfully completed" ) );
            }
        }
    }
@@ -2048,13 +2064,13 @@ void MainWindow::syncSSH()
    system ("scp zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics /home/polo/Applications/korganizer/z_sync.ics");
    while ( timer.elapsed() < 5000 )
        qApp->processEvents();
    qDebug("MainWindow::merging) ");
    mView->syncCalendar( "/home/polo/Applications/korganizer/z_sync.ics", 0 );
-    while ( mBlockSaveFlag ) 
+    while ( mBlockSaveFlag )
        qApp->processEvents();
    save();
    system ("scp /home/polo/Applications/korganizer/mycalendar.ics zaurus@192.168.0.65:/home/zaurus/Applications/korganizer/mycalendar.ics");
 #endif
 }
@@ -2063,21 +2079,21 @@ void MainWindow::syncSSH()
 void MainWindow::syncSharp()
 {
    if ( mCalendarModifiedFlag )
        save();
    mView->syncSharp();
    slotModifiedChanged( true );
-   
 }
 void MainWindow::syncPhone()
 {
    if ( mCalendarModifiedFlag )
        save();
    mView->syncPhone();
    slotModifiedChanged( true );
-   
 }
 void MainWindow::printSel( )
 {
    mView->viewManager()->agendaView()->agenda()->printSelection();
 }