1 files changed, 38 insertions, 8 deletions

diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index b7e89b0..10a9b59 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -219,24 +219,28 @@ void DateBook::receive( const QCString &msg, const QByteArray &data )
 	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()
 {
 	DateBookSettings frmSettings( ampm, this );
 	frmSettings.setStartTime( startTime );
 	frmSettings.setAlarmPreset( aPreset, presetTime );
@@ -427,27 +431,37 @@ void DateBook::duplicateEvent( const Event &e )
 	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, "error box", error, "Fix it", "Continue", 0, 0, 1) == 0)
+			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...
+
 		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;
 	}
@@ -467,25 +481,25 @@ void DateBook::editEvent( const Event &e )
 	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, "error box", error, "Fix it", "Continue", 0, 0, 1) == 0) continue;
+			if (QMessageBox::warning(this, tr("error box"), error, tr("Fix it"), tr("Continue"), 0, 0, 1) == 0) continue;
 	}
 	db->editEvent(e, newEv);
 	emit newEvent();
 	break;
 	}
 }
 
 void DateBook::removeEvent( const Event &e )
 {
 	if (syncing) {
 		QMessageBox::warning( this, tr("Calendar"), tr( "Can not edit data, currently syncing") );
 		return;
@@ -510,26 +524,26 @@ void DateBook::addEvent( const Event &e )
 
 void DateBook::showDay( int year, int month, int day )
 {
     QDate d(year, month, day);
     view(DAY,d);
 }
 
 void DateBook::initDay()
 {
 	if ( !dayView ) {
 		dayView = new DateBookDay( ampm, onMonday, db, views, "day view" );
 		views->addWidget( dayView, DAY );
-		dayView->setStartViewTime( startTime );
 		dayView->setJumpToCurTime( bJumpToCurTime );
+		dayView->setStartViewTime( startTime );
 		dayView->setRowStyle( rowStyle );
 		connect( this, SIGNAL( newEvent() ), dayView, SLOT( redraw() ) );
 		connect( dayView, SIGNAL( newEvent() ), 	this, SLOT( fileNew() ) );
 		connect( dayView, SIGNAL( removeEvent( const Event & ) ), this, SLOT( removeEvent( const Event & ) ) );
 		connect( dayView, SIGNAL( editEvent( const Event & ) ), this, SLOT( editEvent( const Event & ) ) );
 		connect( dayView, SIGNAL( duplicateEvent( const Event & ) ), this, SLOT( duplicateEvent( const Event & ) ) );
 		connect( dayView, SIGNAL( beamEvent( const Event & ) ), this, SLOT( beamEvent( const Event & ) ) );
 		connect( dayView, SIGNAL(sigNewEvent(const QString &)), this, SLOT(slotNewEventFromKey(const QString &)) );
 	}
 }
 
 void DateBook::initWeek()
@@ -688,50 +702,66 @@ void DateBook::appMessage(const QCString& msg, const QByteArray& data)
 				vb->addWidget( cmdOk );
 
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
 				dlg.showMaximized();
 #endif
 				needShow = dlg.exec();
 
 				if ( bSound )
 					killTimer( stopTimer );
 				}
 			}
 		} else if ( msg == "nextView()" ) {
+                    needShow = true;
 			if ( !qApp-> activeWindow ( )) {
 				needShow = TRUE;
 			} else {
 				QWidget* cur = views->visibleWidget();
 				if ( cur ) {
 				if ( cur == dayView )
 					viewWeek();
 				else if ( cur == weekView )
 					viewWeekLst();
 				else if ( cur == weekLstView )
 					viewMonth();
 				else if ( cur == monthView )
 					viewDay();
 				needShow = TRUE;
 			}
 		}
+    }   else if (msg == "editEvent(int)") {
+        /* simple copy from receive */
+        QDataStream stream(data,IO_ReadOnly);
+	int uid;
+	stream >> uid;
+	Event e=db->eventByUID(uid);
+	editEvent(e);
+    } else if (msg == "viewDefault(QDate)"){
+        /* simple copy from receive */
+        QDataStream stream(data,IO_ReadOnly);
+        QDate day;
+        stream >> day;
+        viewDefault(day);
+        needShow = true;
     }
+
     if ( needShow ) {
 #if defined(Q_WS_QWS) || defined(_WS_QWS_)
-		showMaximized();
+//		showMaximized();
 #else
-		show();
+//		show();
 #endif
-		raise();
+//		raise();
 		QPEApplication::setKeepRunning();
-		setActiveWindow();
+//		setActiveWindow();
 	}
 }
 
 void DateBook::reload()
 {
 	db->reload();
 	if ( dayAction->isOn() ) viewDay();
 	else if ( weekAction->isOn() ) viewWeek();
 	else if ( monthAction->isOn() ) viewMonth();
 	syncing = FALSE;
 }
 
@@ -908,25 +938,25 @@ void DateBook::beamEvent( const Event &e )
 }
 
 void DateBook::beamDone( Ir *ir )
 {
     delete ir;
     unlink( beamfile );
 }
 
 void DateBook::slotFind()
 {
     // move it to the day view...
     viewDay();
-    FindDialog frmFind( "Calendar", this );
+    FindDialog frmFind( "Calendar", this ); // no tr needed
     frmFind.setUseDate( true );
     frmFind.setDate( currentDate() );
     QObject::connect( &frmFind,
                       SIGNAL(signalFindClicked(const QString&, const QDate&,
 					       bool, bool, int)),
 		      this,
 		      SLOT(slotDoFind(const QString&, const QDate&,
 				      bool, bool, int)) );
     QObject::connect( this,
 		      SIGNAL(signalNotFound()),
 		      &frmFind,
 		      SLOT(slotNotFound()) );