1 files changed, 667 insertions, 591 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index a18a5b4..f6aab0c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -32,2 +32,4 @@
 #include <opie2/odebug.h>
+#include <opie2/oholidaypluginif.h>
+#include <opie2/oholidayplugin.h>
 
@@ -51,2 +53,4 @@
 #include <qwidgetstack.h>
+#include <qdir.h>
+#include <qtopia/qlibrary.h>
 
@@ -70,20 +74,22 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 {
-        bool needEvilHack= false; // if we need an Evil Hack
-        QTime t;
-        t.start();
-        db = new DateBookDBHack;
-        odebug << "loading db t=" << t.elapsed() << oendl;
-        loadSettings();
-        setCaption( tr("Calendar") );
-        setIcon( Resource::loadPixmap( "datebook_icon" ) );
+    bool needEvilHack= false; // if we need an Evil Hack
+    QTime t;
+    t.start();
+    db = new DateBookDBHack;
+    odebug << "loading db t=" << t.elapsed() << oendl;
+    db_holiday = new DateBookHoliday();
 
-        setToolBarsMovable( FALSE );
+    loadSettings();
+    setCaption( tr("Calendar") );
+    setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
-        views = new QWidgetStack( this );
-        setCentralWidget( views );
+    setToolBarsMovable( FALSE );
 
-        dayView = 0;
-        weekView = 0;
-        weekLstView = 0;
-        monthView = 0;
+    views = new QWidgetStack( this );
+    setCentralWidget( views );
+
+    dayView = 0;
+    weekView = 0;
+    weekLstView = 0;
+    monthView = 0;
 
@@ -98,70 +104,70 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
-        QToolBar *sub_bar = new QToolBar(this);
-        sub_bar->setHorizontalStretchable(TRUE);
+    QToolBar *sub_bar = new QToolBar(this);
+    sub_bar->setHorizontalStretchable(TRUE);
 
-        QActionGroup *g = new QActionGroup( this );
-        g->setExclusive( 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 );
+    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();
+    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 );
+    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();
+    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 = 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->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 = 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->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 = 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->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 = 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;
+    a->setToggleAction( TRUE );
+    monthAction = a;
 
-        sub_bar->addSeparator();
+    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( "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 );
+    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();
+    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)) );
+    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&)) );
+    connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), this, SLOT(appMessage(const QCString&,const QByteArray&)) );
 #endif
@@ -171,6 +177,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 #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&)) );
+    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
@@ -178,3 +184,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
-        odebug << "done t=" << t.elapsed() << oendl;
+    odebug << "done t=" << t.elapsed() << oendl;
 
@@ -196,5 +202,5 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
      */
-        if( needEvilHack ){
-                QTimer::singleShot( 500, this, SLOT(viewWeek()) );
-        }
+    if( needEvilHack ){
+        QTimer::singleShot( 500, this, SLOT(viewWeek()) );
+    }
 }
@@ -205,15 +211,15 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
     if ( msg == "timeChange(QString)" ) {
-        // update active view!
-        if ( dayAction->isOn() )
-            viewDay();
-        else if ( weekAction->isOn() )
-            viewWeek();
-        else if ( monthAction->isOn() )
-            viewMonth();
+    // 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);
+    int uid;
+    stream >> uid;
+    Event e=db->eventByUID(uid);
+    editEvent(e);
     }else if (msg == "viewDefault(QDate)"){
@@ -227,2 +233,3 @@ DateBook::~DateBook()
 {
+    delete db_holiday;
 }
@@ -231,55 +238,55 @@ 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);
-
-        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 ) ) {
-                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();
-                }
-        }
+    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);
+
+    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 ) ) {
+        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();
+        }
+    }
 }
@@ -301,11 +308,11 @@ QString DateBook::checkEvent(const Event &e)
     {
-        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();
+    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();
     }
@@ -313,4 +320,4 @@ QString DateBook::checkEvent(const Event &e)
     if(checkFailed)
-        return tr("Event duration is potentially longer\n"
-                  "than interval between repeats.");
+    return tr("Event duration is potentially longer\n"
+          "than interval between repeats.");
 
@@ -324,3 +331,3 @@ QDate DateBook::currentDate()
     if ( dayView && views->visibleWidget() == dayView ) {
-        d = dayView->date();
+    d = dayView->date();
     } else if ( weekView && views->visibleWidget() == weekView ) {
@@ -330,3 +337,3 @@ QDate DateBook::currentDate()
     } else if ( monthView && views->visibleWidget() == monthView ) {
-        d = monthView->selectedDate();
+    d = monthView->selectedDate();
     }
