resolved merge conflict

14 files changed, 118 insertions, 96 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 10a9b59..07d7164 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -147,96 +147,98 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 	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&)) );
 	qDebug("olle\n");
 #endif
 #endif
 
 	qDebug("done t=%d", t.elapsed() );
 
+        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()
 {
 }
 
 void DateBook::slotSettings()
@@ -357,146 +359,150 @@ void DateBook::view(int v, const QDate &d) {
 		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 )
 {
 	qWarning("Hmmm...");
     // 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 );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
     editDlg.showMaximized();
 #endif
 	while (editDlg.exec() ) {
 		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...
+        /*
+        * 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 );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 	editDlg.showMaximized();
 #endif
 	while (editDlg.exec() ) {
 		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 )
 {
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index 770410e..84b4f1b 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -53,71 +53,72 @@ DateBookWeekHeader::~DateBookWeekHeader()
 }
 
 void DateBookWeekHeader::pickDate()
 {
 	static QPopupMenu *m1 = 0;
 	static DateBookMonth *picker = 0;
 	if ( !m1 ) {
 		m1 = new QPopupMenu( this );
 		picker = new DateBookMonth( m1, 0, TRUE );
 		m1->insertItem( picker );
 		connect( picker, SIGNAL( dateClicked( int, int, int ) ), this, SLOT( setDate( int, int, int ) ) );
 //		connect( m1, SIGNAL( aboutToHide() ), this, SLOT( gotHide() ) );
 	}
 	picker->setDate( date.year(), date.month(), date.day() );
 	m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
 	picker->setFocus();
 }
 
 void DateBookWeekHeader::nextMonth()
 {
 	qWarning("nextMonth() " );
 	setDate(date.addDays(28));
 }
 void DateBookWeekHeader::prevMonth()
 {
 	qWarning("prevMonth() " );
 	setDate(date.addDays(-28));
 }
 void DateBookWeekHeader::nextWeek()
 {
 	qWarning("nextWeek() " );
 	setDate(date.addDays(7));
 }
 void DateBookWeekHeader::prevWeek()
 {
 	qWarning("prevWeek() ");
 	setDate(date.addDays(-7));
 }
 
 void DateBookWeekHeader::setDate( int y, int m, int d )
 {
 	setDate(QDate(y,m,d));
 }
 
 void DateBookWeekHeader::setDate(const QDate &d) {
 	int year,week,dayofweek;
 	date=d;
 	dayofweek=d.dayOfWeek();
-	if(bStartOnMonday) 
+	if(bStartOnMonday)
 	    dayofweek--;
 	else if( dayofweek == 7 )
-	    /* we already have the right day -7 would lead to the current week..*/
+	    // we already have the right day -7 would lead to the current week..
 	    dayofweek = 0;
-	    	    
+
 	date=date.addDays(-dayofweek);
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
 	labelDate->setText( QString::number(start.day()) + "." +
-			start.monthName(start.month()) + "-" +
+			Calendar::nameOfMonth( start.month()) + "-" +
 			QString::number(stop.day()) + "." +
-			start.monthName(stop.month()) +" ("+
+			Calendar::nameOfMonth( stop.month()) +" ("+
 			tr("w")+":"+QString::number( week ) +")");
+	date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
 	emit dateChanged(date);
 }
 
 void DateBookWeekHeader::setStartOfWeek( bool onMonday )
 {
 	bStartOnMonday = onMonday;
 	setDate( date );
 }
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index aad1f3a..24fb0ba 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -1,177 +1,165 @@
 #include "datebookweeklst.h"
 
-#include "datebookweekheaderimpl.h"
 
 #include "datebook.h"
 
-#include <qpe/calendar.h>
-#include <qpe/datebookdb.h>
-#include <qpe/event.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/timestring.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
+#include <qpe/calendar.h>
 
-#include <qdatetime.h>
-#include <qheader.h>
-#include <qlabel.h>
 #include <qlayout.h>
-#include <qpainter.h>
-#include <qpopupmenu.h>
-#include <qtimer.h>
-#include <qstyle.h>
 #include <qtoolbutton.h>
-#include <qvbox.h>
-#include <qsizepolicy.h>
-#include <qabstractlayout.h>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
 DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
 {
 	setBackgroundMode( PaletteButton );
 	labelDate->setBackgroundMode( PaletteButton );
 	forwardweek->setBackgroundMode( PaletteButton );
 	forwardweek->setPixmap( Resource::loadPixmap("forward") );
 	forwardmonth->setBackgroundMode( PaletteButton );
 	forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
 	backweek->setBackgroundMode( PaletteButton );
 	backweek->setPixmap( Resource::loadPixmap("back") );
 	backmonth->setBackgroundMode( PaletteButton );
 	backmonth->setPixmap( Resource::loadPixmap("fastback") );
 	DateBookWeekLstHeaderBaseLayout->setSpacing(0);
 	DateBookWeekLstHeaderBaseLayout->setMargin(0);
 	//setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Expanding));
 	setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
 
 	connect(backmonth, SIGNAL(clicked()), this, SLOT(prevMonth()));
 	connect(backweek, SIGNAL(clicked()), this, SLOT(prevWeek()));
 	connect(forwardweek, SIGNAL(clicked()), this, SLOT(nextWeek()));
 	connect(forwardmonth, SIGNAL(clicked()), this, SLOT(nextMonth()));
 	connect(labelDate, SIGNAL(clicked()), this, SLOT(pickDate()));
 	connect(dbl, SIGNAL(toggled(bool)), this, SIGNAL(setDbl(bool)));
 	bStartOnMonday=onM;
 }
 DateBookWeekLstHeader::~DateBookWeekLstHeader(){}
 
 void DateBookWeekLstHeader::setDate(const QDate &d) {
 	int year,week,dayofweek;
 	date=d;
 	dayofweek=d.dayOfWeek();
 	if(bStartOnMonday)
 	    dayofweek--;
 	else if( dayofweek == 7 )
 	    /* we already have the right day -7 would lead to the same week */
 	    dayofweek = 0;
 
 	date=date.addDays(-dayofweek);
 
 	calcWeek(date,week,year,bStartOnMonday);
 	QDate start=date;
 	QDate stop=start.addDays(6);
 	labelDate->setText( QString::number(start.day()) + "." +
-			start.monthName(start.month()) + "-" +
+			Calendar::nameOfMonth( start.month() ) + "-" +
 			QString::number(stop.day()) + "." +
-			start.monthName(stop.month()) +" ("+
+                                                Calendar::nameOfMonth( stop.month()) +" ("+
 			tr("w")+":"+QString::number( week ) +")");
+	date = d; // bugfix: 0001126 - date has to be the selected date, not monday!
 	emit dateChanged(date);
 }
 
 void DateBookWeekLstHeader::pickDate() {
 	static QPopupMenu *m1 = 0;
 	static DateBookMonth *picker = 0;
 	if ( !m1 ) {
 		m1 = new QPopupMenu( this );
 		picker = new DateBookMonth( m1, 0, TRUE );
 		m1->insertItem( picker );
 		connect( picker, SIGNAL( dateClicked( int, int, int ) ),this, SLOT( setDate( int, int, int ) ) );
 		//connect( m1, SIGNAL( aboutToHide() ),
 		//this, SLOT( gotHide() ) );
 	}
 	picker->setDate( date.year(), date.month(), date.day() );
 	m1->popup(mapToGlobal(labelDate->pos()+QPoint(0,labelDate->height())));
 	picker->setFocus();
 }
 void DateBookWeekLstHeader::setDate(int y, int m, int d) {
 	setDate(QDate(y,m,d));
 }
 
 void DateBookWeekLstHeader::nextWeek() {
 	setDate(date.addDays(7));
 }
 void DateBookWeekLstHeader::prevWeek() {
 	setDate(date.addDays(-7));
 }
 void DateBookWeekLstHeader::nextMonth()
 {
 	setDate(date.addDays(28));
 }
 void DateBookWeekLstHeader::prevMonth()
 {
 	setDate(date.addDays(-28));
 }
 
 DateBookWeekLstDayHdr::DateBookWeekLstDayHdr(const QDate &d, bool /* onM */,
 					     QWidget* parent,
 					     const char* name,
 					     WFlags fl )
     : DateBookWeekLstDayHdrBase(parent, name, fl) {
 
 	date=d;
 
 	static const QString wdays=tr("MTWTFSSM",  "Week days");
 	char day=wdays[d.dayOfWeek()-1];
 
+    //dont use dayOfWeek() to save space !
 	label->setText( QString(QObject::tr(QString(QChar(day)))) + " " +QString::number(d.day()) );
-	add->setText("+");
+
+     add->setText("+");
 
 	if (d == QDate::currentDate()) {
 		QPalette pal=label->palette();
 		pal.setColor(QColorGroup::Foreground, QColor(0,0,255));
 		label->setPalette(pal);
 
 		/*
 		QFont f=label->font();
 		f.setItalic(true);
 		label->setFont(f);
 		label->setPalette(QPalette(QColor(0,0,255),label->backgroundColor()));
 		*/
 	} else if (d.dayOfWeek() == 7) { // FIXME: Match any holiday
 		QPalette pal=label->palette();
 		pal.setColor(QColorGroup::Foreground, QColor(255,0,0));
 		label->setPalette(pal);
 	}
 
 	connect (label, SIGNAL(clicked()), this, SLOT(showDay()));
 	connect (add, SIGNAL(clicked()), this, SLOT(newEvent()));
 }
 
 void DateBookWeekLstDayHdr::showDay() {
 	emit showDate(date.year(), date.month(), date.day());
 }
 
 void DateBookWeekLstDayHdr::newEvent() {
     QDateTime start, stop;
     start=stop=date;
     start.setTime(QTime(10,0));
     stop.setTime(QTime(12,0));
 
     emit addEvent(start,stop,"",0);
 }
 DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 						int weeklistviewconfig,
 						QWidget* parent,
 						const char* name,
 						WFlags fl ) : OClickableLabel(parent,name,fl), event(ev)
 {
 	// old values... lastday = "__|__", middle="   |---", Firstday="00:00",
 	QString s,start,middle,end,day;
 
 	qDebug("weeklistviewconfig=%d",weeklistviewconfig);
 	if(weeklistviewconfig==NONE) {	// No times displayed.
 //		start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
 //		middle.sprintf("<--->");
 //		end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
@@ -296,97 +284,112 @@ DateBookWeekLst::DateBookWeekLst( bool ap, bool onM, DateBookDB *newDB,
 				  QWidget *parent,
 				  const char *name )
     : QWidget( parent, name ),
       db( newDB ),
       startTime( 0 ),
       ampm( ap ),
       bStartOnMonday(onM)
 {
 	setFocusPolicy(StrongFocus);
 	layout = new QVBoxLayout( this );
 	layout->setMargin(0);
 
 	header=new DateBookWeekLstHeader(onM, this);
 	layout->addWidget( header );
 	connect(header, SIGNAL(dateChanged(QDate &)), this, SLOT(dateChanged(QDate &)));
 	connect(header, SIGNAL(setDbl(bool)), this, SLOT(setDbl(bool)));
 
 	scroll=new QScrollView(this);
 	scroll->setResizePolicy(QScrollView::AutoOneFit);
 	layout->addWidget(scroll);
 
 	view=NULL;
 	Config config("DateBook");
 	config.setGroup("Main");
 	dbl=config.readBoolEntry("weeklst_dbl", false);
 	header->dbl->setOn(dbl);
 }
 DateBookWeekLst::~DateBookWeekLst(){
 	Config config("DateBook");
 	config.setGroup("Main");
 	config.writeEntry("weeklst_dbl", dbl);
 }
 
 void DateBookWeekLst::setDate(const QDate &d) {
 	bdate=d;
 	header->setDate(d);
 }
 
 void DateBookWeekLst::setDbl(bool on) {
 	dbl=on;
 	redraw();
 }
 void DateBookWeekLst::redraw() {getEvents();}
 
 QDate DateBookWeekLst::date() {
 	return bdate;
 }
 
+// return the date at the beginning of the week...
+// copied from DateBookWeek
+QDate DateBookWeekLst::weekDate() const
+{
+	QDate d=bdate;
+
+	// Calculate offset to first day of week.
+	int dayoffset=d.dayOfWeek();
+	if(bStartOnMonday) dayoffset--;
+	else if( dayoffset == 7 )
+	    dayoffset = 0;
+
+	return d.addDays(-dayoffset);
+}
+
 void DateBookWeekLst::getEvents() {
-	QDate start = date();
+	QDate start = weekDate(); //date();
 	QDate stop = start.addDays(6);
 	QValueList<EffectiveEvent> el = db->getEffectiveEvents(start, stop);
 
 	if (view) delete view;
 	if (dbl) {
 		QDate start2=start.addDays(7);
 		stop=start2.addDays(6);
 		QValueList<EffectiveEvent> el2 = db->getEffectiveEvents(start2, stop);
 		view=new DateBookWeekLstDblView(el,el2,start,bStartOnMonday,scroll);
 	} else {
 		view=new DateBookWeekLstView(el,start,bStartOnMonday,scroll);
 	}
 
 	connect (view, SIGNAL(editEvent(const Event &)), this, SIGNAL(editEvent(const Event &)));
 	connect (view, SIGNAL(showDate(int,int,int)), this, SIGNAL(showDate(int,int,int)));
 	connect (view, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)),
 		this, SIGNAL(addEvent(const QDateTime &, const QDateTime &, const QString &, const QString &)));
 
 	scroll->addChild(view);
 	view->show();
 	scroll->updateScrollBars();
 }
 
 void DateBookWeekLst::dateChanged(QDate &newdate) {
 	bdate=newdate;
 	getEvents();
 }
 
 void DateBookWeekLst::keyPressEvent(QKeyEvent *e)
 {
 	switch(e->key()) {
 		case Key_Up:
 			scroll->scrollBy(0, -20);
 			break;
 		case Key_Down:
 			scroll->scrollBy(0, 20);
 			break;
 		case Key_Left:
 			header->prevWeek();
 			break;
 		case Key_Right:
 			header->nextWeek();
 			break;
 		default:
 			e->ignore();
 	}
 }
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index 0bfbcda..f683ce7 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -75,81 +75,82 @@ private:
 
 class DateBookWeekLstView: public QWidget
 {
     Q_OBJECT
 public:
     DateBookWeekLstView(QValueList<EffectiveEvent> &ev, const QDate &d, bool onM,
 			QWidget* parent = 0, const char* name = 0,
 			WFlags fl = 0 );
     ~DateBookWeekLstView();
 signals:
 	void editEvent(const Event &e);
 	void showDate(int y, int m, int d);
 	void addEvent(const QDateTime &start, const QDateTime &stop,
 	const QString &str, const QString &location);
 private:
 	bool bStartOnMonday;
 protected slots:
 	void keyPressEvent(QKeyEvent *);
 };
 
 class DateBookWeekLstDblView: public QWidget {
         Q_OBJECT
 public:
     DateBookWeekLstDblView(QValueList<EffectiveEvent> &ev1,
 			   QValueList<EffectiveEvent> &ev2,
 			   QDate &d, bool onM,
 			   QWidget* parent = 0, const char* name = 0,
 			   WFlags fl = 0 );
 signals:
     void editEvent(const Event &e);
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
 		  const QString &str, const QString &location);
 };
 
 class DateBookWeekLst : public QWidget
 {
     Q_OBJECT
 
 public:
     DateBookWeekLst( bool ampm, bool onM, DateBookDB *newDB,
 		     QWidget *parent = 0,
 		     const char *name = 0 );
     ~DateBookWeekLst();
     void setDate( int y, int w );
     void setDate(const QDate &d );
     int week() const { return _week; };
     QDate date();
+    QDate weekDate() const;
 
 public slots:
     void redraw();
     void dateChanged(QDate &date);
 
 protected slots:
     void keyPressEvent(QKeyEvent *);
     void setDbl(bool on);
 
 signals:
 	void showDate(int y, int m, int d);
 	void addEvent(const QDateTime &start, const QDateTime &stop,
 	const QString &str, const QString &location);
 	void editEvent(const Event &e);
 
 private:
     DateBookDB *db;
     int startTime;
     bool ampm;
     bool bStartOnMonday;
     bool dbl;
 	QDate bdate;
     int year, _week,dow;
     DateBookWeekLstHeader *header;
     QWidget *view;
     QVBoxLayout *layout;
     QScrollView *scroll;
 
     void getEvents();
 };
 
 #endif
 
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index be2bf25..5da7ae9 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -31,62 +31,62 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
 	setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
 	actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null,  0, 0, 0, true );
 	actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null,  0, 0, 0, true );
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "datebook_settings" );
    	actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
    	actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
 }
 
 DatebookSearch::~DatebookSearch()
 {
 	qDebug("SAVE DATEBOOK SEARCH CONFIG");
 	Config cfg( "osearch", Config::User );
    	cfg.setGroup( "datebook_settings" );
    	cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
    	cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
 	delete _dates;
 	delete _popupMenu;
 	delete actionShowPastEvents;
 	delete actionSearchInDates;
 }
 
 
 void DatebookSearch::load()
 {
 	 _dates = new ODateBookAccess();
 	 _dates->load();
 }
 
 int DatebookSearch::search()
 {
 	ORecordList<OEvent> results = _dates->matchRegexp(_search);
 	for (uint i = 0; i < results.count(); i++)
 		insertItem( new OEvent( results[i] ) );
 	return _resultCount;
 }
 
 void DatebookSearch::insertItem( void *rec )
 {
 	OEvent *ev = (OEvent*)rec;
 	if ( !actionShowPastEvents->isOn() &&
 	      ev->endDateTime() < QDateTime::currentDateTime() &&
 	      !ev->recurrence().doesRecur()
 	    ) return;
 	if ( !actionSearchInDates->isOn() && (
 	      ev->lastHitField() == Qtopia::StartDateTime ||
  	      ev->lastHitField() == Qtopia::EndDateTime )
 	    ) return;
-	(void)new EventItem( this, ev );
+	new EventItem( this, ev );
 	_resultCount++;
 }
 
 QPopupMenu* DatebookSearch::popupMenu()
 {
 	if (!_popupMenu){
 		_popupMenu = new QPopupMenu( 0 );
  		actionShowPastEvents->addTo( _popupMenu );
  		actionSearchInDates->addTo( _popupMenu );
 	}
 	return _popupMenu;
 }
 
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index aa52061..f768d81 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -37,101 +37,101 @@
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <opie/owait.h>
 
 #include "olistview.h"
 #include "olistviewitem.h"
 #include "resultitem.h"
 #include "adresssearch.h"
 #include "todosearch.h"
 #include "datebooksearch.h"
 #include "applnksearch.h"
 #include "doclnksearch.h"
 #include "mainwindow.h"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0)
 {
   setCaption( tr("OSearch") );
 
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   QFrame *mainFrame = new QFrame( this, "mainFrame" );
   mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   mainLayout = new QVBoxLayout( mainFrame );
   mainLayout->setSpacing( 0 );
   mainLayout->setMargin( 0 );
 
   resultsList = new OListView( mainFrame );
   resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   mainLayout->addWidget( resultsList );
 
   detailsFrame = new QFrame( mainFrame, "detailsFrame" );
   QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
   richEdit = new QTextView( detailsFrame );
   QWhatsThis::add( richEdit, tr("The details of the current result") );
   richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   detailsLayout->addWidget( richEdit );
 
   buttonBox = new QHBox( mainFrame, "Button Box" );
 
   _buttonCount = 0;
 
   mainLayout->addWidget( detailsFrame );
   mainLayout->addWidget( buttonBox );
   detailsFrame->hide();
   buttonBox->hide();
 
-  searches.append( new AppLnkSearch( resultsList, tr("applications") ) );
-  searches.append( new DocLnkSearch( resultsList, tr("documents") ) );
-  searches.append( new TodoSearch( resultsList, tr("todo") ) );
-  searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
-  searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
+  searches.append( new AppLnkSearch( resultsList, tr("Applications") ) );
+  searches.append( new DocLnkSearch( resultsList, tr("Documents") ) );
+  searches.append( new TodoSearch( resultsList, tr("Todo List") ) );
+  searches.append( new DatebookSearch( resultsList, tr("Calendar") ) );
+  searches.append( new AdressSearch( resultsList, tr("Contacts") ) );
 
   setCentralWidget( mainFrame );
 
   popupTimer = new QTimer();
   searchTimer = new QTimer();
 
   connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
   connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
   connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
   connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
 
   signalMapper = new QSignalMapper( this );
 
   connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
 
   makeMenu();
 
    Config cfg( "osearch", Config::User );
    cfg.setGroup( "search_settings" );
    actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
    actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 
 void MainWindow::makeMenu()
 {
    QPEToolBar *toolBar = new QPEToolBar( this );
    QPEToolBar *searchBar = new QPEToolBar(this);
    QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
    QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
    QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
    QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
 
    setToolBarsMovable( false );
    toolBar->setHorizontalStretchable( true );
    menuBar->insertItem( tr( "Search" ), searchMenu );
    menuBar->insertItem( tr( "Settings" ), cfgMenu );
 
    //SETTINGS MENU
    cfgMenu->insertItem( tr( "Search" ), searchOptions );
    QPopupMenu *pop;
    for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
 		pop = s->popupMenu();
 		if (pop){
 			cfgMenu->insertItem( s->text(0), pop );
 		}
   }
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index 1f5c4bb..75054f0 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -1,78 +1,86 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
-// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
+// (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org>
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
+#include <qdialog.h>
+#include <qaction.h>
 #include <qlist.h>
+
 #include <qmap.h>
+#include <qtimer.h>
+#include <qpopupmenu.h>
 
 class QAction;
 class QPEToolBar;
 class QHBox;
 class QVBoxLayout;
 class QTextView;
 class QFrame;
 class OListView;
 class OListViewItem;
 class QListViewItem;
 class QPopupMenu;
-class QSignalMapper;
 class QTimer;
+
+class QSignalMapper;
+class QButton;
+
 class SearchGroup;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
-
+  static QString appName() { return QString::fromLatin1("osearch"); }
 
 public slots:
   void setCurrent(QListViewItem*);
   void setSearch( const QString& );
   void searchAll();
 
 protected slots:
   void slotAction(int);
   void showPopup();
   void stopTimer( QListViewItem* );
   void searchStringChanged();
   void optionChanged(int);
 
 private:
   QHBox *buttonBox;
   QMap<int, QButton*> buttonMap;
   QSignalMapper* signalMapper;
   OListView *resultsList;
   QTextView *richEdit;
   OListViewItem *_currentItem;
   QVBoxLayout *mainLayout;
   QFrame *detailsFrame;
   QTimer *popupTimer;
   QTimer *searchTimer;
 
   QString _searchString;
   QList<SearchGroup> searches;
   QAction *SearchAllAction;
   QAction *actionCaseSensitiv;
   QAction *actionWildcards;
   //QAction *actionWholeWordsOnly;
   uint _buttonCount;
   void makeMenu();
 };
 
 #endif
 
