1 files changed, 42 insertions, 4 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 6dd8918..cf1eeca 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -239,12 +239,26 @@ void DateBook::slotSettings()
 	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 defined (Q_WS_QWS) || defined(_WS_QWS_)
     frmSettings.showMaximized();
 #endif
 
 	if ( frmSettings.exec() ) {
 
@@ -252,12 +266,14 @@ void DateBook::slotSettings()
 		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 );
 		}
@@ -382,14 +398,16 @@ void DateBook::viewWeekLst() {
 void DateBook::viewMonth() {
     view(MONTH,currentDate());
 }
 
 void DateBook::insertEvent( const Event &e )
 {
-	qWarning("Adding Event!");
-	db->addEvent(e);
+	Event dupEvent=e;
+	dupEvent.setLocation(defaultLocation);
+	dupEvent.setCategories(defaultCategories);
+	db->addEvent(dupEvent);
 	emit newEvent();
 }
 
 void DateBook::duplicateEvent( const Event &e )
 {
 	qWarning("Hmmm...");
@@ -603,12 +621,21 @@ void DateBook::loadSettings()
 	aPreset = config.readBoolEntry("alarmpreset");
 	presetTime = config.readNumEntry("presettime");
 	bJumpToCurTime = config.readBoolEntry("jumptocurtime");
 	rowStyle = config.readNumEntry("rowstyle");
 	defaultView = config.readNumEntry("defaultview",DAY);
 	weeklistviewconfig = config.readNumEntry("weeklistviewconfig",NORMAL);
+
+	defaultLocation=config.readEntry("defaultLocation");
+	QString tmpString=config.readEntry("defaultCategories");
+	QStringList tmpStringList=QStringList::split(",",tmpString);
+	defaultCategories.truncate(0);
+	for( QStringList::Iterator i=tmpStringList.begin(); i!=tmpStringList.end(); i++) {
+		defaultCategories.resize(defaultCategories.count()+1);
+		defaultCategories[defaultCategories.count()-1]=(*i).toInt();
+	}
 }
 
 void DateBook::saveSettings()
 {
 	Config config( "qpe" );
 	Config configDB( "DateBook" );
@@ -617,12 +644,19 @@ void DateBook::saveSettings()
 	configDB.writeEntry("alarmpreset",aPreset);
 	configDB.writeEntry("presettime",presetTime);
 	configDB.writeEntry("jumptocurtime", bJumpToCurTime);
 	configDB.writeEntry("rowstyle", rowStyle);
 	configDB.writeEntry("defaultview",defaultView);
 	configDB.writeEntry("weeklistviewconfig",weeklistviewconfig);
+
+	configDB.writeEntry("defaultLocation",defaultLocation);
+	QStringList tmpStringList;
+	for( uint i=0; i<defaultCategories.count(); i++) {
+		tmpStringList << QString::number(defaultCategories[i]);
+	}
+	configDB.writeEntry("defaultCategories",tmpStringList.join(","));
 }
 
 void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 {
 	bool needShow = FALSE;
 	if ( msg == "alarm(QDateTime,int)" ) {
@@ -838,16 +872,21 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const
     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 );
@@ -856,14 +895,13 @@ void DateBook::slotNewEntry(const QDateTime &start, const QDateTime &end, const
 #endif
     while (newDlg.exec()) {
 	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 )
+		if ( QMessageBox::warning( this, tr("Error!"), error, tr("Fix it"), tr("Continue"), 0, 0, 1 ) == 0 )
 		continue;
 	}
 	db->addEvent( ev );
 	emit newEvent();
 	break;
     }