template loading changed

2 files changed, 6 insertions, 3 deletions

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 42c3df1..fc5be71 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -49,8 +49,9 @@
 KOEditorGeneralEvent::KOEditorGeneralEvent(QObject* parent,
                                            const char* name) :
   KOEditorGeneral( parent, name)
 {
+    mTemplate = false;
   connect(this,SIGNAL(dateTimesChanged(QDateTime,QDateTime)),
           SLOT(setDuration()));
   connect(this,SIGNAL(dateTimesChanged(QDateTime,QDateTime)),
           SLOT(emitDateTimeStr()));
@@ -174,14 +175,15 @@ void KOEditorGeneralEvent::dontAssociateTime(bool noTime)
 
 void KOEditorGeneralEvent::setDateTimes(QDateTime start, QDateTime end)
 {
 //  kdDebug() << "KOEditorGeneralEvent::setDateTimes(): Start DateTime: " << start.toString() << endl;
-
+    if ( !mTemplate )
   mStartDateEdit->setDate(start.date());
   // KTimeEdit seems to emit some signals when setTime() is called.
   mStartTimeEdit->blockSignals( true );
   mStartTimeEdit->setTime(start.time());
   mStartTimeEdit->blockSignals( false );
+    if ( !mTemplate )
   mEndDateEdit->setDate(end.date());
   mEndTimeEdit->setTime(end.time());
 
   mCurrStartDateTime = start;
@@ -260,16 +262,16 @@ void KOEditorGeneralEvent::setDefaults(QDateTime from,QDateTime to,bool allDay)
 void KOEditorGeneralEvent::readEvent( Event *event, bool tmpl )
 {
   QString tmpStr;
 
-  if ( !tmpl ) {
+  mTemplate = tmpl;
     // the rest is for the events only
     mNoTimeButton->setChecked(event->doesFloat());
     timeStuffDisable(event->doesFloat());
 
     setDateTimes(event->dtStart(),event->dtEnd());
-  }
 
+  mTemplate = false;
   switch( event->transparency() ) {
   case Event::Transparent:
     mFreeTimeCombo->setCurrentItem(1);
     break;
diff --git a/korganizer/koeditorgeneralevent.h b/korganizer/koeditorgeneralevent.h
index 188dc93..0174788 100644
--- a/korganizer/koeditorgeneralevent.h
+++ b/korganizer/koeditorgeneralevent.h
@@ -89,8 +89,9 @@ class KOEditorGeneralEvent : public KOEditorGeneral
     void allDayChanged(bool);
     void dateTimeStrChanged(const QString &);
 
   private:
+    bool mTemplate;
     QLabel                  *mStartDateLabel;
     QLabel                  *mEndDateLabel;
     KDateEdit               *mStartDateEdit;
     KDateEdit               *mEndDateEdit;