@@ -337,27 +344,27 @@ QDate DateBook::currentDate()
 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();
-        }
+    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();
+    }
 }
@@ -365,3 +372,3 @@ void DateBook::view(int v, const QDate &d) {
 void DateBook::viewDefault(const QDate &d) {
-        view(defaultView,d);
+    view(defaultView,d);
 }
@@ -369,3 +376,3 @@ void DateBook::viewDefault(const QDate &d) {
 void DateBook::viewDay() {
-        view(DAY,currentDate());
+    view(DAY,currentDate());
 }
@@ -373,3 +380,3 @@ void DateBook::viewDay() {
 void DateBook::viewWeek() {
-        view(WEEK,currentDate());
+    view(WEEK,currentDate());
 }
@@ -377,3 +384,3 @@ void DateBook::viewWeek() {
 void DateBook::viewWeekLst() {
-        view(WEEKLST,currentDate());
+    view(WEEKLST,currentDate());
 }
@@ -381,3 +388,3 @@ void DateBook::viewWeekLst() {
 void DateBook::viewMonth() {
-        view(MONTH,currentDate());
+    view(MONTH,currentDate());
 }
@@ -386,9 +393,9 @@ 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();
+    Event dupEvent=e;
+    if(!dupEvent.isValidUid() ) // tkcRom seems to be different
+        dupEvent.assignUid();
+    dupEvent.setLocation(defaultLocation);
+    dupEvent.setCategories(defaultCategories);
+    db->addEvent(dupEvent);
+    emit newEvent();
 }
@@ -398,30 +405,30 @@ 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;
+    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;
-                }
+    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;
+        }
         /*
@@ -435,9 +442,9 @@ void DateBook::duplicateEvent( const Event &e )
         newEv.setRepeat( TRUE, rp ); // has repeat and repeatPattern...
-                if( newEv.uid() == e.uid() || !newEv.isValidUid() )
-                    newEv.assignUid();
+        if( newEv.uid() == e.uid() || !newEv.isValidUid() )
+            newEv.assignUid();
 
-                db->addEvent(newEv);
-                emit newEvent();
-                break;
-        }
+        db->addEvent(newEv);
+        emit newEvent();
+        break;
+    }
 }
@@ -446,34 +453,34 @@ 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;
-        }
+    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;
+    }
 }
@@ -482,6 +489,6 @@ void DateBook::removeEvent( const Event &e )
 {
-        if (syncing) {
-                QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
-                return;
-        }
+    if (syncing) {
+        QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
+        return;
+    }
 
@@ -490,3 +497,3 @@ void DateBook::removeEvent( const Event &e )
     if ( !QPEMessageBox::confirmDelete( this, tr( "Calendar" ),strName ) )
-        return;
+    return;
 
@@ -513,16 +520,16 @@ void DateBook::initDay()
 {
-        if ( !dayView ) {
-                dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
-                views->addWidget( dayView, DAY );
+    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&)) );
-        }
+        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&)) );
+    }
 }
@@ -531,23 +538,23 @@ 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 );
-        }
+    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 );
+    }
 }
@@ -555,16 +562,16 @@ void DateBook::initWeek()
 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 & ) ) );
-        }
+    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 & ) ) );
+    }
 }
@@ -574,9 +581,9 @@ void DateBook::initMonth()
 {
-        if ( !monthView ) {
-                monthView = new DateBookMonth( 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();
-        }
+    if ( !monthView ) {
+        monthView = new DateBookMonth( 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();
+    }
 }
@@ -585,26 +592,26 @@ 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();
-        }
+    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();
+    }
 }
@@ -613,19 +620,19 @@ 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(","));
+    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(","));
 }
@@ -634,79 +641,79 @@ 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()" ) {
+    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;
-                        }
-                }
+            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)") {
@@ -714,6 +721,6 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
         QDataStream stream(data,IO_ReadOnly);
-        int uid;
-        stream >> uid;
-        Event e=db->eventByUID(uid);
-        editEvent(e);
+    int uid;
+    stream >> uid;
+    Event e=db->eventByUID(uid);
+    editEvent(e);
     } else if (msg == "viewDefault(QDate)"){
@@ -729,10 +736,10 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
-        //      showMaximized();
+//      showMaximized();
 #else
-        //      show();
+//      show();
 #endif
-        //      raise();
-                QPEApplication::setKeepRunning();
-        //      setActiveWindow();
-        }
+//      raise();
+        QPEApplication::setKeepRunning();
+//      setActiveWindow();
+    }
 }
@@ -741,7 +748,7 @@ void DateBook::reload()
 {
-        db->reload();
-        if ( dayAction->isOn() ) viewDay();
-        else if ( weekAction->isOn() ) viewWeek();
-        else if ( monthAction->isOn() ) viewMonth();
-        syncing = FALSE;
+    db->reload();
+    if ( dayAction->isOn() ) viewDay();
+    else if ( weekAction->isOn() ) viewWeek();
+    else if ( monthAction->isOn() ) viewMonth();
+    syncing = FALSE;
 }
@@ -750,4 +757,4 @@ void DateBook::flush()
 {
-        syncing = TRUE;
-        db->save();
+    syncing = TRUE;
+    db->save();
 }
@@ -756,8 +763,8 @@ void DateBook::timerEvent( QTimerEvent *e )
 {
-        if ( alarmCounter < 10 ) {
-                alarmCounter++;
-                Sound::soundAlarm();
-        } else {
-                killTimer( e->timerId() );
-        }
+    if ( alarmCounter < 10 ) {
+        alarmCounter++;
+        Sound::soundAlarm();
+    } else {
+        killTimer( e->timerId() );
+    }
 }
@@ -766,7 +773,7 @@ void DateBook::changeClock( bool newClock )
 {
-        ampm = newClock;
-        // repaint the affected objects...
-        if (dayView) dayView->redraw();
-        if (weekView) weekView->redraw();
-        if (weekLstView) weekLstView->redraw();
+    ampm = newClock;
+    // repaint the affected objects...
+    if (dayView) dayView->redraw();
+    if (weekView) weekView->redraw();
+    if (weekLstView) weekLstView->redraw();
 }
@@ -775,5 +782,5 @@ 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;
+    /* no need to redraw, each widget catches.  Do need to
+    store though for widgets we haven't made yet */
+    onMonday = m;
 }
@@ -782,4 +789,4 @@ void DateBook::slotToday()
 {
-        // we need to view today using default view
-        view(defaultView,QDate::currentDate());
+    // we need to view today using default view
+    view(defaultView,QDate::currentDate());
 }
@@ -788,25 +795,25 @@ 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();
+    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();
     }