diff --git a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
index b79c679..8863192 100644
--- a/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginconfig.cpp
@@ -33,125 +33,131 @@ AddressBookPluginConfig::AddressBookPluginConfig( QWidget *parent,  const char*
 
     QVBoxLayout * layout = new QVBoxLayout( this );
     layout->setMargin( 20 );
 
 #if 0
     // Informational stuff
     QHBox *box4 = new QHBox( this );
     QLabel* colorLabel = new QLabel( box4, "" );
     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
 #endif
 
     // Buttongroup to enable/disable shown stuff
     QVGroupBox* b_group = new QVGroupBox( this, "name" );
     b_group -> setTitle( tr("Enable/Disable Views") );
     m_showBirthdayButton = new QRadioButton( b_group );
     m_showBirthdayButton -> setText( tr( "Show &Birthdays" ) );
     m_showAnniversaryButton = new QRadioButton( b_group );
     m_showAnniversaryButton -> setText( tr( "Show &Anniveraries" ) );
 
     QWhatsThis::add( m_showBirthdayButton , tr( "The next birthdays will just be shown, if enabled!" ) );
     QWhatsThis::add( m_showAnniversaryButton , tr( "The next anniversaries will just be shown, if enabled !" ) );
 
     // Max lines settings
     QHBox *box1 = new QHBox( this );
     QLabel* TextLabel6 = new QLabel( box1, "TextLabel6" );
     TextLabel6->setText( tr( "Max Lines: " ) );
     SpinBox2 = new QSpinBox( box1, "SpinBox2" );
     SpinBox2->setMaxValue( 40 );
     QWhatsThis::add( SpinBox2 , tr( "Set the maximum number of lines that should be shown for each anniversaries/birthdays" ) );
 
 #if 0
     // Clip settings (currently not used)
     QHBox *box2 = new QHBox( this );
     QLabel* clipLabel = new QLabel( box2, "" );
     clipLabel->setText( tr( "Clip line after X chars: " ) );
     SpinBoxClip = new QSpinBox( box2, "SpinClip" );
     SpinBoxClip->setMaxValue( 200 );
     QWhatsThis::add( SpinBoxClip , tr( "After how many chars should be the info about the task be cut off" ) );
 #endif
 
     // Look ahead settings
     QHBox *box3 = new QHBox( this );
     QLabel* daysLabel = new QLabel( box3, "" );
     daysLabel->setText( tr( "Days look ahead: " ) );
     SpinDaysClip = new QSpinBox( box3, "SpinDays" );
     SpinDaysClip->setMaxValue( 200 );
     QWhatsThis::add( SpinDaysClip , tr( "How many days we should search forward" ) );
 
+//     QHBox *box4 = new QHBox( this );
+
+//     QLabel* colorLabel = new QLabel( box4, "" );
+//     colorLabel->setText( tr( "To activate settings: Restart application !" ) );
+
+
     QHBox *box5 = new QHBox( this );
     QLabel* colorLabel2 = new QLabel( box5, "" );
     colorLabel2->setText( tr( "Set Headline Color: " ) );
     headlineColor = new OColorButton( box5, black , "headlineColor" );
     QWhatsThis::add( headlineColor , tr( "Colors for the headlines !" ) );
     QHBox *box6 = new QHBox( this );
 
     // Entry color settings
     QLabel* colorLabel3= new QLabel( box6, "" );
     colorLabel3->setText( tr( "Set Entry Color: " ) );
     entryColor = new OColorButton( box6, black , "entryColor" );
     QWhatsThis::add( entryColor , tr( "This color will be used for shown birthdays/anniversaries !" ) );
 
     // Urgent color settings
     QHBox *box7 = new QHBox( this );
     QLabel* colorLabel5 = new QLabel( box7, "" );
     colorLabel5->setText( tr( "Set Urgent\nColor if below " ) );
     SpinUrgentClip = new QSpinBox( box7, "SpinDays" );
     SpinUrgentClip->setMaxValue( 200 );
     QLabel* colorLabel6 = new QLabel( box7, "" );
     colorLabel6->setText( tr( " days: " ) );
     urgentColor = new OColorButton( box7, red , "urgentColor" );
     QWhatsThis::add( urgentColor , tr( "This urgent color will be used if we are close to the event !" ) );
     QWhatsThis::add( SpinUrgentClip , tr( "The urgent color will be used if the birthday/anniversary is closer than given days !" ) );
 
 
-    layout->addWidget( b_group );
+    //layout->addWidget( box4 );
     layout->addWidget( box1 );
-    //    layout->addWidget( box2 );
+    //layout->addWidget( box2 );
     layout->addWidget( box3 );
     layout->addWidget( box5 );
     layout->addWidget( box6 );
     layout->addWidget( box7 );
 
     readConfig();
 
 }
 
 void AddressBookPluginConfig::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_max_lines_task = cfg.readNumEntry( "maxlinestask", 5 );
     SpinBox2->setValue( m_max_lines_task );
 //     m_maxCharClip =  cfg.readNumEntry( "maxcharclip", 38 );
 //     SpinBoxClip->setValue( m_maxCharClip );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
     SpinDaysClip->setValue( m_daysLookAhead );
     m_urgentDays = cfg.readNumEntry( "urgentdays", 7 );
     SpinUrgentClip->setValue( m_urgentDays );
 
     m_entryColor = cfg.readEntry( "entrycolor", Qt::black.name() );
     entryColor->setColor( QColor( m_entryColor ) );
     m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() );
     headlineColor->setColor( QColor( m_headlineColor ) );
     m_urgentColor = cfg.readEntry( "urgentcolor", Qt::red.name() );
     urgentColor->setColor( QColor( m_urgentColor ) );
 
     m_showBirthdayButton->setChecked( cfg.readBoolEntry( "showBirthdays", true ) );
     m_showAnniversaryButton->setChecked( cfg.readBoolEntry( "showAnniversaries", true ) );
 				  
 }
 
 
 void AddressBookPluginConfig::writeConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_max_lines_task = SpinBox2->value();
     cfg.writeEntry( "maxlinestask", m_max_lines_task );
 //     m_maxCharClip = SpinBoxClip->value();
 //     cfg.writeEntry( "maxcharclip",  m_maxCharClip );
     m_daysLookAhead = SpinDaysClip->value();
     cfg.writeEntry( "dayslookahead",  m_daysLookAhead );
     m_urgentDays = SpinUrgentClip->value();
     if ( m_urgentDays > m_daysLookAhead )
 	    m_urgentDays = m_daysLookAhead;
     cfg.writeEntry( "urgentdays", m_urgentDays );
 
