fixes

author: zautrix <zautrix> 2005-02-08 14:12:31 (UTC)
committer: zautrix <zautrix> 2005-02-08 14:12:31 (UTC)
commit: 41111b332c2a5f1b2ec152df309b9199f5e9c921 (patch) (unidiff)
tree: 3a2e5c5a25cdb52f542b2fe84a03f94599be2fe3
parent: 9927a063f34bb826a4b5f7f7029308c9c66acbce (diff)
download: kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.zip
kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.tar.gz
kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.tar.bz2
10 files changed, 98 insertions, 55 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 0fbaa9a..a9de65a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2207,552 +2207,555 @@ void CalendarView::edit_copy()
    Incidence *incidence = mViewManager->currentView()->selectedIncidences().first();
    if (mViewManager->currentView()->isEventView()) {
        if ( incidence && incidence->type() == "Event" ) {
            anEvent = static_cast<Event *>(incidence);
        }
    }
    if (!anEvent) {
        KNotifyClient::beep();
        return;
    }
    DndFactory factory( mCalendar );
    factory.copyIncidence(anEvent);
 }
 void CalendarView::edit_paste()
 {
    QDate date = mNavigator->selectedDates().first();
    DndFactory factory( mCalendar );
    Event *pastedEvent = (Event *)factory.pasteIncidence( date );
    changeEventDisplay( pastedEvent, KOGlobals::EVENTADDED );
 }
 void CalendarView::edit_options()
 {
    QString tz = KPimGlobalPrefs::instance()->mTimeZoneId;
    emit save();
    emit saveStopTimer();
    mDialogManager->showOptionsDialog();
    if ( tz != KPimGlobalPrefs::instance()->mTimeZoneId) {
        emit saveStopTimer();
        if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, i18n("The timezone has changed!\nShould the calendar be reloaded\nto apply timezone changes?\nPlease read Menu: Help->FAQ:\n\"How do I change the timezone?\"\nas well!"),
                                                 i18n("Timezone settings"),i18n("Reload"))) {
            qDebug("KO: TZ reload cancelled ");
            return;
        }
        qDebug("KO: Timezone change ");
        openCalendar( MainWindow::defaultFileName() );
        setModified(true);
    }
    else
        qDebug("KO: No tz change ");
 }
 void  CalendarView::slotSelectPickerDate( QDate  d)
 {
    mDateFrame->hide();
    if ( mDatePickerMode == 1 ) {
        mNavigator->slotDaySelect( d );
    } else  if ( mDatePickerMode == 2 ) {
        if ( mMoveIncidence->type() == "Todo" ) {
            Todo * to = (Todo *) mMoveIncidence;
            QTime tim;
            if ( to->hasDueDate() ) 
                tim = to->dtDue().time();
            else {
                tim = QTime ( 0,0,0 );
                to->setFloats( true );
                to->setHasDueDate( true );
            }
            QDateTime dt ( d,tim );
            to->setDtDue( dt );
            todoChanged( to );
        } else { 
            if ( mMoveIncidence->doesRecur() ) {
 #if 0 
                // PENDING implement this
                Incidence* newInc = mMoveIncidence->recreateCloneException( mMoveIncidenceOldDate );
                mCalendar()->addIncidence( newInc ); 
                if ( mMoveIncidence->type() == "Todo" )
                    emit  todoMoved((Todo*)mMoveIncidence,  KOGlobals::EVENTEDITED );
                else
                    emit incidenceChanged(mMoveIncidence, KOGlobals::EVENTEDITED);
                mMoveIncidence = newInc;
            
 #endif 
            }
            QTime tim = mMoveIncidence->dtStart().time(); 
            int secs = mMoveIncidence->dtStart().secsTo(  mMoveIncidence->dtEnd());
            QDateTime dt ( d,tim );
            mMoveIncidence->setDtStart( dt );
            ((Event*)mMoveIncidence)->setDtEnd( dt.addSecs( secs ) );
            changeEventDisplay((Event*)mMoveIncidence, KOGlobals::EVENTEDITED);
        }
        
        mMoveIncidence->setRevision( mMoveIncidence->revision()+1  );
    }
 }
 void CalendarView::removeCategories()
 {
    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
    QStringList catList = KOPrefs::instance()->mCustomCategories;
    QStringList catIncList;
    QStringList newCatList;
    Incidence* inc = incList.first();
    int i;
    int count = 0;
    while ( inc ) {
        newCatList.clear();
        catIncList =  inc->categories() ;
        for( i = 0; i<   catIncList.count(); ++i ) {
            if ( catList.contains (catIncList[i]))
                newCatList.append( catIncList[i] );
        }
        newCatList.sort();
        inc->setCategories( newCatList.join(",") );
        inc = incList.next();
    }
 }
 int CalendarView::addCategories()
 { 
    QPtrList<Incidence> incList  = mCalendar->rawIncidences(); 
    QStringList catList = KOPrefs::instance()->mCustomCategories;
    QStringList catIncList;
    Incidence* inc = incList.first();
    int i;
    int count = 0;
     while ( inc ) {
        catIncList = inc->categories() ;
        for( i = 0; i<   catIncList.count(); ++i ) {
            if ( !catList.contains (catIncList[i])) {
                catList.append( catIncList[i] );
                //qDebug("add cat %s ",  catIncList[i].latin1());
                ++count;
            }
        }
        inc = incList.next();
    }
    catList.sort();
    KOPrefs::instance()->mCustomCategories = catList;
    return count;
 }
 void CalendarView::manageCategories()
 {
    KOCatPrefs* cp = new KOCatPrefs(); 
    cp->show();
    int w =cp->sizeHint().width() ;
    int h = cp->sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
    if ( !cp->exec() ) {
        delete cp;
        return;
    }
    int count = 0;
    if ( cp->addCat() ) {
        count = addCategories();
        if ( count ) {
            topLevelWidget()->setCaption(QString::number( count )+ i18n(" Categories added to list! "));
            writeSettings();
        } else
            topLevelWidget()->setCaption(QString::number( 0 )+ i18n(" Categories added to list! "));
    } else {
        removeCategories();
        updateView();
    }
    delete cp;
 }
 void CalendarView::beamIncidence(Incidence * Inc) 
 {
    QPtrList<Incidence> delSel ;
    delSel.append(Inc);
    beamIncidenceList( delSel );
 } 
 void CalendarView::beamCalendar() 
 {
    QPtrList<Incidence> delSel  = mCalendar->rawIncidences(); 
    //qDebug("beamCalendar()  ");
    beamIncidenceList( delSel );
 }
 void CalendarView::beamFilteredCalendar() 
 {
    QPtrList<Incidence> delSel  = mCalendar->incidences(); 
    //qDebug("beamFilteredCalendar()  ");
    beamIncidenceList( delSel );
 }
 void  CalendarView::beamIncidenceList(QPtrList<Incidence> delSel )
 {
    if ( beamDialog->exec () == QDialog::Rejected ) 
        return;
 #ifdef DESKTOP_VERSION
    QString fn =  locateLocal( "tmp", "kopibeamfile" );
 #else
    QString fn = "/tmp/kopibeamfile";
 #endif
    QString mes;
    bool createbup = true;
    if ( createbup ) {
        QString description = "\n";
        CalendarLocal* cal = new CalendarLocal();
        if ( beamDialog->beamLocal() )
            cal->setLocalTime();
        else
            cal->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId);
        Incidence *incidence = delSel.first();
        bool addText = false;
        if ( delSel.count() < 10 )
            addText = true;
        else {
            description.sprintf(i18n("  %d items?"),delSel.count() );
        }
        while ( incidence ) {
            Incidence *in = incidence->clone();
            if ( ! in->summary().isEmpty() ) {
                in->setDescription("");
            } else {
                in->setSummary( in->description().left(20));
                in->setDescription("");
            }
            if ( addText )
                description += in->summary() + "\n";
            cal->addIncidence( in );
            incidence = delSel.next();
        }
        if ( beamDialog->beamVcal() ) {
            fn += ".vcs";
            FileStorage storage( cal, fn, new VCalFormat );
            storage.save();
        } else {
            fn += ".ics";
            FileStorage storage( cal, fn, new ICalFormat( ) );
            storage.save();
        }
        delete cal;
        mes = i18n("KO/Pi: Ready for beaming");
        topLevelWidget()->setCaption(mes); 
        KApplication::convert2latin1( fn );
 #ifndef DESKTOP_VERSION
        Ir *ir = new Ir( this ); 
        connect( ir, SIGNAL( done( Ir * ) ), this, SLOT( beamDone( Ir * ) ) );
        ir->send( fn, description, "text/x-vCalendar" );
 #endif
    }
 }
 void  CalendarView::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
    delete ir;
 #endif
    topLevelWidget()->setCaption( i18n("KO/Pi: Beaming done.") ); 
    topLevelWidget()->raise();
 }
 void CalendarView::moveIncidence(Incidence * inc ) 
 {
    if ( !inc ) return;
-    // qDebug("showDatePickerForIncidence( ) ");
+    showDatePickerPopup(); 
-    if ( mDateFrame->isVisible() )
-        mDateFrame->hide();
-    else {
-        int w =mDatePicker->sizeHint().width()+2*mDateFrame->lineWidth() ;
-        int h = mDatePicker->sizeHint().height()+2*mDateFrame->lineWidth() ;
-        int dw = QApplication::desktop()->width();
-        int dh = QApplication::desktop()->height();
-        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
-        mDateFrame->show();
-    }
    mDatePickerMode = 2;
    mMoveIncidence = inc ;
    QDate da;
    if ( mMoveIncidence->type() == "Todo" ) {
        Todo * to = (Todo *) mMoveIncidence;
            if ( to->hasDueDate() ) 
                da = to->dtDue().date();
            else
                da = QDate::currentDate();
    } else {
        da = mMoveIncidence->dtStart().date();
    }
    //PENDING set date for recurring incidence to date of recurrence
    //mMoveIncidenceOldDate;
    mDatePicker->setDate( da );
 }
