4 files changed, 19 insertions, 30 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eac2f29..d25f632 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -3837,385 +3837,389 @@ void CalendarView::exportICalendar()
     // Force correct extension
     if (filename.right(4) != ".ics") filename += ".ics";
 
     FileStorage storage( mCalendar, filename, new ICalFormat() );
     storage.save();
 }
 
 bool CalendarView::exportVCalendar( QString filename )
 {
     if (mCalendar->journals().count() > 0) {
         int result = KMessageBox::warningContinueCancel(this,
                                                         i18n("The journal entries can not be\nexported to a vCalendar file."),
                                                         i18n("Data Loss Warning"),i18n("Proceed"),i18n("Cancel"),
                                                         true);
         if (result != KMessageBox::Continue) return false;
     }
 
     //QString filename = KFileDialog::getSaveFileName("vcalout.vcs",i18n("*.vcs|VCalendars"),this);
 
     // Force correct extension
     if (filename.right(4) != ".vcs") filename += ".vcs";
 
     FileStorage storage( mCalendar, filename, new VCalFormat );
     return storage.save();
  
 }
 
 void CalendarView::eventUpdated(Incidence *)
 {
     setModified();
     // Don't call updateView here. The code, which has caused the update of the
     // event is responsible for updating the view.
     //  updateView();
 }
 
 void CalendarView::adaptNavigationUnits()
 {
     if (mViewManager->currentView()->isEventView()) {
         int days = mViewManager->currentView()->currentDateCount();
         if (days == 1) {
             emit changeNavStringPrev(i18n("&Previous Day"));
             emit changeNavStringNext(i18n("&Next Day"));
         } else {
             emit changeNavStringPrev(i18n("&Previous Week"));
             emit changeNavStringNext(i18n("&Next Week"));
         }
     }
 }
 
 void CalendarView::processMainViewSelection( Incidence *incidence )
 {
     if ( incidence ) mTodoList->clearSelection();
     processIncidenceSelection( incidence );
 }
 
 void CalendarView::processTodoListSelection( Incidence *incidence )
 {
     if ( incidence && mViewManager->currentView() ) {
         mViewManager->currentView()->clearSelection();
     }
     processIncidenceSelection( incidence );
 }
 
 void CalendarView::processIncidenceSelection( Incidence *incidence )
 {
     if ( incidence == mSelectedIncidence ) return;
 
     mSelectedIncidence = incidence;
 
     emit incidenceSelected( mSelectedIncidence );
 
     if ( incidence && incidence->typeID() == eventID ) {
         Event *event = static_cast<Event *>( incidence );
         if ( event->organizer() == KOPrefs::instance()->email() ) {
             emit organizerEventsSelected( true );
         } else {
             emit organizerEventsSelected(false);
         }
         if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
                                     KOPrefs::instance()->email() ) ) {
             emit groupEventsSelected( true );
         } else {
             emit groupEventsSelected(false);
         }
         return;
     } else {
         if  ( incidence && incidence->typeID() == todoID ) {
             emit todoSelected( true );
             Todo *event = static_cast<Todo *>( incidence );
             if ( event->organizer() == KOPrefs::instance()->email() ) {
                 emit organizerEventsSelected( true );
             } else {
                 emit organizerEventsSelected(false);
             }
             if (event->attendeeByMails( KOPrefs::instance()->mAdditionalMails,
                                         KOPrefs::instance()->email() ) ) {
                 emit groupEventsSelected( true );
             } else {
                 emit groupEventsSelected(false);
             }
             return;
         } else {
             emit todoSelected( false );
             emit organizerEventsSelected(false);
             emit groupEventsSelected(false);
         }
         return;
     }
 
     /*  if  ( incidence && incidence->typeID() == todoID ) {
         emit todoSelected( true );
         } else {
         emit todoSelected( false );
         }*/
 }
 
 
 void CalendarView::checkClipboard()
 {
 #ifndef KORG_NODND
     if (ICalDrag::canDecode(QApplication::clipboard()->data())) {
         emit pasteEnabled(true);
     } else {
         emit pasteEnabled(false);
     }
 #endif
 }
 
 void CalendarView::showDates(const DateList &selectedDates)
 {
     //  kdDebug() << "CalendarView::selectDates()" << endl;
   
 
     if ( !mBlockShowDates ) {
         if ( mViewManager->currentView() ) {
             updateView( selectedDates.first(), selectedDates.last() );
         } else {
             mViewManager->showAgendaView();
         }
     }
 
     QDate date = selectedDates.first();
     if ( ! date.isValid() ) {
         topLevelWidget()->setCaption("");
         return;
     }
 
     QString selDates;
     selDates = KGlobal::locale()->formatDate( date, true);
     if  (selectedDates.first() < selectedDates.last() )
         selDates += " - " + KGlobal::locale()->formatDate( selectedDates.last(),true);
     else {
         QString addString;
         if ( date == QDateTime::currentDateTime().date() )
             addString = i18n("Today");
         else if (  date == QDateTime::currentDateTime().date().addDays(1) )
             addString = i18n("Tomorrow");
         else if ( date  == QDateTime::currentDateTime().date().addDays(-1) )
             addString = i18n("Yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(-2) )
             addString = i18n("Day before yesterday");
         else if ( date == QDateTime::currentDateTime().date().addDays(2) )
             addString = i18n("Day after tomorrow");
         if ( !addString.isEmpty() ) {
             topLevelWidget()->setCaption( addString+", " + selDates );
             return;
         }
     }
     topLevelWidget()->setCaption( i18n("Dates: ") + selDates );
   
 }
 
 QPtrList<CalFilter> CalendarView::filters()
 {
     return mFilters;
 
 }
 void CalendarView::editFilters()
 {
     //  kdDebug() << "CalendarView::editFilters()" << endl;
 
     CalFilter *filter = mFilters.first();
     while(filter) {
         kdDebug() << " Filter: " << filter->name() << endl;
         filter = mFilters.next();
     }
 
     mDialogManager->showFilterEditDialog(&mFilters);
     updateFilter();
 }
 void CalendarView::toggleFilter()
 {
-    showFilter(! mCalEditView->isVisible());
+    if ( mLeftFrame->isHidden() ) {
+        toggleExpand();
+        showFilter( true );
+    } else 
+        showFilter(! mCalEditView->isVisible());
 }
 
 KOFilterView *CalendarView::filterView()
 {
     return mFilterView;
 }
 void CalendarView::selectFilter( int fil )
 {
     mFilterView->setSelectedFilter( fil );
 }
 void CalendarView::showFilter(bool visible)
 {
 #if 1
     if (visible)  {
         mCalEditView->readConfig(); 
         mCalEditView->show(); 
         QValueList<int> sizes;
         sizes = mLeftFrame->sizes();
         if ( sizes.count() == 4 &&  sizes[3] < 20 ) {
             sizes.clear();
             sizes << 100;
             sizes << 0;
             sizes << 0;
             sizes << 100;
             mLeftFrame->setSizes(sizes);
         }
 #if 0
         sizes = mLeftFrame->sizes();
         int ccc = 0;
         while ( ccc < sizes.count()) {
             qDebug("size %d %d ", ccc, sizes[ccc]);
             ++ccc;    
         }
 #endif
         
     }
     else {
         mCalEditView->hide();
     }
 #else
     if (visible) mFilterView->show();
     else mFilterView->hide();
 #endif
 }
 void CalendarView::toggleFilerEnabled( )
 {
     mFilterView->setFiltersEnabled ( !mFilterView->filtersEnabled()  );
     if ( !mFilterView->filtersEnabled()   ) 
         topLevelWidget()->setCaption( i18n("Filter disabled ") );
         
 }
 void CalendarView::updateFilter()
 {
     CalFilter *filter = mFilterView->selectedFilter();
     if (filter) {
         QString mess;
         if (mFilterView->filtersEnabled()) {
             mess =  i18n("Filter selected: ")+filter->name();
             filter->setEnabled(true);
         }
         else filter->setEnabled(false);
         mCalendar->setFilter(filter);
         updateView();
         if ( !mess.isEmpty() )
             topLevelWidget()->setCaption( mess );
             
     }
     emit filtersUpdated();
 }
 
 void CalendarView::filterEdited()
 {
     mFilterView->updateFilters();
     updateFilter();
     writeSettings();
 }
 
 
 void CalendarView::takeOverEvent()
 {
     Incidence *incidence = currentSelection();
 
     if (!incidence) return;
 
     incidence->setOrganizer(KOPrefs::instance()->email());
     incidence->recreate();
     incidence->setReadOnly(false);
 
     updateView();
 }
 
 void CalendarView::takeOverCalendar()
 {
     // TODO: Create Calendar::allIncidences() function and use it here
 
     clearAllViews();
     QPtrList<Event> events = mCalendar->events();
     for(uint i=0; i<events.count(); ++i) {
         events.at(i)->setOrganizer(KOPrefs::instance()->email());
         events.at(i)->recreate();
         events.at(i)->setReadOnly(false);
     }
 
     QPtrList<Todo> todos = mCalendar->todos();
     for(uint i=0; i<todos.count(); ++i) {
         todos.at(i)->setOrganizer(KOPrefs::instance()->email());
         todos.at(i)->recreate();
         todos.at(i)->setReadOnly(false);
     }
 
     QPtrList<Journal> journals = mCalendar->journals();
     for(uint i=0; i<journals.count(); ++i) {
         journals.at(i)->setOrganizer(KOPrefs::instance()->email());
         journals.at(i)->recreate();
         journals.at(i)->setReadOnly(false);
     }
 
     updateView();
 }
 
 void CalendarView::showIntro()
 {
     kdDebug() << "To be implemented." << endl;
 }
 
 QWidgetStack *CalendarView::viewStack()
 {
     return mRightFrame;
 }
 
 QWidget *CalendarView::leftFrame()
 {
     return ( QWidget *)mLeftFrame;
 }
 
 DateNavigator *CalendarView::dateNavigator()
 {
     return mNavigator;
 }
 
 KDateNavigator* CalendarView::dateNavigatorWidget()
 {
     return mDateNavigator->navigatorView();
 }
 void CalendarView::toggleDateNavigatorWidget()
 {
     KOPrefs::instance()->mShowDateNavigator = !KOPrefs::instance()->mShowDateNavigator ;
    
     if (!KOPrefs::instance()->mShowDateNavigator )
         mDateNavigator->hide();
     else
         mDateNavigator->show();
 }
 void CalendarView::addView(KOrg::BaseView *view)
 {
     mViewManager->addView(view);
 }
 
 void CalendarView::showView(KOrg::BaseView *view)
 {
     mViewManager->showView(view, mLeftFrame->isVisible());
 }
 
 Incidence *CalendarView::currentSelection()
 {
     return mViewManager->currentSelection();
 }
 void CalendarView::toggleAllDaySize()
 {
     /*
     if ( KOPrefs::instance()->mAllDaySize > 47 )
         KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize /2;
     else
         KOPrefs::instance()->mAllDaySize = KOPrefs::instance()->mAllDaySize *2;
     */
     viewManager()->agendaView()->toggleAllDay();
 }
 void CalendarView::toggleExpand()
 {
     //  if ( mLeftFrame->isHidden() ) {
     //     mLeftFrame->show(); 
     //     emit calendarViewExpanded( false );
     //   } else {
     //     mLeftFrame->hide();
     //     emit calendarViewExpanded( true );
     //   }
     //qDebug(" CalendarView::toggleExpand()");
     globalFlagBlockAgenda = 1;
     emit calendarViewExpanded( !mLeftFrame->isHidden() );
     globalFlagBlockAgenda = 5;
     mViewManager->raiseCurrentView( !mLeftFrame->isHidden() );
     //mViewManager->showView( 0, true );
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e4dc751..bb88386 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -6,419 +6,419 @@
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 
 
 #include <libkcal/calfilter.h>
 
 #include "kofilterview.h"
 #include "koprefs.h"
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <kcolorbutton.h>
 #include <kmessagebox.h>
 
 
 
  
 
 KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
                            const char* name,WFlags fl )
   : KOFilterView_base(parent,name,fl)
 {
   mFilters = filterList;
 
   connect(mSelectionCombo,SIGNAL(activated(int)),SIGNAL(filterChanged()));
   connect(mEnabledCheck,SIGNAL(clicked()),SIGNAL(filterChanged()));
   connect(mEditButton,SIGNAL(clicked()),SIGNAL(editFilters()));
 }
 
 KOFilterView::~KOFilterView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 bool KOFilterView::filtersEnabled()
 {
   return mEnabledCheck->isChecked();
 }
 
 void KOFilterView::setFiltersEnabled(bool set)
 {
   mEnabledCheck->setChecked(set);
   emit filterChanged();
 }
 
 
 void KOFilterView::updateFilters()
 {
   mSelectionCombo->clear();
 
   CalFilter *filter = mFilters->first();
   while(filter) {
     mSelectionCombo->insertItem(filter->name());
     filter = mFilters->next();
   }
 }
 
 CalFilter *KOFilterView::selectedFilter()
 {
   CalFilter *f = mFilters->at(mSelectionCombo->currentItem());
   return f;
 }
 
 void KOFilterView::setSelectedFilter(QString filterName)
 {
   int filter_num = mSelectionCombo->count();
   int i;
   for (i=0;i<filter_num;i++) {
     if (mSelectionCombo->text(i)==filterName)
       mSelectionCombo->setCurrentItem(i);
   }
   emit filterChanged();
 }
 void KOFilterView::setSelectedFilter( int fil )
 { 
   if ( fil >= mSelectionCombo->count() )
       return;
   mSelectionCombo->setCurrentItem( fil );
   emit filterChanged();
 }
 
 
 
 KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
   : QScrollView(parent,name)
 {
     mw = 0; 
     setResizePolicy( AutoOneFit );
     setFrameStyle ( QFrame::Panel | QFrame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
     setFocusPolicy(NoFocus); 
 }
 
 KOCalEditView::~KOCalEditView()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 void KOCalEditView::selectCal(int id ,bool b)
 {
     KOPrefs::instance()->getCalendar( id )->isEnabled = b;
     emit calendarEnabled ( id, b );
     emit needsUpdate();
 
 }
 void KOCalEditView::selectStdCal( int id, bool b )
 {
 
     if ( !b ) {
         KOCalCheckButton* it = (KOCalCheckButton*) sender();
         if ( it ) {
             it->blockSignals( true );
             it->setChecked( true );
             it->blockSignals( false );
             return;
         }
         return;
     }
     KOCalCheckButton* sen = (KOCalCheckButton*) sender();
     KOCalCheckButton* it = mStdandardB.first();
     while ( it ) {
         if ( it->isChecked() ) {
             if ( it != sen ) {
                 it->blockSignals( true );
                 it->setChecked( false );
                 it->blockSignals( false );
                 break;
             }
         }
         it = mStdandardB.next();
     }
    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     while ( kkf ) {
         kkf->isStandard = false;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     KOPrefs::instance()->getCalendar( id )->isStandard = true;
     emit setCalendarDefault ( id );
 }
 
 void KOCalEditView::selectCalAlarm(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isAlarmEnabled = b;
     emit alarmEnabled ( id , b );
     emit needsUpdate();
 }
 void KOCalEditView::selectReadOnly(int id ,bool b )
 {
     KOPrefs::instance()->getCalendar( id )->isReadOnly = b;
     emit calendarReadonly ( id , b );
     if ( KOPrefs::instance()->getCalendar( id )->isStandard && b && id > 1 ) {
         KOPrefs::instance()->getCalendar( id )->isStandard = false;
         KOPrefs::instance()->getCalendar( 1 )->isStandard = true;
         emit setCalendarDefault ( 1 );
     }
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
     
 }
 void KOCalEditView::setColor( const QColor& c, int id )
 {
     KOPrefs::instance()->getCalendar( id )->mDefaultColor = c;
     emit needsUpdate();
 }
 void KOCalEditView::deleteCal( int id )
 {
     KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
     QString name = kkf->mName;
-    QString file = kkf->mFileName;
+    QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
     if ( KMessageBox::warningContinueCancel( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
     if ( kkf->isStandard )
         selectStdCal( 1, true );
     emit removeCalendar ( id );
     KOPrefs::instance()->mCalendars.remove ( kkf );
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
 }
 void KOCalEditView::infoCal( int id )
 {
     QString name = KOPrefs::instance()->getCalendar( id )->mName;
-    QString file = KOPrefs::instance()->getCalendar( id )->mFileName;
+    QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
     if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
         if (  KMessageBox::Yes == KMessageBox::questionYesNo( this,  i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) {
             emit calendarAdded( id );
             emit needsUpdate();
             QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
         }
     }
     else
         KMessageBox::information( this,  i18n("The calendar <b>%1</b> is displaying file <b>%2</b>").arg(name).arg(file) );
 }
 void KOCalEditView::readConfig() 
 {
     
     mStdandardB.clear();
     mEnabledB.clear();
     mAlarmB.clear();
     mROB.clear();
 
     if ( mw ) delete mw;
     mw = new QWidget ( viewport() );
     addChild(mw);
 
     mainLayout = new QGridLayout ( mw , 2, 8 );
     mainLayout->setMargin( 3);
     mainLayout->setSpacing( 2);
     QPushButton * addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,0 );
     addBut->setPixmap ( SmallIcon("plus"));
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,1 );
     addBut->setPixmap ( SmallIcon("eye"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     QLabel* lab = new QLabel (i18n(" Calendar \n Resource "), mw );
     mainLayout->addWidget( lab,0,2 ); 
     lab = new QLabel ( i18n(" "), mw );
     mainLayout->addWidget( lab,0,3 );
     lab->setFixedWidth( 6 );
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,4 );
     addBut->setPixmap ( SmallIcon("bell"));
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     addBut = new QPushButton ( mw );
     addBut->setFocusPolicy(NoFocus); 
     mainLayout->addWidget( addBut,0,5 );
     addBut->setPixmap ( SmallIcon("pencil"));
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 
     lab = new QLabel ( i18n(" Color "), mw );
     mainLayout->addWidget( lab,0,6 );
 #if 0
     addBut = new QPushButton ( mw );
     mainLayout->addWidget( addBut,0,6 );
     addBut->setPixmap ( SmallIcon("minus"));
     connect(addBut,SIGNAL(clicked()),SLOT(deleteAll()));
     addBut->setMaximumWidth( addBut->sizeHint().height() );
 #endif
 
 
     KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
     int row = 1;
     while ( kkf ) {
         int iii = 0;
         KOCalCheckButton* cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,0 );mStdandardB.append( cb );
         cb->setChecked( kkf->isStandard );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectStdCal(int,bool) ) );
         if ( kkf->mErrorOnLoad ||  kkf->isReadOnly )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mEnabledB.append( cb );
         cb->setChecked( kkf->isEnabled );
         cb->setNum( kkf->mCalNumber );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCal(int,bool) ) );
         KOCalButton* name = new KOCalButton( mw );
         name->setNum( kkf->mCalNumber );
         name->setText(  kkf->mName );
         mainLayout->addWidget( name,row,++iii );
         connect (name, SIGNAL (selectNum(int)), SLOT ( infoCal(int) ) );
         lab = new QLabel ( i18n(" "), mw );
         mainLayout->addWidget( lab,row,++iii );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mAlarmB.append( cb );
         cb->setChecked( kkf->isAlarmEnabled );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectCalAlarm(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         cb = new KOCalCheckButton( mw );
         mainLayout->addWidget( cb,row,++iii );mROB.append( cb );
         cb->setChecked( kkf->isReadOnly );
         cb->setNum( kkf->mCalNumber );
         connect (cb, SIGNAL (selectNum(int,bool)), SLOT ( selectReadOnly(int,bool) ) );
         if ( kkf->mErrorOnLoad )
             cb->setEnabled( false );
         if ( row > 1) {
             KColorButton *colb = new KColorButton( mw );
             mainLayout->addWidget( colb,row,++iii );
             colb->setID( kkf->mCalNumber );
             colb->setColor( kkf->mDefaultColor );
             connect (colb, SIGNAL (changedID(const QColor&, int )), SLOT ( setColor(const QColor&,int) ) );
             KOCalButton* calb = new KOCalButton( mw );
             mainLayout->addWidget( calb,row,++iii );
             calb->setNum( kkf->mCalNumber );
             calb->setPixmap ( SmallIcon("minus"));
             connect (calb, SIGNAL (selectNum(int)), SLOT ( deleteCal(int) ) );
             int hei = calb->sizeHint().height();
             //calb->setMaximumSize( hei*9/10, hei*9/10 );
         }
         ++row;
         kkf = KOPrefs::instance()->mCalendars.next();
     }
     lab = new QLabel (  "", mw );
     mainLayout->addWidget( lab,row,0 );
     mw->show();
 
 }
 void KOCalEditView::addCal()
 {
     bool tryagain = true;
     QString name, file;
     while ( tryagain ) {
         KONewCalPrefs prefs ( this ); 
          prefs.nameE->setText( name );
         prefs.url->setURL( file );
         if ( !  prefs.exec() )
             return;
         name = prefs.calName();
         file = prefs.calFileName();
         tryagain = false;
         KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
         while ( kkf ) {
             if ( kkf->mName == name ) {
                 KMessageBox::information( this,  i18n("Sorry, the calendar name \n%1\nalready exists!\nPlease choose another name!").arg( name ) ); 
                 name = "";
                 tryagain = true;  
                 break;
             }
             if ( kkf->mFileName == file ) {
-                KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( file) ); 
+                KMessageBox::information( this,  i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg(  KGlobal::formatMessage (file, 0 )) ); 
                 tryagain = true;  
                 file = "";
                 break;
             }
             kkf = KOPrefs::instance()->mCalendars.next();
         }
     }
     QFileInfo fi ( file );
     if (!fi.exists() ) {
         if ( KMessageBox::questionYesNo(this, i18n("The file\n%1\ndoes not exist!\nShall I create it for you?").arg( file ) )== KMessageBox::No )
             return;
         QFile fileIn( file );
         if (!fileIn.open( IO_WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
             return;
         } 
         QTextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
         tsIn << "BEGIN:VCALENDAR\nPRODID:-//KDE-Pim//Platform-independent 2.1.0\nVERSION:2.0\nEND:VCALENDAR\n";
         fileIn.close();       
     }
     KopiCalendarFile * kkf = KOPrefs::instance()->getNewCalendar();
     kkf->mName = name;
     kkf->mFileName = file;
     emit calendarAdded( kkf->mCalNumber );
     emit needsUpdate();
     QTimer::singleShot( 0, this, SLOT ( readConfig() ) ); 
 }
 void KOCalEditView::enableAll()
 {
     toggleList( mEnabledB );
 }
 void KOCalEditView::enableAlarm()
 {
     toggleList( mAlarmB );
 }
 void KOCalEditView::disableRO()
 {
     toggleList( mROB );
 }
 void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list )
 {
     bool dis = false;
     KOCalCheckButton* it = list.first();
     while ( it ) {
         if ( !it->isChecked() ) {
             dis = true;
             break;
         }
         it = list.next();
     }
     it = list.first();
     while ( it ) {
         it->setChecked(dis);
         it = list.next();
     }  
 }
 void KOCalEditView::deleteAll()
 {
     qDebug("delteAll");
 }
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 13e88ef..926a136 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -1,290 +1,291 @@
 /*
     This file is part of KOrganizer.
     Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #include <qlayout.h>
 #include <qheader.h>
 #include <qcursor.h>
 #include <qwhatsthis.h>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 
 #include <qinputdialog.h>
 
 #include <qvbox.h>
 #include <kdebug.h>
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdateedit.h>
 #include "ktimeedit.h"
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
 #include <libkcal/icaldrag.h>
 #include <libkcal/vcaldrag.h>
 #include <libkcal/calfilter.h>
 #include <libkcal/dndfactory.h>
 #include <libkcal/calendarresources.h>
 #include <libkcal/resourcecalendar.h>
 #include <kresources/resourceselectdialog.h>
 #include <libkcal/kincidenceformatter.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #ifndef KORG_NOPRINTER
 #include "calprinter.h"
 #endif
 #include "docprefs.h"
 
 #include "kotodoview.h"
 using namespace KOrg;
 
 
 KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name ) :
     QDialog( parent, name, true ) 
 {
     mTodo = todo;
     setCaption( i18n("Stop todo") );
     QVBoxLayout* lay = new QVBoxLayout( this );
     lay->setSpacing( 3 );
     lay->setMargin( 3 );
     QLabel * lab = new QLabel( i18n("%1\nis running!").arg( todo->summary() ), this );
     lay->addWidget( lab ); 
     lab->setAlignment( AlignHCenter );
     lab = new QLabel( i18n("Additional Comment:"), this );
     lay->addWidget( lab ); 
     mComment = new QLineEdit( this );
     lay->addWidget( mComment );
     QHBox * start = new QHBox ( this );
     lay->addWidget( start ); 
     lab = new QLabel( i18n("Start:"), start );
     QHBox * end = new QHBox ( this );
     lay->addWidget( end ); 
     lab = new QLabel( i18n("End:"), end );
     sde = new KDateEdit( start );
     ste = new KOTimeEdit( start );
     connect ( sde,SIGNAL(setTimeTo( QTime ) ),ste , SLOT ( setTime(QTime  ) )  );
     ede = new KDateEdit( end );
     ete = new KOTimeEdit(end );
     connect ( ede,SIGNAL(setTimeTo( QTime ) ),ete , SLOT ( setTime(QTime  ) )  );
     sde->setDate( mTodo->runStart().date() );
     ste->setTime( mTodo->runStart().time() );
     ede->setDate( QDate::currentDate());
     ete->setTime( QTime::currentTime() );
     QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
     lay->addWidget( ok );
+    ok->setDefault( true );
     QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
     lay->addWidget( cancel );
     connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() )  );
     connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject())  );
     ok = new QPushButton( i18n("Stop - do not save"), this );
     connect ( ok,SIGNAL(clicked() ),this , SLOT ( doNotSave() )  );
     lay->addWidget( ok );
     if (QApplication::desktop()->width() < 320 )
         resize( 240, 200 );
     else
         resize( 320, 200 );
         
 }
        
 void KOStopTodoPrefs::accept()
 {
     QDateTime start = QDateTime( sde->date(), ste->getTime() );
     QDateTime stop = QDateTime( ede->date(), ete->getTime() );
     if ( start > stop ) {
         KMessageBox::sorry(this,
                            i18n("The start time is\nafter the end time!"),
                            i18n("Time mismatch!"));
         return;
     }
     mTodo->saveRunningInfo( mComment->text(), start, stop );
     QDialog::accept();
 }
 void KOStopTodoPrefs::doNotSave() 
 {
     int result = KMessageBox::warningContinueCancel(this,
                                                     i18n("Do you really want to set\nthe state to stopped\nwithout saving the data?"),mTodo->summary() );
     if (result != KMessageBox::Continue) return;
     mTodo->stopRunning();
     QDialog::accept();
 }
 
 
 class KOTodoViewWhatsThis :public QWhatsThis
 {
 public:
   KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
     return _view->getWhatsThisText(p) ;
   }
 private:
   QWidget* _wid;
   KOTodoView * _view;
 };
 
 KOTodoListView::KOTodoListView(Calendar *calendar,QWidget *parent,
                                const char *name) :
   KListView(parent,name)
 {
   mName = QString ( name );
   mCalendar = calendar;
 #ifndef DESKTOP_VERSION
   QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold );
 #endif
   mOldCurrent = 0;
   mMousePressed = false;
 
   setAcceptDrops(true);
   viewport()->setAcceptDrops(true);
   int size = 16;
   if (qApp->desktop()->width() < 300 )
       size = 12;
   setTreeStepSize( size + 6 );
 
 }
 
 void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragEnterEvent" << endl;
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
        !QTextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   mOldCurrent = currentItem();
 #endif
 }
 
 
 void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragMoveEvent" << endl;
 
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
        !QTextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   e->accept();
 #endif
 }
 
 void KOTodoListView::contentsDragLeaveEvent(QDragLeaveEvent *)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDragLeaveEvent" << endl;
 
   setCurrentItem(mOldCurrent);
   setSelected(mOldCurrent,true);
 #endif
 }
 
 void KOTodoListView::contentsDropEvent(QDropEvent *e)
 {
 #ifndef KORG_NODND
 //  kdDebug() << "KOTodoListView::contentsDropEvent" << endl;
 
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
        !QTextDrag::canDecode( e ) ) {
     e->ignore();
     return;
   }
 
   DndFactory factory( mCalendar );
   Todo *todo = factory.createDropTodo(e);
 
   if (todo) {
     e->acceptAction();
 
     KOTodoViewItem *destination =
         (KOTodoViewItem *)itemAt(contentsToViewport(e->pos()));
     Todo *destinationEvent = 0;
     if (destination) destinationEvent = destination->todo();
 
     Todo *existingTodo = mCalendar->todo(todo->uid());
 
     if(existingTodo) {
       Incidence *to = destinationEvent;
       while(to) {
         if (to->uid() == todo->uid()) {
           KMessageBox::sorry(this,
               i18n("Cannot move Todo to itself\nor a child of itself"),
               i18n("Drop Todo"));
           delete todo;
           return;
         }
         to = to->relatedTo();
       }
       internalDrop = true;
       if ( destinationEvent )
           reparentTodoSignal( destinationEvent, existingTodo );
       else 
           unparentTodoSignal(existingTodo);
       delete todo;
     } else {
       mCalendar->addTodo(todo);
       emit todoDropped(todo, KOGlobals::EVENTADDED);
       if ( destinationEvent )
           reparentTodoSignal( destinationEvent, todo );
     }
   }
   else {
     QString text;
     if (QTextDrag::decode(e,text)) {
       //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
       KOTodoViewItem *todoi = static_cast<KOTodoViewItem *>(itemAt( contentsToViewport(e->pos()) ));
       qDebug("Dropped : " + text);
       QStringList emails = QStringList::split(",",text);
       for(QStringList::ConstIterator it = emails.begin();it!=emails.end();++it) {
         int pos = (*it).find("<");
         QString name = (*it).left(pos);
         QString email = (*it).mid(pos);
         if (!email.isEmpty() && todoi) {
           todoi->todo()->addAttendee(new Attendee(name,email));
         }
       }
     }
     else {
         qDebug("KOTodoListView::contentsDropEvent(): Todo from drop not decodable ");
       e->ignore();
     }
   }
 #endif
 }
 void KOTodoListView::wheelEvent (QWheelEvent *e)
 {
     QListView::wheelEvent (e);
 }
 
 void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
 {
@@ -1013,404 +1014,387 @@ void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
          moveTodo();
         break;
     case 8:
       getCategoryPopupMenu((KOTodoViewItem *)item)->popup(QCursor::pos ()); break;
     default:
             mItemPopupMenu->popup(QCursor::pos());
     }
  } else mPopupMenu->popup(QCursor::pos());
 }
 void KOTodoView::newTodo()
 {
   emit newTodoSignal();
 }
 
 void KOTodoView::newSubTodo()
 {
   if (mActiveItem) {
     emit newSubTodoSignal(mActiveItem->todo());
   }
 }
 void KOTodoView::unparentTodo()
 {
  if (mActiveItem) {
     emit unparentTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::reparentTodo()
 { 
     if (mActiveItem) {
         topLevelWidget()->setCaption(i18n("Click on new parent item"));
         pendingSubtodo = mActiveItem;
     }
 }
 void KOTodoView::editTodo()
 {
   if (mActiveItem) {
     emit editTodoSignal(mActiveItem->todo());
   }
 }
 void KOTodoView::cloneTodo()
 {
   if (mActiveItem) {
     emit cloneTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 void KOTodoView::cancelTodo()
 {
   if (mActiveItem) {
     emit cancelTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 void KOTodoView::moveTodo()
 {
   if (mActiveItem) {
     emit moveTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 void KOTodoView::beamTodo()
 {
   if (mActiveItem) {
     emit beamTodoSignal((Incidence*)mActiveItem->todo());
   }
 }
 
 
 void KOTodoView::showTodo()
 {
   if (mActiveItem) {
     emit showTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::deleteTodo()
 {
   if (mActiveItem) {
       emit deleteTodoSignal(mActiveItem->todo());
   }
 }
 
 void KOTodoView::setNewPriority(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     mActiveItem->todo()->setPriority(mPriority[index]);
     mActiveItem->construct();
    todoModified (mActiveItem->todo(), KOGlobals::PRIORITY_MODIFIED);
    mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
   }
 }
 
 void KOTodoView::setNewPercentage(int index)
 {
     if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
 
         if ( mPercentage[index] == 100 && !mActiveItem->isOn() ) {
             mActiveItem->setOn( true );
             return;
         } else   if ( mPercentage[index] != 100 && mActiveItem->isOn() ) {
             KOTodoViewItem* par = (static_cast<KOTodoViewItem*>(mActiveItem->parent()));
             if ( par && par->isOn()  )
                 par->setOn( false );
         }
         if (mPercentage[index] == 100) {
             mActiveItem->todo()->setCompleted(QDateTime::currentDateTime());
         } else {
             mActiveItem->todo()->setCompleted(false);
         }
         mActiveItem->todo()->setPercentComplete(mPercentage[index]);
         mActiveItem->construct();
         todoModified (mActiveItem->todo (), KOGlobals::COMPLETION_MODIFIED);
         mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     }
 }
 
 
 QPopupMenu * KOTodoView::getCategoryPopupMenu (KOTodoViewItem *todoItem)
 {
   QPopupMenu* tempMenu = new QPopupMenu (this);
   QStringList checkedCategories = todoItem->todo()->categories ();
 
   tempMenu->setCheckable (true);
   for (QStringList::Iterator it = KOPrefs::instance()->mCustomCategories.begin ();
        it != KOPrefs::instance()->mCustomCategories.end ();
        ++it) {
     int index = tempMenu->insertItem (*it);
     mCategory[index] = *it;
     if (checkedCategories.find (*it) != checkedCategories.end ()) tempMenu->setItemChecked (index, true);
   }
 
   connect (tempMenu, SIGNAL (activated (int)), SLOT (changedCategories (int)));
   return tempMenu;
 
 
 }
 void KOTodoView::changedCategories(int index)
 {
   if (mActiveItem && !mActiveItem->todo()->isReadOnly ()) {
     QStringList categories = mActiveItem->todo()->categories ();
     QString colcat = categories.first();
     if (categories.find (mCategory[index]) != categories.end ())
       categories.remove (mCategory[index]);
     else
       categories.insert (categories.end(), mCategory[index]);
     categories.sort ();
     if ( !colcat.isEmpty() ) {
         if ( categories.find ( colcat ) != categories.end () ) {
             categories.remove( colcat );
             categories.prepend( colcat );
         }
     }
     mActiveItem->todo()->setCategories (categories);
     mActiveItem->construct();
     mActiveItem->todo()->setRevision( mActiveItem->todo()->revision()+1  );
     todoModified (mActiveItem->todo (), KOGlobals::CATEGORY_MODIFIED);
   }
 }
 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);
     if (!item) {
         newTodo();
         return;
     } else {
         if ( row == 2 || row == 1 ) {
             mActiveItem = (KOTodoViewItem *) item;
             newSubTodo();
             return;
         }
         if ( row == 5 || row == 6 ) {
             mActiveItem = (KOTodoViewItem *) item;
             toggleRunningItem();
             return;
         }
     }
     if ( KOPrefs::instance()->mEditOnDoubleClick )
         editItem( item );
     else
         showItem( item , QPoint(), 0 );
 }
 void KOTodoView::toggleRunningItem()
 {
     // qDebug("KOTodoView::toggleRunning() ");
     if ( ! mActiveItem )
         return;
     Todo * t = mActiveItem->todo();
     if ( t->isRunning() ) {
-
-
         KOStopTodoPrefs tp ( t, this );
         tp.exec();
-
-
-#if 0
-        int result = KMessageBox::warningYesNoCancel(this,
-                                                        i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop"),i18n("Stop+note"));
-        if (result == KMessageBox::Cancel) return;
-        if ( result == KMessageBox::No ) {
-            QString comment = QInputDialog::getText(mActiveItem->text(0).left( 25 ),i18n("Comment for todo:") );
-            t->setRunningFalse( comment );
-        } else {
-            t->setRunning( false );
-        }
         mActiveItem->construct();
-
-
-#endif
     } else {
         int result = KMessageBox::warningContinueCancel(this,
                                                         i18n("<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>").arg(mActiveItem->text(0).left( 25 ) ),i18n("Start todo"),i18n("Start todo"),i18n("Cancel"), true);
         if (result != KMessageBox::Continue) return;
         t->setRunning( true );
         mActiveItem->construct();
     }
 }
 
 void KOTodoView::itemClicked(QListViewItem *item)
 {
     //qDebug("KOTodoView::itemClicked %d", item);
   if (!item) {
       if ( pendingSubtodo != 0 ) {
           topLevelWidget()->setCaption(i18n("Reparenting aborted!"));
       }
       pendingSubtodo = 0;
       return;
   }
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
   if ( pendingSubtodo != 0 ) {
       bool allowReparent = true;
       QListViewItem *par = item;
       while ( par ) {
           if ( par ==  pendingSubtodo ) {
               allowReparent = false;
               break;
           }
           par = par->parent();
       }
       if ( !allowReparent  ) {
           topLevelWidget()->setCaption(i18n("Recursive reparenting not possible!"));
           pendingSubtodo = 0;
       } else {
           Todo* newParent = todoItem->todo();
           Todo* newSub = pendingSubtodo->todo();
           pendingSubtodo = 0;
           emit reparentTodoSignal( newParent,newSub  );
           return;
       }
   }
 
 }
 
 void KOTodoView::setDocumentId( const QString &id )
 {
 
   mDocPrefs->setDoc( id );
 }
 
 void KOTodoView::itemStateChanged( QListViewItem *item )
 {
   if (!item) return;
 
   KOTodoViewItem *todoItem = (KOTodoViewItem *)item;
 
 //  kdDebug() << "KOTodoView::itemStateChanged(): " << todoItem->todo()->summary() << endl;
 
   if( mDocPrefs ) mDocPrefs->writeEntry( todoItem->todo()->uid(), todoItem->isOpen() );
 }
 
 void KOTodoView::saveLayout(KConfig *config, const QString &group) const
 {
   mTodoListView->saveLayout(config,group);
 }
 
 void KOTodoView::restoreLayout(KConfig *config, const QString &group)
 {
   mTodoListView->restoreLayout(config,group);
 }
 
 void KOTodoView::processSelectionChange()
 {
 //  kdDebug() << "KOTodoView::processSelectionChange()" << endl;
 
   KOTodoViewItem *item =
     static_cast<KOTodoViewItem *>( mTodoListView->selectedItem() );
 
   if ( !item ) {
     emit incidenceSelected( 0 );
   } else {
     emit incidenceSelected( item->todo() );
   }
 }
 
 void KOTodoView::modified(bool b)
 {
   emit isModified(b);
 }
 void KOTodoView::setTodoModified( Todo* todo )
 {
   todoModified( todo, KOGlobals::UNKNOWN_MODIFIED );
 }
 void KOTodoView::clearSelection()
 {
   mTodoListView->selectAll( false );
 }
 void  KOTodoView::setAllOpen()
 {
     if ( isFlatDisplay ) {
         isFlatDisplay = false;
         mPopupMenu->setItemChecked( 8,false );
         updateView();
     } else {
         storeCurrentItem();
     }
     setOpen(mTodoListView->firstChild(), true);
     resetCurrentItem();
 }
 void  KOTodoView::setAllClose()
 {
     if ( isFlatDisplay ) {
         isFlatDisplay = false;
         mPopupMenu->setItemChecked( 8,false );
         updateView();
     } else {
         storeCurrentItem();
     }
     setOpen(mTodoListView->firstChild(), false);
     resetCurrentItem();
 }
 void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
 {
 
     while ( item ) {
         setOpen( item->firstChild(), setOpenI );
         item->setOpen( setOpenI );
         item = item->nextSibling();
     }
 }
 
 void KOTodoView::displayAllFlat()
 {
     pendingSubtodo = 0;
     if ( mBlockUpdate ) {
         return;
     }
     mPopupMenu->setItemChecked( 8,true );
     isFlatDisplay = true;
     QPtrList<Todo> todoList = calendar()->todos();
     mTodoMap.clear();
     mTodoListView->clear();
     Todo *todo;   
     for(todo = todoList.first(); todo; todo = todoList.next()) {
         KOTodoViewItem *todoItem = new KOTodoViewItem(mTodoListView,todo,this);
         mTodoMap.insert(todo,todoItem);
     }
     mTodoListView->setFocus();
     processSelectionChange();
 }
 
 void  KOTodoView::setAllFlat()
 {
     if ( isFlatDisplay ) {
         isFlatDisplay = false;
         mPopupMenu->setItemChecked( 8,false );
         updateView();
         return;
     } 
     storeCurrentItem();
     displayAllFlat();
     resetCurrentItem();
 }
 
 void KOTodoView::purgeCompleted()
 {
   emit purgeCompletedSignal();
  
 }
 void KOTodoView::toggleQuickTodo()
 {
     if ( mQuickAdd->isVisible() ) {
         mQuickAdd->hide();
         KOPrefs::instance()->mEnableQuickTodo = false;
     }
     else {
         mQuickAdd->show();
         KOPrefs::instance()->mEnableQuickTodo = true;
     }
     mPopupMenu->setItemChecked(4,KOPrefs::instance()->mEnableQuickTodo);
     mItemPopupMenu->setItemChecked( 34 , KOPrefs::instance()->mEnableQuickTodo );
 }
 
 void KOTodoView::toggleRunning()
 {
     KOPrefs::instance()->mHideNonStartedTodos = !KOPrefs::instance()->mHideNonStartedTodos;
     mPopupMenu->setItemChecked(5,KOPrefs::instance()->mHideNonStartedTodos);
     mItemPopupMenu->setItemChecked( 35 , KOPrefs::instance()->mHideNonStartedTodos );
     updateView();
 }
 
 void KOTodoView::toggleCompleted()
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 13e186d..f945383 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -589,412 +589,413 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
 
     showMaximized();
     raise();
 }
 
 QPixmap MainWindow::loadPixmap( QString name )
 {
     return SmallIcon( name );
 
 }
 void MainWindow::setUsesBigPixmaps ( bool b )
 {
     qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
     if ( b )
         qDebug("KO: BigPixmaps are not supported ");
 }
 void MainWindow::initActions()
 {
     //KOPrefs::instance()->mShowFullMenu
     iconToolBar->clear();
     KOPrefs *p = KOPrefs::instance();
     //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
 
     QPopupMenu *viewMenu = new QPopupMenu( this );
     QPopupMenu *actionMenu = new QPopupMenu( this );
     QPopupMenu *importMenu = new QPopupMenu( this );
     QPopupMenu *importMenu_X = new QPopupMenu( this );
     QPopupMenu *exportMenu_X = new QPopupMenu( this );
     QPopupMenu *beamMenu_X = new QPopupMenu( this );
     selectFilterMenu = new QPopupMenu( this );
     selectFilterMenu->setCheckable( true );
     syncMenu = new QPopupMenu( this );
     configureAgendaMenu = new QPopupMenu( this );
     configureToolBarMenu = new QPopupMenu( this );
     QPopupMenu *helpMenu = new QPopupMenu( this );
     QIconSet icon;
     int pixWid = 22, pixHei = 22;
     QString pathString = "";
     if ( !p->mToolBarMiniIcons ) {
         if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
             pathString += "icons16/";
             pixWid = 18; pixHei = 16;
         }
     } else {
         pathString += "iconsmini/";
         pixWid = 18; pixHei = 16;
     }
     if ( KOPrefs::instance()->mShowFullMenu ) {
         QMenuBar *menuBar1;
         menuBar1 = menuBar();
         menuBar1->insertItem( i18n("File"), importMenu );
         menuBar1->insertItem( i18n("View"), viewMenu );
         menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
         menuBar1->insertItem( i18n("Synchronize"), syncMenu );
         menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
         menuBar1->insertItem( i18n("Sync"), syncMenu );
         menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
         //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
         menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar1->insertItem( i18n("Help"), helpMenu );
     } else {
         QPEMenuBar *menuBar1;
         menuBar1 = new QPEMenuBar( iconToolBar );
         QPopupMenu *menuBar = new QPopupMenu( this );
         icon = loadPixmap( pathString + "z_menu" );
         menuBar1->insertItem( icon.pixmap(), menuBar);
         //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("Toolbar"),configureToolBarMenu );
         menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
         menuBar->insertItem( i18n("Help"), helpMenu );
         //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
         menuBar1->setMaximumSize( menuBar1->sizeHint( ));
     }
     connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
 
    
     mWeekBgColor = iconToolBar->backgroundColor();
     mWeekPixmap.resize( pixWid , pixHei );
     mWeekPixmap.fill( mWeekBgColor );
     icon = mWeekPixmap;
     mWeekAction = new QAction( i18n("Select week number"),icon, i18n("Select week number"), 0, this );
     if ( p-> mShowIconWeekNum )
         mWeekAction->addTo( iconToolBar );
     mWeekFont = font();
 
     int fontPoint = mWeekFont.pointSize();
     QFontMetrics f( mWeekFont );
     int fontWid =  f.width( "30" );
     while ( fontWid > pixWid ) {
         --fontPoint;
         mWeekFont.setPointSize( fontPoint );
         QFontMetrics f( mWeekFont );
         fontWid =  f.width( "30" );
         //qDebug("dec-- ");
     }
 
     connect( mWeekAction, SIGNAL( activated() ),
              this, SLOT( weekAction() ) );
 
     connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
     if ( p->mShowIconFilterview ) {
         icon = loadPixmap( pathString + "filter" );
         actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
         connect( actionFilterMenuTB, SIGNAL( activated() ),
                  this, SLOT( fillFilterMenuTB() ) );
         actionFilterMenuTB->addTo( iconToolBar  );
         selectFilterMenuTB = new QPopupMenu( this );
         selectFilterMenuTB->setCheckable( true ); 
         connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
     }
 
     //#endif
     // ******************
     QAction *action;
     // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
     configureToolBarMenu->setCheckable( true );
 
    
     configureAgendaMenu->setCheckable( true );
     int iii ;
     for ( iii = 1;iii<= 10 ;++iii ){
         configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
     }
     //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
 
     connect( configureAgendaMenu, SIGNAL( aboutToShow()),
              this, SLOT( showConfigureAgenda( ) ) );
 
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_options() ) );  
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( edit_global_options() ) );
     actionMenu->insertSeparator();
 
     action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( undo_delete() ) );
     actionMenu->insertSeparator();
 
     icon = loadPixmap( pathString + "newevent" );
     configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
     configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
     configureToolBarMenu->insertSeparator();
     configureToolBarMenu->insertItem(i18n("Week Number"), 400);
     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" );
     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 + "today" );
     QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
     today_action->addTo( viewMenu );
     connect( today_action, SIGNAL( activated() ),
              mView, SLOT( goToday() ) );
     viewMenu->insertSeparator();
 
     // ***********************
     if ( KOPrefs::instance()->mVerticalScreen ) {
          icon = SmallIcon( "1updownarrow" );
     } else {
         icon = SmallIcon("1leftrightarrow" );
     }
     configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
     QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
     FSaction->addTo( viewMenu );
     connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
 
-    icon = loadPixmap( pathString + "navi" );
-    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
-    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
-    action->addTo( viewMenu );
-    connect( action, SIGNAL( activated() ),
-             mView, SLOT( toggleDateNavigatorWidget() ) );
-    mToggleNav = action ;
+   
     icon = loadPixmap( pathString + "filter" );
     configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
     icon = loadPixmap( pathString + "configure" );
     action = new QAction( i18n("Toggle Resource View"), icon, i18n("Toggle Resource View"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleFilter() ) );
     mToggleFilter = action;
+    icon = loadPixmap( pathString + "navi" );
+    configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
+    action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+    action->addTo( viewMenu );
+    connect( action, SIGNAL( activated() ),
+             mView, SLOT( toggleDateNavigatorWidget() ) );
+    mToggleNav = action ;
     icon = loadPixmap( pathString + "allday" );
     configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
     action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView, SLOT( toggleAllDaySize() ) );
     mToggleAllday = action;
 
 
     connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
              mToggleNav, SLOT( setEnabled ( bool ) ) );
-    connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
-             mToggleFilter, SLOT( setEnabled ( bool ) ) );
+    //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+    //       mToggleFilter, SLOT( setEnabled ( bool ) ) );
     connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
              mToggleAllday, SLOT( setEnabled ( bool ) ) );
     // connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
     //       configureAgendaMenu, SLOT( setEnabled ( bool ) ) );
 
     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();
 
     if ( p-> mShowIconToggleFull )
         FSaction->addTo( iconToolBar );
     if ( p->mShowIconNavigator ) mToggleNav ->addTo( iconToolBar );
    
     //********************
     if ( p->mShowIconAllday ) mToggleAllday->addTo( iconToolBar );
 
 
     icon = loadPixmap( pathString + "whatsnext" );
     configureToolBarMenu->insertItem(icon, i18n("What's Next"), 110 );
     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() ) );
 
     icon = loadPixmap( pathString + "xdays" );
     configureToolBarMenu->insertItem(icon, i18n("Next days"), 100 );
     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 + "journal" );
     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 + "day" );
     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" );
     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 );
     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 + "workweek2" );
     configureToolBarMenu->insertItem(icon, i18n("List week view"), 75 );
     QAction* day6_action = new QAction( i18n("List week"), icon, i18n("List week"), 0, this );
     day6_action->addTo( viewMenu );
     connect( day6_action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showMonthViewWeek() ) );
 
     icon = loadPixmap( pathString + "month" );
     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 + "list" );
     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 + "todo" );
     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() ) );
 
 
 
 #if 0
     action = new QAction( "view_timespan", "Time Span", 0, this );
     action->addTo( viewMenu );
     connect( action, SIGNAL( activated() ),
              mView->viewManager(), SLOT( showTimeSpanView() ) );
 #endif
 
     mNewSubTodoAction = new QAction( "new_subtodo", i18n("New Sub-Todo..."), 0,
                                      this );
     mNewSubTodoAction->addTo( actionMenu );
     connect( mNewSubTodoAction, SIGNAL( activated() ),
              mView, SLOT( newSubTodo() ) );
 
     actionMenu->insertSeparator();
 
     mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
     mShowAction->addTo( actionMenu );
     connect( mShowAction, SIGNAL( activated() ),
              mView, SLOT( showIncidence() ) );
 
     mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
     mEditAction->addTo( actionMenu );
     connect( mEditAction, SIGNAL( activated() ),
              mView, SLOT( editIncidence() ) );
 
     mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
     mDeleteAction->addTo( actionMenu );
     connect( mDeleteAction, SIGNAL( activated() ),
              mView, SLOT( deleteIncidence() ) );
 
 
     mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
     mCloneAction->addTo( actionMenu );
     connect( mCloneAction, SIGNAL( activated() ),
              mView, SLOT( cloneIncidence() ) );
     mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
     mMoveAction->addTo( actionMenu );
     connect( mMoveAction, SIGNAL( activated() ),
              mView, SLOT( moveIncidence() ) );
     mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
     mBeamAction->addTo( actionMenu );
     connect( mBeamAction, SIGNAL( activated() ),
              mView, SLOT( beamIncidence() ) );
     mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
     mCancelAction->addTo( actionMenu );
     connect( mCancelAction, SIGNAL( activated() ),
              mView, SLOT( toggleCancelIncidence() ) );
 
     actionMenu->insertSeparator();
 
     action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
                           this );
     action->addTo( actionMenu );
     connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
 
     icon = loadPixmap( pathString + "search" );
     QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
     configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
     search_action->addTo( actionMenu );
     connect( search_action, SIGNAL( activated() ),
              mView->dialogManager(), SLOT( showSearchDialog() ) );
 
     
 
     if ( KOPrefs::instance()->mShowFullMenu ) {
         actionMenu->insertSeparator();
         actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
 
     }
     // actionMenu->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
     action = new QAction( "import_quick", i18n("Import last file"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
     importMenu_X->insertSeparator();
     action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
     //#ifndef DESKTOP_VERSION
     importMenu_X->insertSeparator();
     action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                           this );
     action->addTo( importMenu_X );
     connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
     //#else
 #ifdef _OL_IMPORT_
     importMenu_X->insertSeparator();
     action = new QAction( "import_ol", i18n("Import from OL"), 0,
                           this );
     action->addTo( importMenu_X );