fixi

1 files changed, 20 insertions, 0 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 940ea91..ccacc52 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1453,4 +1453,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             idS = inR->IDStr();
+                        int calID = inR->calID();
                         remote->deleteIncidence( inR );
                         inR = inL->clone();
+                        inR->setCalID( calID );
                         inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
@@ -1465,4 +1467,6 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         int pid = inL->pilotId();
+                        int calID = inL->calID();
                         local->deleteIncidence( inL );
                         inL = inR->clone();
+                        inL->setCalID( calID );
                         if ( mSyncManager->syncWithDesktop() )
@@ -1495,2 +1499,4 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
+                            
+                            inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
@@ -1504,2 +1510,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                             inL->setIDStr( ":" );
+                            inL->setCalID( 0 );// add to default cal
                             local->addIncidence( inL );
@@ -1561,2 +1568,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
+                                inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
@@ -1575,2 +1583,3 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                                 inR->setIDStr( ":" );
+                                inR->setCalID( 0 );// add to default cal
                                 remote->addIncidence(  inR );
@@ -2145,2 +2154,11 @@ bool CalendarView::openCalendar(QString filename, bool merge)
 }
+void CalendarView::mergeFile( QString fn )
+{
+    clearAllViews();
+    mCalendar->mergeCalendarFile( fn ); 
+    mCalendar->reInitAlarmSettings();
+    setSyncEventsReadOnly();
+    updateUnmanagedViews();
+    updateView();
+}
 void CalendarView::showOpenError()
@@ -3360,2 +3378,3 @@ void CalendarView::newEvent()
     QDate date = mNavigator->selectedDates().first();
+#if 0
     QDateTime current =  QDateTime::currentDateTime();
@@ -3366,2 +3385,3 @@ void CalendarView::newEvent()
     } else
+#endif
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),