6 files changed, 22 insertions, 13 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 6945864..65bb075 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,386 +1,390 @@
 Info about the changes in new versions of KDE-Pim/Pi
+********** VERSION 2.0.5 ************
+Bugfixes in KO/Pi.
 ********** VERSION 2.0.4 ************
 KO/Pi:
 Fixed problem loading translations for summary/location edit boxes in event/todo editor.
 Added a general "select week number" to the toolbar.
 Fixed some small problem of the new features introduced in version 2.0.3.
 Made it possible to specify one specific category as category color,
 if more than one categories are selected.
 Fixed a bug in saving colors for categories with non-ascii characters.
 (Like, e.g. German Umlauts).
 Propably you have to set your colors again for those categories. 
 ********** VERSION 2.0.3 ************
 KO/Pi:
 Added feature for changing alarm settings for many items at once:
 Open list view (or search dialog), select the desired items and choose in
 the popup menu: Set alarm for selected...
 Added to the event/todo viewer the option to send an email to 
 all attendees or all selected (with RSVP) attendees. 
 Made the week-month mode changing in month view faster.
 Made month view better useable with keyboard.
 Now TAB key jumps to next cell with an event/todo.
 Scroll in cell with coursor keys, scroll in time (next week) with
 Shift/Control + coursorkeys.
 Fixed bug that the todo view flat mode was reset after first view update.
 If a todo is displayed closed in the todo view, 
 it is now displayed in overdue/due today color depending on the subtodos overdue/due today properties.
 Added info about the numbers of years to the caption (title) information about a birthday event.
 Made completion date in todo editor editable.
 Added possibility to save/load templates for journals.
 (Which is just a simple "save text to file" or "insert text from file".
 ********** VERSION 2.0.2 ************
 KO/Pi:
 Fixed the layout problem of the day label buttons 
 of the agenda view introduced in version 2.0.1.
 Added WhatsThis support for the todo view and the list view.
 Added a quite useful feature to the montview.
 Just click on the week numbers on the left.
 And in the top right corner of month view/agenda view 
 there is now a "week number quick selector".
 (Click on the black triangle).
 Made the quite difficult timezone change in KO/Pi easy.
 OM/Pi:
 Fixed too small icons on desktop.
 Fixed non visible icons in mainwindow on Z with fastload enabled.
 Added signature file setting to smtp account config.
 And the signature can be edited and saved in the edit mail dialog.
 That does mean:
 Simply edit the signature for the selected smtp account in the
 edit new mail dialog and press the "save signature" button there.
 Then the signature is saved to the file specified in the smtp account settings.
 If there is no file specified, it is saved automatically to the file
 kdepim/apps/kopiemail/<accountname>.sig.
 ********** VERSION 2.0.1 ************
 Oooops ... I forgot to test on the Zaurus 5500 ...
 Fixed many problems of new (english) strings (and german translations)
 introduced in the latest versions, where the text was not fitting on the 
 240x320 display of the Zaurus 5500.
 KO/Pi:
 Added a popup menu ( press pen and hold to get popup ) to the agenda view
 with many useful items (add event/todo, show next week, two weeks, month, journal).
 Added items to the todolist popup menu for:
 Display all opened, all closed or all todos flat.
 The "flat" view makes is possible to sort all todos after ,e.g., prio or date.
 Made the reparenting of todos on the desktop possible via Drag&Drop.
 Fixed several bugs in setting the completed datetime for todos.
 Added info about completed datetime of todos to the todo viewer.
 Now displaying a completed todo (with completed datetime set) in the agenda view
 at the time of the completion. Such that now it is possible to see in the agenda view
 when what todo was completed.
 Fixed behaviour of automatic setting completion of todos with sub-todos/parent todos.
 Now the behaviour is:
 Setting a parent to complete  sets all (sub)childs to complete. 
 Setting a parent to uncomplete does not change the childs.
 Setting a child to uncomplete sets all parent to uncomplete.
 Setting a child to complete does not change the parents.
 Smart updating and double buffering of the daymatrix.
 Showing holidays in the day matrix.
 Many other small performance updates.
 Made day labels in agenda clickable. By clicking a label, the day is displayed in single day mode.
 Now the translation file usertranslation.txt is supposed to be in utf8 format.
 If you want to translate a language from western europe, just change the germantranslation.txt file. Please read the updated Usertranslation HowTo in KO/Pi Help menu.
 ********** VERSION 2.0.0 ************
 Stable release 2.0.0!
 KO/Pi:
 Fixed problem in edit dialog recreation at startup.
 Made "toggle view*" menu items enabled context sensitive.
 Changed agenda size menu to items 1-10.
 Made it possible to change agenda size quickly by pressing mouse on timelabels in agenda view and move mouse up/down.
 Usebility enhancements in the KO/Pi menus.
 Birthday import now adds year to summary.
 What's Next view shows age in years for birthday.
 OM/Pi:
 Added three info lines to display subject, from and to of selected mails.
 KA/Pi:
 Fixed jump bar behaviour on Zaurus.
 Now KA/Pi search field supports searching for a range of starting characters.
 E.g. to search for all contact beginning with b to n, type 
 b-n
 in the search field.
 ********** VERSION 1.9.20 ************
 KO/Pi:
 Added for the "dislplay one day" agenda mode 
 info in the caption and in the day lables:
 Now it is displayed, if the selected day is from "day before yesterday"
 to "day after tomorrow".
 Made it possible to delete a Todo, which has sub-todos.
 Fixed two small problems in the todo view.
 Added missing German translation for filter edit and print dialog.
 Made search dialog closeable by cancel key.
 Made it possible to select in the date picker the (ligt grey )
 dates of the prev./next month with the mouse.
 OM/Pi:
 "Delete mail" icon in main window now deletes all selected mails.
 Fixed the problem, that the state flag of imap mails was ignored.
 Now mails with "FLAG_SEEN" on the imap server get no icon in the list view
 to indecate that they are already seen.
 Fixed the problem that the body of some mails was not displayed in the
 mail viewer when fetching them from the imap server directly to read them.
 Made it (configurable) possible  to show the "To:" field in the list view.
 Added to the mail viewer the option "View Source" to make it possible to see the raw mail data.
 Added a "Download Mail" button to the mail viewer to quickly download the viewed mail to the
 local storage folder (specified in account settings) of the account of the mail.
 Removed some memory leaks in OM/Pi.
 ********** VERSION 1.9.19 ************
 Added a lot of missing translations to KA/Pi, 
 Added some missing translations to KO/Pi and OM/Pi.
 Fixed some minor problems in KA/Pi + KO/Pi.
 Fixed a crash when closing PwM/Pi.
 Added German translation for PwM/Pi.
 Made view change and Month View update faster in KO/Pi.
 ********** VERSION 1.9.18 ************
 FYI: The VERSION 1.9.17 was a testing release only.
 Please read the changelog of VERSION 1.9.17 as well.
 Cleaned up the syncing config dialog.
 Added sync config options for date range for events.
 Added sync config options for filters on incoming data.
 Added sync config options for filters on outgoing data.
 Please read the updated SyncHowTo about the new filter settings.
 These filter settings make it now possible to sync with shared
 calendars without writing back private or confidential data
 (via the outgoing filters).
 To sync only with particular parts of a shared calendar, 
 the incoming filter settings can be used.
 An example can be found in the SyncHowTo.
 Same for shared addressbooks.
 Added a setting for the global kdepim data storage.
 Usually the data is stored in (yourhomedir/kdepim).
 Now you can set in the Global config dialog TAB, subTAB "Data storage path"
 a directory where all the kdepim data is stored.
 That makes it easy to save all kdepim data on a SD card on the Z, for example.
 KO/Pi:
 The timeedit input has a pulldown list for times.
 If opened, this pulldown list should now has the right time highlighted.
 Added the possibility to exclude events/todos/journals in a filter.
 You should exclude journals, if you do not want them to sync with a  public calendar.
 KA/Pi:
 Added the possibility to in/exclude public/private/confidential contacts to a filter.
 If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ...
 Added printing of card view and details view on desktop.
 Printing of list view is not working...
 Added button for removing pictures in contact editor.
 Parsing data fix of KA/Pi version 1.9.17.
 Fixed the "parse name automatically" problem of KA/Pi version 1.9.17.
 Fixed some syncing merging problems.
 ********** VERSION 1.9.17 ************
 KO/Pi:
 Fixed that tooltips were not updated after moving an item in agenda view.
 Fixed a bug in sorting start date for recurring events in list view.
 Changed the left button in todo viewer from "Agenda" to "Set completed".
 This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
 Added more info in the todo viewer: Startdate, parent/sub todos.
 
 KA/Pi:
 All fields search does now actually search all the (possible) fields, 
 not only those listed in the contact list.
 Made is possible to inline a picture in a vcard on the Z.
 This was only possible on the desktop, now is it possible on the Z as well.
 Fixed of missing save settings after filter configuration.
 Made saving of addressbook much faster.
 Fixed extension widget layout problem.
 Fixed saving of default formatted name settings.
 Fixed formatted name handling in edit dialog.
 Added an option for changing formatted names of many contacts
 (menu: File - Change - Set formatted name).
 QWhatsThis was not working on the Z ( only black rectangle was shown).
 This is Fixed.
 KDE-Sync:
 Now readonly KDE resources are synced as well.
 (They are not changed in KDE itself, of course).
 
 ********** VERSION 1.9.16 ************
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
 Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 Added tooltips in month view.(Tooltips only available on desktop)
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 KA/Pi:
 Fixed the problem, that internal pictures were not saved.
 Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
 Fixed some minor problems. (Like word wrap in help text windows).
 Fixed a compiling problem in microkde/kresources.
 KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM.
 This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9)
 such that now syncing KO/Pi with Sharp DTM should work on the 
 Zaurus C 3000 model.
 ********** VERSION 1.9.15 ************
 Usebilty enhancements in KO/Pi:
 When clicking on the date in a month view cell, the day view is shown.
 Old behaviour was, that the "new event" dialog popped up.
 Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 
 That means, you can restore the latest
 event/todo/journal you have deleted.
 A journal is deleted, if you clear all the text of the journal.
 Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
 KA/Pi  starting in 480x640 resolution:
 Hide the filter action in toolbar
 and added icons for undo/delete/redo in toolbar.
 Change in OM/Pi ViewMail dialog:
 When clicking on the "delete" icon the mail is deleted after confirmation as usual. 
 But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
 Fixed a crash when deleting mail-accounts in OM/Pi.
 ********** VERSION 1.9.14 ************
 Fixed some problems with the dialog sizes when switching 
 portrait/landscape mode on 640x480 PDA display.
 Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
 Fixed an ugly bug in KOpieMail: 
 KOpieMail was not able to write files (mails) to MSDOS file system, 
 like on an usual preformatted SD card. That should work now.
 To save your mail data on the Sd card do the following:
 Create a dir on the SD card:
 mkdir /mnt/card/localmail
 Go to your home dir:
 cd
 Go to kopiemail data storage dir:
 cd kdepim/apps/kopiemail
 Create a symlink to the SD card:
 ls -s /mnt/card/localmail
 Now KOpieMail will store all mails on the SD card.
 KO/Pi Monthview:
 Now "Go to Today" selects the current month from day 1-end,
 not the current date + some days.
 I.e. "Go to Today" shows now always
 the current month with first day of month in the first row. 
 Added missing German translation.
 Fixed icons of executeable on Wintendo.
 Added a "Show next Mail" button to the OM/Pi 
 mail viewer such that the mail below the current mail
 in the mail list view of the current folder
 can be read with a single click.
 ********** VERSION 1.9.13 ************
 Fixed nasty PwM/Pi file reading bug, when
 the used hash algo of file is different then the global 
 hash algo.
 Added KA/Pi support for opie mailit mailapplication.
 Fixed some bugs in OM/Pi.
 Now character conversion tables are available for the Zaurus
 to make OM/Pi working properly.
 To get the character conversion in OM/Pi working, please download
 at the sourceforge project site the package
 sr-character-conversion_SharpROM_arm.ipk.zip
 (or oz-character-conversion_OZ-gcc3xx_arm.ipk.zip for OZ roms)
 from the section "general files for KDE/Pim"
 Instructions how to install this package are in a ReadMe in this file.
 Fixed the orientation change problem in KA/Pi when switching
 portrait/landscape mode.
 French translation available for KA/Pi and OM/Pi.
 Fixed some problems with categories in KO/Pi in DTM sync.
 Added selection dialog for export to phone in KA/Pi.
 If in KO/Pi is an attendee selected to add to a meeting and this
 attendee is already in the list of attendees, this person is not added
 again.
 Some menu cleanup in KA/Pi.
 ********** VERSION 1.9.12 ************
 Fix for the bug in KO/Pi What's Next view of version 1.9.11.
 Bugfix: Licence file is now shown again.
diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm
index 04c6aa1..4c53aac 100644
--- a/desktop/rpm/kdepim_rpm
+++ b/desktop/rpm/kdepim_rpm
@@ -1,84 +1,84 @@
 Summary: A collection of PIM programs
 Name: KDE-Pim-Pi
-Version: 2.0.4
+Version: 2.0.5
 Release: SuSE_9.2
 Copyright:GPL
 Group: Productivity/Pim
 Source:http://sourceforge.net/projects/kdepimpi/
 URL:http://sourceforge.net/projects/kdepimpi/
 Packager: zautrix
 %description
 This package contains the platform-independent PIM programs from
 www.pi-sync.net, compiled for SuSE 9.2:
 KTimeTacker/Pi
 KPhone/Pi
 KAddressbook/Pi
 KOrganizer/Pi
 PasswordManager/Pi
 KOPieMail/Pi
 These applications do not need anything from the KDE-desktop
 at all to run on Linux. However, there is a dependency from
 two KDE libs, because a small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 These applications are independent from the KDE-desktop
 environment. That means, nothing of your existing
 KDE-desktop setup will be changed, or any data 
 (calendar-addressbook) used by the KDE-desktop
 applications will be changed or accessed.
 These applications stores their data and config in
 $HOME/kdepim/
 However, because the same file format is used,
 an easy exchange of data with the KDE-desktop
 is possible.
 A small command line program is included
 to make it possible to sync with the KDE-desktop applications.
 You do not need to call this program from the commandline,
 it is called from the KDE-Pim/Pi apps when you choose there:
 Sync with KDE_Desktop.
 If something is going wrong, please start the
 KDE-Pim/Pi program itself from the console to get detailed output.
 After installation, you should have a 
 PIM-pi
 folder in your KDE start menu, where you can
 start the applications from.
 These programs makes it possible to sync your Zaurus easily
 (with the KDE-Pim/Pi programs running on the Zaurus)
 with the KDE-desktop calendar/addressbook data.
 If you want to use that, you have to update your 
 KDE-desktop to version 3.3.0 or higher.
 SuSE 9.2 contains KDE 3.3.0 such that no update is needed.
 Actually - after the (non difficult) configuration is set up -
 with two mouseklicks on the Zaurus,
 the Zaurus syncs with the corresponding  KDE-Pim/Pi 
 program on the Linux Desktop which syncs automatically
 with the KDE-desktop data.
 If you want to use the KDE-desktop calendar/addressbook applications,
 just install these apps in this package and use them as a syncing tool for the
 Zaurus <-> KDE-desktop sync.
 The sync requires a network connection from your Zaurus to
 the PC. A detailed Sync HowTo is available in the
 Help menu of the applications.
 These applications makes it also possible, that you can sync
 (or just export the data to) your mobile phone with your 
 data of the KDE-desktop calendar/addressbook applications.
 This is tested and working for Nokia mobile phones,
 it may work with others as well.
 (More info about that: -> Sync HowTo)
 NOTE:
 When using SuSE 9.1 you have to update your KDE to 3.3.x
 and you have to make an online update in SuSE 9.1 to make it
 possible to get the infrared connection working, such that
 you can sync your (Nokia) mobile phone via infrared.
 %files
 /opt/kde3/share/applnk/PIM-pi/
 /opt/kdepimpi/
 /usr/lib/libmicro*
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index 9b9e164..6ae4c6f 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -409,1190 +409,1192 @@ void MonthViewCell::keyPressEvent ( QKeyEvent * e )
 }
 void MonthViewCell::startUpdateCell()
 {
    mItemList->setFocusPolicy(NoFocus); 
    if ( !mMonthView->isUpdatePossible() )
        return;
    /*    
          if ( !isVisible() ){
          return;
          }
    */
    // qDebug("MonthViewCell::updateCell() ");
    setPrimary( mDate.month()%2 );
    setHoliday( KOGlobals::self()->calendarSystem()->dayOfWeek(mDate) == KOGlobals::self()->calendarSystem()->weekDayOfPray() || ( mDate.dayOfWeek() == 6 ) && KOPrefs::instance()-> mExcludeSaturdays);
    if ( mDate == QDate::currentDate()  ) {
        mItemList->setLineWidth( 3 );
    } else {
        mItemList->setLineWidth( 1 );
    }
    mItemList->clear();
 #ifdef DESKTOP_VERSION
    QToolTip::remove(this); 
 #endif
    mToolTip = ""; 
    //qApp->processEvents();
    if ( !mHolidayString.isEmpty() ) {
        MonthViewItem *item = new MonthViewItem( 0, mDate, mHolidayString );
        item->setPalette( mHolidayPalette );
        mItemList->insertItem( item );
        mToolTip += mHolidayString+"\n"; 
    }
 }
 void MonthViewCell::insertEvent(Event *event)
 {
    
    mItemList->setFocusPolicy(WheelFocus); 
        if ( !(event->doesRecur() == Recurrence::rNone) ) {
            if ( !KOPrefs::instance()->mMonthDailyRecur && event->doesRecur() == Recurrence::rDaily )
                return;
            else
                if ( !KOPrefs::instance()->mMonthWeeklyRecur && event->doesRecur() == Recurrence::rWeekly )
                    return;
        }
        
        if ( event->categories().contains("Holiday") ||
             event->categories().contains(i18n("Holiday"))) {
            setHoliday( true );
            if ( mDate.dayOfWeek() == 7 )
                mItemList->setLineWidth( 3 );
        }
        QString text;
        if (event->isMultiDay()) {
            QString prefix = "<->";
            if ( event->doesRecur() ) {
                if ( event->recursOn( mDate) )
                    prefix ="->" ;
                else {
                    int days =  event->dtStart().date().daysTo ( event->dtEnd().date() );
                    if ( event->recursOn( mDate.addDays( -days)) )
                        prefix ="<-" ;
                } 
            } else {
                if (mDate == event->dtStart().date()) {
                    prefix ="->" ;
                } else if (mDate == event->dtEnd().date()) {
                    prefix ="<-" ;
                }
            }
            if ( !event->doesFloat() ) {
                if ( mDate == event->dtStart().date () )
                    prefix += KGlobal::locale()->formatTime(event->dtStart().time())+" ";
                else if ( mDate == event->dtEnd().date () )
                    prefix += KGlobal::locale()->formatTime(event->dtEnd().time())+" ";
            }
            text = prefix + event->summary();
            mToolTip += text;
        } else {
            if (event->doesFloat()) {
                text = event->summary();
                mToolTip += text;
            }
            else {
                text = KGlobal::locale()->formatTime(event->dtStart().time());
                text += " " + event->summary();
                mToolTip +=  KGlobal::locale()->formatTime(event->dtStart().time()) +"-"+KGlobal::locale()->formatTime(event->dtEnd().time())+" " + event->summary();
            }
        }
        MonthViewItem *item = new MonthViewItem( event, mDate, text );
        QPalette pal;
        if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
            QStringList categories = event->categories();
            QString cat = categories.first();
            if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                pal = getPalette();
                if (cat.isEmpty()) {
                    pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                } else {
                    pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                }
            } else {
                if (cat.isEmpty()) {
                    pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                } else {
                    pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                } 
            }
           
        } else {
            pal = mStandardPalette ;
        }
        item->setPalette( pal );
        item->setRecur( event->recurrence()->doesRecur() );
        item->setAlarm( event->isAlarmEnabled() );
        item->setMoreInfo( event->description().length() > 0  );
 #ifdef DESKTOP_VERSION
        Attendee *me = event->attendeeByMails(KOPrefs::instance()->mAdditionalMails,
                                              KOPrefs::instance()->email());
        if ( me != 0 ) {
            if ( me->status() == Attendee::NeedsAction && me->RSVP())
                item->setReply(true);
            else
                item->setReply(false);
        } else
            item->setReply(false);
 #endif
        mItemList->insertItem( item );
        mToolTip += "\n";
 }
 void MonthViewCell::insertTodo(Todo *todo)
 {
    mItemList->setFocusPolicy(WheelFocus); 
      QString text;
        if (todo->hasDueDate()) {
            if (!todo->doesFloat()) {
                text += KGlobal::locale()->formatTime(todo->dtDue().time());
                text += " ";
            }
        }
        text += i18n("Td: %1").arg(todo->summary());
        MonthViewItem *item = new MonthViewItem( todo, mDate, text );
        //item->setPalette( mStandardPalette );
        QPalette pal;
        if (KOPrefs::instance()->mMonthViewUsesCategoryColor) {    
            QStringList categories = todo->categories();
            QString cat = categories.first();
            if ( KOPrefs::instance()->mMonthViewUsesForegroundColor ) {
                pal = getPalette();
                if (cat.isEmpty()) {
                    pal.setColor(QColorGroup::Foreground,KOPrefs::instance()->mEventColor);
                } else {
                    pal.setColor(QColorGroup::Foreground, *(KOPrefs::instance()->categoryColor(cat)));
                }
            } else {
                if (cat.isEmpty()) {
                    pal = QPalette(KOPrefs::instance()->mEventColor, KOPrefs::instance()->mEventColor);
                } else {
                    pal = QPalette(*(KOPrefs::instance()->categoryColor(cat)), *(KOPrefs::instance()->categoryColor(cat)));
                } 
            }
           
        } else {
            pal = mStandardPalette ;
        }
        item->setPalette( pal );
        mItemList->insertItem( item );
        mToolTip += text+"\n"; 
 }
 void MonthViewCell::finishUpdateCell()
 {
 #ifdef DESKTOP_VERSION
    if (mToolTip != "")
        QToolTip::add(this,mToolTip,toolTipGroup(),"");
 #endif
    mItemList->sort();
    //setMyPalette(); 
    setMyPalette();
    QString text;
    bool smallDisplay = QApplication::desktop()->width() < 320 && KOPrefs::instance()->mMonthViewSatSunTog;
    if ( KOPrefs::instance()->mMonthViewWeek || KOGlobals::self()->calendarSystem()->day( mDate ) == 1 || (mDate.dayOfWeek() == 7 && !smallDisplay ) || KOPrefs::instance()->mMonthShowShort) { 
        text = KOGlobals::self()->calendarSystem()->monthName( mDate, true ) + " ";
        mLabel->resize( mLabelBigSize  );
        text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
    } else {
        mLabel->resize( mLabelSize );
        text += QString::number( KOGlobals::self()->calendarSystem()->day(mDate) );
    }
    
    mLabel->setText( text );
    resizeEvent( 0 );
 }
 void MonthViewCell::updateCell()
 {
    qDebug("MonthViewCell::updateCell() ");
    if ( !mMonthView->isUpdatePossible() )
        return;
    startUpdateCell();
    //mLabel->setMaximumWidth( width() - mItemList->lineWidth()*2);
    QPtrList<Event> events = mMonthView->calendar()->events( mDate, true );
    Event *event;
    for( event = events.first(); event; event = events.next() ) { // for event
        insertEvent(event);
    }
    // insert due todos
    QPtrList<Todo> todos = mMonthView->calendar()->todos( mDate );
    Todo *todo;
    for(todo = todos.first(); todo; todo = todos.next()) {
        insertTodo( todo );
    }
    finishUpdateCell();
    // if ( isVisible())
    //qApp->processEvents();
 }
 void MonthViewCell::updateConfig( bool bigFont ) // = false
 {
    if ( bigFont ) {
        QFont fo = KOPrefs::instance()->mMonthViewFont;
        int ps = fo.pointSize() + 2;
        if ( ps < 18 )
            ps += 2;
        fo.setPointSize( ps ); 
        setFont( fo );
    } else
        setFont( KOPrefs::instance()->mMonthViewFont );
    QFontMetrics fm( font() );
    mLabelSize = fm.size( 0, "30" ) + QSize( 4, 2 );
    mLabelBigSize = fm.size( 0, "Mag 30" ) + QSize( 2, 2 );
    mHolidayPalette = mStandardPalette;
    mPrimaryPalette = mStandardPalette;
    mNonPrimaryPalette = mStandardPalette;
    if ( KOPrefs::instance()->mMonthViewUsesDayColors ) {
        mHolidayPalette.setColor(QColorGroup::Base, KOPrefs::instance()->mMonthViewHolidayColor  );
        mHolidayPalette.setColor(QColorGroup::Background, KOPrefs::instance()->mMonthViewHolidayColor  );
        mHolidayPalette.setColor(QColorGroup::Foreground,  KOPrefs::instance()->mMonthViewHolidayColor.dark());
        mPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewOddColor.dark());
        mPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewOddColor);
        mPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewOddColor);
        mNonPrimaryPalette.setColor(QColorGroup::Foreground,KOPrefs::instance()->mMonthViewEvenColor.dark());
        mNonPrimaryPalette.setColor(QColorGroup::Base,KOPrefs::instance()->mMonthViewEvenColor); 
        mNonPrimaryPalette.setColor(QColorGroup::Background,KOPrefs::instance()->mMonthViewEvenColor); 
    }
    //updateCell(); 
 }
 void MonthViewCell::enableScrollBars( bool enabled )
 {
    if ( enabled ) {
        mItemList->setVScrollBarMode(QScrollView::Auto);
        mItemList->setHScrollBarMode(QScrollView::Auto);
    } else {
        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 ),
-      mShortDayLabels( false ), mWidthLongDayLabel( 0 ), mSelectedCell( 0 )
+      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();
 #endif
 }
 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 = mShortDayLabels;