diff --git a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
index dad09db..d47bc0b 100644
--- a/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
+++ b/core/pim/today/plugins/addressbook/addresspluginwidget.cpp
@@ -57,110 +57,114 @@ AddressBookPluginWidget::~AddressBookPluginWidget() {
     delete m_contactdb;
 }
 
 void AddressBookPluginWidget::refresh( const OContactAccess* )
 {
 	qWarning(" AddressBookPluginWidget::Database was changed externally ! ");
 	m_contactdb->reload();
 	getAddress();
 }
 
 void AddressBookPluginWidget::reinitialize() {
 	readConfig();
 	getAddress();
 }
 
 void AddressBookPluginWidget::readConfig() {
     Config cfg( "todayaddressplugin" );
     cfg.setGroup( "config" );
     m_maxLinesTask  = cfg.readNumEntry( "maxlinestask", 5 );
     m_maxCharClip   = cfg.readNumEntry( "maxcharclip", 38 );
     m_daysLookAhead = cfg.readNumEntry( "dayslookahead", 14 );
     m_urgentDays    = cfg.readNumEntry( "urgentdays", 7 );
     m_entryColor    = cfg.readEntry("entrycolor", Qt::black.name() );
     m_headlineColor = cfg.readEntry( "headlinecolor", Qt::black.name() );
     m_urgentColor   = cfg.readEntry( "urgentcolor", Qt::red.name() );
     m_showBirthdays = cfg.readBoolEntry( "showBirthdays", true );
     m_showAnniversaries = cfg.readBoolEntry( "showAnniversaries", true );
 }
 
 
 /**
  * Get the addresss
  */
 void AddressBookPluginWidget::getAddress() {
 
 	if ( ! layoutTodo ){
 		layoutTodo = new QVBoxLayout( this );
 	}
 
 	if ( ! addressLabel ) {
 		addressLabel = new OClickableLabel( this );
 		connect( addressLabel, SIGNAL( clicked() ), this, SLOT( startAddressBook() ) );
 		layoutTodo->addWidget( addressLabel );
 	}
 	
 	QString output;
 
 	// Check whether the database provide the search option..
-	if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+    if ( !m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
 		// Libopie seems to be old..
 		output = QObject::tr( "Database does not provide this search query ! Please upgrade libOpie !<br>" );
 		addressLabel->setText( output );
 		return;
 	}
-	
+
 	// Define the query for birthdays and start search..
 	QDate lookAheadDate = QDate::currentDate().addDays( m_daysLookAhead );
 	int ammount = 0;
 	if ( m_showBirthdays ){
-		qWarning("Searching from now (%s) until %s ! ", 
-			 QDate::currentDate().toString().latin1(), 
+		qWarning("Searching from now (%s) until %s ! ",
+			 QDate::currentDate().toString().latin1(),
 			 lookAheadDate.toString().latin1() );
+    }
+
+    if ( m_contactdb->hasQuerySettings( OContactAccess::DateDiff ) ){
+
 
 		OContact querybirthdays;
 		querybirthdays.setBirthday( lookAheadDate );
 		
 		m_list = m_contactdb->queryByExample( querybirthdays, 
 						      OContactAccess::DateDiff );
 		if ( m_list.count() > 0 ){
 			output = "<font color=" + m_headlineColor + ">"
 				+ QObject::tr( "Next birthdays in <b> %1 </b> days:" )
 				.arg( m_daysLookAhead )
 				+ "</font> <br>";
 			for ( m_it = m_list.begin(); m_it != m_list.end(); ++m_it ) {
 				if ( ammount++ < m_maxLinesTask ){
 					// Now we want to calculate how many days 
 					//until birthday. We have to set 
 					// the correct year to calculate the day diff...
 					QDate destdate = (*m_it).birthday();
 					destdate.setYMD( QDate::currentDate().year(), 
 							 destdate.month(), destdate.day() );
 					if ( QDate::currentDate().daysTo(destdate) < 0 )
 						destdate.setYMD( QDate::currentDate().year()+1, 
 								 destdate.month(), destdate.day() );
 
 					
 					if ( QDate::currentDate().daysTo(destdate) < m_urgentDays )
 						output += "<font color=" + m_urgentColor + "><b>-" 
 							+ (*m_it).fullName() 
 							+ " (" 
 							+ QString::number(QDate::currentDate()
 									  .daysTo(destdate)) 
 							+ " Days) </b></font><br>";
 					
 					else
 						output += "<font color=" + m_entryColor + "><b>-" 
 							+ (*m_it).fullName() 
 							+ " (" 
 							+ QString::number(QDate::currentDate()
 									  .daysTo(destdate)) 
 							+ " Days) </b></font><br>";
 				}
 			}
 		} else {
 			output = "<font color=" + m_headlineColor + ">"
 				+ QObject::tr( "No birthdays in <b> %1 </b> days!" )
 				.arg( m_daysLookAhead )
 				+ "</font> <br>";
 		}
 	}
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index bc412dd..2d303fc 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -1,62 +1,60 @@
 /*
  * datebookpluginconfig.h
  *
  * copyright   : (c) 2002,2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef DATEBOOK_PLUGIN_CONFIG_H
 #define DATEBOOK_PLUGIN_CONFIG_H
 
 
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
-class DatebookPluginConfig : public TodayConfigWidget {
+#include "datebookpluginconfigbase.h"
+
+class DatebookPluginConfig : public TodayConfigWidget  {
 
     Q_OBJECT
 
+
 public:
     DatebookPluginConfig( QWidget *parent,  const char *name );
    ~DatebookPluginConfig();
 
     void writeConfig();
 private:
     /**
      * if changed then save
      */
     bool changed();
     void readConfig();
 
-    QCheckBox* CheckBox2;
-    QCheckBox* CheckBox1;
-    QCheckBox* CheckBox3;
-    QSpinBox* SpinBox1;
-    QSpinBox* SpinBox2;
-
 
+    DatebookPluginConfigBase *m_gui;
     // how many lines should be showed in the datebook section
     int m_max_lines_meet;
     // If location is to be showed too, 1 to activate it.
     int m_show_location;
     // if notes should be shown
     int m_show_notes;
     // should only later appointments be shown or all for the current day.
     int m_only_later;
     int m_more_days;
 
 };
 
 
 #endif
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index e09251c..54d35cf 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -1,58 +1,59 @@
 /*
  * todopluginconfig.h
  *
  * copyright   : (c) 2002, 2003 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef TODOLIST_PLUGIN_CONFIG_H
 #define TODOLIST_PLUGIN_CONFIG_H
 
-//#include <qwidget.h>
 #include <qspinbox.h>
 
 #include <opie/todayconfigwidget.h>
 
+#include "todopluginconfigbase.h"
+
 class TodolistPluginConfig : public TodayConfigWidget {
 
-Q_OBJECT
+    Q_OBJECT
 
 public:
 
     TodolistPluginConfig( QWidget *parent,  const char *name );
     ~TodolistPluginConfig();
 
 private:
     /**
      * if changed then save
      */
     bool changed();
     void readConfig();
     void writeConfig();
+    
+    TodoPluginConfigBase *m_gui;
 
-    QSpinBox* SpinBox2;
-    QSpinBox* SpinBoxClip;
 
     // how many lines should be showed in the todolist section
     int m_max_lines_task;
     // clip the lines after X chars
     int m_maxCharClip;
 
 
 
 };
 
 
 
 
 
 #endif
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index c4726b3..00ea105 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -66,247 +66,258 @@
 
     loginCfg.setGroup("General");
     autoLoginName=loginCfg.readEntry("AutoLogin","");
 
     if (autoLoginName.stripWhiteSpace().isEmpty()) {
         autoLogin=false;
     } else {
         autoLogin=true;
     }
 
     cfg.setGroup("SyncMode");
     int mode = cfg.readNumEntry("Mode",2); // Default to Sharp
     syncModeCombo->setCurrentItem( mode - 1 );
 
     connect(autologinToggle, SIGNAL(toggled(bool)), this, SLOT(toggleAutoLogin(bool)));
     connect(userlist, SIGNAL(activated(int)), this, SLOT(changeLoginName(int)));
     connect(changepasscode,SIGNAL(clicked()), this, SLOT(changePassCode()));
     connect(clearpasscode,SIGNAL(clicked()), this, SLOT(clearPassCode()));
 
     loadUsers();
     updateGUI();
 
     dl = new QPEDialogListener(this);
     showMaximized();
 }
 
 Security::~Security()
 {
 }
 
 
 void Security::updateGUI()
 {
     bool empty = passcode.isEmpty();
 
     changepasscode->setText( empty ? tr("Set passcode" )
             : tr("Change passcode" )  );
     passcode_poweron->setEnabled( !empty );
     clearpasscode->setEnabled( !empty );
 
     autologinToggle->setChecked(autoLogin);
     userlist->setEnabled(autoLogin);
 
 }
 
 
 void Security::show()
 {
-    valid=FALSE;
+    //valid=FALSE;
     setEnabled(FALSE);
     SecurityBase::show();
     if ( passcode.isEmpty() ) {
         // could insist...
         //changePassCode();
         //if ( passcode.isEmpty() )
         //reject();
     } else {
-        QString pc = enterPassCode(tr("Enter passcode"));
-        if ( pc != passcode ) {
-            QMessageBox::critical(this, tr("Passcode incorrect"),
-                    tr("The passcode entered is incorrect.\nAccess denied"));
-            reject();
-            return;
-        }
+
+		if (!valid) // security passcode was not asked yet, so ask now
+		{
+			QString pc = enterPassCode(tr("Enter passcode"));
+			if ( pc != passcode ) {
+				QMessageBox::critical(this, tr("Passcode incorrect"),
+						tr("The passcode entered is incorrect.\nAccess denied"));
+				reject();
+				return;
+			}
+		}
     }
     setEnabled(TRUE);
     valid=TRUE;
 }
 
 void Security::accept()
 {
     applySecurity();
     QDialog::accept();
     QCopEnvelope env("QPE/System", "securityChanged()" );
 }
 
 void Security::done(int r)
 {
     QDialog::done(r);
     close();
 }
 
 void Security::selectNet(int auth_peer,int auth_peer_bits)
 {
     QString sn;
     if ( auth_peer_bits == 0 && auth_peer == 0 ) {
         sn = tr("Any");
     } else if ( auth_peer_bits == 32 && auth_peer == 0 ) {
         sn = tr("None");
     } else {
         sn =
             QString::number((auth_peer>>24)&0xff) + "."
             + QString::number((auth_peer>>16)&0xff) + "."
             + QString::number((auth_peer>>8)&0xff) + "."
             + QString::number((auth_peer>>0)&0xff) + "/"
             + QString::number(auth_peer_bits);
     }
     for (int i=0; i<syncnet->count(); i++) {
         if ( syncnet->text(i).left(sn.length()) == sn ) {
             syncnet->setCurrentItem(i);
             return;
         }
     }
     qDebug("No match for \"%s\"",sn.latin1());
 }
 
 void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
         auth_peer = 0;
         auth_peer_bits = 0;
     } else if ( sn == tr("None") ) {
         auth_peer = 0;
         auth_peer_bits = 32;
     } else {
         int x=0;
         for (int i=0; i<4; i++) {
             int nx = sn.find(QChar(i==3 ? '/' : '.'),x);
             auth_peer = (auth_peer<<8)|sn.mid(x,nx-x).toInt();
             x = nx+1;
         }
         uint n = (uint)sn.find(' ',x)-x;
         auth_peer_bits = sn.mid(x,n).toInt();
     }
 }
 
 void Security::loadUsers ( void )
 {
     QFile passwd("/etc/passwd");
     if ( passwd.open(IO_ReadOnly) ) {
         QTextStream t( &passwd );
         QString s;
         QStringList account;
         while ( !t.eof() ) {
             account = QStringList::split(':',t.readLine());
 
             // Hide disabled accounts
             if (*account.at(1)!="*") {
 
                 userlist->insertItem(*account.at(0));
                 // Highlight this item if it is set to autologinToggle
                 if ( *account.at(0) == autoLoginName)
                     userlist->setCurrentItem(userlist->count()-1);
             }
         }
         passwd.close();
     }
 
 }
