5 files changed, 531 insertions, 4 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 0579279..cc7bf4b 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -1,1213 +1,1214 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "modules/weeklst/datebookweeklst.h"
+#include "modules/monthview/odatebookmonth.h"
 #include "dateentryimpl.h"
 
 #include <opie2/odebug.h>
 #include <opie2/oholidaypluginif.h>
 #include <opie2/oholidayplugin.h>
 #include <opie2/opluginloader.h>
 #include <opie2/todayplugininterface.h>
 
-#include <qpe/datebookmonth.h>
+//#include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/tzselect.h>
 #include <qtopia/qlibrary.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtl.h>
 #include <qtoolbar.h>
 #include <qwidgetstack.h>
 #include <qdir.h>
 #include <qlabel.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
     : QMainWindow( parent, "datebook", f ),
       aPreset( FALSE ),
       presetTime( -1 ),
       startTime( 8 ), // an acceptable default
       rowStyle( 0 ),
       bJumpToCurTime(FALSE),
       syncing(FALSE),
       inSearch(FALSE),
       alarmCounter(0)
 {
     bool needEvilHack= false; // if we need an Evil Hack
     QTime t;
     t.start();
     db = new DateBookDBHoliday;
     odebug << "loading db t=" << t.elapsed() << oendl;
     db_holiday = new DateBookHoliday();
     db->db_holiday=db_holiday;
 
     loadSettings();
     setCaption( tr("Calendar") );
     setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
     setToolBarsMovable( FALSE );
 
     views = new QWidgetStack( this );
     setCentralWidget( views );
 
     dayView = 0;
     weekView = 0;
     weekLstView = 0;
     monthView = 0;
 
 //    QToolBar *bar = new QToolBar( this );
 //    bar->setHorizontalStretchable( TRUE );
 
 //    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 
 //    QPopupMenu *view = new QPopupMenu( this );
 //    mb->insertItem( tr( "View" ), view );
 
     QToolBar *sub_bar = new QToolBar(this);
     sub_bar->setHorizontalStretchable(TRUE);
 
     QActionGroup *g = new QActionGroup( this );
     g->setExclusive( TRUE );
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
     a->addTo( sub_bar );
 
     sub_bar->addSeparator();
 
     a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
     a->addTo( sub_bar );
 //  a->addTo( view );
 
     sub_bar->addSeparator();
 
     a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
     a->addTo( sub_bar );
 //    a->addTo( view );
     a->setToggleAction( TRUE );
     a->setOn( TRUE );
     dayAction = a;
 
     a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
     a->addTo( sub_bar );
 //    a->addTo( view );
     a->setToggleAction( TRUE );
     weekAction = a;
 
     a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "datebook/weeklst" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
     a->addTo( sub_bar );
 //    a->addTo( view );
     a->setToggleAction( TRUE );
     weekLstAction = a;
 
     a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
     a->addTo( sub_bar );
 //    a->addTo( view );
     a->setToggleAction( TRUE );
     monthAction = a;
 
     sub_bar->addSeparator();
 
     a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
     a->addTo( sub_bar );
 
     a = new QAction( tr( "Edit..." ), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
     a->addTo( sub_bar );
 
     if(defaultView==DAY) viewDay();
     if(defaultView==WEEK) needEvilHack=true;    // viewWeek();
     if(defaultView==WEEKLST) viewWeekLst();
     if(defaultView==MONTH) viewMonth();
 
     connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
     connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 #endif
 
     // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
     QCopChannel *channel = new QCopChannel( "QPE/System", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
     channel = new QCopChannel( "QPE/Datebook", this );
     connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
 #endif
 
     odebug << "done t=" << t.elapsed() << oendl;
 
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
      *  Here is a problem description:
      *  When Weekview is the default view
      *  a DateBookWeekView get's created
      *  redraw() get's called. So what?
      *  Remember that we're still in the c'tor
      *  and no final layout has happened? Ok
      *  now all Events get arranged. Their x
      *  position get's determined by a QHeader
      *  position. But the QHeader isn't layouted or
      *  at the right position. redraw() is a slot
      *  so we'll call it then via a singleShot
      *  from view()
      */
     if( needEvilHack ){
         QTimer::singleShot( 500, this, SLOT(viewWeek()) );
     }
 }
 
 void DateBook::receive( const QCString &msg, const QByteArray &data )
 {
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "timeChange(QString)" ) {
     // update active view!
     if ( dayAction->isOn() )
         viewDay();
     else if ( weekAction->isOn() )
         viewWeek();
     else if ( monthAction->isOn() )
         viewMonth();
     }
     else if (msg == "editEvent(int)") {
     int uid;
     stream >> uid;
     Event e=db->eventByUID(uid);
     editEvent(e);
     }else if (msg == "viewDefault(QDate)"){
          QDate day;
          stream >> day;
          viewDefault(day);
      }
 }
 
 DateBook::~DateBook()
 {
     delete db_holiday;
 }
 
 void DateBook::slotSettings()
 {
     DateBookSettings frmSettings( ampm, this );
     frmSettings.setStartTime( startTime );
     frmSettings.setAlarmPreset( aPreset, presetTime );
     frmSettings.setJumpToCurTime( bJumpToCurTime );
     frmSettings.setRowStyle( rowStyle );
     frmSettings.comboDefaultView->setCurrentItem(defaultView-1);
     frmSettings.comboWeekListView->setCurrentItem(weeklistviewconfig);
     frmSettings.setPluginList(db_holiday->pluginManager(),db_holiday->pluginLoader());
 
     bool found=false;
     for (int i=0; i<(frmSettings.comboLocation->count()); i++) {
         if ( frmSettings.comboLocation->text(i) == defaultLocation ) {
             frmSettings.comboLocation->setCurrentItem(i);
             found=true;
             break;
         }
     }
     if(!found) {
         frmSettings.comboLocation->insertItem(defaultLocation);
         frmSettings.comboLocation->setCurrentItem(frmSettings.comboLocation->count()-1);
     }
     frmSettings.comboCategory->setCategories(defaultCategories,"Calendar", tr("Calendar"));
 
     if ( QPEApplication::execDialog( &frmSettings ) ) {
         frmSettings.savePlugins();
         db_holiday->pluginManager()->save();
         db_holiday->reloadPlugins();
 
         aPreset = frmSettings.alarmPreset();
         presetTime = frmSettings.presetTime();
         startTime = frmSettings.startTime();
         bJumpToCurTime = frmSettings.jumpToCurTime();
         rowStyle = frmSettings.rowStyle();
         defaultView=frmSettings.comboDefaultView->currentItem()+1;
         weeklistviewconfig=frmSettings.comboWeekListView->currentItem();
         defaultLocation=frmSettings.comboLocation->currentText();
         defaultCategories=frmSettings.comboCategory->currentCategories();
 
         if ( dayView ) {
             dayView->setStartViewTime( startTime );
             dayView->setJumpToCurTime( bJumpToCurTime );
             dayView->setRowStyle( rowStyle );
         }
         if ( weekView ) {
             weekView->setStartViewTime( startTime );
         }
         saveSettings();
 
         // make the change obvious
         if ( views->visibleWidget() ) {
             if ( views->visibleWidget() == dayView )
                 dayView->redraw();
             else if ( views->visibleWidget() == weekView )
                 weekView->redraw();
             else if ( views->visibleWidget() == weekLstView )
                 weekLstView->redraw();
         }
     }
 }
 
 void DateBook::fileNew()
 {
     slotNewEventFromKey("");
 }
 
 QString DateBook::checkEvent(const Event &e)
 {
     /* check if overlaps with itself */
     bool checkFailed = FALSE;
 
     /* check the next 12 repeats. should catch most problems */
     QDate current_date = e.start().date();
     Event previous = e;
     for(int i = 0; i < 12; i++)
     {
     QDateTime next;
     if (!nextOccurance(previous, current_date.addDays(1), next)) {
         break;  // no more repeats
     }
     if(next < previous.end()) {
         checkFailed = TRUE;
         break;
     }
     current_date = next.date();
     }
 
     if(checkFailed)
     return tr("Event duration is potentially longer\n"
           "than interval between repeats.");
 
     return QString::null;
 }
 
 QDate DateBook::currentDate()
 {
     QDate d = QDate::currentDate();
 
     if ( dayView && views->visibleWidget() == dayView ) {
     d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
         d = weekView->date();
     } else if ( weekLstView && views->visibleWidget() == weekLstView ) {
         d = weekLstView->date();
     } else if ( monthView && views->visibleWidget() == monthView ) {
     d = monthView->selectedDate();
     }
 
     return d;
 }
 
 void DateBook::view(int v, const QDate &d) {
     if (v==DAY) {
         initDay();
         dayAction->setOn( TRUE );
         dayView->setDate( d );
         views->raiseWidget( dayView );
         dayView->redraw();
     } else if (v==WEEK) {
         initWeek();
         weekAction->setOn( TRUE );
         weekView->setDate( d );
         views->raiseWidget( weekView );
         weekView->redraw();
     } else if (v==WEEKLST) {
         initWeekLst();
         weekLstAction->setOn( TRUE );
         weekLstView->setDate(d);
         views->raiseWidget( weekLstView );
         weekLstView->redraw();
     } else if (v==MONTH) {
         initMonth();
         monthAction->setOn( TRUE );
         monthView->setDate( d.year(), d.month(), d.day() );
         views->raiseWidget( monthView );
         monthView->redraw();
     }
 }
 
 void DateBook::viewDefault(const QDate &d) {
     view(defaultView,d);
 }
 
 void DateBook::viewDay() {
     view(DAY,currentDate());
 }
 
 void DateBook::viewWeek() {
     view(WEEK,currentDate());
 }
 
 void DateBook::viewWeekLst() {
     view(WEEKLST,currentDate());
 }
 
 void DateBook::viewMonth() {
     view(MONTH,currentDate());
 }
 
 void DateBook::insertEvent( const Event &e )
 {
     Event dupEvent=e;
     if(!dupEvent.isValidUid() ) // tkcRom seems to be different
         dupEvent.assignUid();
     dupEvent.setLocation(defaultLocation);
     dupEvent.setCategories(defaultCategories);
     db->addEvent(dupEvent);
     emit newEvent();
 }
 
 void DateBook::duplicateEvent( const Event &e )
 {
     // Alot of code duplication, as this is almost like editEvent();
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
         return;
     }
 
     Event dupevent(e);  // Make a duplicate.
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Duplicate Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, dupevent, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
     while ( QPEApplication::execDialog( &editDlg ) ) {
         Event newEv = entry->event();
         QString error = checkEvent(newEv);
         if (!error.isNull()) {
             if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0)
                 continue;
         }
         /*
         * The problem:
         * DateBookDB does remove repeating events not by uid but by the time
         * the recurrence was created
         * so we need to update that time as well
         */
         Event::RepeatPattern rp = newEv.repeatPattern();
         rp.createTime = ::time( NULL );
         newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
         if( newEv.uid() == e.uid() || !newEv.isValidUid() )
             newEv.assignUid();
 
         db->addEvent(newEv);
         emit newEvent();
         break;
     }
 }
 
 void DateBook::editEvent( const Event &e )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
         return;
     }
 
     // workaround added for text input.
     QDialog editDlg( this, 0, TRUE );
     DateEntry *entry;
     editDlg.setCaption( tr("Edit Event") );
     QVBoxLayout *vb = new QVBoxLayout( &editDlg );
     QScrollView *sv = new QScrollView( &editDlg, "scrollview" );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     // KLUDGE!!!
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
     entry = new DateEntry( onMonday, e, ampm, &editDlg, "editor" );
     entry->timezone->setEnabled( FALSE );
     sv->addChild( entry );
 
     while ( QPEApplication::execDialog( &editDlg ) ) {
         Event newEv = entry->event();
         if(newEv.description().isEmpty() && newEv.notes().isEmpty() )
             break;
         newEv.setUid(e.uid()); // FIXME: Hack not to clear uid
         QString error = checkEvent(newEv);
         if (!error.isNull()) {
             if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) continue;
     }
     db->editEvent(e, newEv);
     emit newEvent();
     break;
     }
 }
 
 void DateBook::removeEvent( const Event &e )
 {
     if (syncing) {
         QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
         return;
     }
 
     QString strName = e.description();
 
     if ( !QPEMessageBox::confirmDelete( this, tr( "Calendar" ),strName ) )
     return;
 
     db->removeEvent( e );
     if ( views->visibleWidget() == dayView && dayView )
         dayView->redraw();
 
 }
 
 void DateBook::addEvent( const Event &e )
 {
     QDate d = e.start().date();
     initDay();
     dayView->setDate( d );
 }
 
 void DateBook::showDay( int year, int month, int day )
 {
     QDate d(year, month, day);
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
     if ( !dayView ) {
         dayView = new DateBookDay( ampm, onMonday, db, db_holiday, views, "day view" );
         views->addWidget( dayView, DAY );
                 dayView->setJumpToCurTime( bJumpToCurTime );
         dayView->setStartViewTime( startTime );
         dayView->setRowStyle( rowStyle );
         connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) );
         connect( dayView, SIGNAL( newEvent() ),     this, SLOT( fileNew() ) );
         connect( dayView, SIGNAL( removeEvent(const Event&) ), this, SLOT( removeEvent(const Event&) ) );
         connect( dayView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
         connect( dayView, SIGNAL( duplicateEvent(const Event&) ), this, SLOT( duplicateEvent(const Event&) ) );
         connect( dayView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) );
         connect( dayView, SIGNAL(sigNewEvent(const QString&)), this, SLOT(slotNewEventFromKey(const QString&)) );
     }
 }
 
 void DateBook::initWeek()
 {
     if ( !weekView ) {
         weekView = new DateBookWeek( ampm, onMonday, db, views, "week view" );
         weekView->setStartViewTime( startTime );
         views->addWidget( weekView, WEEK );
         connect( weekView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
         connect( this, SIGNAL( newEvent() ), weekView, SLOT( redraw() ) );
     }
 
     //But also get it right: the year that we display can be different
     //from the year of the current date. So, first find the year
     //number of the current week.
     int yearNumber, totWeeks;
     calcWeek( currentDate(), totWeeks, yearNumber, onMonday );
 
     QDate d = QDate( yearNumber, 12, 31 );
     calcWeek( d, totWeeks, yearNumber, onMonday );
 
     while ( totWeeks == 1 ) {
         d = d.addDays( -1 );
         calcWeek( d, totWeeks, yearNumber, onMonday );
     }
 }
 
 void DateBook::initWeekLst() {
     if ( !weekLstView ) {
         weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" );
         views->addWidget( weekLstView, WEEKLST );
 
         //weekLstView->setStartViewTime( startTime );
         connect( weekLstView, SIGNAL( showDate(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
         connect( weekLstView, SIGNAL( addEvent(const QDateTime&,const QDateTime&,const QString&, const QString&) ),
             this, SLOT( slotNewEntry(const QDateTime&,const QDateTime&,const QString&, const QString&) ) );
         connect( this, SIGNAL( newEvent() ), weekLstView, SLOT( redraw() ) );
         connect( weekLstView, SIGNAL( editEvent(const Event&) ), this, SLOT( editEvent(const Event&) ) );
         connect( weekLstView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
         connect( weekLstView, SIGNAL( beamEvent(const Event&) ), this, SLOT( beamEvent(const Event&) ) );
         connect( weekLstView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) );
     }
 }
 
 
 void DateBook::initMonth()
 {
     if ( !monthView ) {
-        monthView = new DateBookMonth( views, "month view", FALSE, db );
+        monthView = new ODateBookMonth( views, "month view", FALSE, db );
         views->addWidget( monthView, MONTH );
         connect( monthView, SIGNAL( dateClicked(int,int,int) ), this, SLOT( showDay(int,int,int) ) );
         connect( this, SIGNAL( newEvent() ), monthView, SLOT( redraw() ) );
         qApp->processEvents();
     }
 }
 
 void DateBook::loadSettings()
 {
     Config qpeconfig( "qpe" );
     qpeconfig.setGroup("Time");
     ampm = qpeconfig.readBoolEntry( "AMPM", TRUE );
     onMonday = qpeconfig.readBoolEntry( "MONDAY" );
 
     Config config("DateBook");
     config.setGroup("Main");
     startTime = config.readNumEntry("startviewtime", 8);
     aPreset = config.readBoolEntry("alarmpreset");
     presetTime = config.readNumEntry("presettime");
     bJumpToCurTime = config.readBoolEntry("jumptocurtime");
     rowStyle = config.readNumEntry("rowstyle");
     defaultView = config.readNumEntry("defaultview",DAY);
     weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL);
 
     defaultLocation=config.readEntry("defaultLocation");
     QString tmpString=config.readEntry("defaultCategories");
     QStringList tmpStringList=QStringList::split(",",tmpString);
     defaultCategories.truncate(0);
 
     for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
         defaultCategories.resize(defaultCategories.count()+1);
         defaultCategories[defaultCategories.count()-1]=(*i).toInt();
     }
 }
 
 void DateBook::saveSettings()
 {
     Config config( "qpe" );
     Config configDB( "DateBook" );
     configDB.setGroup( "Main" );
     configDB.writeEntry("startviewtime",startTime);
     configDB.writeEntry("alarmpreset",aPreset);
     configDB.writeEntry("presettime",presetTime);
     configDB.writeEntry("jumptocurtime", bJumpToCurTime);
     configDB.writeEntry("rowstyle", rowStyle);
     configDB.writeEntry("defaultview",defaultView);
     configDB.writeEntry("weeklistviewconfig",weeklistviewconfig);
 
     configDB.writeEntry("defaultLocation",defaultLocation);
     QStringList tmpStringList;
     for( uint i=0; i<defaultCategories.count(); i++) {
         tmpStringList << QString::number(defaultCategories[i]);
     }
     configDB.writeEntry("defaultCategories",tmpStringList.join(","));
 }
 
 void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 {
     bool needShow = FALSE;
     if ( msg == "alarm(QDateTime,int)" ) {
         QDataStream ds(data,IO_ReadOnly);
         QDateTime when; int warn;
         ds >> when >> warn;
 
         // check to make it's okay to continue,
         // this is the case that the time was set ahead, and
         // we are forced given a stale alarm...
         QDateTime current = QDateTime::currentDateTime();
         if ( current.time().hour() != when.time().hour() && current.time().minute() != when.time().minute() )
             return;
 
         QValueList<EffectiveEvent> list = db->getEffectiveEvents(when.addSecs(warn*60));
         if ( list.count() > 0 ) {
             QString msg;
             bool bSound = FALSE;
             int stopTimer = 0;
             bool found = FALSE;
             for ( QValueList<EffectiveEvent>::ConstIterator it=list.begin(); it!=list.end(); ++it ) {
                 if ( (*it).event().hasAlarm() ) {
                     found = TRUE;
                     msg += "<CENTER><B>" + (*it).description() + "</B>"
                     + "<BR>" + (*it).location() + "<BR>"
                     + TimeString::dateString((*it).event().start(),ampm)
                     + (warn
                         ? tr(" (in " + QString::number(warn)
                         + tr(" minutes)"))
                         : QString(""))
                     + "<BR>"
                     + (*it).notes() + "</CENTER>";
                     if ( (*it).event().alarmSound() != Event::Silent ) {
                         bSound = TRUE;
                     }
                 }
             }
             if ( found ) {
                 if ( bSound ) {
                     Sound::soundAlarm();
                     alarmCounter = 0;
                     stopTimer = startTimer( 5000 );
                 }
                 QDialog dlg( this, 0, TRUE );
                 QVBoxLayout *vb = new QVBoxLayout( &dlg );
                 QScrollView *view = new QScrollView( &dlg, "scrollView");
                 view->setResizePolicy( QScrollView::AutoOneFit );
                 vb->addWidget( view );
                 QLabel *lblMsg = new QLabel( msg, &dlg );
                 view->addChild( lblMsg );
                 QPushButton *cmdOk = new QPushButton( tr("OK"), &dlg );
                 connect( cmdOk, SIGNAL(clicked()), &dlg, SLOT(accept()) );
                 vb->addWidget( cmdOk );
 
                 needShow = QPEApplication::execDialog( &dlg );
 
                 if ( bSound )
                     killTimer( stopTimer );
                 }
             }
         } else if ( msg == "nextView()" ) {
                     needShow = true;
             if ( !qApp-> activeWindow ( )) {
                 needShow = TRUE;
             } else {
                 QWidget* cur = views->visibleWidget();
                 if ( cur ) {
                 if ( cur == dayView )
                     viewWeek();
                 else if ( cur == weekView )
                     viewWeekLst();
                 else if ( cur == weekLstView )
                     viewMonth();
                 else if ( cur == monthView )
                     viewDay();
                 needShow = TRUE;
             }
         }
     }   else if (msg == "editEvent(int)") {
         /* simple copy from receive */
         QDataStream stream(data,IO_ReadOnly);
     int uid;
     stream >> uid;
     Event e=db->eventByUID(uid);
     editEvent(e);
     } else if (msg == "viewDefault(QDate)"){
         /* simple copy from receive */
         QDataStream stream(data,IO_ReadOnly);
         QDate day;
         stream >> day;
         viewDefault(day);
         needShow = true;
      }
 
     if ( needShow ) {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 //      showMaximized();
 #else
 //      show();
 #endif
 //      raise();
         QPEApplication::setKeepRunning();
 //      setActiveWindow();
     }
 }
 
 void DateBook::reload()
 {
     db->reload();
     if ( dayAction->isOn() ) viewDay();
     else if ( weekAction->isOn() ) viewWeek();
     else if ( monthAction->isOn() ) viewMonth();
     syncing = FALSE;
 }
 
 void DateBook::flush()
 {
     syncing = TRUE;
     db->save();
 }
 
 void DateBook::timerEvent( QTimerEvent *e )
 {
     if ( alarmCounter < 10 ) {
         alarmCounter++;
         Sound::soundAlarm();
     } else {
         killTimer( e->timerId() );
     }
 }
 
 void DateBook::changeClock( bool newClock )
 {
     ampm = newClock;
     // repaint the affected objects...
     if (dayView) dayView->redraw();
     if (weekView) weekView->redraw();
     if (weekLstView) weekLstView->redraw();
 }
 
 void DateBook::changeWeek( bool m )
 {
     /* no need to redraw, each widget catches.  Do need to
     store though for widgets we haven't made yet */
     onMonday = m;
 }
 
 void DateBook::slotToday()
 {
     // we need to view today using default view
     view(defaultView,QDate::currentDate());
 }
 
 void DateBook::closeEvent( QCloseEvent *e )
 {
     if(syncing) {
         /* no need to save, did that at flush */
         e->accept();
         return;
     }
 
     // save settings will generate it's own error messages, no
     // need to do checking ourselves.
     saveSettings();
     if ( db->save() ) {
         e->accept();
     } else {
         if ( QMessageBox::critical( this, tr( "Out of space" ),
                         tr("Calendar was unable to save\n"
                         "your changes.\n"
                         "Free up some space and try again.\n"
                         "\nQuit anyway?"),
                         QMessageBox::Yes|QMessageBox::Escape,
                         QMessageBox::No|QMessageBox::Default )
             != QMessageBox::No )
             e->accept();
         else
             e->ignore();
     }
 }
 
 // Entering directly from the "keyboard"
 void DateBook::slotNewEventFromKey( const QString &str )
 {
     if (syncing) {
     QMessageBox::warning( this, tr("Calendar"),
                           tr( "Can not edit data, currently syncing") );
     return;
     }
 
     // We get to here from a key pressed in the Day View
     // So we can assume some things.  We want the string
     // passed in to be part of the description.
     QDateTime start, end;
     if ( views->visibleWidget() == dayView ) {
     dayView->selectedDates( start, end );
     } else if ( views->visibleWidget() == monthView ) {
     QDate d = monthView->selectedDate();
     start = end = d;
     start.setTime( QTime( 10, 0 ) );
     end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekView ) {
     QDate d = weekView->date();
     start = end = d;
     start.setTime( QTime( 10, 0 ) );
     end.setTime( QTime( 12, 0 ) );
     } else if ( views->visibleWidget() == weekLstView ) {
     QDate d = weekLstView->date();
     start = end = d;
     start.setTime( QTime( 10, 0 ) );
     end.setTime( QTime( 12, 0 ) );
     }
     slotNewEntry(start, end, str);
 }
 void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location) {
     // argh!  This really needs to be encapsulated in a class
     // or function.
     QDialog newDlg( this, 0, TRUE );
     newDlg.setCaption( DateEntryBase::tr("New Event") );
     DateEntry *e;
     QVBoxLayout *vb = new QVBoxLayout( &newDlg );
     QScrollView *sv = new QScrollView( &newDlg );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     sv->setHScrollBarMode( QScrollView::AlwaysOff );
     vb->addWidget( sv );
 
     Event ev;
     ev.setDescription(  str );
     // When the new gui comes in, change this...
     if(location==0) {
         if(defaultLocation.isEmpty()) {
             ev.setLocation(tr("(Unknown)"));
         } else {
             ev.setLocation( defaultLocation );
         }
     } else {
         ev.setLocation(location);
     }
     ev.setCategories(defaultCategories);
     ev.setStart( start );
     ev.setEnd( end );
 
     e = new DateEntry( onMonday, ev, ampm, &newDlg );
     e->setAlarmEnabled( aPreset, presetTime, Event::Loud );
     sv->addChild( e );
     while ( QPEApplication::execDialog( &newDlg ) ) {
         ev = e->event();
         ev.assignUid();
         QString error = checkEvent( ev );
         if ( !error.isNull() ) {
         if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
             continue;
         }
         db->addEvent( ev );
         emit newEvent();
         break;
     }
 }
 
 void DateBook::setDocument( const QString &filename )
 {
     if ( filename.find(".vcs") != int(filename.length()) - 4 ) return;
 
     QValueList<Event> tl = Event::readVCalendar( filename );
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
     db->addEvent( *it );
     }
 }
 
 static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
     odebug << "trying to beam" << oendl;
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, e );
     Ir *ir = new Ir( this );
     connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
     QString description = e.description();
     ir->send( beamfile, description, "text/x-vCalendar" );
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void DateBook::slotFind()
 {
     // move it to the day view...
     viewDay();
     FindDialog frmFind( "Calendar", this ); // no tr needed
     frmFind.setUseDate( true );
     frmFind.setDate( currentDate() );
     QObject::connect( &frmFind,
                       SIGNAL(signalFindClicked(const QString&,const QDate&,bool,bool,int)),
               this,
               SLOT(slotDoFind(const QString&,const QDate&,bool,bool,int)) );
     QObject::connect( this,
               SIGNAL(signalNotFound()),
               &frmFind,
               SLOT(slotNotFound()) );
     QObject::connect( this,
               SIGNAL(signalWrapAround()),
               &frmFind,
               SLOT(slotWrapAround()) );
     frmFind.move(0,0);
     frmFind.exec();
     inSearch = false;
 }
 
 bool catComp( QArray<int> cats, int category )
 {
     bool returnMe;
     int i,
     count;
 
     count = int(cats.count());
     returnMe = false;
     if ( (category == -1 && count == 0) || category == -2 )
     returnMe = true;
     else {
     for ( i = 0; i < count; i++ ) {
         if ( category == cats[i] ) {
         returnMe = true;
         break;
         }
     }
     }
     return returnMe;
 }
 
 
 void DateBook::slotDoFind( const QString& txt, const QDate &dt,
                bool caseSensitive, bool /*backwards*/,
                int category )
 {
     QDateTime dtEnd( QDate(3001, 1, 1), QTime(0, 0, 0) ),
     next;
 
     QRegExp r( txt );
     r.setCaseSensitive( caseSensitive );
 
 
     static Event rev, nonrev;
     if ( !inSearch ) {
     rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
     nonrev.setStart( rev.start() );
     inSearch = true;
     }
     static QDate searchDate = dt;
     // if true at the end we will start at the begin again and afterwards
     // we will emit string not found
     static bool wrapAround = true;
     bool candidtate;
     candidtate = false;
 
     QValueList<Event> repeats = db->getRawRepeats();
 
     // find the candidate for the first repeat that matches...
     // first check if there can ever be a match and then compute
     // the next occurence from start. See if this event is  closer
     // to the beginning (start. next < dtEnd) and not smaller then the last
     // result. If we find a canditate we set the dtEnd to the time
     // of the ocurrence and rev to this occurence.
     // set wrap around to true because there might be more events coming
     // and we're not at the end.
     QValueListConstIterator<Event> it;
     QDate start = dt;
     for ( it = repeats.begin(); it != repeats.end(); ++it ) {
     if ( catComp( (*it).categories(), category ) ) {
             if ( (*it).match( r ) ) {
                 if ( nextOccurance( *it, start, next ) ) {
                     if ( next < dtEnd && !(next <= rev.start() ) ) {
                         rev = *it;
                         dtEnd = next;
                         rev.setStart( next );
                         candidtate = true;
                         wrapAround = true;
                     }
                 }
             }
         }
     }
 
     // now the for first non repeat...
     // dtEnd is set by the previous iteration of repeatingEvents
     // check if we find a closer item. Also set dtEnd to find even
     // more close occurrence
     QValueList<Event> nonRepeats = db->getNonRepeatingEvents( dt, dtEnd.date() );
     qHeapSort( nonRepeats.begin(), nonRepeats.end() );
     for ( it = nonRepeats.begin(); it != nonRepeats.end(); ++it ) {
     if ( catComp( (*it).categories(), category ) ) {
         if ( (*it).start() < dtEnd ) {
         if ( (*it).match( r ) && !(*it <= nonrev) ) {
             nonrev = *it;
             dtEnd = nonrev.start();
             candidtate = true;
             wrapAround = true;
             break;
         }
         }
     }
     }
     if ( candidtate ) {
     dayView->setStartViewTime( dtEnd.time().hour() );
     dayView->setDate( dtEnd.date().year(), dtEnd.date().month(),
               dtEnd.date().day() );
     } else {
     if ( wrapAround ) {
         emit signalWrapAround();
         rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
         nonrev.setStart( rev.start() );
     } else
         emit signalNotFound();
     wrapAround = !wrapAround;
     }
 }
 
 Event DateBookDBHack::eventByUID(int uid) {
 
     // FIXME: Dirty Hacks to get hold of the private event lists
     QDate start;
     QDate end=start.addDays(-1);
     QValueList<Event> myEventList=getNonRepeatingEvents(start,end);
     QValueList<Event> myRepeatEvents=getRawRepeats();
 
     QValueList<Event>::ConstIterator it;
 
     for (it = myEventList.begin(); it != myEventList.end(); it++) {
     if ((*it).uid() == uid) return *it;
     }
     for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
     if ((*it).uid() == uid) return *it;
     }
 
     Event ev;
     return ev; // return at least
 }
 
 DateBookHoliday::DateBookHoliday()
 {
     _pluginlist.clear();
     m_pluginLoader = new Opie::Core::OPluginLoader("holidays",false);
     m_pluginLoader->setAutoDelete(true);
     m_pluginManager = new Opie::Core::OPluginManager(m_pluginLoader);
     m_pluginManager->load();
 
     init();
 }
 
 void DateBookHoliday::reloadPlugins()
 {
     deinit();
     init();
 }
 
 DateBookHoliday::~DateBookHoliday()
 {
     deinit();
     delete m_pluginLoader;
     delete m_pluginManager;
 }
 
 void DateBookHoliday::deinit()
 {
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         *it = 0;
         delete _pl;
     }
     _pluginlist.clear();
 }
 
 #if 0
 void debugLst( const Opie::Core::OPluginItem::List& lst ) {
     for ( Opie::Core::OPluginItem::List::ConstIterator it = lst.begin(); it != lst.end(); ++it )
         odebug << "Name " << (*it).name() << " " << (*it).path() << " " << (*it).position() << oendl;
 }
 #endif
 
 void DateBookHoliday::init()
 {
     deinit();
 
     Opie::Core::OPluginItem::List  lst = m_pluginLoader->filtered(true);
 //    debugLst( lst );
     for( Opie::Core::OPluginItem::List::Iterator it = lst.begin(); it != lst.end(); ++it ){
         Opie::Datebook::HolidayPluginIf*hif = m_pluginLoader->load<Opie::Datebook::HolidayPluginIf>(*it,IID_HOLIDAY_PLUGIN);
         if (hif) {
             Opie::Datebook::HolidayPlugin*pl = hif->plugin();
             if (pl) {
                 HPlugin*_pl=new HPlugin;
                 _pl->_plugin = pl;
                 odebug << "Found holiday " << pl->description()<<oendl;
                 _pluginlist.append(_pl);
                 //_pl->_if = hif;
             }
         }
     }
 }
 
 QStringList DateBookHoliday::holidaylist(const QDate&aDate)
 {
     QStringList ret;
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         ret+=_pl->_plugin->entries(aDate);
     }
     return ret;
 }
 
 QStringList DateBookHoliday::holidaylist(unsigned year, unsigned month, unsigned day)
 {
     return holidaylist(QDate(year,month,day));
 }
 
 QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
 {
     QValueList<EffectiveEvent> ret;
     QValueList<HPlugin*>::Iterator it;
     for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
         HPlugin*_pl = *it;
         ret+=_pl->_plugin->events(from,to);
     }
     return ret;
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDate &from,const QDate &to )
 {
     return DateBookDBHack::getEffectiveEvents(from,to);
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEventsNoHoliday(const QDateTime &start)
 {
     return DateBookDBHack::getEffectiveEvents(start);
 }
 
 QValueList<EffectiveEvent> DateBookHoliday::getEffectiveEvents(const QDateTime &start)
 {
     return getEffectiveEvents(start.date(),start.date());
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents(const QDate &from,const QDate &to )
 {
     QValueList<EffectiveEvent> ret;
     odebug << "Ueberlagert 1" << oendl;
     if (db_holiday) {
         ret+=db_holiday->getEffectiveEvents(from,to);
     }
     ret+=getEffectiveEventsNoHoliday(from,to);
     return ret;
 }
 
 QValueList<EffectiveEvent> DateBookDBHoliday::getEffectiveEvents( const QDateTime &start)
 {
     odebug << "Ueberlagert 2" << oendl;
     return DateBookDBHack::getEffectiveEvents(start);
 }
diff --git a/core/pim/datebook/datebook.h b/core/pim/datebook/datebook.h
index fb8b083..05ab781 100644
--- a/core/pim/datebook/datebook.h
+++ b/core/pim/datebook/datebook.h
@@ -1,134 +1,134 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef DATEBOOK_H
 #define DATEBOOK_H
 
 #include "datebooktypes.h"
 
 #include <qpe/datebookdb.h>
 
 #include <qmainwindow.h>
 
 class QAction;
 class QWidgetStack;
 class DateBookDay;
 class DateBookWeek;
 class DateBookWeekLst;
-class DateBookMonth;
+class ODateBookMonth;
 class Event;
 class QDate;
 class Ir;
 
 class DateBook : public QMainWindow
 {
     Q_OBJECT
 
 public:
     static QString appName() { return QString::fromLatin1("datebook"); }
     DateBook( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~DateBook();
 
 signals:
     void newEvent();
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     QDate currentDate();
     void timerEvent( QTimerEvent *e );
     void closeEvent( QCloseEvent *e );
 
     void view(int v, const QDate &d);
 
 public slots:
     void flush();
     void reload();
 
 private slots:
     void fileNew();
     void slotNewEntry(const QDateTime &start, const QDateTime &end, const QString &str, const QString &location=0);
     void slotSettings();
     void slotToday();   // view today
     void changeClock( bool newClock );
     void changeWeek( bool newDay );
     void appMessage(const QCString& msg, const QByteArray& data);
     // handle key events in the day view...
     void slotNewEventFromKey( const QString &str );
     void slotFind();
     void slotDoFind( const QString &, const QDate &, bool, bool, int );
 
     void viewDefault(const QDate &d);
 
     void viewDay();
     void viewWeek();
     void viewWeekLst();
     void viewMonth();
 
     void showDay( int y, int m, int d );
 
     void insertEvent( const Event &e );
     void editEvent( const Event &e );
     void duplicateEvent( const Event &e );
     void removeEvent( const Event &e );
 
     void receive( const QCString &msg, const QByteArray &data );
     void setDocument( const QString & );
     void beamEvent( const Event &e );
     void beamDone( Ir *ir );
 
 private:
     void addEvent( const Event &e );
     void initDay();
     void initWeek();
     void initWeekLst();
     void initMonth();
     void loadSettings();
     void saveSettings();
 
 private:
     DateBookDBHoliday *db;
     DateBookHoliday*db_holiday;
     QWidgetStack *views;
     DateBookDay *dayView;
     DateBookWeek *weekView;
-    DateBookMonth *monthView;
+    ODateBookMonth *monthView;
     DateBookWeekLst *weekLstView;
     QAction *dayAction, *weekAction, *weekLstAction, *monthAction;
     int weeklistviewconfig;
     bool aPreset;    // have everything set to alarm?
     int presetTime;  // the standard time for the alarm
     int startTime;
     int rowStyle;
     int defaultView;
     QArray<int> defaultCategories;
     QString defaultLocation;
     bool bJumpToCurTime; //should jump to current time in dayview?
     bool ampm;
     bool onMonday;
 
     bool syncing;
     bool inSearch;
 
     int alarmCounter;
 
     QString checkEvent(const Event &);
 };
 
 #endif
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index 26f4d8d..7813673 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -1,52 +1,54 @@
         CONFIG  += qt warn_on  quick-app
         HEADERS= datebookday.h \
           datebook.h \
           dateentryimpl.h \
           datebookdayheaderimpl.h \
           datebooksettings.h \
           datebookweek.h \
           modules/weeklst/datebookweeklst.h \
       modules/weeklst/datebookweeklstdayhdr.h \
       modules/weeklst/datebookweeklstheader.h \
       modules/weeklst/datebookweeklstevent.h \
       modules/weeklst/datebookweeklstview.h \
       modules/weeklst/datebookweeklstdblview.h \
+      modules/monthview/odatebookmonth.h \
           datebookweekheaderimpl.h \
           repeatentry.h \
           noteentryimpl.h \
           onoteedit.h \
           datebookdayallday.h  \
           namespace_hack.h \
           datebooktypes.h
         SOURCES= main.cpp \
           datebookday.cpp \
           datebook.cpp \
           dateentryimpl.cpp \
           datebookdayheaderimpl.cpp \
           datebooksettings.cpp \
           datebookweek.cpp \
           modules/weeklst/datebookweeklst.cpp \
       modules/weeklst/datebookweeklstdayhdr.cpp \
       modules/weeklst/datebookweeklstheader.cpp \
       modules/weeklst/datebookweeklstevent.cpp \
       modules/weeklst/datebookweeklstview.cpp \
       modules/weeklst/datebookweeklstdblview.cpp \
+      modules/monthview/odatebookmonth.cpp \
           datebookweekheaderimpl.cpp \
           repeatentry.cpp \
           noteentryimpl.cpp \
           onoteedit.cpp \
           datebookdayallday.cpp
         INTERFACES= dateentry.ui \
                   datebookdayheader.ui \
                   datebookweekheader.ui \
                   modules/weeklst/datebookweeklstheaderbase.ui \
                   modules/weeklst/datebookweeklstdayhdrbase.ui \
                   repeatentrybase.ui \
                   datebooksettingsbase.ui \
                   noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
 LIBS            += -lqpe -lopieui2 -lopiecore2 -lopiepim2
         TARGET  = datebook
 
 include( $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/modules/monthview/odatebookmonth.cpp b/core/pim/datebook/modules/monthview/odatebookmonth.cpp
new file mode 100644
index 0000000..5e2f1bb
--- a/dev/null
+++ b/core/pim/datebook/modules/monthview/odatebookmonth.cpp
@@ -0,0 +1,392 @@
+/* this is a straight copy of datemonthview. We can not make child of
+ * it 'cause the origin view isn't virtual in any form.
+ */
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#include "odatebookmonth.h"
+#include "datebooktypes.h"
+
+#include <qpe/config.h>
+#include <qpe/datebookmonth.h>
+
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+#include <qtoolbutton.h>
+#include <qspinbox.h>
+#include <qcombobox.h>
+#include <qvaluestack.h>
+#include <qwhatsthis.h>
+
+
+//---------------------------------------------------------------------------
+
+class ODateBookMonthTablePrivate
+{
+public:
+    ODateBookMonthTablePrivate() {};
+    ~ODateBookMonthTablePrivate() { mMonthEvents.clear(); };
+
+    QValueList<EffectiveEvent> mMonthEvents;
+    bool onMonday;
+};
+
+ODateBookMonthTable::ODateBookMonthTable( QWidget *parent, const char *name,
+                                        DateBookDBHoliday *newDb  )
+    : QTable( 6, 7, parent, name ),
+      db( newDb )
+{
+    d = new ODateBookMonthTablePrivate();
+    selYear = -1;
+    selMonth = -1;
+    selDay = -1;
+
+    /* init these as well  make valgrind happy and be consistent with Qtopia1.6 -zecke */
+    year = -1;
+    month = -1;
+    day = -1;
+
+    Config cfg( "qpe" );
+    cfg.setGroup( "Time" );
+    d->onMonday = cfg.readBoolEntry( "MONDAY" );
+
+    horizontalHeader()->setResizeEnabled( FALSE );
+    // we have to do this here... or suffer the consequences later...
+    for ( int i = 0; i < 7; i++ ){
+    horizontalHeader()->resizeSection( i, 30 );
+    setColumnStretchable( i, TRUE );
+    }
+    setupLabels();
+
+    verticalHeader()->hide();
+    setLeftMargin( 0 );
+    for ( int i = 0; i < 6; ++i )
+        setRowStretchable( i, TRUE );
+
+    setSelectionMode( NoSelection );
+
+    connect( this, SIGNAL( clicked(int,int,int,const QPoint&) ),
+         this, SLOT( dayClicked(int,int) ) );
+    connect( this, SIGNAL( currentChanged(int,int) ),
+             this, SLOT( dragDay(int,int) ) );
+    setVScrollBarMode( AlwaysOff );
+    setHScrollBarMode( AlwaysOff );
+}
+
+ODateBookMonthTable::~ODateBookMonthTable()
+{
+    monthsEvents.clear();
+    delete d;
+}
+
+void ODateBookMonthTable::setDate(int y, int m, int d)
+{
+    if (month == m && year == y) {
+    if ( selYear == -1 )
+        year = selYear;
+    if ( selMonth == -1 )
+        month = selMonth;
+    int r1, c1, r2, c2;
+    findDay(selDay, r1, c1);
+    selDay = day = d;
+    findDay(selDay, r2, c2);
+    setCurrentCell( r2, c2 );
+    //updateCell(r1,c1);
+    //updateCell(r2,c2);
+    } else {
+    selYear = year = y;
+    selMonth = month = m;
+    selDay = day = d;
+    setupTable();
+    }
+}
+
+void ODateBookMonthTable::redraw()
+{
+    setupLabels();
+    setupTable();
+}
+
+void ODateBookMonthTable::setWeekStart( bool onMonday )
+{
+    d->onMonday = onMonday;
+    setupLabels();
+    setupTable();
+}
+
+void ODateBookMonthTable::setupTable()
+{
+    QValueList<Calendar::Day> days = Calendar::daysOfMonth( year, month, d->onMonday );
+    QValueList<Calendar::Day>::Iterator it = days.begin();
+    int row = 0, col = 0;
+    int crow = 0;
+    int ccol = 0;
+    for ( ; it != days.end(); ++it ) {
+    DayItemMonth *i = (DayItemMonth *)item( row, col );
+    if ( !i ) {
+        i = new DayItemMonth( this, QTableItem::Never, "" );
+        setItem( row, col, i );
+    }
+    Calendar::Day calDay = *it;
+    i->clearEffEvents();
+    i->setDay( calDay.date );
+    i->setType( calDay.type );
+    if ( i->day() == day && calDay.type == Calendar::Day::ThisMonth ) {
+        crow = row;
+        ccol = col;
+    }
+
+    updateCell( row, col );
+
+    if ( col == 6 ) {
+        ++row;
+        col = 0;
+    } else {
+        ++col;
+    }
+    }
+    setCurrentCell( crow, ccol );
+    getEvents();
+}
+
+void ODateBookMonthTable::findDay( int day, int &row, int &col )
+{
+    QDate dtBegin( year, month, 1 );
+    int skips = dtBegin.dayOfWeek();
+    int effective_day = day + skips - 1; // row/columns begin at 0
+    // make an extra adjustment if we start on Mondays.
+    if ( d->onMonday )
+    effective_day--;
+    row = effective_day / 7;
+    col = effective_day % 7;
+}
+
+void ODateBookMonthTable::dayClicked( int row, int col )
+{
+    changeDaySelection( row, col );
+    emit dateClicked( selYear, selMonth,  selDay );
+}
+
+void ODateBookMonthTable::dragDay( int row, int col )
+{
+    changeDaySelection( row, col );
+}
+
+void ODateBookMonthTable::changeDaySelection( int row, int col )
+{
+    DayItemMonth *i = (DayItemMonth*)item( row, col );
+    if ( !i )
+    return;
+    switch ( i->type() ) {
+    case Calendar::Day::ThisMonth:
+        selMonth = month;
+        break;
+    case Calendar::Day::PrevMonth:
+        selMonth = month-1;
+        break;
+    default:
+        selMonth = month+1;
+    }
+
+    selYear = year;
+    if ( selMonth <= 0 ) {
+    selMonth = 12;
+    selYear--;
+    } else if ( selMonth > 12 ) {
+    selMonth = 1;
+    selYear++;
+    }
+    selDay = i->day();
+}
+
+
+void ODateBookMonthTable::viewportMouseReleaseEvent( QMouseEvent * )
+{
+    dayClicked( currentRow(), currentColumn() );
+}
+
+void ODateBookMonthTable::getEvents()
+{
+    if ( !db )
+    return;
+
+    QDate dtStart( year, month, 1 );
+    d->mMonthEvents = db->getEffectiveEvents( dtStart,
+                          QDate( year, month,
+                             dtStart.daysInMonth() ) );
+    QValueListIterator<EffectiveEvent> it = d->mMonthEvents.begin();
+    // now that the events are sorted, basically go through the list, make
+    // a small list for every day and set it for each item...
+    // clear all the items...
+    while ( it != d->mMonthEvents.end() ) {
+    QValueList<EffectiveEvent> dayEvent;
+    EffectiveEvent e = *it;
+    ++it;
+    dayEvent.append( e );
+    while ( it != d->mMonthEvents.end()
+            && e.date() == (*it).date() ) {
+        dayEvent.append( *it );
+        ++it;
+    }
+    int row, col;
+    findDay( e.date().day(), row, col );
+    DayItemMonth* w = static_cast<DayItemMonth*>( item( row, col ) );
+    w->setEvents( dayEvent );
+    updateCell( row, col );
+    dayEvent.clear();
+    }
+}
+
+
+void ODateBookMonthTable::setupLabels()
+{
+    for ( int i = 0; i < 7; ++i ) {
+//  horizontalHeader()->resizeSection( i, 30 );
+//  setColumnStretchable( i, TRUE );
+    if ( d->onMonday )
+        horizontalHeader()->setLabel( i, Calendar::nameOfDay( i + 1 ) );
+    else {
+        if ( i == 0 )
+        horizontalHeader()->setLabel( i, Calendar::nameOfDay( 7 ) );
+        else
+        horizontalHeader()->setLabel( i, Calendar::nameOfDay( i ) );
+    }
+    }
+}
+
+
+//---------------------------------------------------------------------------
+
+ODateBookMonth::ODateBookMonth( QWidget *parent, const char *name, bool ac,
+                              DateBookDBHoliday *data )
+    : QVBox( parent, name ),
+      autoClose( ac )
+{
+    setFocusPolicy(StrongFocus);
+    year = QDate::currentDate().year();
+    month = QDate::currentDate().month();
+    day = QDate::currentDate().day();
+    header = new DateBookMonthHeader( this, "DateBookMonthHeader" );
+    table = new ODateBookMonthTable( this, "DateBookMonthTable", data );
+    header->setDate( year, month );
+    table->setDate( year, month, QDate::currentDate().day() );
+    header->setFocusPolicy(NoFocus);
+    table->setFocusPolicy(NoFocus);
+    connect( header, SIGNAL( dateChanged(int,int) ),
+         this, SLOT( setDate(int,int) ) );
+    connect( table, SIGNAL( dateClicked(int,int,int) ),
+         this, SLOT( finalDate(int,int,int) ) );
+    connect( qApp, SIGNAL(weekChanged(bool)), this,
+         SLOT(slotWeekChange(bool)) );
+    table->setFocus();
+}
+
+ODateBookMonth::~ODateBookMonth()
+{
+
+}
+
+void ODateBookMonth::setDate( int y, int m )
+{
+    /* only change the date if this is a different date,
+     * other wise we may mistakenly overide the day */
+    if ( (y != year) || (m != month) ) {
+    year = y;
+    month = m;
+    QDate nd( y, m, 1 );
+    if ( nd.daysInMonth() < day )
+        day = nd.daysInMonth();
+    table->setDate( year, month, day );
+    }
+}
+
+void ODateBookMonth::setDate( int y, int m, int d )
+{
+    header->setDate( y, m);
+    table->setDate( y, m, d);
+    year = y;
+    month = m;
+    day = d;
+}
+
+/* called when we wish to close or pass back the date */
+void ODateBookMonth::finalDate(int y, int m, int d)
+{
+    setDate( y, m, d );
+
+    emit dateClicked(y, m, d);
+    //    emit dateClicked(QDate(y, m, d).toString());
+
+    if ( autoClose && parentWidget() )
+    parentWidget()->close();
+}
+
+void ODateBookMonth::setDate( QDate d)
+{
+    setDate(d.year(), d.month(), d.day());
+}
+
+void ODateBookMonth::redraw()
+{
+    table->setDate( year, month, day );
+    table->redraw();
+}
+
+QDate  ODateBookMonth::selectedDate() const
+{
+    if ( !table )
+    return QDate::currentDate();
+    int y, m, d;
+    table->getDate( y, m, d );
+    return QDate( y, m, d );
+}
+
+void ODateBookMonth::slotWeekChange( bool startOnMonday )
+{
+    table->setWeekStart( startOnMonday );
+}
+
+void ODateBookMonth::keyPressEvent( QKeyEvent *e )
+{
+    switch(e->key()) {
+    case Key_Up:
+        setDate(QDate(year, month, day).addDays(-7));
+        break;
+    case Key_Down:
+        setDate(QDate(year, month, day).addDays(7));
+        break;
+    case Key_Left:
+        setDate(QDate(year, month, day).addDays(-1));
+        break;
+    case Key_Right:
+        setDate(QDate(year, month, day).addDays(1));
+        break;
+    case Key_Space:
+        qWarning("space");
+        emit dateClicked(year, month, day);
+        if ( autoClose && parentWidget() )
+        parentWidget()->close();
+        break;
+    default:
+        qWarning("ignore");
+        e->ignore();
+        break;
+    }
+}
diff --git a/core/pim/datebook/modules/monthview/odatebookmonth.h b/core/pim/datebook/modules/monthview/odatebookmonth.h
new file mode 100644
index 0000000..e967abe
--- a/dev/null
+++ b/core/pim/datebook/modules/monthview/odatebookmonth.h
@@ -0,0 +1,132 @@
+/* this is a straight copy of datemonthview. We can not make child of
+ * it 'cause the origin view isn't virtual in any form.
+ */
+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef ODATEBOOKMONTH
+#define ODATEBOOKMONTH
+
+#include <qtopia/private/event.h>
+#include <qpe/datebookmonth.h>
+
+#include <qvbox.h>
+#include <qhbox.h>
+#include <qdatetime.h>
+#include <qvaluelist.h>
+#include <qtable.h>
+#include <qpushbutton.h>
+#include <qpopupmenu.h>
+
+#include <qpe/calendar.h>
+#include <qpe/timestring.h>
+
+class QToolButton;
+class QComboBox;
+class QSpinBox;
+class Event;
+class DateBookDB;
+class DateBookDBHoliday;
+
+class ODateBookMonthTablePrivate;
+class ODateBookMonthTable : public QTable
+{
+    Q_OBJECT
+
+public:
+    ODateBookMonthTable( QWidget *parent = 0, const char *name = 0,
+                        DateBookDBHoliday *newDb = 0 );
+    virtual ~ODateBookMonthTable();
+    void setDate( int y, int m, int d );
+    void redraw();
+
+    QSize minimumSizeHint() const { return sizeHint(); }
+    QSize minimumSize() const { return sizeHint(); }
+    void  getDate( int& y, int &m, int &d ) const {y=selYear;m=selMonth;d=selDay;}
+    void setWeekStart( bool onMonday );
+signals:
+    void dateClicked( int year, int month, int day );
+
+protected:
+    virtual void viewportMouseReleaseEvent( QMouseEvent * );
+
+protected slots:
+
+    virtual void keyPressEvent(QKeyEvent *e ) {
+    e->ignore();
+    }
+
+private slots:
+    void dayClicked( int row, int col );
+    void dragDay( int row, int col );
+
+private:
+    void setupTable();
+    void setupLabels();
+
+    void findDay( int day, int &row, int &col );
+    void getEvents();
+    void changeDaySelection( int row, int col );
+
+    int year, month, day;
+    int selYear, selMonth, selDay;
+    QValueList<Event> monthsEvents; // not used anymore...
+    DateBookDBHoliday *db;
+    ODateBookMonthTablePrivate *d;
+};
+
+class ODateBookMonthPrivate;
+class ODateBookMonth : public QVBox
+{
+    Q_OBJECT
+
+public:
+    /* ac = Auto Close */
+    ODateBookMonth( QWidget *parent = 0, const char *name = 0, bool ac = FALSE,
+                   DateBookDBHoliday *data = 0 );
+    virtual ~ODateBookMonth();
+    QDate  selectedDate() const;
+
+signals:
+    /* ### FIXME add a signal with QDate -zecke */
+    void dateClicked( int year, int month, int day );
+
+public slots:
+    void setDate( int y, int m );
+    void setDate( int y, int m, int d );
+    void setDate( QDate );
+    void redraw();
+    void slotWeekChange( bool );
+
+protected slots:
+    virtual void keyPressEvent(QKeyEvent *e);
+
+private slots:
+    void forwardDateClicked( int y, int m, int d ) { emit dateClicked(  y, m, d  ); }
+    void finalDate(int, int, int);
+
+private:
+    DateBookMonthHeader *header;
+    ODateBookMonthTable *table;
+    int year, month, day;
+    bool autoClose;
+    class ODateBookMonthPrivate *d;
+};
+
+#endif