-void CalendarView::showDatePicker( ) 
+void CalendarView::showDatePickerPopup() 
 {
-    //qDebug("CalendarView::showDatePicker( )  ");
+ if ( mDateFrame->isVisible() )
-    if ( mDateFrame->isVisible() )
        mDateFrame->hide();
    else {
+        int offX = 0, offY = 0;
+#ifdef DESKTOP_VERSION
+        int w =mDatePicker->sizeHint().width() ;
+        int h = mDatePicker->sizeHint().height() ;
+        int dw = topLevelWidget()->width();
+        int dh = topLevelWidget()->height();
+        offX = topLevelWidget()->x();
+        offY = topLevelWidget()->y();
+#else
        int w =mDatePicker->sizeHint().width() ;
        int h = mDatePicker->sizeHint().height() ;
        int dw = QApplication::desktop()->width();
        int dh = QApplication::desktop()->height();
-        mDateFrame->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+#endif
+        mDateFrame->setGeometry( (dw-w)/2+offX, (dh - h )/2+offY ,w,h );
        mDateFrame->show();
    }
+}
+void CalendarView::showDatePicker( ) 
+{
+    showDatePickerPopup(); 
    mDatePickerMode = 1;
    mDatePicker->setDate( mNavigator->selectedDates().first() );
 }
 void CalendarView::showEventEditor()
 {
 #ifdef DESKTOP_VERSION
    mEventEditor->show();
 #else
    if ( mEventEditor->width() < QApplication::desktop()->width() -60 || mEventEditor->width() > QApplication::desktop()->width() ) {
        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
        qDebug("KO: CalendarView: recreate mEventEditor %d %d",  mEventEditor->width(), QApplication::desktop()->width() );
        qApp->processEvents();
        delete mEventEditor;
        mEventEditor = mDialogManager->getEventEditor(); 
        topLevelWidget()->setCaption( i18n("") );
    }
    mEventEditor->showMaximized();
 #endif
 }
 void CalendarView::showTodoEditor()
 {
 #ifdef DESKTOP_VERSION
    mTodoEditor->show();
 #else
    if ( mTodoEditor->width() < QApplication::desktop()->width() -60|| mTodoEditor->width() > QApplication::desktop()->width() ) {
        topLevelWidget()->setCaption( i18n("Recreating edit dialog. Please wait...") );
        qDebug("KO: CalendarView: recreate mTodoEditor %d %d ",  mTodoEditor->width() ,QApplication::desktop()->width()     );
        qApp->processEvents();
        delete mTodoEditor;  
        mTodoEditor = mDialogManager->getTodoEditor(); 
        topLevelWidget()->setCaption( i18n("") );
    }
    mTodoEditor->showMaximized();
 #endif
 }
 void CalendarView::cloneIncidence()
 {
    Incidence *incidence = currentSelection();
    if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
    if ( incidence ) {
        cloneIncidence(incidence);
    }
 }
 void CalendarView::moveIncidence()
 {
  Incidence *incidence = currentSelection();
    if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
    if ( incidence ) {
        moveIncidence(incidence);
    }
 }
 void CalendarView::beamIncidence()
 {
  Incidence *incidence = currentSelection();
    if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
    if ( incidence ) {
        beamIncidence(incidence);
    }
 }
 void CalendarView::toggleCancelIncidence()
 {
  Incidence *incidence = currentSelection();
    if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
    if ( incidence ) {
        cancelIncidence(incidence);
    }
 }
 void CalendarView::cancelIncidence(Incidence * inc )
 {
    inc->setCancelled( ! inc->cancelled() );
    changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED );
    updateView();
 }
 void CalendarView::cloneIncidence(Incidence * orgInc )
 { 
    Incidence * newInc = orgInc->clone();
    newInc->recreate();
 
    if ( newInc->type() == "Todo" ) {
        Todo* t = (Todo*) newInc; 
        showTodoEditor();
        mTodoEditor->editTodo( t );
        if ( mTodoEditor->exec() ) {
            mCalendar->addTodo( t );
            updateView();
        } else {
            delete t;
        }
    }
    else {
        Event*  e = (Event*)  newInc;
        showEventEditor();
        mEventEditor->editEvent( e );
        if ( mEventEditor->exec() ) {
            mCalendar->addEvent( e );
            updateView();
        } else {
            delete e;
        }
    }
 }
 void CalendarView::newEvent()
 {
    // TODO: Replace this code by a common eventDurationHint of KOBaseView.
    KOAgendaView *aView = mViewManager->agendaView();
    if (aView) {
        if (aView->selectionStart().isValid()) {
            if (aView->selectedIsAllDay()) {
                newEvent(aView->selectionStart(),aView->selectionEnd(),true);
            } else {
                newEvent(aView->selectionStart(),aView->selectionEnd());
            }
            return;
        }
    }
    QDate date = mNavigator->selectedDates().first();
    QDateTime current =  QDateTime::currentDateTime();
    if ( date <= current.date() ) {
        int hour = current.time().hour() +1;
        newEvent( QDateTime(  current.date(), QTime( hour, 0, 0 ) ),
                  QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
    } else
        newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                  QDateTime( date, QTime( KOPrefs::instance()->mStartTime +
                                          KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
 }
 void CalendarView::newEvent(QDateTime fh)
 {
    newEvent(fh,
             QDateTime(fh.addSecs(3600*KOPrefs::instance()->mDefaultDuration)));
 }
 void CalendarView::newEvent(QDate dt)
 {
    newEvent(QDateTime(dt, QTime(0,0,0)),
             QDateTime(dt, QTime(0,0,0)), true);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint)
 {
    newEvent(fromHint,  toHint, false);
 }
 void CalendarView::newEvent(QDateTime fromHint, QDateTime toHint, bool allDay)
 {
  
    showEventEditor();
    mEventEditor->newEvent(fromHint,toHint,allDay);
    if ( mFilterView->filtersEnabled() ) {
        CalFilter *filter = mFilterView->selectedFilter();
        if (filter && filter->showCategories()) {
            mEventEditor->setCategories(filter->categoryList().join(",") );
        }
        if ( filter )
            mEventEditor->setSecrecy( filter->getSecrecy() );
    }
 }
 void  CalendarView::todoAdded(Todo * t)
 {
  
    changeTodoDisplay ( t ,KOGlobals::EVENTADDED);
    updateTodoViews();
 }
 void  CalendarView::todoChanged(Todo * t)
 {
    emit todoModified( t, 4 );
    // updateTodoViews();
 }
 void  CalendarView::todoToBeDeleted(Todo *)
 {
    //qDebug("todoToBeDeleted(Todo *) ");
    updateTodoViews();
 }
 void  CalendarView::todoDeleted()
 {
    //qDebug(" todoDeleted()");
    updateTodoViews();
 }
 void CalendarView::newTodoDateTime( QDateTime dt, bool allday )
 { 
    showTodoEditor();
    mTodoEditor->newTodo(dt,0,allday);
    if ( mFilterView->filtersEnabled() ) {
        CalFilter *filter = mFilterView->selectedFilter();
        if (filter && filter->showCategories()) {
            mTodoEditor->setCategories(filter->categoryList().join(",") );
        }
        if ( filter )
            mTodoEditor->setSecrecy( filter->getSecrecy() );
    }
 }
 void CalendarView::newTodo()
 { 
    newTodoDateTime( QDateTime(),true );
 }
 void CalendarView::newSubTodo()
 {
    Todo *todo = selectedTodo();
    if ( todo ) newSubTodo( todo );
 }
 void CalendarView::newSubTodo(Todo *parentEvent)
 {
  
    showTodoEditor();
    mTodoEditor->newTodo(QDateTime(),parentEvent,true);
 }
 void CalendarView::newFloatingEvent()
 {
    DateList tmpList = mNavigator->selectedDates();
    QDate date = tmpList.first();
    newEvent( QDateTime( date, QTime( 12, 0, 0 ) ),
              QDateTime( date, QTime( 12, 0, 0 ) ), true );
 }
 void CalendarView::editEvent( Event *event )
 {
    if ( !event ) return;
    if ( event->isReadOnly() ) {
        showEvent( event );
        return;
    }
    showEventEditor();
    mEventEditor->editEvent( event , mFlagEditDescription);
 }
 void CalendarView::editJournal( Journal *jour )
 { 
    if ( !jour ) return;
    mDialogManager->hideSearchDialog();
    mViewManager->showJournalView();
    mNavigator->slotDaySelect( jour->dtStart().date() );
 }
 void CalendarView::editTodo( Todo *todo )
 {
    if ( !todo ) return;
 
    if ( todo->isReadOnly() ) {
        showTodo( todo );
        return;
    }
    showTodoEditor();
    mTodoEditor->editTodo( todo ,mFlagEditDescription);
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 731298d..e626ea3 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -188,424 +188,425 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
    void insertBirthdays(const QString& uid, const QStringList& birthdayList, 
                         const QStringList& anniversaryList, const QStringList& realNameList,
                         const QStringList& emailList, const QStringList& assembledNameList,
                         const QStringList& uidList);
    /**
      Load calendar from file \a filename. If \a merge is true, load 
      calendar into existing one, if it is false, clear calendar, before
      loading. Return true, if calendar could be successfully loaded.
    */
    bool openCalendar(QString filename, bool merge=false);
    bool syncCalendar(QString filename,int mode = 0 );
    /**
      Save calendar data to file. Return true if calendar could be
      successfully saved.
    */
    bool saveCalendar(QString filename);
  
    /**
      Close calendar. Clear calendar data and reset views to display an empty
      calendar.
    */
    void closeCalendar();
  
    /** Archive old events of calendar */
    void archiveCalendar();
    void showIncidence();
    void editIncidence();
    void editIncidenceDescription();
    void deleteIncidence();
    void cloneIncidence();
    void moveIncidence();
    void beamIncidence();
    void toggleCancelIncidence();
  
    /** create an editeventwin with supplied date/time, and if bool is true,
     * make the event take all day. */
    void newEvent(QDateTime, QDateTime, bool allDay );
    void newEvent(QDateTime, QDateTime);
    void newEvent(QDateTime fh);
    void newEvent(QDate dt);
    /** create new event without having a date hint. Takes current date as
     default hint. */ 
    void newEvent();
    void newFloatingEvent();
    /** Create a read-only viewer dialog for the supplied incidence. It calls the correct showXXX method*/
    void showIncidence(Incidence *);
    /** Create an editor for the supplied incidence. It calls the correct editXXX method*/
    void editIncidence(Incidence *);
    /** Delete the supplied incidence. It calls the correct deleteXXX method*/
    void deleteIncidence(Incidence *);
    void cloneIncidence(Incidence *);
    void cancelIncidence(Incidence *);
    /** Create an editor for the supplied event. */
    void editEvent(Event *);
    /** Delete the supplied event. */
    void deleteEvent(Event *);
    /** Delete the event with the given unique ID. Returns false, if event wasn't
    found. */
    bool deleteEvent(const QString &uid);
    /** Create a read-only viewer dialog for the supplied event. */
    void showEvent(Event *);
    void editJournal(Journal *);
    void showJournal(Journal *);
    void deleteJournal(Journal *);
    /** Create an editor dialog for a todo */
    void editTodo(Todo *);
    /** Create a read-only viewer dialog for the supplied todo */
    void showTodo(Todo *);
    /** create new todo */
    void newTodo();
    void newTodoDateTime(QDateTime, bool allday); 
    /** create new todo with a parent todo */
    void newSubTodo();
    /** create new todo with a parent todo */
    void newSubTodo(Todo *);
    /** Delete todo */
    void deleteTodo(Todo *);
            
    /** Check if clipboard contains vCalendar event. The signal pasteEnabled() is
     * emitted as result. */
    void checkClipboard();
    
    /** using the KConfig associated with the kapp variable, read in the
     * settings from the config file. 
     */
    void readSettings();
    
    /** write current state to config file. */
    void writeSettings();
    /** read settings for calendar filters */
    void readFilterSettings(KConfig *config);
    
    /** write settings for calendar filters */
    void writeFilterSettings(KConfig *config);
    /** passes on the message that an event has changed to the currently
     * activated view so that it can make appropriate display changes. */
    void changeEventDisplay(Event *, int);
    void changeIncidenceDisplay(Incidence *, int);
    void changeTodoDisplay(Todo *, int);
  
    void eventAdded(Event *);
    void eventChanged(Event *);
    void eventToBeDeleted(Event *);
    void eventDeleted();
  
    void todoAdded(Todo *);
    void todoChanged(Todo *);
    void todoToBeDeleted(Todo *);
    void todoDeleted();
    void updateView(const QDate &start, const QDate &end);
    void updateView();
  
    /** Full update of visible todo views */
    void updateTodoViews();
    void updateUnmanagedViews();
  
    /** cut the current appointment to the clipboard */
    void edit_cut();
  
    /** copy the current appointment(s) to the clipboard */
    void edit_copy();
    /** paste the current vobject(s) in the clipboard buffer into calendar */
    void edit_paste();
  
    /** edit viewing and configuration options. */
    void edit_options();
    /**
      Functions for printing, previewing a print, and setting up printing
      parameters.
    */
    void print();
    void printSetup();
    void printPreview();
    /** Export as iCalendar file */
    void exportICalendar();
  
    /** Export as vCalendar file */
    bool exportVCalendar( QString fn);
  
    /** pop up a dialog to show an existing appointment. */
    void appointment_show();
    /**
             * pop up an Appointment Dialog to edit an existing appointment.Get
     * information on the appointment from the list of unique IDs that is
     * currently in the View, called currIds.
     */
    void appointment_edit();
    /**
     * pop up dialog confirming deletion of currently selected event in the
     * View.
     */
    void appointment_delete();
    /** mails the currently selected event to a particular user as a vCalendar
      attachment. */
    void action_mail();
    /* frees a subtodo from it's relation */
    void todo_unsub( Todo * );
    void todo_resub( Todo * parent, Todo * sub );
    /** Take ownership of selected event. */
    void takeOverEvent();
    /** Take ownership of all events in calendar. */
    void takeOverCalendar();
  
    /** query whether or not the calendar is "dirty". */
    bool isModified();
    /** set the state of calendar. Modified means "dirty", i.e. needing a save. */
    void setModified(bool modified=true);
    /** query if the calendar is read-only. */
    bool isReadOnly();
    /** set state of calendar to read-only */
    void setReadOnly(bool readOnly=true);
    void eventUpdated(Incidence *);
    /* iTIP scheduling actions */
    void schedule_publish(Incidence *incidence = 0);
    void schedule_request(Incidence *incidence = 0);
    void schedule_refresh(Incidence *incidence = 0);
    void schedule_cancel(Incidence *incidence = 0);
    void schedule_add(Incidence *incidence = 0);
    void schedule_reply(Incidence *incidence = 0);
    void schedule_counter(Incidence *incidence = 0);
    void schedule_declinecounter(Incidence *incidence = 0);
    void schedule_publish_freebusy(int daysToPublish = 30);
    void openAddressbook();
    void editFilters();
    void toggleFilerEnabled();
    QPtrList<CalFilter> filters();
    void toggleFilter();
    void showFilter(bool visible);
    void updateFilter();
    void filterEdited();
    void selectFilter( int );
    KOFilterView *filterView();
    void showIntro();
    /** Move the curdatepient view date to today */
    void goToday();
    /** Move to the next date(s) in the current view */
    void goNext();
  
    /** Move to the previous date(s) in the current view */
    void goPrevious();
  /** Move to the next date(s) in the current view */
    void goNextMonth();
  
    /** Move to the previous date(s) in the current view */
    void goPreviousMonth();
    void toggleExpand();
    void toggleDateNavigatorWidget();
    void toggleAllDaySize();
    void dialogClosing(Incidence *);
  
    /** Look for new messages in the inbox */
    void lookForIncomingMessages();
   /** Look for new messages in the outbox */
    void lookForOutgoingMessages();
    void processMainViewSelection( Incidence * );
    void processTodoListSelection( Incidence * );
    
    void processIncidenceSelection( Incidence * );
    void purgeCompleted();
    bool removeCompletedSubTodos( Todo* );
    void slotCalendarChanged();
    bool importBday();
    bool addAnniversary( QDate data, QString name, KCal::Attendee* a , bool birthday  );
    bool importQtopia( const QString &categoriesFile,
                       const QString &datebookFile,
                       const QString &tasklistFile );
    void syncExternal( int mode );
    void slotSelectPickerDate( QDate ) ;
-    void showDatePicker( ) ;
+    void showDatePicker() ;
+    void showDatePickerPopup() ;
    void moveIncidence(Incidence *) ;
    void beamIncidence(Incidence *) ;
    void beamCalendar() ;
    void beamFilteredCalendar() ;
    void beamIncidenceList(QPtrList<Incidence>) ;
    void manageCategories();
    int addCategories();
    void removeCategories();
    void setSyncDevice( QString );
    void setSyncName( QString );
    void showDay( QDate );
    void undo_delete();
  protected slots:
    void timerAlarm();
    void suspendAlarm();
    void beamDone( Ir *ir );
    /** Select a view or adapt the current view to display the specified dates. */
    void showDates( const KCal::DateList & );
    void selectWeekNum ( int );
  
  public:
    // show a standard warning
    // returns KMsgBox::yesNoCancel()
    int msgCalModified(); 
    virtual bool sync(KSyncManager* manager, QString filename, int mode);
    virtual bool syncExternal(KSyncManager* manager, QString resource);
    virtual void removeSyncInfo( QString syncProfile);
    void setSyncManager(KSyncManager* manager);
    void setLoadedFileVersion(QDateTime);
    bool checkFileVersion(QString fn);
    bool checkFileChanged(QString fn);
    Event* getLastSyncEvent();
    /** Adapt navigation units correpsonding to step size of navigation of the
     * current view.
     */
    void adaptNavigationUnits();
    bool synchronizeCalendar( Calendar* local,  Calendar* remote, int mode );
    int  takeEvent( Incidence* local,  Incidence* remote, int mode, bool full = false );
    //Attendee* getYourAttendee(Event *event);
    void setBlockShowDates( bool b ) { mBlockShowDates = b ;}
  protected:
    void schedule(Scheduler::Method, Incidence *incidence = 0);
    
    // returns KMsgBox::OKCandel()
    int msgItemDelete(const QString name);
    void showEventEditor();
    void showTodoEditor();
    void writeLocale();
    Todo *selectedTodo();
  private:
    bool mBlockShowDates;
    KSyncManager* mSyncManager;
    AlarmDialog * mAlarmDialog;
    QString mAlarmNotification;
    QString mSuspendAlarmNotification;
    QTimer* mSuspendTimer;
    QTimer* mAlarmTimer;
    QTimer* mRecheckAlarmTimer;
    void computeAlarm( QString );
    void startAlarm( QString, QString );
    void setSyncEventsReadOnly();
    
    QDateTime loadedFileVersion;
    void checkExternSyncEvent( QPtrList<Event> lastSync , Incidence* toDelete );
    void checkExternalId( Incidence * inc );
    int mGlobalSyncMode;
    QString  mCurrentSyncDevice;
    QString  mCurrentSyncName;
    KOBeamPrefs* beamDialog;
    void init();
    int mDatePickerMode;
    bool mFlagEditDescription;
    QDateTime mLastCalendarSync;
    void createPrinter();
    void calendarModified( bool, Calendar * );
    CalPrinter *mCalPrinter;
    QSplitter    *mPanner;
    QSplitter    *mLeftSplitter;
    QWidget      *mLeftFrame;
    QWidgetStack *mRightFrame;
    KDatePicker* mDatePicker;
    QVBox* mDateFrame;
    KDateNavigator *mDateNavigator;       // widget showing small month view.
    KOFilterView *mFilterView;
    ResourceView *mResourceView;
    // calendar object for this viewing instance
    Calendar      *mCalendar;
    CalendarResourceManager *mResourceManager;
    FileStorage *mStorage;
    DateNavigator *mNavigator;
    KOViewManager *mViewManager;
    KODialogManager *mDialogManager;
    // Calendar filters
    QPtrList<CalFilter> mFilters;
    // various housekeeping variables.
            bool            mModified;   // flag indicating if calendar is modified
    bool            mReadOnly; // flag indicating if calendar is read-only
    QDate mSaveSingleDate;
    Incidence *mSelectedIncidence;
    Incidence *mMoveIncidence;
    QDate mMoveIncidenceOldDate;
    KOTodoView *mTodoList;
    KOEventEditor * mEventEditor;
    KOTodoEditor  * mTodoEditor;
    KOEventViewerDialog * mEventViewerDialog;
    void keyPressEvent ( QKeyEvent *e) ;
    //QMap<Incidence*,KOIncidenceEditor*> mDialogList;
 };
 class CalendarViewVisitor : public Incidence::Visitor
 {
  public:
    CalendarViewVisitor() : mView( 0 ) {}
    bool act( Incidence *incidence, CalendarView *view )
    {
      mView = view;
      return incidence->accept( *this );
    }
    
  protected:
    CalendarView *mView;
 };
 class ShowIncidenceVisitor : public CalendarViewVisitor
 {
  protected:
    bool visit( Event *event ) { mView->showEvent( event ); return true; }  
    bool visit( Todo *todo ) { mView->showTodo( todo ); return true; }  
    bool visit( Journal * j ) { mView->showJournal( j );return true; }
 };
 class EditIncidenceVisitor : public CalendarViewVisitor
 {
  protected:
    bool visit( Event *event ) { mView->editEvent( event ); return true; }  
    bool visit( Todo *todo ) { mView->editTodo( todo ); return true; }  
    bool visit( Journal *j ) {  mView->editJournal( j); return true; }
 };
 class DeleteIncidenceVisitor : public CalendarViewVisitor
 {
  protected:
    bool visit( Event *event ) { mView->deleteEvent( event ); return true; }  
    bool visit( Todo *todo ) { mView->deleteTodo( todo ); return true; }  
    bool visit( Journal * j) {mView->deleteJournal( j ); return true; }
 };
 #endif
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 6ae4c6f..02d2585 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -672,514 +672,517 @@ void MonthViewCell::enableScrollBars( bool enabled )
        mItemList->setVScrollBarMode(QScrollView::AlwaysOff);
        mItemList->setHScrollBarMode(QScrollView::AlwaysOff);
    }
 }
 Incidence *MonthViewCell::selectedIncidence()
 {
    int index = mItemList->currentItem();
    if ( index < 0 ) return 0;
  
    MonthViewItem *item =
        static_cast<MonthViewItem *>( mItemList->item( index ) );
    if ( !item ) return 0;
  
    return item->incidence();
 }
 QDate MonthViewCell::selectedIncidenceDate()
 {
    QDate qd;
    int index = mItemList->currentItem();
    if ( index < 0 ) return qd;
  
    MonthViewItem *item =
        static_cast<MonthViewItem *>( mItemList->item( index ) );
    if ( !item ) return qd;
  
    return item->incidenceDate();
 }
 void MonthViewCell::deselect()
 {
    mItemList->clearSelection();
    enableScrollBars( false );
    // updateCell();
 }
 void MonthViewCell::select()
 {
    ;// updateCell();
 }
 void MonthViewCell::resizeEvent ( QResizeEvent * )
 {
    if ( !mMonthView->isUpdatePossible() )
        return;
    int size = height() - mLabel->height() - 2;
    if ( size > 0 )
        mItemList->verticalScrollBar()->setMaximumHeight( size );
    size = width() - mLabel->width() -2;
    if ( size > 0 )
        mItemList->horizontalScrollBar()->setMaximumWidth( size );
    mLabel->move( width()-mItemList->lineWidth() - mLabel->width(), height()-mItemList->lineWidth() - mLabel->height() );
    //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
 }
 void MonthViewCell::defaultAction( QListBoxItem *item )
 {
    if ( !item ) return;
    MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
    Incidence *incidence = eventItem->incidence();
    if ( incidence ) mMonthView->defaultAction( incidence );
 }
 void MonthViewCell::showDay()
 {
    emit showDaySignal( date() );
 }
 void MonthViewCell::newEvent()
 {
    QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
    emit newEventSignal( dt );
 }
 void MonthViewCell::cellClicked( QListBoxItem *item )
 {
    static  QListBoxItem * lastClicked = 0;
    if ( item == 0 ) {
        QDateTime dt( date(), QTime( KOPrefs::instance()->mStartTime, 0 ) );
        emit newEventSignal( dt );
        return;
    }
    /*
      if ( lastClicked )
      if ( ! item ) {
      if ( lastClicked->listBox() != item->listBox() )
      lastClicked->listBox()->clearSelection();
      }
    */
 
    mMonthView->setSelectedCell( this );
    if( KOPrefs::instance()->mEnableMonthScroll || KOPrefs::instance()->mMonthViewWeek ) enableScrollBars( true );
    select();
 }
 void MonthViewCell::contextMenu( QListBoxItem *item )
 {
    if ( !item ) return;
  
    MonthViewItem *eventItem = static_cast<MonthViewItem *>( item );
    Incidence *incidence = eventItem->incidence();
    if ( incidence ) mMonthView->showContextMenu( incidence );
 }
 void MonthViewCell::selection( QListBoxItem *item )
 {
    if ( !item ) return;
    mMonthView->setSelectedCell( this );
 }
 // *******************************************************************************
 // *******************************************************************************
 // *******************************************************************************
 KOMonthView::KOMonthView(Calendar *calendar, QWidget *parent, const char *name)
    : KOEventView( calendar, parent, name ),
      mDaysPerWeek( 7 ), mNumWeeks( 6 ), mNumCells( mDaysPerWeek * mNumWeeks ),
      mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
 {
    mShortDayLabelsM = false;
    mShortDayLabelsW = false;
    skipResize = false;
    clPending = true;
    mNavigatorBar = new NavigatorBar( QDate::currentDate(), this, "useBigPixmaps" );
    mWidStack = new QWidgetStack( this );
    QVBoxLayout* hb = new QVBoxLayout( this );
    mMonthView = new QWidget( mWidStack );
    mWeekView = new QWidget( mWidStack );
 #if QT_VERSION >= 0x030000
    mWidStack->addWidget(mMonthView );
    mWidStack->addWidget(mWeekView  );
 #else
    mWidStack->addWidget( mMonthView, 1 );
    mWidStack->addWidget( mWeekView , 1 );
 #endif
    hb->addWidget( mNavigatorBar );
    hb->addWidget( mWidStack );
    mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
    mShowWeekView = KOPrefs::instance()->mMonthViewWeek;
    if ( mShowWeekView )
        mWeekStartsMonday = true;
    updatePossible = false;
    //updatePossible = true;
    mCells.setAutoDelete( true );
    mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
    mDayLabels.resize( mDaysPerWeek );
    mDayLabelsW.resize( mDaysPerWeek );
    QFont bfont = font();
    if ( QApplication::desktop()->width() < 650 ) {
        bfont.setPointSize( bfont.pointSize() - 2 );
    }
    bfont.setBold( true );
    int i;
  
    for( i = 0; i < mDaysPerWeek; i++ ) {
        QLabel *label = new QLabel( mMonthView );
        label->setFont(bfont);
        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        label->setLineWidth(1);
        label->setAlignment(AlignCenter);
        mDayLabels.insert( i, label );
        label = new QLabel( mWeekView );
        label->setFont(bfont);
        label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        label->setLineWidth(1);
        label->setAlignment(AlignCenter);
        mDayLabelsW.insert( i, label );
    }
    bfont.setBold( false );
    mWeekLabels.resize( mNumWeeks+1 );
    mWeekLabelsW.resize( 2 );
    for( i = 0; i < mNumWeeks+1; i++ ) {
        KOWeekButton *label = new KOWeekButton( mMonthView );
        label->setFocusPolicy(NoFocus); 
        label->setFont(bfont);
        connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
        label->setFlat(true);
        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
        //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        //label->setLineWidth(1);
        //label->setAlignment(AlignCenter);
        mWeekLabels.insert( i, label );
    }
    mWeekLabels[mNumWeeks]->setText( i18n("W"));
    QWhatsThis::add(mWeekLabels[mNumWeeks],i18n("Click on this to\nselect week number"));
    
    for( i = 0; i < 1+1; i++ ) {
        KOWeekButton *label = new KOWeekButton( mWeekView );
        label->setFocusPolicy(NoFocus); 
        label->setFont(bfont);
        connect( label, SIGNAL( selectWeekNum ( int )),this, SLOT( selectInternalWeekNum ( int ))   );  
        label->setFlat(true);
        QWhatsThis::add(label,i18n("Click on the week number to\nshow week zoomed"));
        //label->setFrameStyle(QFrame::Panel|QFrame::Raised);
        //label->setLineWidth(1);
        //label->setAlignment(AlignCenter);
        mWeekLabelsW.insert( i, label );
    }
    mWeekLabelsW[1]->setText( i18n("W"));
    int row, col;
    mCells.resize( mNumCells );
    for( row = 0; row < mNumWeeks; ++row ) {
        for( col = 0; col < mDaysPerWeek; ++col ) {
            MonthViewCell *cell = new MonthViewCell( this, mMonthView );
            mCells.insert( row * mDaysPerWeek + col, cell );
            connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                     SLOT( defaultAction( Incidence * ) ) );
            connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                     SIGNAL( newEventSignal( QDateTime ) ) );
            connect( cell, SIGNAL( showDaySignal( QDate ) ),
                     SIGNAL( showDaySignal( QDate ) ) );
        }
    }
    mCellsW.resize( mDaysPerWeek );
    for( col = 0; col < mDaysPerWeek; ++col ) {
        MonthViewCell *cell = new MonthViewCell( this, mWeekView );
        mCellsW.insert( col, cell );
        connect( cell, SIGNAL( defaultAction( Incidence * ) ),
                 SLOT( defaultAction( Incidence * ) ) );
        connect( cell, SIGNAL( newEventSignal( QDateTime ) ),
                 SIGNAL( newEventSignal( QDateTime ) ) );
        connect( cell, SIGNAL( showDaySignal( QDate ) ),
                 SIGNAL( showDaySignal( QDate ) ) );
        cell->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont );
    }
    //connect( mWeekLabels[mNumWeeks], SIGNAL( clicked() ), SLOT( switchView() ) );
    mContextMenu = eventPopup();
    // updateConfig(); //useless here...
    // ... but we need mWidthLongDayLabel computed
    QFontMetrics fontmetric(mDayLabels[0]->font());
    mWidthLongDayLabel = 0;
    for (int i = 0; i < 7; i++) {
        int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
        if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
    }
    //mWeekLabels[mNumWeeks]->setText( i18n("W"));
    if ( mShowWeekView )
        mWidStack->raiseWidget( mWeekView );
    else
        mWidStack->raiseWidget( mMonthView );
    emit incidenceSelected( 0 );
 #ifndef DESKTOP_VERSION
    resize( QApplication::desktop()->size() );
