some fixes

4 files changed, 25 insertions, 16 deletions

diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp
index 2a49528..d4aa78c 100644
--- a/korganizer/koeditorgeneralevent.cpp
+++ b/korganizer/koeditorgeneralevent.cpp
@@ -377,18 +377,25 @@ void KOEditorGeneralEvent::emitDateTimeStr()
 {
   KLocale *l = KGlobal::locale();
-
-  QString from,to;
-  if (mNoTimeButton->isChecked()) {
-    from = l->formatDate(mCurrStartDateTime.date());
-    to = l->formatDate(mCurrEndDateTime.date());
+  QString startString = "";
+  if ( mCurrStartDateTime.date() < mCurrEndDateTime.date()  ) {
+      if ( mNoTimeButton->isChecked() ) {
+          startString = i18n("From: ") + l->formatDate(mCurrStartDateTime.date() );
+          startString += "\n"+i18n("To: ")+ l->formatDate(mCurrEndDateTime.date());
+          
+      } else {
+          startString = i18n("From: ") +l->formatDateTime(mCurrStartDateTime, false);
+          startString += "\n"+i18n("To: ")+l->formatDateTime(mCurrEndDateTime, false);
+      }
   } else {
-    from = l->formatDateTime(mCurrStartDateTime);
-    to = l->formatDateTime(mCurrEndDateTime);
+      if ( mNoTimeButton->isChecked() ) {
+          startString = i18n("On: ") + l->formatDate(mCurrStartDateTime.date() );
+      } else {
+          startString = i18n("From: ") + KGlobal::locale()->formatTime(mCurrStartDateTime.time())+
+              "-"+KGlobal::locale()->formatTime(mCurrEndDateTime.time());
+          startString += i18n(" on ")+KGlobal::locale()->formatDate( mCurrStartDateTime.date(), true);
+      }
   }
-
-  QString str = i18n("From: %1   To: %2   %3").arg(from).arg(to)
-                .arg(mDurationLabel->text());
-
-  emit dateTimeStrChanged(str);
+  startString +="\n"+mDurationLabel->text();
+  emit dateTimeStrChanged(startString);
 }
 
diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index bf81b01..01c5773 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -730,5 +730,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
 
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Appointment Time "),
+  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
                                  this );
   topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
@@ -745,6 +745,6 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 //  mDateTimeLabel = new QLabel( timeFrame );
 //  layoutTimeFrame->addWidget( mDateTimeLabel );
-
-
+  //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
+  //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
   mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
   topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 51e2524..6a05cc8 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -73,4 +73,5 @@ void KOTodoEditor::init()
   setupRecurrence();
   connect(mGeneral,SIGNAL(datesChecked()),this ,SLOT(checkRecurrence()));
+  mRecurrence->setDateTimeStr( i18n("<i>The recurrence is computed from the start datetime!</i>")  );
 }
 void KOTodoEditor::setupRecurrence()
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 94f4677..ffc4d9a 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1588,5 +1588,6 @@ void MainWindow::processIncidenceSelection( Incidence *incidence )
                 startString = ": "+KGlobal::locale()->formatTime(incidence->dtStart().time())+
                     "-"+KGlobal::locale()->formatTime(incidence->dtEnd().time());
-            if ( incidence->categories().contains( i18n("Birthday") ) || incidence->categories().contains( i18n("Anniversary") )  ) {
+
+            if ( incidence->isBirthday() || incidence->isAnniversary() ) {
                 bool ok;
                 QDateTime noc = incidence->getNextOccurence( mView->startDate().addDays(-1), &ok );