+            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,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsW));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabelsW));
        }
    }
    mDayLabelsT = &mDayLabels;
    for (int i = 0; i < 7; i++) {
        if (mWeekStartsMonday) {
-            bool show = mShortDayLabels;
+            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,mShortDayLabels));
+            if (i==0) (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(7,mShortDayLabelsM));
-            else (*mDayLabelsT)[i]->setText(KOGlobals::self()->calendarSystem()->weekDayName(i,mShortDayLabels));
+            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() ) {
                        incidenceEnd = incidenceStart.addDays( eventlen );
                        int st =   incidenceStart.date().daysTo( endDate );
                        if ( st >= 0 ) { // start before timeend
                            int end = mStartDate.daysTo( incidenceEnd.date() );
                            if ( end >= 0 ) { // end after timestart --- got one!
                                //normalize
                                st =  timeSpan - st;
                                if ( st < 0 ) st = 0;
                                if ( end > timeSpan ) end = timeSpan;
                                int iii;
                                //qDebug("found %s %d %d ",event->summary().latin1(), st, end );
                                for ( iii = st;iii<= end;++iii) 
                                    (*cells)[iii]->insertEvent( event );
                            }
                        }
                    } else {
                        if ( invalid )
                            break;
                        invalid = true;
                        //qDebug("invalid %s", event->summary().latin1());
                        incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                    }
                    if ( last )
                        break;
                    bool ok;
                    incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
                    if ( ! ok )
                        break;
                    if ( incidenceStart.date() > endDate )
                        break;
            }
        } else { // no recur 
            int st =  event->dtStart().date().daysTo( endDate );
            if ( st >= 0 ) { // start before timeend
                int end = mStartDate.daysTo( event->dtEnd().date() );
                if ( end >= 0 ) { // end after timestart --- got one!
                    //normalize
                    st =  timeSpan - st;
                    if ( st < 0 ) st = 0;
                    if ( end > timeSpan ) end = timeSpan;
                    int iii;
                    for ( iii = st;iii<= end;++iii)
                        (*cells)[iii]->insertEvent( event );
                }
            }
        }
    }
    // insert due todos
    QPtrList<Todo> todos = calendar()->todos( );
    Todo *todo;
    for(todo = todos.first(); todo; todo = todos.next()) {
        //insertTodo( todo );
        if ( todo->hasDueDate() ) {
            int day = mStartDate.daysTo( todo->dtDue().date() );
            if ( day >= 0 && day < timeSpan + 1)  {
                (*cells)[day]->insertTodo( todo );
            }
        }
    }
    for( i = 0; i < timeSpan+1; ++i ) {
        (*cells)[i]->finishUpdateCell();
    }
    processSelectionChange();
    (*cells)[0]->setFocus();
 #else
    // old code
    //qDebug("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ ");
    int i;
    for( i = 0; i < (*cells).count(); ++i ) {
        (*cells)[i]->updateCell();
    }
 
    //qDebug("KOMonthView::updateView() ");
    processSelectionChange();
    // qDebug("---------------------------------------------------------------------+ ");
    (*cells)[0]->setFocus();
 #endif
    //qDebug("update time %d ", ti.elapsed());
 }
 void KOMonthView::resizeEvent(QResizeEvent * e)
 {
    //qDebug("KOMonthView::resizeEvent %d %d -- %d %d ", e->size().width(), e->size().height(), e->oldSize().width(), e->oldSize().height());
    computeLayout();
    clPending = true; 
    if ( mShowWeekView )
        mCellsW[0]->setFocus();
    else
        mCells[0]->setFocus();
 }
 void KOMonthView::computeLayoutWeek()
 {
    static int lastWid = 0;
    static int lastHei = 0;
    int daysToShow;
    bool combinedSatSun  = false;
    if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
        daysToShow = 6;
        combinedSatSun  = true;
    }
    int tWid = topLevelWidget()->size().width();
    int tHei = topLevelWidget()->size().height();
    int wid = width();//e
    int hei = height()-1-mNavigatorBar->height();
    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) 
        return;
     
    if ( lastWid == width() && lastHei == height() )
        return;
    lastWid = width();
    lastHei = height();
    if ( wid < hei )
        daysToShow = 2;
    else
        daysToShow = 3;
    mShowSatSunComp = true;
    combinedSatSun  = true;
        
    //qDebug("KOMonthView::computeLayout() WWW ------------------------------------ ");
    QFontMetrics fm ( mWeekLabels[0]->font() );
    int weeklabelwid = fm.width( "888" );
    wid -= weeklabelwid;
    int colWid = wid / daysToShow;
    int lastCol = wid - ( colWid*6  ); 
    int dayLabelHei = mDayLabelsW[0]->sizeHint().height();
    int cellHei = (hei - (5- daysToShow )*dayLabelHei) /(5- daysToShow ); 
    int colModulo = wid % daysToShow;
    int rowModulo = (hei- (5- daysToShow )*dayLabelHei) % daysToShow-1;
    //qDebug("rowmod %d ", rowModulo);
    int i;
    int x,y,w,h;
    x= 0;
    y= 0;
    w = colWid;
    h = dayLabelHei ;
    for ( i = 0; i < 7; i++) {
        if ( i && !( i % daysToShow) && i < 6) {
            y += hei/(5-daysToShow);
            x = 0;
            w =  colWid;
        }
        if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
            ++w;
        }
        if ( i >=  5 ) {
            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w/2+w%2,h);
            x -= (w/2 );
        }
        else
            mDayLabelsW[i]->setGeometry( x+weeklabelwid,y,w,h);
        x += w;                                   
    }
    x= 0;
    y= dayLabelHei;
    w = colWid;
    h = cellHei;
    for ( i = 0; i < mCellsW.count(); ++i) {
        if ( i > 6 ) {
            mCellsW[i]->hide();
            continue;
        }
        
        w = colWid;
        if ( ((i) % daysToShow) >= daysToShow-colModulo ) {
            ++w;
        }
        if ( i  == (daysToShow-1-rowModulo)*7)
            ++h; 
      
        if ( i >= 5 ) {
            if ( i ==5 ) {
                mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                x -= w ;y += h/2;
            } else {
                if ( ((i-1) % daysToShow) >= daysToShow-colModulo ) {
                    ++w;
                }
                mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                y -= h/2;
            }
        } else
            mCellsW[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                
       
        x += w;
        if ( x + w/2 > wid ) {
            x = 0;
            y += h+dayLabelHei ;
        }
    }
    y= dayLabelHei;
    h = cellHei ;
    mWeekLabelsW[0]->setGeometry( 0,y,weeklabelwid,hei-dayLabelHei);
    mWeekLabelsW[1]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
    // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
    //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
-    mShortDayLabels = mDayLabelsW[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsW = mDayLabelsW[0]->width()-2 < mWidthLongDayLabel ;
    updateDayLabels();
    //bool forceUpdate = !updatePossible;
    updatePossible = true;
    //mWeekLabels[mNumWeeks]->setText( i18n("M"));
    //if ( forceUpdate )
    //  updateView();
 }
 void KOMonthView::computeLayout()
 {
  
    static int lastWid = 0;
    static int lastHei = 0;
    if ( mShowWeekView ){
            computeLayoutWeek();
            return;
    }
    int daysToShow = 7;
    bool combinedSatSun  = false;
    if (mShowSatSunComp = KOPrefs::instance()->mMonthViewSatSunTog ) {
        daysToShow = 6;
        combinedSatSun  = true;
    }
    int tWid = topLevelWidget()->size().width();
    int tHei = topLevelWidget()->size().height();
    int wid = width();//e
    int hei = height()-1-mNavigatorBar->height();
    if ( ((wid *3)/2) < tWid && (( hei *3) /2) < tHei  ) {
        return;  
    }
    if ( lastWid == width() && lastHei == height() ){
        return;
    }
    lastWid = width();
    lastHei =  height();
    //qDebug("KOMonthView::computeLayout() MMM ------------------------------------ ");
    QFontMetrics fm ( mWeekLabels[0]->font() );
    int weeklabelwid = fm.width( "888" );
    wid -= weeklabelwid;
    int colWid = wid / daysToShow;
    int lastCol = wid - ( colWid*6  ); 
    int dayLabelHei = mDayLabels[0]->sizeHint().height();
    int cellHei = (hei - dayLabelHei) /6; 
    int colModulo = wid % daysToShow;
    int rowModulo = (hei- dayLabelHei) % 6;
    //qDebug("rowmod %d ", rowModulo);
    int i;
    int x,y,w,h;
    x= 0;
    y= 0;
    w = colWid;
    h = dayLabelHei ;
    for ( i = 0; i < 7; i++) {
        if ( i == daysToShow-colModulo )
            ++w;
        if ( combinedSatSun ) {
            if ( i >=  daysToShow-1 ) {
                mDayLabels[i]->setGeometry( x+weeklabelwid,y,w/2,h);
                x -= w/2 ;
            }
            else
                mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
        } else
            mDayLabels[i]->setGeometry( x+weeklabelwid,y,w,h);
        x += w;                                   
    }
    x= 0;
    y= dayLabelHei;
    w = colWid;
    h = cellHei ;
    for ( i = 0; i < mCells.count(); ++i) {
        //qDebug("iii %d ", i);
        w = colWid;
        if ( ((i) % 7) >= 7-colModulo ) {
            ++w;
        }
        if ( i  == (6-rowModulo)*7)
            ++h; 
        if ( combinedSatSun ) {
            if ( (i)%7 >=  daysToShow-1 ) {
                if ( (i)%7 ==  daysToShow-1 ) {
                    mCells[i]->setGeometry ( x+weeklabelwid,y,w,h/2 ); 
                    x -= w ;y += h/2;
                } else {
                    mCells[i]->setGeometry ( x+weeklabelwid,y,w,h-h/2 ); 
                    y -= h/2;
                }
            } else
                mCells[i]->setGeometry ( x+weeklabelwid,y,w,h ); 
                
        }
        else
            mCells[i]->setGeometry ( x+weeklabelwid,y,w,h );
        x += w;
        if ( x + w/2 > wid ) {
            x = 0;
            y += h;
        }
    }
    y= dayLabelHei;
    h = cellHei ;
    for ( i = 0; i < 6; i++) {
        if ( i  == (6-rowModulo))
            ++h;
        mWeekLabels[i]->setGeometry( 0,y,weeklabelwid,h);
        y += h;                            
    }
    mWeekLabels[6]->setGeometry( 0,0,weeklabelwid,dayLabelHei);
    // qDebug("RRRRRRRRRRRRR %d %d  old %d %d", e->size().width(),e->size().height() , e->oldSize().width(),e->oldSize().height());
    //qDebug("parent %d %d ", topLevelWidget()->size().width(), topLevelWidget()->size().height());
-    mShortDayLabels = mDayLabels[0]->width() < mWidthLongDayLabel ;
+    mShortDayLabelsM = mDayLabels[0]->width()-2 < mWidthLongDayLabel ;
    updateDayLabels();
    //bool forceUpdate = !updatePossible;
    updatePossible = true;
    //mWeekLabels[mNumWeeks]->setText( i18n("W"));
 }
 void KOMonthView::showContextMenu( Incidence *incidence )
 {
    mContextMenu->showIncidencePopup(incidence);
    /*
      if( incidence && incidence->type() == "Event" ) {
      Event *event = static_cast<Event *>(incidence);
      mContextMenu->showEventPopup(event);
      } else {
      kdDebug() << "MonthView::showContextMenu(): cast failed." << endl;
      }
    */
 }
 MonthViewCell * KOMonthView::selectedCell( )
 {
    return mSelectedCell;
 }
 void KOMonthView::setSelectedCell( MonthViewCell *cell )
 {
    // qDebug("KOMonthView::setSelectedCell ");
    if ( mSelectedCell && mSelectedCell != cell ) {
        MonthViewCell * mvc = mSelectedCell;
        mSelectedCell = cell;
        mvc->deselect();
    } else 
        mSelectedCell = cell;
    //  if ( mSelectedCell )
    //         mSelectedCell->select();
    if ( !mSelectedCell )
        emit incidenceSelected( 0 );
    else 
        emit incidenceSelected( mSelectedCell->selectedIncidence() );
 }
 void KOMonthView::processSelectionChange()
 {
    QPtrList<Incidence> incidences = selectedIncidences();
    if (incidences.count() > 0) {
        emit incidenceSelected( incidences.first() );
    } else {
        emit incidenceSelected( 0 );
    }
 }
 void KOMonthView::clearSelection()
 {
    if ( mSelectedCell ) {
        mSelectedCell->deselect();
        mSelectedCell = 0;
    }
 }
 void KOMonthView::keyPressEvent ( QKeyEvent * e )
 {
    //qDebug("KOMonthView::keyPressEvent ");
    switch(e->key()) {
    case Key_Up: 
        {
            emit prevMonth();
            if ( mShowWeekView )
                mCellsW[0]->setFocus();
            else
                mCells[0]->setFocus();
        }
        e->accept();
        break;
    case Key_Down:
        {
            emit nextMonth();
            if ( mShowWeekView )
                mCellsW[0]->setFocus();
            else
                mCells[0]->setFocus();
           
        }
        e->accept();
        break;
    case Key_Return:
    case Key_Enter:
        {
            selectInternalWeekNum ( currentWeek() );
        }
        e->accept();
        break;
    default:
        e->ignore();     
        break;
    }
 }
diff --git a/korganizer/komonthview.h b/korganizer/komonthview.h
index bf861ef..03f9dc6 100644
--- a/korganizer/komonthview.h
+++ b/korganizer/komonthview.h
@@ -1,297 +1,298 @@
 /*
    This file is part of KOrganizer.
    Copyright (c) 2000,2001 Cornelius Schumacher <schumacher@kde.org>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 #ifndef _KOMONTHVIEW_H
 #define _KOMONTHVIEW_H
 #include <qlabel.h>
 #include <qframe.h>
 #include <qdatetime.h>
 #include <qlistbox.h>
 #include <qpoint.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qintdict.h>
 #include <qpushbutton.h>
 #include <qvaluelist.h>
 #include <qptrvector.h>
 #include <libkcal/calendar.h>
 #include <libkcal/event.h>
 #include "koeventview.h"
 #include "navigatorbar.h"
 #ifdef DESKTOP_VERSION
 class QToolTipGroup; 
 #endif
 class KNOWhatsThis; 
 class KOWeekButton : public QPushButton
 {
    Q_OBJECT
  public:
    KOWeekButton( QWidget *parent=0, const char *name=0 ) :
      QPushButton( parent, name) 
    {
      connect( this, SIGNAL( clicked() ),
               SLOT( bottonClicked() )); 
      mNumber = -1;
    }
    void setWeekNum ( int num ) {mNumber = num; setText( QString::number ( num ));}
    int getWeekNum() { return mNumber;}
    signals:
    void selectWeekNum ( int );
 private:
    int mNumber;
 private slots :
    void bottonClicked() { if ( mNumber > 0 ) emit selectWeekNum ( mNumber ); }
 };
 class KNoScrollListBox: public QListBox
 {
    Q_OBJECT
  public:
    KNoScrollListBox(QWidget *parent=0, const char *name=0);
    ~KNoScrollListBox();
    QString getWhatsThisText(QPoint p) ;
  signals:
    void shiftDown();
    void shiftUp();
    void rightClick();
   protected slots:
    void oneDown();
    void keyPressEvent(QKeyEvent *);
    void keyReleaseEvent(QKeyEvent *);
    void mousePressEvent(QMouseEvent *);
 private:
    KNOWhatsThis * mWT;
 };
 class MonthViewItem: public QListBoxItem
 {
  public:
    MonthViewItem( Incidence *, QDate qd, const QString & title );
    void setRecur(bool on) { mRecur = on; }
    void setAlarm(bool on) { mAlarm = on; }
    void setReply(bool on) { mReply = on; }
    void setMoreInfo(bool on) { mInfo = on; }
    void setPalette(const QPalette &p) { mPalette = p; }
    QPalette palette() const { return mPalette; }
    Incidence *incidence() const { return mIncidence; }
    QDate incidenceDate() { return mDate; }
  protected:
    virtual void paint(QPainter *);
    virtual int height(const QListBox *) const;
    virtual int width(const QListBox *) const;
  private:
    bool mRecur;
    bool mAlarm;
    bool mReply;
    bool mInfo;
    QPalette mPalette;
    QDate mDate;
    Incidence *mIncidence;
 };
 class KOMonthView;
 class MonthViewCell : public QWidget
 {
    Q_OBJECT
  public:
    MonthViewCell(KOMonthView *,QWidget* );
    void setDate( const QDate & );
    QDate date() const;
    void setPrimary( bool );
    bool isPrimary() const;
    void setHoliday( bool );
    void setHoliday( const QString & );
    void updateCell();
    void startUpdateCell();
    void finishUpdateCell();
    void insertEvent(Event *);
    void insertTodo(Todo *);
    void updateConfig( bool bigFont = false );
    void enableScrollBars( bool );
    Incidence *selectedIncidence();
    QDate selectedIncidenceDate();
    void deselect();
    void select();
 #ifdef DESKTOP_VERSION
    static QToolTipGroup *toolTipGroup(); 
 #endif
  signals:
    void defaultAction( Incidence * );
    void newEventSignal( QDateTime );
    void showDaySignal( QDate );
    
  protected:
    QString mToolTip;
    void resizeEvent( QResizeEvent * );
  protected slots:
    void defaultAction( QListBoxItem * );
    void contextMenu( QListBoxItem * );
    void selection( QListBoxItem * );
    void cellClicked( QListBoxItem * );
    void newEvent();
    void showDay();
    
  private:
    KOMonthView *mMonthView;
  
    QDate mDate;
    bool mPrimary;
    bool mHoliday;
    QString mHolidayString;
    
    //QLabel *mLabel;
    QPushButton *mLabel;
    QListBox *mItemList;
 #ifdef DESKTOP_VERSION
    static QToolTipGroup *mToolTipGroup; 
 #endif 
    QSize mLabelSize;
    QSize mLabelBigSize;
    QPalette mHolidayPalette;
    QPalette mStandardPalette;
    QPalette mPrimaryPalette;
    QPalette mNonPrimaryPalette;
    void setMyPalette();
    QPalette  getPalette ();
    void keyPressEvent ( QKeyEvent * ) ;
    
 };
 class KOMonthView: public KOEventView
 {
    Q_OBJECT
  public:
    KOMonthView(Calendar *cal, QWidget *parent = 0, const char *name = 0 );
    ~KOMonthView();
    /** Returns maximum number of days supported by the komonthview */
    virtual int maxDatesHint();
    /** Returns number of currently shown dates. */
    virtual int currentDateCount();
    /** returns the currently selected events */
    virtual QPtrList<Incidence> selectedIncidences();
    /** returns dates of the currently selected events */
    virtual DateList selectedDates();
    virtual void printPreview(CalPrinter *calPrinter,
                              const QDate &, const QDate &);
    bool isMonthView() { return true; }
    bool isUpdatePossible() { return updatePossible; }
    MonthViewCell * selectedCell();
    bool skipResize; 
    NavigatorBar* navigatorBar() { return mNavigatorBar ;}
  public slots:
    virtual void updateView();
    virtual void updateConfig();
    virtual void showDates(const QDate &start, const QDate &end);
    virtual void showEvents(QPtrList<Event> eventList);
    void changeEventDisplay(Event *, int);
    void clearSelection();
    void showContextMenu( Incidence * );
    void setSelectedCell( MonthViewCell * );
  protected slots:
    void selectInternalWeekNum ( int );
    void switchView();
    void processSelectionChange();
 signals:
    void nextMonth();
    void prevMonth();
    void selectWeekNum ( int );
    void showDaySignal( QDate );
  protected:
    void resizeEvent(QResizeEvent *);
    void viewChanged();
    void updateDayLabels();
  private:
    NavigatorBar* mNavigatorBar;
    int currentWeek();
    bool clPending;
    QWidgetStack * mWidStack;
    QWidget* mMonthView;
    QWidget* mWeekView;
    bool mShowWeekView;
    bool updatePossible;
    int mDaysPerWeek;
    int mNumWeeks;
    int mNumCells;
    bool mWeekStartsMonday;
    bool mShowSatSunComp;
    void computeLayout();
    void computeLayoutWeek();
    QPtrVector<MonthViewCell> mCells;
    QPtrVector<QLabel> mDayLabels;
    QPtrVector<KOWeekButton> mWeekLabels;
    QPtrVector<MonthViewCell> mCellsW;
    QPtrVector<QLabel> mDayLabelsW;
    QPtrVector<KOWeekButton> mWeekLabelsW;
-    bool mShortDayLabels;
+    bool mShortDayLabelsM;
+    bool mShortDayLabelsW;
    int mWidthLongDayLabel;
    QDate mStartDate;
    MonthViewCell *mSelectedCell;
    KOEventPopupMenu *mContextMenu;
    void keyPressEvent ( QKeyEvent * ) ;
 };
 #endif