-    computeLayout();
+#else
+    resize(640, 480 );
 #endif
+    computeLayout();
 }
 KOMonthView::~KOMonthView()
 {
    delete mContextMenu;
 }
 void KOMonthView::selectInternalWeekNum ( int n )
 {
    switchView();
    emit selectWeekNum ( n );
 }
 int KOMonthView::currentWeek()
 {
    if ( mShowWeekView )
        return mWeekLabelsW[0]->getWeekNum();
    return mWeekLabels[0]->getWeekNum();
 }
 void KOMonthView::switchView()
 {
    if ( selectedCell( ) )
        selectedCell()->deselect();
    mShowWeekView = !mShowWeekView;
    KOPrefs::instance()->mMonthViewWeek = mShowWeekView;
    if ( clPending ) {
      computeLayout();
      updateConfig();
    }
    if ( mShowWeekView )
        mWidStack->raiseWidget( mWeekView );
    else
        mWidStack->raiseWidget( mMonthView ); 
    clPending = false;
 }
 int KOMonthView::maxDatesHint()
 {
    return mNumCells;
 }
 int KOMonthView::currentDateCount()
 {
    return mNumCells;
 }
 QPtrList<Incidence> KOMonthView::selectedIncidences()
 {
    QPtrList<Incidence> selected;
    if ( mSelectedCell ) {
        Incidence *incidence = mSelectedCell->selectedIncidence();
        if ( incidence ) selected.append( incidence );
    }
    return selected;
 }
 DateList KOMonthView::selectedDates()
 {
    DateList selected;
    if ( mSelectedCell ) {
        QDate qd = mSelectedCell->selectedIncidenceDate();
        if ( qd.isValid() ) selected.append( qd );
    }
    return selected;
 }
 void KOMonthView::printPreview(CalPrinter *calPrinter, const QDate &fd,
                               const QDate &td)
 {
 #ifndef KORG_NOPRINTER
    calPrinter->preview(CalPrinter::Month, fd, td);
 #endif
 }
 void KOMonthView::updateConfig()
 {
 
    mWeekStartsMonday = KGlobal::locale()->weekStartsMonday();
    if ( mShowWeekView ) {
        mWeekStartsMonday = true;
    } 
    QFontMetrics fontmetric(mDayLabels[0]->font());
    mWidthLongDayLabel = 0;
    for (int i = 0; i < 7; i++) {
        int width = fontmetric.width(KOGlobals::self()->calendarSystem()->weekDayName(i+1));
        if ( width > mWidthLongDayLabel ) mWidthLongDayLabel = width;
    }
    bool temp = mShowSatSunComp ;
    mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ;
    if ( !  mShowWeekView ) {
        if ( temp != KOPrefs::instance()->mMonthViewSatSunTog )
            computeLayout();
    }
    updateDayLabels();
    //qDebug("KOMonthView::updateConfig() %d %d %d ",height(), mDayLabels[0]->sizeHint().height() ,mNumWeeks);
    //int cellHeight = (height() - mDayLabels[0]->sizeHint().height()) /mNumWeeks;
    //resizeEvent( 0 );
    for (uint i = 0; i < mCells.count(); ++i) {
        mCells[i]->updateConfig();
    }
    for (uint i = 0; i < mCellsW.count(); ++i) {
        mCellsW[i]->updateConfig(KOPrefs::instance()->mMonthViewUsesBigFont);
    }
 #ifdef DESKTOP_VERSION
    MonthViewCell::toolTipGroup()->setEnabled(KOPrefs::instance()->mEnableToolTips); 
 #endif
    updateView();
 }
 void KOMonthView::updateDayLabels()
 {
  
    QPtrVector<QLabel> *mDayLabelsT;
    mDayLabelsT = &mDayLabelsW;
    for (int i = 0; i < 7; i++) {
        if (mWeekStartsMonday) {
            bool show = mShortDayLabelsW;
            if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                show = true;
            (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
        } else {
            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
        }
    }
    mDayLabelsT = &mDayLabels;
    for (int i = 0; i < 7; i++) {
        if (mWeekStartsMonday) {
            bool show = mShortDayLabelsM;
            if ( i > 4 && mShowSatSunComp && mWidthLongDayLabel > (*mDayLabelsT)[i]->width()  )
                show = true;
            (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i+1,show));
        } else {
            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsM));
        }
    }
 }
 void KOMonthView::showDates(const QDate &start, const QDate &)
 {
    //  kdDebug() << "KOMonthView::showDates(): " << start.toString() << endl;
    QPtrVector<MonthViewCell> *cells;
    QPtrVector<QLabel> *dayLabels;
    QPtrVector<KOWeekButton> *weekLabels;
    int weekNum = 6;
    if ( mShowWeekView ) {
        weekNum = 1;
        cells = &mCellsW;
        dayLabels = &mDayLabelsW;
        weekLabels = &mWeekLabelsW;
    } else {
        cells = &mCells;
        dayLabels = &mDayLabels;
        weekLabels = &mWeekLabels;
    }
    mStartDate = start;
    int startWeekDay = mWeekStartsMonday ? 1 : 7;
    while( KOGlobals::self()->calendarSystem()->dayOfWeek(mStartDate) != startWeekDay ) {
        mStartDate = mStartDate.addDays( -1 );
    }
    bool primary = false;
    uint i;
    for( i = 0; i < (*cells).size(); ++i ) {
        QDate date = mStartDate.addDays( i );
        (*cells)[i]->setDate( date );
 #ifndef KORG_NOPLUGINS
        // add holiday, if present
        QString hstring(KOCore::self()->holiday(date));
        (*cells)[i]->setHoliday( hstring );
 #endif
    }
    QDate date = mStartDate.addDays( mWeekStartsMonday ? 3 : 4 );
    for( i = 0; i < weekNum; ++i ) {
        int wno;
        // remember, according to ISO 8601, the first week of the year is the
        // first week that contains a thursday.  Thus we must subtract off 4,
        // not just 1.
        int dayOfYear = date.dayOfYear();
        if (dayOfYear % 7 != 0)
            wno = dayOfYear / 7 + 1;
        else
            wno =dayOfYear / 7;
        (*weekLabels)[i]->setWeekNum( wno );
        date = date.addDays( 7 );
    }
    updateView();
 }
 void KOMonthView::showEvents(QPtrList<Event>)
 {
    qDebug("KOMonthView::selectEvents is not implemented yet. ");
 }
 void KOMonthView::changeEventDisplay(Event *, int)
 {
    // this should be re-written to be much more efficient, but this
    // quick-and-dirty-hack gets the job done for right now.
    updateView();
 }
 void KOMonthView::updateView()
 { 
    if ( !updatePossible )
        return;
    //QTime ti;
    //ti.start();
    QPtrVector<MonthViewCell> *cells;
    if ( mShowWeekView ) {
        cells = &mCellsW;
    } else {
        cells = &mCells;
    }
 #if 1
    int i;
    int timeSpan = (*cells).size()-1;
    if ( KOPrefs::instance()->mMonthViewWeek )         
        timeSpan = 6;
    for( i = 0; i < timeSpan + 1; ++i ) {
        (*cells)[i]->startUpdateCell();
    }
 
    QPtrList<Event> events = calendar()->events();
    Event *event;
    QDateTime dt;
    bool ok;
    QDate endDate =  mStartDate.addDays( timeSpan );
    for( event = events.first(); event; event = events.next() ) { // for event
        if ( event->doesRecur() ) {
            bool last;
            QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
            QDateTime incidenceEnd;
            int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
            bool invalid = false;
            while( true ) {
                    if ( incidenceStart.isValid() ) {
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 576c265..5bfe2a1 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -1,426 +1,430 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 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 <time.h>
 #ifndef _WIN32_
 #include <unistd.h>
 #endif
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qstring.h>
 #include <qregexp.h>
 #include <qfont.h>
 #include <qcolor.h>
 #include <qstringlist.h>
 #include <stdlib.h>
 #include <kglobal.h>
+#include <kglobalsettings.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <kstaticdeleter.h>
 #include <libkdepim/kpimglobalprefs.h>
 #include "koprefs.h"
 #include "mainwindow.h"
 KOPrefs *KOPrefs::mInstance = 0;
 static KStaticDeleter<KOPrefs> insd;
 KOPrefs::KOPrefs() :
  KPimPrefs("korganizerrc")
 {
  mCategoryColors.setAutoDelete(true);
  fillMailDefaults();
  mDefaultCategoryColor           = QColor(175,210,255);//196,196,196);
  QColor defaultHolidayColor      = QColor(255,0,0);
  QColor defaultHighlightColor    = QColor(129,112,255);//64,64,255);
  QColor defaultAgendaBgColor     = QColor(239,241,169);//128,128,128);
  QColor defaultWorkingHoursColor = QColor(170,223,150);//160,160,160);
  QColor defaultTodoDueTodayColor = QColor(255,220,100);
  QColor defaultTodoOverdueColor  = QColor(255,153,125);
+  /*
  mTimeBarFont = QFont("helvetica",10);//,QFont::Bold);
  mDefaultViewFont = QFont("helvetica",10);
  mDefaultMonthViewFont = QFont("helvetica",8);
  mMarcusBainsFont= QFont("helvetica",10);
  mDateNavigatorFont= QFont("helvetica",10, QFont::Bold);
  mEditBoxFont = QFont("helvetica",12);
  mJornalViewFont = QFont("helvetica",12);
+  */
  KPrefs::setCurrentGroup("General");
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("ShowIconNewTodo",&mShowIconNewTodo,true);
  addItemBool("ShowIconNewEvent",&mShowIconNewEvent,true);
  addItemBool("ShowIconSearch",&mShowIconSearch,true);
  addItemBool("ShowIconList",&mShowIconList,true);
  addItemBool("ShowIconDay1",&mShowIconDay1,true);
  addItemBool("ShowIconDay5",&mShowIconDay5,true);
  addItemBool("ShowIconDay7",&mShowIconDay7,true);
  addItemBool("ShowIconMonth",&mShowIconMonth,true);
  addItemBool("ShowIconTodoview",&mShowIconTodoview,true);
  addItemBool("ShowIconBackFast",&mShowIconBackFast,true);
  addItemBool("ShowIconBack",&mShowIconBack,true);
  addItemBool("ShowIconToday",&mShowIconToday,true);
  addItemBool("ShowIconForward",&mShowIconForward,true);
  addItemBool("ShowIconForwardFast",&mShowIconForwardFast,true);
  addItemBool("ShowIconWhatsThis",&mShowIconWhatsThis,true);
  addItemBool("ShowIconNextDays",&mShowIconNextDays,true);
  addItemBool("ShowIconNext",&mShowIconNext,true);
  addItemBool("ShowIconJournal",&mShowIconJournal,true); 
  addItemBool("ShowIconStretch",&mShowIconStretch,true); 
  addItemInt("LastLoadedLanguage",&mOldLanguage,0);
  addItemBool("AskForQuit",&mAskForQuit,false); 
 #ifndef DESKTOP_VERSION
  addItemBool("ShowFullMenu",&mShowFullMenu,false); 
 #else
  addItemBool("ShowFullMenu",&mShowFullMenu,true); 
 #endif
  addItemBool("ToolBarHor",&mToolBarHor, true );
  addItemBool("ToolBarUp",&mToolBarUp, false );
  addItemBool("ToolBarMiniIcons",&mToolBarMiniIcons, false );
  addItemInt("Whats Next Days",&mWhatsNextDays,3);
  addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
  addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
  addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
  addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
  addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
  addItemInt("AllDay Size",&mAllDaySize,28);
  QString defAlarm = KGlobal::iconLoader()->iconPath()+"koalarm.wav";
  addItemString("DefaultAlarmFile",&mDefaultAlarmFile,defAlarm );
  addItemStringList("LocationDefaults",&mLocationDefaults );
  addItemStringList("EventSummary User",&mEventSummaryUser);
  addItemStringList("TodoSummary User",&mTodoSummaryUser);
  addItemBool("Enable Group Scheduling",&mEnableGroupScheduling,false);
  addItemBool("Enable Project View",&mEnableProjectView,false);
  addItemBool("Auto Save",&mAutoSave,false);
  addItemInt("Auto Save Interval",&mAutoSaveInterval,3);
  addItemBool("Confirm Deletes",&mConfirm,true);
  addItemString("Archive File",&mArchiveFile);
  addItemString("Html Export File",&mHtmlExportFile,
      QDir::homeDirPath() + "/" + i18n("Default export file", "calendar.html"));
  addItemBool("Html With Save",&mHtmlWithSave,false);
  KPrefs::setCurrentGroup("Personal Settings");
  addItemInt("Mail Client",&mMailClient,MailClientKMail);
  addItemBool("Use Control Center Email",&mEmailControlCenter,false);
  addItemBool("Bcc",&mBcc,false);
  KPrefs::setCurrentGroup("Time & Date");
  addItemInt("Default Start Time",&mStartTime,10);
  addItemInt("Default Duration",&mDefaultDuration,2);
  addItemInt("Default Alarm Time",&mAlarmTime,3);
  KPrefs::setCurrentGroup("AlarmSettings");
  addItemInt("AlarmPlayBeeps",&mAlarmPlayBeeps,20);
  addItemInt("AlarmSuspendTime",&mAlarmSuspendTime,7);
  addItemInt("AlarmSuspendCount",&mAlarmSuspendCount,5);
  addItemInt("AlarmBeepInterval",&mAlarmBeepInterval,3);
  KPrefs::setCurrentGroup("Calendar");
  addItemInt("Default Calendar Format",&mDefaultFormat,FormatICalendar);
  KPrefs::setCurrentGroup("Fonts");
  // qDebug(" KPrefs::setCurrentGroup(Fonts); ");
-  addItemFont("TimeBar Font",&mTimeBarFont);
+  addItemFont("TimeBar Font",&mTimeBarFont,KGlobalSettings::generalFont() );
-  addItemFont("MonthView Font",&mMonthViewFont);
+  addItemFont("MonthView Font",&mMonthViewFont,KGlobalSettings::generalFont());
-  addItemFont("AgendaView Font",&mAgendaViewFont);
+  addItemFont("AgendaView Font",&mAgendaViewFont,KGlobalSettings::generalFont());
-  addItemFont("MarcusBains Font",&mMarcusBainsFont);
+  addItemFont("MarcusBains Font",&mMarcusBainsFont,KGlobalSettings::generalFont());
-  addItemFont("TimeLabels Font",&mTimeLabelsFont);
+  addItemFont("TimeLabels Font",&mTimeLabelsFont,KGlobalSettings::generalFont());
-  addItemFont("TodoView Font",&mTodoViewFont);
+  addItemFont("TodoView Font",&mTodoViewFont,KGlobalSettings::generalFont());
-  addItemFont("ListView Font",&mListViewFont);
+  addItemFont("ListView Font",&mListViewFont,KGlobalSettings::generalFont());
-  addItemFont("DateNavigator Font",&mDateNavigatorFont);
+  addItemFont("DateNavigator Font",&mDateNavigatorFont,KGlobalSettings::generalFont());
-  addItemFont("EditBox Font",&mEditBoxFont);
+  addItemFont("EditBox Font",&mEditBoxFont,KGlobalSettings::generalFont());
-  addItemFont("JournalView Font",&mJornalViewFont);
+  addItemFont("JournalView Font",&mJornalViewFont,KGlobalSettings::generalFont());
-  addItemFont("WhatsNextView Font",&mWhatsNextFont);
+  addItemFont("WhatsNextView Font",&mWhatsNextFont,KGlobalSettings::generalFont());
-  addItemFont("EventView Font",&mEventViewFont);
+  addItemFont("EventView Font",&mEventViewFont,KGlobalSettings::generalFont());
  KPrefs::setCurrentGroup("RemoteSyncing");
  addItemString("ActiveSyncPort",&mActiveSyncPort,"9197" );  
  addItemString("ActiveSyncIP",&mActiveSyncIP,"192.168.0.40" ); 
  addItemBool("ShowSyncEvents",&mShowSyncEvents,false); 
  addItemInt("LastSyncTime",&mLastSyncTime,0); 
 #ifdef _WIN32_
  QString hdp= locateLocal("data","korganizer")+"\\\\";
 #else
  QString hdp= locateLocal("data","korganizer")+"/";
 #endif
  KPrefs::setCurrentGroup("LoadSaveFileNames");
  addItemString("LastImportFile", &mLastImportFile ,hdp +"import.ics" );
  addItemString("LastVcalFile", &mLastVcalFile ,hdp +"export.vcs" );
  addItemString("LastSaveFile", &mLastSaveFile ,hdp +"mybackup.ics" );
  addItemString("LastLoadFile", &mLastLoadFile ,hdp +"mybackup.ics" );
 
  KPrefs::setCurrentGroup("Locale");
  addItemBool("ShortDateInViewer",&mShortDateInViewer,false); 
  KPrefs::setCurrentGroup("Colors");
  addItemColor("Holiday Color",&mHolidayColor,defaultHolidayColor);
  addItemColor("Highlight Color",&mHighlightColor,defaultHighlightColor);
  addItemColor("Event Color",&mEventColor,mDefaultCategoryColor);
  addItemColor("Todo done Color",&mTodoDoneColor,QColor(111,255,115) );
  addItemColor("Agenda Background Color",&mAgendaBgColor,defaultAgendaBgColor);
  addItemColor("WorkingHours Color",&mWorkingHoursColor,defaultWorkingHoursColor);
  addItemColor("Todo due today Color",&mTodoDueTodayColor,defaultTodoDueTodayColor);
  addItemColor("Todo overdue Color",&mTodoOverdueColor,defaultTodoOverdueColor);
  addItemColor("MonthViewEvenColor",&mMonthViewEvenColor,QColor( 160,160,255 ));
  addItemColor("MonthViewOddColor",&mMonthViewOddColor,QColor( 160,255,160 ));
  addItemColor("MonthViewHolidayColor",&mMonthViewHolidayColor,QColor( 255,160,160 ));
  addItemBool("MonthViewUsesDayColors",&mMonthViewUsesDayColors,true); 
  addItemBool("MonthViewSatSunTog",&mMonthViewSatSunTog,true);
  addItemBool("MonthViewWeek",&mMonthViewWeek,false);
  addItemBool("HightlightDateTimeEdit",&mHightlightDateTimeEdit,false); 
  addItemColor("AppColor1",&mAppColor1,QColor( 130,170,255 ));
  addItemColor("AppColor2",&mAppColor2,QColor(  174,216,255 ));
  addItemBool("UseAppColors",&mUseAppColors,false); 
  
  KPrefs::setCurrentGroup("Views");
  addItemBool("Show Date Navigator",&mShowDateNavigator,true);
  addItemInt("Hour Size",&mHourSize,8);
  addItemBool("Show Daily Recurrences",&mDailyRecur,true);
  addItemBool("Show Weekly Recurrences",&mWeeklyRecur,true);
  addItemBool("Show Month Daily Recurrences",&mMonthDailyRecur,true);
  addItemBool("Show Month Weekly Recurrences",&mMonthWeeklyRecur,true);
  addItemBool("ShowShortMonthName",&mMonthShowShort,false);
  addItemBool("ShowIconsInMonthCell",&mMonthShowIcons,true);
 #ifdef DESKTOP_VERION
  addItemBool("Enable ToolTips",&mEnableToolTips,true);
 #else
  addItemBool("Enable ToolTips",&mEnableToolTips,false);
 #endif
  addItemBool("Enable MonthView ScrollBars",&mEnableMonthScroll,false);
  addItemBool("Marcus Bains shows seconds",&mMarcusBainsShowSeconds,false);
  addItemBool("Show Marcus Bains",&mMarcusBainsEnabled,true);
  addItemBool("EditOnDoubleClick",&mEditOnDoubleClick,true);
  addItemBool("ViewChangeHoldFullscreen",&mViewChangeHoldFullscreen,true);
  addItemBool("ViewChangeHoldNonFullscreen",&mViewChangeHoldNonFullscreen,false);
  addItemBool("CenterOnCurrentTime",&mCenterOnCurrentTime,false);
  addItemBool("SetTimeToDayStartAt",&mSetTimeToDayStartAt,true);
  addItemBool("HighlightCurrentDay",&mHighlightCurrentDay,true);
  addItemBool("WNViewShowsParents",&mWNViewShowsParents,true);;
  addItemBool("WNViewShowsPast",&mWNViewShowsPast,true);
  addItemBool("WNViewShowLocation",&mWNViewShowLocation,false);
  addItemBool("UseHighlightLightColor",&mUseHighlightLightColor,false);
  addItemBool("ListViewMonthTimespan",&mListViewMonthTimespan,true);
  addItemBool("TodoViewUsesCatColors",&mTodoViewUsesCatColors,false);
  addItemBool("TodoViewShowsPercentage",&mTodoViewShowsPercentage,false);
  addItemBool("TodoViewUsesSmallFont",&mTodoViewUsesSmallFont,true);
  addItemBool("MonthViewUsesBigFont",&mMonthViewUsesBigFont,true);
  addItemBool("TodoViewUsesForegroundColor",&mTodoViewUsesForegroundColor,false);
  addItemBool("MonthViewUsesForegroundColor",&mMonthViewUsesForegroundColor,false);
 #ifdef DESKTOP_VERSION
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,true);
 #else
  addItemBool("UseInternalAlarmNotification",&mUseInternalAlarmNotification,false);
 #endif
  addItemInt("Day Begins",&mDayBegins,7);
  addItemInt("Working Hours Start",&mWorkingHoursStart,8);
  addItemInt("Working Hours End",&mWorkingHoursEnd,17);
  addItemBool("Exclude Holidays",&mExcludeHolidays,true);
  addItemBool("Exclude Saturdays",&mExcludeSaturdays,true);
  addItemBool("Month View Uses Category Color",&mMonthViewUsesCategoryColor,false);
  addItemBool("Full View Month",&mFullViewMonth,true);
  addItemBool("Full View Todo",&mFullViewTodo,true);
  addItemBool("Quick Todo",&mEnableQuickTodo,false);
  addItemInt("Next X Days",&mNextXDays,3);
  KPrefs::setCurrentGroup("Printer");
  KPrefs::setCurrentGroup("Layout");
  addItemBool("CompactDialogs",&mCompactDialogs,false);
  addItemBool("VerticalScreen",&mVerticalScreen,true);
  KPrefs::setCurrentGroup("KOrganizer Plugins");
  addItemStringList("SelectedPlugins",&mSelectedPlugins,"holidays");
  KPrefs::setCurrentGroup("Group Scheduling");
  addItemInt("IMIPScheduler",&mIMIPScheduler,IMIPKMail);
  addItemInt("IMIPSend",&mIMIPSend,IMIPdirectsend);
  addItemStringList("AdditionalMails",&mAdditionalMails,"");
  addItemInt("IMIP auto refresh",&mIMIPAutoRefresh,neverAuto);
  addItemInt("IMIP auto insert request",&mIMIPAutoInsertRequest,neverAuto);
  addItemInt("IMIP auto insert reply",&mIMIPAutoInsertReply,neverAuto);
  addItemInt("IMIP auto FreeBusy",&mIMIPAutoFreeBusy,neverAuto);
  addItemInt("IMIP auto save FreeBusy",&mIMIPAutoFreeBusyReply,neverAuto);
  KPrefs::setCurrentGroup( "Editors" );
  addItemStringList( "EventTemplates", &mEventTemplates );
  addItemStringList( "TodoTemplates", &mTodoTemplates );
  addItemInt("DestinationPolicy",&mDestination,standardDestination);
 }
 KOPrefs::~KOPrefs()
 {
  if (mInstance == this)
      mInstance = insd.setObject(0); 
 
  //qDebug("KOPrefs::~KOPrefs() ");
 }
 KOPrefs *KOPrefs::instance()
 {
  if (!mInstance) {
      mInstance = insd.setObject(new KOPrefs());
      mInstance->readConfig();
  }
  return mInstance;
 }
 void KOPrefs::usrSetDefaults()
 {
   
 }
 void KOPrefs::fillMailDefaults()
 {
  if (mName.isEmpty()) mName = i18n("Anonymous");
  if (mEmail.isEmpty()) mEmail = i18n("nobody@nowhere");
 }
 void KOPrefs::setTimeZoneIdDefault()
 {
    ;
 }
 void KOPrefs::setAllDefaults()
 {
    setCategoryDefaults();
    mEventSummaryUser  = getDefaultList() ;
    mTodoSummaryUser  = getDefaultList() ;
    mLocationDefaults  = getLocationDefaultList();
 }
 void KOPrefs::setCategoryDefaults()
 {
  mCustomCategories.clear();
  mCustomCategories = getDefaultList();
  QStringList::Iterator it;
  for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
    setCategoryColor(*it,mDefaultCategoryColor);
  }
 }
 QStringList KOPrefs::getLocationDefaultList()
 {
 QStringList retval ;
 retval << i18n("Home") << i18n("Office") << i18n("Library") << i18n("School") << i18n("Doctor") << i18n("Beach") 
        << i18n("University") << i18n("Restaurant")  << i18n("Bar") << i18n("Conference room") 
        << i18n("Cinema")  << i18n("Lake") << i18n("Kindergarten")
        << i18n("Germany") << i18n("Sweden") << i18n("Forest") << i18n("Desert") << i18n("Kitchen") ;
 // << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("") << i18n("")
    retval.sort();
    return retval; 
 }
 QStringList KOPrefs::getDefaultList()
 {
    QStringList retval ;
    retval << i18n("Anniversary") << i18n("Appointment") << i18n("Birthday") << i18n("Business") << i18n("Business Travel") << i18n("Cinema")  << i18n("Customer")
           << i18n("Break")<< i18n("Breakfast")<< i18n("Competition")<< i18n("Dinner")
           << i18n("Education")<< i18n("Family")  << i18n("Favorites")  << i18n("Festival")<< i18n("Fishing")<< i18n("Flight") << i18n("Gifts")  
           << i18n("Holiday") << i18n("Holiday Cards")<< i18n("Hot Contacts") << i18n("Hiking") << i18n("Hunting") << i18n("Key Customer") << i18n("Kids") 
                    << i18n("Lunch")  << i18n("Meeting") << i18n("Miscellaneous") << i18n("Partner")<< i18n("Party") << i18n("Personal") << i18n("Personal Travel")
           << i18n("PHB") << i18n("Phone Calls") << i18n("Projects") << i18n("Recurring") << i18n("School") << i18n("Shopping")
           << i18n("Speach")  << i18n("Special Occasion") << i18n("Sports") << i18n("Talk") << i18n("Travel") << i18n("TV")<< i18n("University")
           << i18n("Vacation") << i18n("VIP") << i18n("SyncEvent")  ;
    retval.sort();
    //qDebug("cat %s ", retval.join("-").latin1());
    return retval; 
 }
 void KOPrefs::usrReadConfig()
 {
    config()->setGroup("General");
    
    //qDebug("KOPrefs::usrReadConfig() ");
    mCustomCategories = config()->readListEntry("Custom Categories");
    mOldLoadedLanguage = mOldLanguage ;
    mOldLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
    if (mLocationDefaults.isEmpty()) {
        mLocationDefaults  = getLocationDefaultList();
    }
       
    if (mEventSummaryUser.isEmpty()) {
        mEventSummaryUser  = getDefaultList() ;
    }
    if (mTodoSummaryUser.isEmpty()) {
        mTodoSummaryUser  = getDefaultList() ;
    }
  
    if (mCustomCategories.isEmpty()) setCategoryDefaults();
    config()->setGroup("Personal Settings");
    mName = config()->readEntry("user_name","");
    mEmail = config()->readEntry("user_email","");
    fillMailDefaults();
    config()->setGroup("Category Colors");
    QStringList::Iterator it;
    for (it = mCustomCategories.begin();it != mCustomCategories.end();++it ) {
        setCategoryColor(*it,config()->readColorEntry(*it,&mDefaultCategoryColor));
   
    }
 
    KPimPrefs::usrReadConfig();
 }
 void KOPrefs::usrWriteConfig()
 {
  config()->setGroup("General");
  config()->writeEntry("Custom Categories",mCustomCategories); 
  
diff --git a/korganizer/ktimeedit.cpp b/korganizer/ktimeedit.cpp
index 5222ac9..61a0931 100644
--- a/korganizer/ktimeedit.cpp
+++ b/korganizer/ktimeedit.cpp
@@ -1,311 +1,313 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 1999 Preston Brown, Ian Dawes
    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 <qkeycode.h>
 #include <qcombobox.h>
 #include <qdatetime.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qapplication.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kpimglobalprefs.h>
 #include "ktimeedit.h"
 #include "koprefs.h"
 #include <qvalidator.h>
 // Validator for a time value with only hours and minutes (no seconds)
 // Mostly locale aware. Author: David Faure <faure@kde.org>
 // KTimeWidget/QTimeEdit provide nicer editing, but don't provide a combobox.
 // Difficult to get all in one...
 // But Qt-3.2 will offer QLineEdit::setMask, so a "99:99" mask would help.
 KOTimeEdit::KOTimeEdit(QWidget *parent, QTime qt, const char *name)
  : QComboBox(TRUE, parent, name)
 {
  setInsertionPolicy(NoInsertion);
    mFlagKeyPressed = false;
+    if ( QApplication::desktop()->height() <= 480 ) {
-    if ( QApplication::desktop()->width() < 650 )
        setSizeLimit ( 6 ); 
-  mTime = qt;
+    } else {
+        setSizeLimit ( 12 ); 
+    }
+    mTime = qt;
 //  mNoTimeString = i18n("No Time");
 //  insertItem( mNoTimeString );
  // Fill combo box with selection of times in localized format.
  QTime timeEntry(0,0,0);
  do {
    insertItem(KGlobal::locale()->formatTime(timeEntry));
    timeEntry = timeEntry.addSecs(60*15);
  } while (!timeEntry.isNull());
  // Add end of day.
  insertItem( KGlobal::locale()->formatTime( QTime( 23, 59, 59 ) ) );
  updateText();
  setFocusPolicy(QWidget::StrongFocus);
  connect(this, SIGNAL(activated(int)), this, SLOT(activ(int)));
  connect(this, SIGNAL(highlighted(int)), this, SLOT(hilit(int)));
  connect(this,SIGNAL(textChanged(const QString&)),this,SLOT(changedText()));
  QFontMetrics fm ( font() );
  QString timeString = "24:00";
  if ( KPimGlobalPrefs::instance()->mPreferredTime == 1 )
      timeString = "02:00pm";
  int addSpace = 32;
  if ( QApplication::desktop()->width() > 320 )
      timeString += ":00";
  setFixedWidth(fm.width( timeString ) + 32 );
  // Highlight Background and Textcolor change from default
  QPalette palette = QWidget::palette();
  unsigned char red, green, blue;
  red = palette.color( QPalette::Normal , QColorGroup::Background ).red() - 10;
  green = palette.color( QPalette::Normal , QColorGroup::Background ).green() - 10;
  blue = palette.color( QPalette::Normal , QColorGroup::Background ).blue() - 10;
  palette.setColor( QColorGroup::Highlight, QColor(red,green,blue) );
  palette.setColor( QColorGroup::HighlightedText, palette.color( QPalette::Normal , QColorGroup::Foreground ) );
  setPalette( palette );
 }
 KOTimeEdit::~KOTimeEdit()
 {
 }
 bool KOTimeEdit::hasTime() const
 {
  // Can't happen
  if ( currentText().isEmpty() ) return false;
  //if ( currentText() == mNoTimeString ) return false;
  return true; // always
 }
 QTime KOTimeEdit::getTime() const
 {
  return KGlobal::locale()->readTime(currentText());
 }
 /*
 QSizePolicy  KOTimeEdit::sizePolicy() const
 {
  // Set size policy to Fixed, because edit cannot contain more text than the
  // string representing the time. It doesn't make sense to provide more space.
  QSizePolicy sizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
  return sizePolicy;
 }
 */
 void KOTimeEdit::setTime(QTime newTime)
 {
  if ( mTime != newTime )
  {
    mTime = newTime;
    updateText();
  }
 }
 void KOTimeEdit::activ(int i)
 {
    // The last entry, 23:59, is a special case
    if( i == count() - 1 )
        mTime = QTime( 23, 59, 0 );
    else
        mTime = QTime(0,0,0).addSecs(i*15*60);
    emit timeChanged(mTime);
 }
 void KOTimeEdit::hilit(int )
 {
  // we don't currently need to do anything here.
 }
 void KOTimeEdit::addTime(QTime qt, bool update)
 {
  // Calculate the new time.
    //qDebug("add h %d min %d  ", qt.hour(),qt.minute() );
  mTime = mTime.addSecs(qt.minute()*60+qt.hour()*3600);
  // if ( update )
      updateText();
  emit timeChanged(mTime);
 }
 void KOTimeEdit::subTime(QTime qt, bool update)
 {
  int h, m;
  //qDebug("sub  h %d min %d  ", qt.hour(),qt.minute() );
  mTime = mTime.addSecs(-(qt.minute()*60+qt.hour()*3600));
  // store the newly calculated time.
  // mTime.setHMS(h, m, 0);
  //if ( update )
      updateText();
  emit timeChanged(mTime);
 }
 // void KOTimeEdit::mouseReleaseEvent ( QMouseEvent * )
 // {
 //     qDebug("mouseReleaseEvent ( QMouseEvent * )  ");
 // }
 // void KOTimeEdit::focusInEvent ( QFocusEvent * )
 // {
 //     qDebug("focusInEvent ( QFocusEvent * )   ");
 // }
 void KOTimeEdit::keyReleaseEvent(QKeyEvent *e)
 {
  if ( !e->isAutoRepeat() ) {
      mFlagKeyPressed = false;
    }
 }
 void KOTimeEdit::setSelect( int from, int to )
 {
    if ( KOPrefs::instance()->mHightlightDateTimeEdit)
        lineEdit()->setSelection( from , to );
 }
 void KOTimeEdit::keyPressEvent(QKeyEvent *e)
 {
  qApp->processEvents();
  bool hour12Format =  ( KPimGlobalPrefs::instance()->mPreferredTime == 1 );
  int maxpos = hour12Format?7:5;
  if ( e->isAutoRepeat() && !mFlagKeyPressed ) {
    e->ignore();
    // qDebug("  ignore  %d",e->isAutoRepeat()  );
    return;
  }
  if (! e->isAutoRepeat() ) {
    mFlagKeyPressed = true;
  }
  // Tap -> Focus Next Widget
  if ( e->key() == Key_Tab ) {
    QComboBox::keyPressEvent(e);
    return;
  }
  // save Text from QLineEdit and CursorPosition
  QString text = lineEdit()->text();
  int cpos = lineEdit()->cursorPosition();
  // qDebug("cpos %d  ", cpos);
  // Switch for arrows, backspace and escape
  switch(e->key()) {
  case Key_Escape:
      lineEdit()->deselect();
  case Key_Tab:
      QComboBox::keyPressEvent(e);
    break;
  case Key_Up:
      if ( e->state () == Qt::ControlButton ) {
          addTime(QTime(0,15,0), false );
          lineEdit()->setCursorPosition(3);
          setSelect( 3 , 2 );
      }
      else
          if ( e->state () == Qt::ShiftButton ) {
              addTime(QTime(1,0,0), false );
              lineEdit()->setCursorPosition(0);
              setSelect( 0 , 2 );
          }
          else
              // switch time up, cursor location depend
              switch (cpos) {
                  case 7:
                  case 6:
                  case 5:
                      if(!hour12Format) {
                          lineEdit()->setCursorPosition(cpos = 4);
                      } else {
                          addTime(QTime(12,0,0), false );
                          setSelect ( 5 , 2 );
                          break;
                      }
                  case 4:
                      addTime(QTime(0,1,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 3:
                      addTime(QTime(0,10,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 2:
                      lineEdit()->setCursorPosition(--cpos);
                  case 1:
                  case 0:
                      addTime(QTime(1,0,0), false );
                      setSelect ( 0, 2 );
                      break;
              }
      break;
  case Key_Down:
      if ( e->state () == Qt::ControlButton ) {
          subTime(QTime(0,15,0), false );
          lineEdit()->setCursorPosition(3);
          setSelect( 3 , 2 );
      }
      else
          if ( e->state () == Qt::ShiftButton ) {
              subTime(QTime(1,0,0), false );
              lineEdit()->setCursorPosition(0);
              setSelect( 0 , 2 );
          }
          else
              // switch time down, cursor location depend
              switch (cpos) {
                  case 7:
                  case 6:
                  case 5:
                      if(!hour12Format) {
                          lineEdit()->setCursorPosition(cpos = 4);
                      } else {
                          subTime(QTime(12,0,0), false );
                          setSelect ( 5 , 2 );
                          break;
                      }
                  case 4:
                      subTime(QTime(0,1,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 3:
                      subTime(QTime(0,10,0), false );
                      setSelect ( cpos , 1 );
                      break;
                  case 2:
                      lineEdit()->setCursorPosition(--cpos);
                  case 1:
                  case 0:
                      subTime(QTime(1,0,0), false );
                      setSelect ( 0 , 2 );
                      break;
              }
      break;
  // set cursor to correct place
  case Key_Left:
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 7810bf9..61c39f5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1777,273 +1777,290 @@ void MainWindow::fillFilterMenu()
            selectFilterMenu->setItemChecked( iii, true );
        if ( disable )
            selectFilterMenu->setItemEnabled( iii, false );
        filter = fili.next();
        ++iii;
    }
 }
 void MainWindow::selectFilter( int fil )
 {
    if ( fil == 0 ) {
        mView->editFilters( );
    } else if ( fil == 1 ){
        mView->toggleFilerEnabled( );
    } else {
        mView->selectFilter(  fil-2 );
    }
 }
 void MainWindow::configureToolBar( int item  )
 {
    configureToolBarMenu->setItemChecked( item, !configureToolBarMenu-> isItemChecked ( item ) );
    KOPrefs *p = KOPrefs::instance();
    p-> mShowIconStretch= configureToolBarMenu->isItemChecked( 5 );
    p-> mShowIconNewEvent= configureToolBarMenu->isItemChecked( 10 );
    p->mShowIconNewTodo = configureToolBarMenu->isItemChecked( 20 );
    p-> mShowIconSearch= configureToolBarMenu->isItemChecked( 120 );
    p-> mShowIconList= configureToolBarMenu->isItemChecked( 30 );
    p-> mShowIconDay1= configureToolBarMenu->isItemChecked( 40 );
    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-> 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 );
    // 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); 
    else {
        QString addString;
        if ( mView->startDate() == QDateTime::currentDateTime().date() )
            addString = i18n("Today");
        else if ( mView->startDate() == QDateTime::currentDateTime().date().addDays(1) )
            addString = i18n("Tomorrow");
        if ( !addString.isEmpty() )
            selDates = addString+", "+selDates ;
    }
    setCaption( i18n("Dates: ") + selDates );
 }
 void MainWindow::showConfigureAgenda( )
 {
    int iii;
    for ( iii = 1;iii<= 10 ;++iii ){
        configureAgendaMenu->setItemChecked( (iii+1)*2, false );
    }
    configureAgendaMenu->setItemChecked( (KOPrefs::instance()->mHourSize/2)*2, true );
 }
 void MainWindow::configureAgenda( int item )
 {
    if ( KOPrefs::instance()->mHourSize == item )
        return;
    KOPrefs::instance()->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() ) {
        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 );
        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;
    if ( info. exists() ) {
        mess =   i18n("Backup file from:\n%1\nLoading  backup\nfile will delete\nyour current Data!\n").arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        int result = QMessageBox::warning( this, "KO/Pi: Warning!",
                                           mess,
                                           i18n("Load!"), i18n("Cancel"), 0,
                                           0, 1 );
        if ( result != 0 ) {
            loadbup = false;
        }
    } else {
        QMessageBox::warning( this, i18n("KO/Pi: Warning!"),
                              i18n("Backup file\ndoes not exist!\nNothing loaded!"), 0, 0,
                              0, 1 );
        return;
    }
    if ( loadbup ) {
        mView->openCalendar( fn );
        KOPrefs::instance()->mLastLoadFile = fn;
        mess = i18n("KO/Pi:Loaded %1").arg(fn) ;
        setCaption(mess);
    }
 }
 void  MainWindow::quickImportIcal()
 {
    importFile( KOPrefs::instance()->mLastImportFile, false );
 }
 void MainWindow::importFile( QString  fn, bool quick )
 {
    QFileInfo info;
    info.setFile( fn );
    QString mess;
    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 ) {
        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 );
    }
    if ( result == 0 ) {
        if ( mView->openCalendar( fn, true )) {
            KOPrefs::instance()->mLastImportFile = fn;
            setCaption(i18n("Imported file successfully"));
        } else {
            setCaption(i18n("Error importing file"));
        }
    }
 }
 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() ) {
        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 ) ) {
            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);
        }
    }
 }
 void MainWindow::syncFileRequest()
 {
    if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
        mSyncManager->slotSyncMenu( 999 );
    } 
    save();
 }
 void MainWindow::getFile( bool success )
 {
    if ( ! success ) {
        setCaption( i18n("Error receiving file. Nothing changed!") );
        return;
    }
    mView->openCalendar( defaultFileName() ); 
    if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
        mSyncManager->slotSyncMenu( 999 );
    } 
    setCaption( i18n("Pi-Sync successful!") );
 } 
 void MainWindow::printSel( )
 {
    mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 void MainWindow::printCal()
 {
    mView->print();//mCp->showDialog();
 }
 #include "libkdepim/kdatepicker.h"
 #include <kdatetbl.h>
 void MainWindow::weekAction()
 {
    int month;
    KPopupFrame* popup = new KPopupFrame(this);
-    int size = 12;
+    KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(10, popup);
-    if ( QApplication::desktop()->width() >= 480 ) 
-        size = 18;
-    KDateInternalWeekPicker* picker = new KDateInternalWeekPicker(size, popup);
    // -----
    picker->resize(picker->sizeHint());
    popup->setMainWidget(picker);
    picker->setFocus();
    connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
-    if(popup->exec(iconToolBar->mapToGlobal(QPoint(0, iconToolBar->height()))))
+    int x = 0;
+    int y = iconToolBar->height();
+    int dX = 0;
+    int dY = 0;
+    if ( iconToolBar->orientation () == Qt:: Horizontal ) {
+        if ( iconToolBar->y() > height()/2 ) {
+            dY = iconToolBar->height()+picker->sizeHint().height();
+            y = 0;
+        }
+    } else {
+        if ( iconToolBar->x() > width()/2 ) { // right side
+            x=0;
+            dX= iconToolBar->width()+picker->sizeHint().width();
+            y = 0;
+        } else {
+            x= iconToolBar->width();
+            y = 0;
+        }
+    }
+    qDebug("dax %d  dy %d         %d %d ", dX, dY, iconToolBar->x(), iconToolBar->y() );
+    if(popup->exec(iconToolBar->mapToGlobal(QPoint(x,y)-QPoint( dX,dY))))
        {
            month = picker->getResult();
            emit selectWeek ( month );
            //qDebug("weekSelected %d ", month);
        }
    delete popup;
 }
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp
index f05e6f6..4a31c77 100644
--- a/korganizer/navigatorbar.cpp
+++ b/korganizer/navigatorbar.cpp
@@ -1,202 +1,203 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2003 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 <qstring.h>
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "libkdepim/kdatepicker.h"
 #include <knotifyclient.h>
 #include "kdatetbl.h"
 #include "koglobals.h"
+#include <kglobalsettings.h>
 #include "koprefs.h"
 #ifndef KORG_NOPLUGINS
 #include "kocore.h"
 #endif
 #include <kcalendarsystem.h>
 #include "navigatorbar.h"
 NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *name )
  : QWidget( parent, name )
 {
  QBoxLayout *topLayout = new QHBoxLayout( this );
  // Set up the control buttons and date label
  mCtrlFrame = new QFrame( this );
  mCtrlFrame->setFrameStyle(QFrame::Panel|QFrame::Raised);
  mCtrlFrame->setLineWidth(1);
  topLayout->addWidget( mCtrlFrame );
-  QFont tfont = font();
+  QFont tfont = KGlobalSettings::generalFont();//font();
  if ( QApplication::desktop()->width() >= 480 ) 
      tfont.setPointSize(tfont.pointSize()+2);
  tfont.setBold(true);
  bool isRTL = KOGlobals::self()->reverseLayout();
 #ifndef DESKTOP_VERSION
  bool isDesktop = false;
 #else
  bool isDesktop = true;
 #endif
  if ( QString ( name ) == QString("useBigPixmaps") && QApplication::desktop()->width() > 320 )
      isDesktop = true;
  // Create backward navigation buttons
  mPrevYear = new QPushButton( mCtrlFrame );
  mPrevYear->setPixmap( SmallIcon( isDesktop ? "2leftarrowB" : "2leftarrow" ) );
  QToolTip::add( mPrevYear, i18n("Previous Year") );
  mPrevMonth = new QPushButton( mCtrlFrame );
  mPrevMonth->setPixmap( SmallIcon( isDesktop ? "1leftarrowB" : "1leftarrow") );
  QToolTip::add( mPrevMonth, i18n("Previous Month") );
  // Create forward navigation buttons
  mNextMonth = new QPushButton( mCtrlFrame );
  mNextMonth->setPixmap( SmallIcon( isDesktop ? "1rightarrowB" : "1rightarrow") );
  QToolTip::add( mNextMonth, i18n("Next Month") );
  mNextYear = new QPushButton( mCtrlFrame );
  mNextYear->setPixmap( SmallIcon( isDesktop ? "2rightarrowB": "2rightarrow") );
  QToolTip::add( mNextYear, i18n("Next Year") );
  mSelectMonth = new QPushButton( mCtrlFrame );
  // Create month name label
  //selectMonth->setFont( tfont );
  // selectMonth->setAlignment( AlignCenter );
  //mDateLabel = new QLabel( selectMonth );
  //mDateLabel->setFont( tfont );
  //mDateLabel->setAlignment( AlignCenter );
  if ( QString ( name ) == QString("useBigPixmaps") ) {
      mNextMonth->setFlat( true);
      mNextYear->setFlat( true);
      mSelectMonth->setFlat( true);
      mPrevYear->setFlat( true);
      mPrevMonth->setFlat( true);
  }
  mSelectMonth->setFont( tfont );
  // Set minimum width to width of widest month name label
  int i;
  int maxwidth = 0;
  QFontMetrics fm ( mSelectMonth->font() );
  int width = fm.width("September '00" );
 //   for( i = 1; i <= KOGlobals::self()->calendarSystem()->monthsInYear(date);
 //       ++i ) {
 //       //int width = fm.width( KOGlobals::self()->calendarSystem()->monthName(i,
 //       //   KOGlobals::self()->calendarSystem()->year(date) ) + " 2000" );
 //       int width = fm.width("September 2000" );
 //     if ( width > maxwidth ) maxwidth = width;
 //   }
  maxwidth = width+2;
  int size = fm.height()+2;
  if ( QApplication::desktop()->width() >= 480 ) { 
      size += 6;
      maxwidth+= 6;
  }
  mSelectMonth->setFixedWidth( maxwidth );
  mSelectMonth->setFixedHeight( size );
   mPrevYear->setFixedHeight(  size );
  mPrevMonth->setFixedHeight( size );
   mNextMonth->setFixedHeight( size );
  mNextYear->setFixedHeight ( size );
  // set up control frame layout
  QBoxLayout *ctrlLayout = new QHBoxLayout( mCtrlFrame, 1 );
  ctrlLayout->addWidget( mPrevYear, 3 );
  ctrlLayout->addWidget( mPrevMonth, 3 );
  //ctrlLayout->addStretch( 1 );
  // ctrlLayout->addSpacing( 1 );
  // ctrlLayout->addWidget( mDateLabel );
  ctrlLayout->addWidget( mSelectMonth );
  //  ctrlLayout->addSpacing( 1 );
  // ctrlLayout->addStretch( 1 );
  ctrlLayout->addWidget( mNextMonth, 3 );
  ctrlLayout->addWidget( mNextYear, 3 );
  connect( mPrevYear, SIGNAL( clicked() ), SIGNAL( goPrevYear() ) );
  connect( mPrevMonth, SIGNAL( clicked() ), SIGNAL( goPrevMonth() ) );
  connect( mNextMonth, SIGNAL( clicked() ), SIGNAL( goNextMonth() ) );
  connect( mNextYear, SIGNAL( clicked() ), SIGNAL( goNextYear() ) );
  connect( mSelectMonth, SIGNAL( clicked() ),SLOT( selectMonth() ) );
  mPrevYear->setFocusPolicy(NoFocus);
  mPrevMonth->setFocusPolicy(NoFocus);
  mNextMonth->setFocusPolicy(NoFocus);
  mNextYear->setFocusPolicy(NoFocus);
  mSelectMonth->setFocusPolicy(NoFocus);
  setSizePolicy( QSizePolicy (  QSizePolicy::Expanding ,QSizePolicy::Fixed ) );
 }
 NavigatorBar::~NavigatorBar()
 {
 }
 void NavigatorBar::selectMonth()
 {
    int month;
  KPopupFrame* popup = new KPopupFrame(this);
  int size = 12;
  if ( QApplication::desktop()->width() >= 480 ) 
      size = 18;
  KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(size, popup);
  // -----
  picker->resize(picker->sizeHint());
  popup->setMainWidget(picker);
  picker->setFocus();
  connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
  if(popup->exec(mSelectMonth->mapToGlobal(QPoint(0, mSelectMonth->height()))))
    {
        month = picker->getResult();
        emit monthSelected ( month );
    } else {
      KNotifyClient::beep();
    }
  delete popup;
 }
 void NavigatorBar::selectDates( const KCal::DateList &dateList )
 {
  if (dateList.count() > 0) {
    QDate date = dateList.first();
    const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
    // compute the label at the top of the navigator
    QString dtstr = i18n(calSys->monthName( date )) + " '" +
                    QString::number( calSys->year( date ) ).right(2);
    mSelectMonth->setText( dtstr );
  }
 }