+
 void Security::toggleAutoLogin(bool val)
 {
     autoLogin=val;
     userlist->setEnabled(val);
     if (!autoLogin)
         autoLoginName=userlist->currentText();
 }
+
+
+
+
 void Security::setSyncNet(const QString& sn)
 {
     int auth_peer,auth_peer_bits;
     parseNet(sn,auth_peer,auth_peer_bits);
     selectNet(auth_peer,auth_peer_bits);
 }
 
 void Security::applySecurity()
 {
     if ( valid ) {
+<<<<<<< security.cpp
         Config cfg("Security");
         cfg.setGroup("Passcode");
         cfg.writeEntry("passcode",passcode);
         cfg.writeEntry("passcode_poweron",passcode_poweron->isChecked());
         cfg.setGroup("Sync");
         int auth_peer=0;
         int auth_peer_bits;
         QString sn = syncnet->currentText();
         parseNet(sn,auth_peer,auth_peer_bits);
         cfg.writeEntry("auth_peer",auth_peer);
         cfg.writeEntry("auth_peer_bits",auth_peer_bits);
         /*
            cfg.setGroup("Remote");
            if ( telnetAvailable() )
            cfg.writeEntry("allow_telnet",telnet->isChecked());
            if ( sshAvailable() )
            cfg.writeEntry("allow_ssh",ssh->isChecked());
         // ### write ssh/telnet sys config files
         */
 
         QString configFile = QPEApplication::qpeDir() + "/etc/opie-login.conf";
         Config loginCfg(configFile,Config::File);
         loginCfg.setGroup("General");
 
         if (autoLogin) {
             loginCfg.writeEntry("AutoLogin",autoLoginName);
         } else {
             loginCfg.removeEntry("AutoLogin");
         }
 
 	cfg.setGroup("SyncMode");
 	cfg.writeEntry("Mode", syncModeCombo->currentItem()+1 );
+
     }
 }
 
 void Security::changeLoginName( int idx )
 {
     autoLoginName = userlist->text(idx);;
     updateGUI();
 }
 
 void Security::changePassCode()
 {
     QString new1;
     QString new2;
 
     do {
         new1 = enterPassCode(tr("Enter new passcode"));
         if ( new1.isNull() )
             return;
         new2 = enterPassCode(tr("Re-enter new passcode"));
         if ( new2.isNull() )
             return;
     } while (new1 != new2);
 
     passcode = new1;
     updateGUI();
 }
 
 void Security::clearPassCode()
 {
     passcode = QString::null;
     updateGUI();
 }
 
 
 QString Security::enterPassCode(const QString& prompt)
 {
     return Password::getPassword(prompt);
 }
 
 bool Security::telnetAvailable() const
 {
     // ### not implemented
     return FALSE;
 }
 
 bool Security::sshAvailable() const
 {
     // ### not implemented
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 7e7f064..74923c8 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,13 +1,8 @@
 
 #include "mainwindow.h"
 
-#include <opie2/oapplication.h>
-
-int main( int argc, char ** argv )
-{
-  OApplication a( argc, argv, "confedit" );
-  MainWindow mw;
-  mw.showMaximized();
-  a.showMainDocumentWidget( &mw );
-  return a.exec();
-}
+#include <qpe/qpeapplication.h>
+#include <opie/oapplicationfactory.h>
+
+OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
+
diff --git a/noncore/games/tictac/main.cpp b/noncore/games/tictac/main.cpp
index 78fb3b7..0185b8c 100644
--- a/noncore/games/tictac/main.cpp
+++ b/noncore/games/tictac/main.cpp
@@ -1,31 +1,19 @@
 /****************************************************************************
+<<<<<<< main.cpp
 ** $Id$
+=======
+** $Id$
+>>>>>>> 1.1.8.1.2.1
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 
 #include <qpe/qpeapplication.h>
-#include <stdlib.h>
+#include <opie/oapplicationfactory.h>
 #include "tictac.h"
 
-
-int main( int argc, char **argv )
-{
-    QPEApplication a( argc, argv );
-    int n = 3;
-    if ( argc == 2 )				// get board size n
-        n = atoi(argv[1]);
-    if ( n < 3 || n > 10 ) {			// out of range
-        qWarning( "%s: Board size must be from 3x3 to 10x10", argv[0] );
-        return 1;
-    }
-    TicTacToe ttt( n );				// create game
-    a.setMainWidget( &ttt );
-    ttt.setCaption( QObject::tr("TicTac") );
-    ttt.show();					// show widget
-    return a.exec();				// go
-}
+OPIE_EXPORT_APP( OApplicationFactory<TicTacToe> )