@@ -818,5 +825,5 @@ void DateBook::slotNewEventFromKey( const QString &str )
     if (syncing) {
-        QMessageBox::warning( this, tr("Calendar"),
-                              tr( "Can not edit data, currently syncing") );
-        return;
+    QMessageBox::warning( this, tr("Calendar"),
+                          tr( "Can not edit data, currently syncing") );
+    return;
     }
@@ -828,19 +835,19 @@ void DateBook::slotNewEventFromKey( const QString &str )
     if ( views->visibleWidget() == dayView ) {
-        dayView->selectedDates( start, end );
+    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 ) );
+    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 ) );
+    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 ) );
-        }
+    QDate d = weekLstView->date();
+    start = end = d;
+    start.setTime( QTime( 10, 0 ) );
+    end.setTime( QTime( 12, 0 ) );
+    }
     slotNewEntry(start, end, str);
@@ -848,45 +855,45 @@ void DateBook::slotNewEventFromKey( const QString &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;
-        }
+    // 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;
+    }
 }
@@ -899,3 +906,3 @@ void DateBook::setDocument( const QString &filename )
     for( QValueList<Event>::Iterator it = tl.begin(); it != tl.end(); ++it ) {
-        db->addEvent( *it );
+    db->addEvent( *it );
     }
@@ -907,3 +914,3 @@ void DateBook::beamEvent( const Event &e )
 {
-        odebug << "trying to beam" << oendl;
+    odebug << "trying to beam" << oendl;
     unlink( beamfile ); // delete if exists
@@ -932,13 +939,13 @@ void DateBook::slotFind()
                       SIGNAL(signalFindClicked(const QString&,const QDate&,bool,bool,int)),
-                      this,
-                      SLOT(slotDoFind(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()) );
+              SIGNAL(signalNotFound()),
+              &frmFind,
+              SLOT(slotNotFound()) );
     QObject::connect( this,
-                      SIGNAL(signalWrapAround()),
-                      &frmFind,
-                      SLOT(slotWrapAround()) );
-        frmFind.move(0,0);
+              SIGNAL(signalWrapAround()),
+              &frmFind,
+              SLOT(slotWrapAround()) );
+    frmFind.move(0,0);
     frmFind.exec();