diff --git a/libkdepim/kdatepicker.cpp b/libkdepim/kdatepicker.cpp
index d8bc9f5..2be9c9e 100644
--- a/libkdepim/kdatepicker.cpp
+++ b/libkdepim/kdatepicker.cpp
@@ -1,317 +1,313 @@
 /*  -*- C++ -*-
    This file is part of the KDE libraries
    Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org)
              (C) 1998-2001 Mirko Boehm (mirko@kde.org)
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 #include "kdatepicker.h"
 #include <kglobal.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <qframe.h>
 #include <qpainter.h>
 #include <qdialog.h>
 #include <qtoolbutton.h>
 #include <qfont.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qvalidator.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
+#include <kglobalsettings.h>
 #include "kdatetbl.h"
 #include "kdateedit.h"
 //#include "kdatepicker.moc"
 KDatePicker::KDatePicker(QWidget *parent, QDate dt, const char *name)
  : QFrame(parent,name),
    yearForward(new QToolButton(this)),
    yearBackward(new QToolButton(this)),
    monthForward(new QToolButton(this)),
    monthBackward(new QToolButton(this)),
    selectMonth(new QToolButton(this)),
    selectYear(new QToolButton(this)),
    //line(new QLineEdit(this)),
    val(new KDateValidator(this))
    //table(new KDateTable(this)),
    //fontsize(1)
 {
-  // -----
+  setFont ( KGlobalSettings::generalFont() );
-    int size = 12;
-  if (  QApplication::desktop()->width() >= 480 )
-      size = 18;
-  fontsize = size;
-  setFont ( QFont("helvetica",size) );
  table = new KDateTable(this);
-  setFontSize(size);
+  setFontSize(font().pointSize()+2);
  //line->setValidator(val);
  lineDate = new KDateEdit( this, "dateediipicker", true );
  yearForward->setPixmap(SmallIcon("2rightarrowB"));
  yearBackward->setPixmap(SmallIcon("2leftarrowB"));
  monthForward->setPixmap(SmallIcon("1rightarrowB"));
  monthBackward->setPixmap(SmallIcon("1leftarrowB"));
  setDate(dt); // set button texts
  connect(table, SIGNAL(dateChanged(QDate)), SLOT(dateChangedSlot(QDate)));
  connect(table, SIGNAL(tableClicked()), SLOT(tableClickedSlot()));
  connect(monthForward, SIGNAL(clicked()), SLOT(monthForwardClicked()));
  connect(monthBackward, SIGNAL(clicked()), SLOT(monthBackwardClicked()));
  connect(yearForward, SIGNAL(clicked()), SLOT(yearForwardClicked()));
  connect(yearBackward, SIGNAL(clicked()), SLOT(yearBackwardClicked()));
  connect(selectMonth, SIGNAL(clicked()), SLOT(selectMonthClicked()));
  connect(selectYear, SIGNAL(clicked()), SLOT(selectYearClicked()));
  //connect(line, SIGNAL(returnPressed()), SLOT(lineEnterPressed()));
  connect(lineDate, SIGNAL(dateChanged(QDate)), SLOT(slotSetDate(QDate)));
  connect(lineDate, SIGNAL(returnPressed()), SLOT(lineEnterPressed()));
  table->setFocus();
 }
 KDatePicker::~KDatePicker()
 {
 }
 void
 KDatePicker::resizeEvent(QResizeEvent*)
 {
    QWidget *buttons[] = {
        yearBackward,
            monthBackward,
            selectMonth,
            selectYear,
            monthForward,
            yearForward };
    const int NoOfButtons=sizeof(buttons)/sizeof(buttons[0]);
    QSize sizes[NoOfButtons];
    int buttonHeight=0;
    int count;
    int w;
    int x=0;
    // ----- calculate button row height:
    for(count=0; count<NoOfButtons; ++count) {
        int xS = buttons[count]->sizeHint().width();
        int yS = buttons[count]->sizeHint().height(); 
        if (  QApplication::desktop()->width() < 320 ) 
            sizes[count]=QSize ( xS+4, yS );
        else
            sizes[count]=QSize ( xS+10, yS );
            
        buttonHeight=QMAX(buttonHeight, sizes[count].height());
    }
    buttonHeight += 10;
    // ----- calculate size of the month button:
    w=0;
    for(count=0; count<NoOfButtons; ++count) {
        if(buttons[count]!=selectMonth)
        {
            w+=sizes[count].width();
        } else {
            x=count;
        }
    }
    sizes[x].setWidth(width()-w); // stretch the month button
    // ----- place the buttons:
    x=0;
    for(count=0; count<NoOfButtons; ++count)
    {
        w=sizes[count].width();
        buttons[count]->setGeometry(x, 0, w, buttonHeight);
        x+=w;
    }
    // ----- place the line edit for direct input:
    sizes[0]=lineDate->sizeHint();
    //line->setGeometry(0, height()-sizes[0].height(), width(), sizes[0].height());
    lineDate->setGeometry(0, height()-sizes[0].height(), width(), sizes[0].height());
    // ----- adjust the table:
    table->setGeometry(0, buttonHeight, width(),
                       height()-buttonHeight-sizes[0].height());
 }
 void
 KDatePicker::dateChangedSlot(QDate date)
 {
    lineDate->setDate( date );//(KGlobal::locale()->formatDate(date, true));
    //line->setText(KGlobal::locale()->formatDate(date, true));
    emit(dateChanged(date));
 }
 void
 KDatePicker::tableClickedSlot()
 {
  emit(dateSelected(table->getDate()));
  emit(tableClicked());
 }
 const QDate&
 KDatePicker::getDate() const
 {
  return table->getDate();
 }
 const QDate &
 KDatePicker::date() const
 {
    return table->getDate();
 }
 void KDatePicker::slotSetDate( QDate date )
 {
 
 if(date.isValid()) {
        QString temp;
        // -----
        table->setDate(date);
        selectMonth->setText(KGlobal::locale()->monthName(date.month(), false));
        temp.setNum(date.year());
        selectYear->setText(temp);
        //line->setText(KGlobal::locale()->formatDate(date, true));
        lineDate->setDate( date );
    }
 }
 bool
 KDatePicker::setDate(const QDate& date)
 {
    table->setFocus();
    if(date.isValid()) {
        QString temp;
        // -----
        table->setDate(date);
        selectMonth->setText(KGlobal::locale()->monthName(date.month(), false));
        temp.setNum(date.year());
        selectYear->setText(temp);
        //line->setText(KGlobal::locale()->formatDate(date, true));
        lineDate->setDate( date );
        return true;
    } else {
        return false;
    }
 }
 void
 KDatePicker::monthForwardClicked()
 {
    QDate temp=table->getDate();
    int day=temp.day();
    // -----
    if(temp.month()==12) {
        temp.setYMD(temp.year()+1, 1, 1);
    } else {
        temp.setYMD(temp.year(), temp.month()+1, 1);
    }
    if(temp.daysInMonth()<day) {
        temp.setYMD(temp.year(), temp.month(), temp.daysInMonth());
    } else {
        temp.setYMD(temp.year(), temp.month(), day);
    }
    // assert(temp.isValid());
    setDate(temp);
 }
 void
 KDatePicker::monthBackwardClicked()
 {
  QDate temp=table->getDate();
  int day=temp.day();
  // -----
  if(temp.month()==1)
    {
      temp.setYMD(temp.year()-1, 12, 1);
    } else {
      temp.setYMD(temp.year(), temp.month()-1, 1);
    }
  if(temp.daysInMonth()<day)
    {
      temp.setYMD(temp.year(), temp.month(), temp.daysInMonth());
    } else {
      temp.setYMD(temp.year(), temp.month(), day);
    }
  // assert(temp.isValid());
  setDate(temp);
 }
 void
 KDatePicker::yearForwardClicked()
 {
  QDate temp=table->getDate();
  int day=temp.day();
  // -----
  temp.setYMD(temp.year()+1, temp.month(), 1);
  if(temp.daysInMonth()<day)
    {
      temp.setYMD(temp.year(), temp.month(), temp.daysInMonth());
    } else {
      temp.setYMD(temp.year(), temp.month(), day);
    }
  // assert(temp.isValid());
  setDate(temp);
 }
 void
 KDatePicker::yearBackwardClicked()
 {
  QDate temp=table->getDate();
  int day=temp.day();
  // -----
  temp.setYMD(temp.year()-1, temp.month(), 1);
  if(temp.daysInMonth()<day)
    {
      temp.setYMD(temp.year(), temp.month(), temp.daysInMonth());
    } else {
      temp.setYMD(temp.year(), temp.month(), day);
    }
  // assert(temp.isValid());
  setDate(temp);
 }
 void
 KDatePicker::selectMonthClicked()
 {
  int month;
  KPopupFrame* popup = new KPopupFrame(this);
  KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(fontsize, popup);
  // -----
  picker->resize(picker->sizeHint());
  popup->setMainWidget(picker);
  picker->setFocus();
  connect(picker, SIGNAL(closeMe(int)), popup, SLOT(close(int)));
  if(popup->exec(selectMonth->mapToGlobal(QPoint(0, selectMonth->height()))))
    {
      QDate date;
      int day;
      // -----
      month=picker->getResult();
      date=table->getDate();
      day=date.day();
      // ----- construct a valid date in this month:
      date.setYMD(date.year(), month, 1);
      date.setYMD(date.year(), month, QMIN(day, date.daysInMonth()));
      // ----- set this month
      setDate(date);
    } else {
      KNotifyClient::beep();
    }
  delete popup;
 }
 void
 KDatePicker::selectYearClicked()
 {
diff --git a/microkde/kdatetbl.cpp b/microkde/kdatetbl.cpp
index fce0e5a..e827412 100644
--- a/microkde/kdatetbl.cpp
+++ b/microkde/kdatetbl.cpp
@@ -1,915 +1,929 @@
 /*  -*- C++ -*-
    This file is part of the KDE libraries
    Copyright (C) 1997 Tim D. Gilman (tdgilman@best.org)
    (C) 1998-2001 Mirko Boehm (mirko@kde.org)
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
    This library 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
    Library General Public License for more details.
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
 /////////////////// KDateTable widget class //////////////////////
 //
 // Copyright (C) 1997 Tim D. Gilman
 //           (C) 1998-2001 Mirko Boehm
 // Written using Qt (http://www.troll.no) for the
 // KDE project (http://www.kde.org)
 //
 // This is a support class for the KDatePicker class.  It just
 // draws the calender table without titles, but could theoretically
 // be used as a standalone.
 //
 // When a date is selected by the user, it emits a signal:
 //      dateSelected(QDate)
 #include <kglobal.h>
 #include <kglobalsettings.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <knotifyclient.h>
 #include "kdatetbl.h"
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qpen.h>
 #include <qpainter.h>
 #include <qdialog.h>
 #include <assert.h>
 #include <qapplication.h>
 KDateValidator::KDateValidator(QWidget* parent, const char* name)
    : QValidator(parent, name)
 {
 }
 QValidator::State
 KDateValidator::validate(QString& text, int&) const
 {
    QDate temp;
    // ----- everything is tested in date():
    return date(text, temp);
 }
 QValidator::State
 KDateValidator::date(const QString& text, QDate& d) const
 {
    QDate tmp = KGlobal::locale()->readDate(text);
    if (!tmp.isNull())
        {
            d = tmp;
            return Acceptable;
        } else
        return Valid;
 }
 void
 KDateValidator::fixup( QString& ) const
 {
 }
 KDateTable::KDateTable(QWidget *parent, QDate date_, const char* name, WFlags f)
    : QGridView(parent, name, f)
 {
    setFontSize(10);
    if(!date_.isValid())
        {
            date_=QDate::currentDate();
        }
    setFocusPolicy( QWidget::StrongFocus );
    setNumRows(7); // 6 weeks max + headline
    setNumCols(7); // 7 days a week
    setHScrollBarMode(AlwaysOff);
    setVScrollBarMode(AlwaysOff);
    viewport()->setBackgroundColor(QColor(220,245,255));
 #if 0
    viewport()->setEraseColor(lightGray);
 #endif
    mMarkCurrent = false;
    setDate(date_); // this initializes firstday, numdays, numDaysPrevMonth
 }
 void
 KDateTable::paintCell(QPainter *painter, int row, int col)
 {
    QRect rect;
    QString text;
    QPen pen;
    int w=cellWidth();
    int h=cellHeight();
    int pos;
    QBrush brushBlue(blue);
    QBrush brushLightblue(QColor(220,245,255));
    QFont font=KGlobalSettings::generalFont();
    // -----
    font.setPointSize(fontsize);
    if(row==0)
        { // we are drawing the headline
            font.setBold(true);
            painter->setFont(font);
            bool normalday = true;
            QString daystr;
            if (KGlobal::locale()->weekStartsMonday())
                {
                    daystr = KGlobal::locale()->weekDayName(col+1, true);
                    if (col == 5 || col == 6)
                        normalday = false;
                } else {
                daystr = KGlobal::locale()->weekDayName(col==0? 7 : col, true);
                if (col == 0 || col == 6)
                    normalday = false;
            }
            if (!normalday)
                {
                    painter->setPen(QColor(220,245,255));
                    painter->setBrush(brushLightblue);
                    painter->drawRect(0, 0, w, h);
                    painter->setPen(blue);
                } else {
                painter->setPen(blue);
                painter->setBrush(brushBlue);
                painter->drawRect(0, 0, w, h);
                painter->setPen(white);
            }
            painter->drawText(0, 0, w, h-1, AlignCenter,
                              daystr, -1, &rect);
            painter->setPen(black);
            painter->moveTo(0, h-1);
            painter->lineTo(w-1, h-1);
            // ----- draw the weekday:
        } else {
        painter->setFont(font);
        pos=7*(row-1)+col;
        if (KGlobal::locale()->weekStartsMonday())
            pos++;
        if(pos<firstday || (firstday+numdays<=pos))
            { // we are either
                // � painting a day of the previous month or
                // � painting a day of the following month
                if(pos<firstday)
                    { // previous month
                        text.setNum(numDaysPrevMonth+pos-firstday+1);
                    } else { // following month
                    text.setNum(pos-firstday-numdays+1);
                }
                painter->setPen(gray);
            } else { // paint a day of the current month
            text.setNum(pos-firstday+1);
            painter->setPen(black);
        }
        pen=painter->pen();
        if(firstday+date.day()-1==pos)
            {
                if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                    painter->setPen(green);
                else
                    painter->setPen(red);
                if(hasFocus())
                    {  
                        painter->setBrush(darkRed);
                        pen=white;
                    } else {
                    painter->setBrush(darkGray);
                    pen=white;
                }
            } else {
            if(mMarkCurrent && firstday+QDate::currentDate().day()-1==pos)
                {
                    painter->setPen(green);
                    painter->setBrush(darkGreen);
                    pen=white;
                } else {
                painter->setBrush(QColor(220,245,255));
                painter->setPen(QColor(220,245,255));
            }
        }
        painter->drawRect(0, 0, w, h);
        painter->setPen(pen);
        painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect);
    }
-    if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width());
+    /*
-    if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height());
+    if(rect.width()>maxCell.width()) maxCell.setWidth(rect.width()); 
+    if(rect.height()>maxCell.height()) {
+        maxCell.setHeight(rect.height());
+    }
+    */
 }
 void
 KDateTable::keyPressEvent( QKeyEvent *e )
 {
    /*
    // not working properly
    if ( e->key() == Qt::Key_Prior ) {
    if ( date.month() == 1 ) {
    KNotifyClient::beep();
    return;
    }
    int day = date.day();
    if ( day > 27 )
    while ( !QDate::isValid( date.year(), date.month()-1, day ) )
    day--;
    setDate(QDate(date.year(), date.month()-1, day));
    return;
    }
    if ( e->key() == Qt::Key_Next ) {
    if ( date.month() == 12 ) {
    KNotifyClient::beep();
    return;
    }
    int day = date.day();
    if ( day > 27 )
    while ( !QDate::isValid( date.year(), date.month()+1, day ) )
    day--;
    setDate(QDate(date.year(), date.month()+1, day));
    return;
    }
    */
    int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
    int temp=firstday+date.day()-dayoff;
    int pos = temp;
    bool irgnore = true;
    if ( e->state() != Qt::ControlButton ) {
        if ( e->key() == Qt::Key_Up ) {
            pos -= 7;
            irgnore = false;
        }
        if ( e->key() == Qt::Key_Down ) {
            pos += 7;
            irgnore = false;
        }
        if ( e->key() == Qt::Key_Left ) {
            pos--;
            irgnore = false;
        }
        if ( e->key() == Qt::Key_Right ) {
            pos++;
            irgnore = false;
        }
    } 
    if ( irgnore )
        e->ignore();
    if(pos+dayoff<=firstday)
        { // this day is in the previous month
            KNotifyClient::beep();
            return;
        }
    if(firstday+numdays<pos+dayoff)
        { // this date is in the next month
            KNotifyClient::beep(i18n( "Month not long enough" ));
            return;
        }
    if ( pos == temp )
        return;
    setDate(QDate(date.year(), date.month(), pos-firstday+dayoff));
    updateCell(temp/7+1, temp%7); // Update the previously selected cell
    updateCell(pos/7+1, pos%7); // Update the selected cell
    assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
  
 }
 void
 KDateTable::viewportResizeEvent(QResizeEvent * e)
 {
    QGridView::viewportResizeEvent(e);
    setCellWidth(viewport()->width()/7);
    setCellHeight(viewport()->height()/7);
 }
 void
 KDateTable::setFontSize(int size)
 {
    int count;
    QRect rect;
    // ----- store rectangles:
    fontsize=size;
    QFont font = KGlobalSettings::generalFont();
    font.setPointSize(fontsize);
    font.setBold( true );
    QFontMetrics metrics(font);
    // ----- find largest day name:
    maxCell.setWidth(0);
    maxCell.setHeight(0);
    for(count=0; count<7; ++count)
        {
            rect=metrics.boundingRect(KGlobal::locale()->weekDayName(count+1, true));
            maxCell.setWidth(QMAX(maxCell.width(), rect.width()));
            maxCell.setHeight(QMAX(maxCell.height(), rect.height()));
        }
    // ----- compare with a real wide number and add some space:
    rect=metrics.boundingRect(QString::fromLatin1("88"));
    maxCell.setWidth(QMAX(maxCell.width()+2, rect.width()));
+#ifdef DESKTOP_VERSION
+    maxCell.setHeight(QMAX(maxCell.height()+8, rect.height()));
+#else
    maxCell.setHeight(QMAX(maxCell.height()+4, rect.height()));
-    if ( maxCell.width() * 1000 / maxCell.height()  > 1900 )
+#endif
+    if ( maxCell.width() * 1000 / maxCell.height()  > 1900 ) {
        maxCell.setHeight(maxCell.width() * 1000 / 1900 );
+        qDebug("setmax ");
+    }
 }
 void
 KDateTable::contentsMousePressEvent(QMouseEvent *e)
 {
    if(e->type()!=QEvent::MouseButtonPress)
        { // the KDatePicker only reacts on mouse press events:
            return;
        }
    if(!isEnabled())
        {
            KNotifyClient::beep();
            return;
        }
    int dayoff = KGlobal::locale()->weekStartsMonday() ? 1 : 0;
    // -----
    int row, col, pos, temp;
    QPoint mouseCoord;
    // -----
    mouseCoord = e->pos();
    row=rowAt(mouseCoord.y());
    col=columnAt(mouseCoord.x());
    if(row<0 || col<0)
        { // the user clicked on the frame of the table
            return;
        }
    pos=7*(row-1)+col+1;
 #if 0
    if(pos+dayoff<=firstday)
        { // this day is in the previous month
            KNotifyClient::beep();
            return;
        }
    if(firstday+numdays<pos+dayoff)
        { // this date is in the next month
            KNotifyClient::beep();
            return;
        }
 #endif
    temp=firstday+date.day()-dayoff-1;
    QDate da = QDate(date.year(), date.month(),1);
    setDate(da.addDays( pos-firstday+dayoff-1));
    updateCell(temp/7+1, temp%7); // Update the previously selected cell
    updateCell(row, col); // Update the selected cell
    // assert(QDate(date.year(), date.month(), pos-firstday+dayoff).isValid());
    emit(tableClicked());
 }
 bool
 KDateTable::setDate(const QDate& date_)
 {
    bool changed=false;
    QDate temp;
    mMarkCurrent = false;
    // -----
    if(!date_.isValid())
        {
            kdDebug() << "KDateTable::setDate: refusing to set invalid date." << endl;
            return false;
        }
    if(date!=date_)
        {
            date=date_;
            changed=true;
        }
    mMarkCurrent = ( date.month() ==  QDate::currentDate().month() && date.year() ==  QDate::currentDate().year() );
    temp.setYMD(date.year(), date.month(), 1);
    firstday=temp.dayOfWeek();
    if(firstday==1) firstday=8;
    numdays=date.daysInMonth();
    if(date.month()==1)
        { // set to december of previous year
            temp.setYMD(date.year()-1, 12, 1);
        } else { // set to previous month
        temp.setYMD(date.year(), date.month()-1, 1);
    }
    numDaysPrevMonth=temp.daysInMonth();
    if(changed)
        {
            repaintContents(false);
        }
    emit(dateChanged(date));
    return true;
 }
 const QDate&
 KDateTable::getDate() const
 {
    return date;
 }
 void KDateTable::focusInEvent( QFocusEvent *e )
 {
    repaintContents(false);
    QGridView::focusInEvent( e );
 }
 void KDateTable::focusOutEvent( QFocusEvent *e )
 {
    repaintContents(false);
    QGridView::focusOutEvent( e );
 }
 QSize
 KDateTable::sizeHint() const
 {
    if(maxCell.height()>0 && maxCell.width()>0)
        {
            return QSize((maxCell.width()+2)*numCols()+2*frameWidth(),
                         (maxCell.height()+4)*numRows()+2*frameWidth());
        } else {
        return QSize(-1, -1);
    }
 }
 KDateInternalMonthPicker::KDateInternalMonthPicker
 (int fontsize, QWidget* parent, const char* name)
    : QGridView(parent, name),
      result(0) // invalid
 {
    QRect rect;
    QFont font;
    // -----
    activeCol = -1;
    activeRow = -1;
    font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
    setFont(font);
    setHScrollBarMode(AlwaysOff);
    setVScrollBarMode(AlwaysOff);
    setFrameStyle(QFrame::NoFrame);
    setNumRows(4);
    setNumCols(3);
    // enable to find drawing failures:
    // setTableFlags(Tbl_clipCellPainting);
 #if 0
    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
 #endif
    // ----- find the preferred size
    //       (this is slow, possibly, but unfortunatly it is needed here):
    QFontMetrics metrics(font);
    for(int i=1; i <= 12; ++i)
        {
            rect=metrics.boundingRect(KGlobal::locale()->monthName(i, false));
            if(max.width()<rect.width()) max.setWidth(rect.width());
            if(max.height()<rect.height()) max.setHeight(rect.height());
        }
 }
 QSize
 KDateInternalMonthPicker::sizeHint() const
 {
    return QSize((max.width()+6)*numCols()+2*frameWidth(),
                 (max.height()+6)*numRows()+2*frameWidth());
 }
 int
 KDateInternalMonthPicker::getResult() const
 {
    return result;
 }
 void
 KDateInternalMonthPicker::setupPainter(QPainter *p)
 {
    p->setPen(black);
 }
 void
 KDateInternalMonthPicker::viewportResizeEvent(QResizeEvent*)
 {
    setCellWidth(width()/3);
    setCellHeight(height()/4);
 }
 void
 KDateInternalMonthPicker::paintCell(QPainter* painter, int row, int col)
 {
    int index;
    QString text;
    // ----- find the number of the cell:
    index=3*row+col+1;
    text=KGlobal::locale()->monthName(index, false);
    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
    if ( activeCol == col && activeRow == row )
        painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 void
 KDateInternalMonthPicker::contentsMousePressEvent(QMouseEvent *e)
 {
    if(!isEnabled() || e->button() != LeftButton)
        {
            KNotifyClient::beep();
            return;
        }
    // -----
    int row, col;
    QPoint mouseCoord;
    // -----
    mouseCoord = e->pos();
    row=rowAt(mouseCoord.y());
    col=columnAt(mouseCoord.x());
    if(row<0 || col<0)
        { // the user clicked on the frame of the table
            activeCol = -1;
            activeRow = -1;
        } else {
        activeCol = col;
        activeRow = row;
        updateCell( row, col /*, false */ );
    }
 }
 void
 KDateInternalMonthPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
    if (e->state() & LeftButton)
        {
            int row, col;
            QPoint mouseCoord;
            // -----
            mouseCoord = e->pos();
            row=rowAt(mouseCoord.y());
            col=columnAt(mouseCoord.x());
            int tmpRow = -1, tmpCol = -1;
            if(row<0 || col<0)
                { // the user clicked on the frame of the table
                    if ( activeCol > -1 )
                        {
                            tmpRow = activeRow;
                            tmpCol = activeCol;
                        }
                    activeCol = -1;
                    activeRow = -1;
                } else {
                bool differentCell = (activeRow != row || activeCol != col);
                if ( activeCol > -1 && differentCell)
                    {
                        tmpRow = activeRow;
                        tmpCol = activeCol;
                    }
                if ( differentCell)
                    {
                        activeRow = row;
                        activeCol = col;
                        updateCell( row, col /*, false */ ); // mark the new active cell
                    }
            }
            if ( tmpRow > -1 ) // repaint the former active cell
                updateCell( tmpRow, tmpCol /*, true */ );
        }
 }
 void
 KDateInternalMonthPicker::contentsMouseReleaseEvent(QMouseEvent *e)
 {
    if(!isEnabled())
        {
            return;
        }
    // -----
    int row, col, pos;
    QPoint mouseCoord;
    // -----
    mouseCoord = e->pos();
    row=rowAt(mouseCoord.y());
    col=columnAt(mouseCoord.x());
    if(row<0 || col<0)
        { // the user clicked on the frame of the table
            emit(closeMe(0));
        }
    pos=3*row+col+1;
    result=pos;
    emit(closeMe(1));
 }
 KDateInternalYearSelector::KDateInternalYearSelector
 (int fontsize, QWidget* parent, const char* name)
    : QLineEdit(parent, name),
      val(new QIntValidator(this)),
      result(0)
 {
    QFont font;
    // -----
    font=KGlobalSettings::generalFont();
    font.setPointSize(fontsize);
    setFont(font);
 #if 0
    setFrameStyle(QFrame::NoFrame);
 #endif
    // we have to respect the limits of QDate here, I fear:
    val->setRange(0, 8000);
    setValidator(val);
    connect(this, SIGNAL(returnPressed()), SLOT(yearEnteredSlot()));
 }
 void
 KDateInternalYearSelector::yearEnteredSlot()
 {
    bool ok;
    int year;
    QDate date;
    // ----- check if this is a valid year:
    year=text().toInt(&ok);
    if(!ok)
        {
            KNotifyClient::beep();
            return;
        }
    date.setYMD(year, 1, 1);
    if(!date.isValid())
        {
            KNotifyClient::beep();
            return;
        }
    result=year;
    emit(closeMe(1));
 }
 int
 KDateInternalYearSelector::getYear()
 {
    return result;
 }
 void
 KDateInternalYearSelector::setYear(int year)
 {
    QString temp;
    // -----
    temp.setNum(year);
    setText(temp);
 }
 KPopupFrame::KPopupFrame(QWidget* parent, const char*  name)
    : QFrame(parent, name, WType_Popup),
      result(0), // rejected
      main(0)
 {
    setFrameStyle(QFrame::Box|QFrame::Raised);
    setMidLineWidth(2);
 }
 void
 KPopupFrame::keyPressEvent(QKeyEvent* e)
 {
    if(e->key()==Key_Escape)
        {
            result=0; // rejected
            qApp->exit_loop();
        }
 }
 void
 KPopupFrame::close(int r)
 {
    result=r;
    qApp->exit_loop();
 }
 void
 KPopupFrame::setMainWidget(QWidget* m)
 {
    main=m;
    if(main!=0)
        {
            resize(main->width()+2*frameWidth(), main->height()+2*frameWidth());
        }
 }
 void
 KPopupFrame::resizeEvent(QResizeEvent*)
 {
    if(main!=0)
        {
            main->setGeometry(frameWidth(), frameWidth(),
                              width()-2*frameWidth(), height()-2*frameWidth());
        }
 }
 void
 KPopupFrame::popup(const QPoint &pos)
 {
    // Make sure the whole popup is visible.
    QRect d = QApplication::desktop()->frameGeometry();
    int x = pos.x();
    int y = pos.y();
    int w = width();
    int h = height();
    if (x+w > d.x()+d.width())
        x = d.width() - w;
    if (y+h > d.y()+d.height())
        y = d.height() - h;
    if (x < d.x())
        x = 0;
    if (y < d.y())
        y = 0;
    // Pop the thingy up.
    move(x, y);
    show();
 }
 int
 KPopupFrame::exec(QPoint pos)
 {
    popup(pos);
    repaint();
    qApp->enter_loop();
    hide();
    return result;
 }
 int
 KPopupFrame::exec(int x, int y)
 {
    return exec(QPoint(x, y));
 }
 void KPopupFrame::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 void KDateTable::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 //#include "kdatetbl.moc"
 KDateInternalWeekPicker::KDateInternalWeekPicker
 (int fontsize, QWidget* parent, const char* name)
    : QGridView(parent, name),
      result(0) // invalid
 {
    QRect rect;
    QFont font;
    // -----
    activeCol = -1;
    activeRow = -1;
    font=KGlobalSettings::generalFont();
-    font.setPointSize(fontsize);
+    //font.setPointSize(fontsize);
    setFont(font);
    setHScrollBarMode(AlwaysOff);
    setVScrollBarMode(AlwaysOff);
    setFrameStyle(QFrame::NoFrame);
    setNumRows(13);
    setNumCols(4);
    // enable to find drawing failures:
    // setTableFlags(Tbl_clipCellPainting);
 #if 0
    viewport()->setEraseColor(lightGray); // for consistency with the datepicker
 #endif
    // ----- find the preferred size
    //       (this is slow, possibly, but unfortunatly it is needed here):
    QFontMetrics metrics(font);
    for(int i=1; i <= 52; ++i)
        {
            rect=metrics.boundingRect(QString::number( i ));
            if(max.width()<rect.width()) max.setWidth(rect.width());
            if(max.height()<rect.height()) max.setHeight(rect.height());
        }
+    if ( QApplication::desktop()->width() > 640 ) {
+      
+        max.setWidth(max.width()+6);
+        max.setHeight(max.height()+8);
+    }
 }
 QSize
 KDateInternalWeekPicker::sizeHint() const
 {
    return QSize((max.width()+6)*numCols()+2*frameWidth(),
                 (max.height()+6)*numRows()+2*frameWidth());
 }
 int
 KDateInternalWeekPicker::getResult() const
 {
    return result;
 }
 void
 KDateInternalWeekPicker::setupPainter(QPainter *p)
 {
    p->setPen(black);
 }
 void
 KDateInternalWeekPicker::viewportResizeEvent(QResizeEvent*)
 {
    setCellWidth(width()/4);
    setCellHeight(height()/13);
 }
 void
 KDateInternalWeekPicker::paintCell(QPainter* painter, int row, int col)
 {
    int index;
    QString text;
    // ----- find the number of the cell:
    index=4*row+col+1;
    text=QString::number( index );
    painter->drawText(0, 0, cellWidth(), cellHeight(), AlignCenter, text);
    if ( activeCol == col && activeRow == row )
        painter->drawRect( 0, 0, cellWidth(), cellHeight() );
 }
 void
 KDateInternalWeekPicker::contentsMousePressEvent(QMouseEvent *e)
 {
    if(!isEnabled() || e->button() != LeftButton)
        {
            KNotifyClient::beep();
            return;
        }
    // -----
    int row, col;
    QPoint mouseCoord;
    // -----
    mouseCoord = e->pos();
    row=rowAt(mouseCoord.y());
    col=columnAt(mouseCoord.x());
    if(row<0 || col<0)
        { // the user clicked on the frame of the table
            activeCol = -1;
            activeRow = -1;
        } else {
        activeCol = col;
        activeRow = row;
        updateCell( row, col /*, false */ );
    }
 }
 void
 KDateInternalWeekPicker::contentsMouseMoveEvent(QMouseEvent *e)
 {
    if (e->state() & LeftButton)
        {
            int row, col;
            QPoint mouseCoord;
            // -----
            mouseCoord = e->pos();
            row=rowAt(mouseCoord.y());
            col=columnAt(mouseCoord.x());
            int tmpRow = -1, tmpCol = -1;
            if(row<0 || col<0)
                { // the user clicked on the frame of the table
                    if ( activeCol > -1 )
                        {
                            tmpRow = activeRow;
                            tmpCol = activeCol;
                        }
                    activeCol = -1;
                    activeRow = -1;
                } else {
                bool differentCell = (activeRow != row || activeCol != col);
                if ( activeCol > -1 && differentCell)
                    {
                        tmpRow = activeRow;
                        tmpCol = activeCol;
                    }
                if ( differentCell)
                    {
                        activeRow = row;
                        activeCol = col;
                        updateCell( row, col /*, false */ ); // mark the new active cell
                    }
            }
            if ( tmpRow > -1 ) // repaint the former active cell
                updateCell( tmpRow, tmpCol /*, true */ );
        }
 }
 void
 KDateInternalWeekPicker::contentsMouseReleaseEvent(QMouseEvent *e)
 {
    if(!isEnabled())
        {
            return;
        }
    // -----
    int row, col, pos;
    QPoint mouseCoord;
    // -----
    mouseCoord = e->pos();
    row=rowAt(mouseCoord.y());
    col=columnAt(mouseCoord.x());
    if(row<0 || col<0)
        { // the user clicked on the frame of the table
            emit(closeMe(0));
        }
    pos=4*row+col+1;
    result=pos;
    emit(closeMe(1));
 }