diff --git a/korganizer/koviewmanager.cpp b/korganizer/koviewmanager.cpp
index 90be237..b0f26d1 100644
--- a/korganizer/koviewmanager.cpp
+++ b/korganizer/koviewmanager.cpp
@@ -1,537 +1,539 @@
 /*
  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 <qwidgetstack.h>
 #include <kconfig.h>
 #include <kglobal.h>
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdatetime.h>
 #include "calendarview.h"
 #include "datenavigator.h"
 #include "kotodoview.h"
 #include "koagendaview.h"
 #include "kodialogmanager.h"
 #include "komonthview.h"
 #include "kolistview.h"
 #include "kowhatsnextview.h"
 #include "kojournalview.h"
 #include "kotimespanview.h"
 #include "koprefs.h"
 #include "navigatorbar.h"
 #include "kdatenavigator.h"
 #include "koviewmanager.h"
 //extern bool externFlagMonthviewBlockPainting;
 //bool globalFlagBlockPainting = false;
 int globalFlagBlockAgenda = 0;
 int globalFlagBlockLabel = 0;
 int globalFlagBlockAgendaItemPaint = 1;
 int globalFlagBlockAgendaItemUpdate = 1;
 KOViewManager::KOViewManager( CalendarView *mainView ) :
    QObject(), mMainView( mainView )
 {
    mCurrentView = 0;
    mWhatsNextView = 0;
    mTodoView = 0;
    mAgendaView = 0;
    mMonthView = 0;
    mListView = 0;
    mJournalView = 0;
    mTimeSpanView = 0; 
    mCurrentAgendaView = 0 ;
    mFlagShowNextxDays = false;
 }
 KOViewManager::~KOViewManager()
 {
 }
 KOrg::BaseView *KOViewManager::currentView()
 {
    return mCurrentView;
 }
 void KOViewManager::readSettings(KConfig *config)
 {
    config->setGroup("General");
    QString view = config->readEntry("Current View");
    if (view == "WhatsNext") showWhatsNextView();
    else if (view == "Month") showMonthView();
    else if (view == "List") showListView();
    else if (view == "Journal") showJournalView();
    else if (view == "TimeSpan") showTimeSpanView();
    else if (view == "Todo") showTodoView();
    else {
        showAgendaView();
    }
 }
 void KOViewManager::showDateView( int view, QDate date)
 {
    static int lastMode = 0;
    static int lastCount = 0;
    static bool lastNDMode = false;
    static QDate lastDate;
    //qDebug("date %d %s", view, date.toString().latin1());
+    if (view != 9)
+        lastMode = 0;
    //qDebug("%d %d  ", lastNDMode, mFlagShowNextxDays );
    bool savemFlagShowNextxDays = mFlagShowNextxDays;
    mFlagShowNextxDays = false;
    if ( view == 3 ) {
        //mCurrentAgendaView = 1 ;
        lastDate = mMainView->dateNavigator()->selectedDates().first();
        lastCount = mMainView->dateNavigator()->selectedDates().count();
        lastNDMode = savemFlagShowNextxDays;
        mMainView->showDay( date );
+        lastMode = 1;
    } else if (view == 4 ) {
        mCurrentAgendaView = 7 ;
        mMainView->dateNavigator()->selectDates( date, 7 );
    } else if (view == 5 ) {
        mCurrentAgendaView = 14 ;
        mMainView->dateNavigator()->selectDates( date, 14);
    } else if (view == 6 ) {
        //mMainView->dateNavigator()->selectDates( date, 7 );
        showMonthView();
    } else if (view == 7 ) {
        mMainView->dateNavigator()->selectDate( date );
        showJournalView();
    } else if (view == 8 ) {
        globalFlagBlockAgenda = 1;
        if ( mCurrentAgendaView != 3 )
            mCurrentAgendaView = -1;
        showAgendaView(KOPrefs::instance()->mFullViewMonth);
        globalFlagBlockAgenda = 2;
        mMainView->dateNavigator()->selectDates( date ,
                                                 KOPrefs::instance()->mNextXDays );
        mFlagShowNextxDays = true;
        mCurrentAgendaView = 3 ;
    } if (view == 9) { // return behaviour, for getting back from mode == 3 (single day mode )
        if ( lastMode ) {
            mCurrentAgendaView = lastCount ;
            mMainView->dateNavigator()->selectDates( lastDate, lastCount);
            mFlagShowNextxDays = lastNDMode;
            if ( mFlagShowNextxDays  ) {
                mCurrentAgendaView = 3 ;
            }
        } else
            showWeekView();
    } else if (view == 10) {
        mMainView->dateNavigator()->selectDates( date,mMainView->dateNavigator()->selectedDates().count() );
    } 
-    lastMode = view;
 }
   
 void KOViewManager::writeSettings(KConfig *config)
 {
     config->setGroup("General");
    QString view;
    if (mCurrentView == mWhatsNextView) view = "WhatsNext";
    else if (mCurrentView == mMonthView) view = "Month";
    else if (mCurrentView == mListView) view = "List";
    else if (mCurrentView == mJournalView) view = "Journal";
    else if (mCurrentView == mTimeSpanView) view = "TimeSpan";
    else if (mCurrentView == mTodoView) view = "Todo";
    else view = "Agenda";
    config->writeEntry("Current View",view);
    if (mAgendaView) {
        mAgendaView->writeSettings(config);
    }
    if (mTimeSpanView) {
        mTimeSpanView->writeSettings(config);
    }
    if (mListView) {
        mListView->writeSettings(config);
    }
    if (mTodoView) {
        mTodoView->saveLayout(config,"Todo View");
    }
 }
 void KOViewManager::showView(KOrg::BaseView *view, bool fullScreen )
 {
 
    //mFlagShowNextxDays = false;
    //if(view == mCurrentView) return;  
    if ( view == 0 ) {
        view = mCurrentView;
        if ( view == 0 )
            return;
    }
    bool full = fullScreen;
    if(view == mCurrentView && view != mWhatsNextView ) {
        if ( mCurrentAgendaView < 0 )
            return;
        full = mMainView->leftFrame()->isVisible();
    } else {
        if ( view == mMonthView && mMonthView)
            ;//mMonthView->skipResize = true ; 
        mCurrentView = view;
        // bool full = fullScreen;
        bool isFull = !mMainView->leftFrame()->isVisible();
        if ( isFull && KOPrefs::instance()->mViewChangeHoldFullscreen )
            full = true;
        if ( !isFull && KOPrefs::instance()->mViewChangeHoldNonFullscreen )
            full = false;
    }
    if ( mAgendaView ) mAgendaView->deleteSelectedDateTime();
    //raiseCurrentView( full );
    mMainView->processIncidenceSelection( 0 );
    //mMainView->updateView();
    raiseCurrentView( full, true );
    mMainView->adaptNavigationUnits();
 }
 void KOViewManager::raiseCurrentView( bool fullScreen, bool callUpdateView  )
 {
    mCurrentAgendaView = 0;
    if ( fullScreen ) {
        mMainView->leftFrame()->hide();
    } else {
        mMainView->leftFrame()->show();
    }
    emit signalFullScreen( !fullScreen );
    if ( callUpdateView )
        mMainView->updateView();
        
    if ( globalFlagBlockAgenda ==  5 ) {
        globalFlagBlockAgenda =  4;
        globalFlagBlockAgendaItemPaint = 1;
    }
    mMainView->viewStack()->raiseWidget(mCurrentView);
    if ( globalFlagBlockAgenda ==  4 ) {
        if ( mCurrentView == mAgendaView ) {
            //globalFlagBlockAgenda =1 ;
            if ( KOPrefs::instance()->mSetTimeToDayStartAt )
                mAgendaView->setStartHour( KOPrefs::instance()->mDayBegins  );
            else if ( KOPrefs::instance()->mCenterOnCurrentTime )
                mAgendaView->setStartHour( QTime::currentTime ().hour() );
            qApp->processEvents();  
            //qDebug("qApp->processEvents() ");
            globalFlagBlockAgenda = 0;
            mAgendaView->repaintAgenda();
        } 
        globalFlagBlockAgenda = 0;
    }
    emit signalAgendaView( mCurrentView == mAgendaView );
    //qDebug("raiseCurrentView ende ");
 }
 void KOViewManager::updateView()
 {
    // qDebug("KOViewManager::updateView() ");
    // if we are updating mTodoView, we get endless recursion
    if ( mTodoView == mCurrentView )
        return;
    if ( mCurrentView ) mCurrentView->updateView();
 }
 void KOViewManager::updateView(const QDate &start, const QDate &end)
 {
    //  kdDebug() << "KOViewManager::updateView()" << endl;
    if (mCurrentView) mCurrentView->showDates(start, end);
    if (mTodoView && mTodoView == mCurrentView ) mTodoView->updateView();
 }
 void KOViewManager::updateWNview()
 {
    if ( mCurrentView == mWhatsNextView && mWhatsNextView )
        mWhatsNextView->updateView();
        
 }
 void KOViewManager::showWhatsNextView()
 {
    if (!mWhatsNextView) {
        mWhatsNextView = new KOWhatsNextView(mMainView->calendar(),mMainView->viewStack(),
                                             "KOViewManager::WhatsNextView");
        mWhatsNextView->setEventViewer( mMainView->getEventViewerDialog());
        connect(mMainView, SIGNAL(configChanged()), mWhatsNextView, SLOT(updateConfig()));
        addView(mWhatsNextView);
         connect(this, SIGNAL( printWNV() ),
             mWhatsNextView, SLOT( printMe() ) );
    }
    globalFlagBlockAgenda = 1;
    showView(mWhatsNextView, true );
    //mWhatsNextView->updateView();
 
 }
 void KOViewManager::showListView()
 {
    if (!mListView) {
        mListView = new KOListView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::ListView");
        addView(mListView);
        connect(mListView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mListView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mListView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mListView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) ); 
        connect( mListView, SIGNAL( signalNewEvent() ),
                 mMainView, SLOT( newEvent() ) );
        connect(mMainView, SIGNAL(configChanged()), mListView, SLOT(updateConfig())); 
        connect( mListView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cloneIncidence( Incidence * ) ) ); 
        connect( mListView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cancelIncidence( Incidence * ) ) ); 
        connect( mListView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mListView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
    }
    // bool temp = mFlagShowNextxDays;
    //globalFlagBlockPainting = true;
    globalFlagBlockAgenda = 1;
    if ( KOPrefs::instance()->mListViewMonthTimespan ) {
        mMainView->setBlockShowDates( true );
        mMainView->dateNavigator()->selectMonth();
        mMainView->setBlockShowDates( false );
    }
    showView(mListView, KOPrefs::instance()->mFullViewTodo);
    //mFlagShowNextxDays = temp;
 }
 void KOViewManager::showAgendaView( bool fullScreen )
 {
    mMainView->dialogManager()->hideSearchDialog();
    // qDebug("KOViewManager::showAgendaView ");
    bool full;
    full = fullScreen;
    if (!mAgendaView) {
        full = false; 
        mAgendaView = new KOAgendaView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::AgendaView"); 
        addView(mAgendaView);
 #ifndef DESKTOP_VERSION
        QPEApplication::setStylusOperation( mAgendaView, QPEApplication::RightOnHold );
 #endif
        connect( mAgendaView, SIGNAL( incidenceChanged(Incidence  *, int )),
                 mMainView, SLOT( changeIncidenceDisplay( Incidence  *, int ) ));
        // SIGNALS/SLOTS FOR DAY/WEEK VIEW
        connect(mAgendaView,SIGNAL(showDateView( int, QDate )),SLOT(showDateView( int, QDate )));
        connect(mAgendaView,SIGNAL(newTodoSignal(QDateTime,bool)),
                mMainView, SLOT(newTodoDateTime(QDateTime,bool)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDateTime)),
                mMainView, SLOT(newEvent(QDateTime)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDateTime,QDateTime)),
             mMainView, SLOT(newEvent(QDateTime,QDateTime)));
        connect(mAgendaView,SIGNAL(newEventSignal(QDate)),
                mMainView, SLOT(newEvent(QDate)));
        connect(mAgendaView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mAgendaView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mAgendaView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mAgendaView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
        connect(mAgendaView, SIGNAL( toggleExpand() ),
                mMainView, SLOT( toggleExpand() ) );
       
        connect(mMainView, SIGNAL( calendarViewExpanded( bool ) ),
                mAgendaView, SLOT( setExpandedButton( bool ) ) );
        connect( mAgendaView, SIGNAL( cloneIncidenceSignal(Incidence *) ), 
                 mMainView, SLOT(cloneIncidence(Incidence *) ) ) ;
        connect( mAgendaView, SIGNAL( cancelIncidenceSignal(Incidence *) ), 
                 mMainView, SLOT(cancelIncidence(Incidence *) ) ) ;
        connect(mMainView, SIGNAL(configChanged()), mAgendaView, SLOT(updateConfig())); 
        connect( mMainView, SIGNAL( todoModified( Todo *, int )), mAgendaView,
                 SLOT( updateTodo( Todo *, int ) ) );  
        connect(  mAgendaView,SIGNAL( todoMoved( Todo *, int )),
                  mMainView, SIGNAL( todoModified( Todo *, int )));
        connect( mAgendaView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mAgendaView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
        connect( mAgendaView, SIGNAL( selectWeekNum( int ) ),
                 mMainView->dateNavigator(), SLOT ( selectWeek( int ) ) );
        mAgendaView->readSettings(); 
        mAgendaView->updateConfig(); 
    }
   
    showView( mAgendaView, full);
  
 }
 void KOViewManager::showDayView()
 {
    mFlagShowNextxDays =  false;
    globalFlagBlockLabel = 1;
    globalFlagBlockAgenda = 1;
    if ( mCurrentAgendaView != 1 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;
    mMainView->dateNavigator()->selectDates( 1 );
    mCurrentAgendaView = 1 ;
    
 }
 void KOViewManager::showWorkWeekView()
 {
    mFlagShowNextxDays =  false;
    globalFlagBlockAgenda = 1;
    globalFlagBlockLabel = 1;
    if ( mCurrentAgendaView != 5 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;
    mMainView->dateNavigator()->selectWorkWeek();
    mCurrentAgendaView = 5 ;
   
 }
 void KOViewManager::showWeekView()
 {
    /*
      globalFlagBlockAgenda = 2;
      qDebug("4globalFlagBlockAgenda = 2; ");
      //globalFlagBlockPainting = true;
      mMainView->dateNavigator()->selectWeek();
      showAgendaView();
    */
    mFlagShowNextxDays = false;
    globalFlagBlockAgenda = 1;
    globalFlagBlockLabel = 1;
    if ( mCurrentAgendaView != 7 )
        mCurrentAgendaView = -1;
    showAgendaView();
    qApp->processEvents();  
    globalFlagBlockAgenda = 2;
    globalFlagBlockLabel = 0;  
    mMainView->dateNavigator()->selectWeek();
    mCurrentAgendaView = 7 ;
 }
 void KOViewManager::showNextXView()
 {
      
    globalFlagBlockAgenda = 1;
    if ( mCurrentAgendaView != 3 )
        mCurrentAgendaView = -1;
    showAgendaView(KOPrefs::instance()->mFullViewMonth);
    globalFlagBlockAgenda = 2;
    mMainView->dateNavigator()->selectDates( QDate::currentDate(),
                                             KOPrefs::instance()->mNextXDays );
    mFlagShowNextxDays = true;
    mCurrentAgendaView = 3 ;
 }
 bool KOViewManager::showsNextDays() 
 {
    return mFlagShowNextxDays;
 }
 void KOViewManager::showMonthView()
 {
    if (!mMonthView) {
        mMonthView = new KOMonthView(mMainView->calendar(), mMainView->viewStack(), "KOViewManager::MonthView");
     
        addView(mMonthView);
        // mMonthView->show();
        // SIGNALS/SLOTS FOR MONTH VIEW
        connect(mMonthView, SIGNAL(newEventSignal(QDateTime)),
                mMainView, SLOT(newEvent(QDateTime)));
        connect(mMonthView, SIGNAL(showIncidenceSignal(Incidence *)),
                mMainView, SLOT(showIncidence(Incidence *)));
        connect(mMonthView, SIGNAL(editIncidenceSignal(Incidence *)),
                mMainView, SLOT(editIncidence(Incidence *)));
        connect(mMonthView, SIGNAL(deleteIncidenceSignal(Incidence *)),
                mMainView, SLOT(deleteIncidence(Incidence *)));
        connect( mMonthView, SIGNAL( incidenceSelected( Incidence * ) ),
                 mMainView, SLOT( processMainViewSelection( Incidence * ) ) );
        connect( mMonthView, SIGNAL( cloneIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cloneIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( cancelIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( cancelIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( moveIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( moveIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( beamIncidenceSignal( Incidence *  ) ),
                 mMainView, SLOT ( beamIncidence( Incidence * ) ) );
        connect( mMonthView, SIGNAL( selectWeekNum( int ) ),
                 mMainView->dateNavigator(), SLOT ( selectWeekFromMonthView( int ) ) );
        connect( mMonthView, SIGNAL( showDaySignal( QDate ) ),
                 mMainView, SLOT ( showDay( QDate ) ) );
        connect(mMainView, SIGNAL(configChanged()), mMonthView, SLOT(updateConfig()));
        connect( mMonthView, SIGNAL(nextMonth() ),
                 mMonthView->navigatorBar(), SIGNAL(goNextMonth() ) );
        connect( mMonthView, SIGNAL(prevMonth() ),
                 mMonthView->navigatorBar(), SIGNAL(goPrevMonth() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goPrevYear() ),
                 mMainView->dateNavigator(), SLOT( selectPreviousYear() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goNextYear() ),
                 mMainView->dateNavigator(), SLOT( selectNextYear() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goPrevMonth() ),
                 mMainView->dateNavigator(), SLOT( selectPreviousMonth() ) );
        connect( mMonthView->navigatorBar(), SIGNAL( goNextMonth() ),
                 mMainView->dateNavigator(), SLOT( selectNextMonth() ) );
        
        connect( mMainView->dateNavigator(), SIGNAL( datesSelected( const KCal::DateList & ) ),
                 mMonthView->navigatorBar(), SLOT( selectDates( const KCal::DateList & ) ) );
        
        
        connect( mMonthView->navigatorBar(), SIGNAL( monthSelected ( int ) ),
                 mMainView->dateNavigator(), SLOT( slotMonthSelect( int ) ) );
    }
    globalFlagBlockAgenda = 1;
    //mFlagShowNextxDays = false;
diff --git a/version b/version
index 0584395..2976531 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-version = "2.0.4";
+version = "2.0.5";