@@ -951,3 +958,3 @@ bool catComp( QArray<int> cats, int category )
     int i,
-        count;
+    count;
 
@@ -956,10 +963,10 @@ bool catComp( QArray<int> cats, int category )
     if ( (category == -1 && count == 0) || category == -2 )
-        returnMe = true;
+    returnMe = true;
     else {
-        for ( i = 0; i < count; i++ ) {
-            if ( category == cats[i] ) {
-                returnMe = true;
-                break;
-            }
-        }
+    for ( i = 0; i < count; i++ ) {
+        if ( category == cats[i] ) {
+        returnMe = true;
+        break;
+        }
+    }
     }
@@ -970,7 +977,7 @@ bool catComp( QArray<int> cats, int category )
 void DateBook::slotDoFind( const QString& txt, const QDate &dt,
-                           bool caseSensitive, bool /*backwards*/,
-                           int category )
+               bool caseSensitive, bool /*backwards*/,
+               int category )
 {
     QDateTime dtEnd( QDate(3001, 1, 1), QTime(0, 0, 0) ),
-        next;
+    next;
 
@@ -982,5 +989,5 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
     if ( !inSearch ) {
-        rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
-        nonrev.setStart( rev.start() );
-        inSearch = true;
+    rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
+    nonrev.setStart( rev.start() );
+    inSearch = true;
     }
@@ -1006,3 +1013,3 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
     for ( it = repeats.begin(); it != repeats.end(); ++it ) {
-        if ( catComp( (*it).categories(), category ) ) {
+    if ( catComp( (*it).categories(), category ) ) {
             if ( (*it).match( r ) ) {
@@ -1028,26 +1035,26 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt,
     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 ( 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() );
+    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;
+    if ( wrapAround ) {
+        emit signalWrapAround();
+        rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) );
+        nonrev.setStart( rev.start() );
+    } else
+        emit signalNotFound();
+    wrapAround = !wrapAround;
     }
@@ -1066,6 +1073,6 @@ Event DateBookDBHack::eventByUID(int uid) {
     for (it = myEventList.begin(); it != myEventList.end(); it++) {
-        if ((*it).uid() == uid) return *it;
+    if ((*it).uid() == uid) return *it;
     }
     for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
-        if ((*it).uid() == uid) return *it;
+    if ((*it).uid() == uid) return *it;
     }
@@ -1075 +1082,70 @@ Event DateBookDBHack::eventByUID(int uid) {
 }
+
+DateBookHoliday::DateBookHoliday()
+{
+    _pluginlist.clear();
+    init();
+}
+
+DateBookHoliday::~DateBookHoliday()
+{
+    deinit();
+}
+
+void DateBookHoliday::deinit()
+{
+    QValueList<HPlugin*>::Iterator it;
+    for (it=_pluginlist.begin();it!=_pluginlist.end();++it) {
+        HPlugin*_pl = *it;
+        // destructs itself?
+        _pl->_if->release();
+        _pl->_lib->unload();
+        delete _pl->_lib;
+        delete _pl;
+    }
+    _pluginlist.clear();
+}
+
+void DateBookHoliday::init()
+{
+    deinit();
+    QString path = QPEApplication::qpeDir() + "plugins/datebook/holiday";
+    QDir dir( path, "lib*.so" );
+    QStringList list = dir.entryList();
+    QStringList::Iterator it;
+    for (it=list.begin();it!=list.end();++it) {
+        Opie::Datebook::HolidayPluginIf*hif = 0;
+        QLibrary*lib=new QLibrary(path+"/"+*it);
+        if ((lib->queryInterface(IID_HOLIDAY_PLUGIN,(QUnknownInterface**)&hif) == QS_OK) && hif) {
+            Opie::Datebook::HolidayPlugin*pl = hif->plugin();
+            if (pl) {
+                HPlugin*_pl=new HPlugin;
+                _pl->_plugin = pl;
+                odebug << "Found holiday " << pl->description()<<oendl;
+                _pl->_lib = lib;
+                _pl->_if = hif;
+                _pluginlist.append(_pl);
+            } else {
+            }
+        } else {
+            delete lib;
+        }
+    }
+}
+
+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));
+}
+