diff --git a/microkde/kglobalsettings.cpp b/microkde/kglobalsettings.cpp
index 2fff8fc..30e793f 100644
--- a/microkde/kglobalsettings.cpp
+++ b/microkde/kglobalsettings.cpp
@@ -1,41 +1,43 @@
 #include "kglobalsettings.h"
 #include "kconfig.h"
 #include "kglobal.h"
 #include "kconfigbase.h"
 #include <qapplication.h>
 QFont KGlobalSettings::generalFont()
 {
   int size = 12;
    if (QApplication::desktop()->width() < 480 )
        size = 10;   
-    return QFont("helvetica",size);
+    QFont f = QApplication::font();
+    f.setPointSize( size );
+    return f;
 }
 QFont KGlobalSettings::toolBarFont()
 {
-  return QFont("helevetica",12);
+    return  QApplication::font();
 }
 QColor KGlobalSettings::toolBarHighlightColor()
 {
-  return QColor("black");
+    return QColor( "black" );
 }
 QRect KGlobalSettings::desktopGeometry( QWidget * )
 {
  return QApplication::desktop()->rect();
 }
    /**
     * Returns whether KDE runs in single (default) or double click
     * mode.
     * see http://developer.kde.org/documentation/standards/kde/style/mouse/index.html
     * @return true if single click mode, or false if double click mode.
     **/
 bool KGlobalSettings::singleClick()
-{
+{   
    KConfig *c = KGlobal::config();
    KConfigGroupSaver cgs( c, "KDE" );
    return c->readBoolEntry("SingleClick", KDE_DEFAULT_SINGLECLICK);
 }
author	zautrix <zautrix>	2005-02-08 14:12:31 (UTC)
committer	zautrix <zautrix>	2005-02-08 14:12:31 (UTC)
commit	41111b332c2a5f1b2ec152df309b9199f5e9c921 (patch) (unidiff)
tree	3a2e5c5a25cdb52f542b2fe84a03f94599be2fe3
parent	9927a063f34bb826a4b5f7f7029308c9c66acbce (diff)
download	kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.zip kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.tar.gz kdepimpi-41111b332c2a5f1b2ec152df309b9199f5e9c921.tar.bz2