fixes

5 files changed, 67 insertions, 8 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 71d7208..27d37c4 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -5,2 +5,4 @@ Info about the changes in new versions of KDE-Pim/Pi
 Fixed a problem in KA/Pi search.
+Fixed some minor problems in KO/Pi.
+Added calendar selection possibility to the todo view popup and to the event/todo editor.
 
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 29e68b3..753630b 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -83,3 +83,3 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent);
-    headerLayout->addWidget(summaryLabel,1,0);
+    headerLayout->addWidget(summaryLabel,0,0);
 
@@ -95,3 +95,6 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     //   mSummaryEdit = new QLineEdit(parent);
-    headerLayout->addWidget(mSummaryEdit,1,1);
+    if ( QApplication::desktop()->height() < 320 ) 
+        headerLayout->addWidget(mSummaryEdit,0,1);
+    else
+        headerLayout->addMultiCellWidget(mSummaryEdit,0,0,1,2);
     connect ( mSummaryEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
@@ -100,5 +103,5 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     if ( QApplication::desktop()->height() < 320 ) 
-        headerLayout->addWidget(locationLabel,1,2);
+        headerLayout->addWidget(locationLabel,0,2);
     else
-        headerLayout->addWidget(locationLabel,2,0);
+        headerLayout->addWidget(locationLabel,1,0);
 
@@ -111,11 +114,18 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
     connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
+
+    mCalendarBox = new QComboBox ( parent );
+    mCalendarBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred  ,QSizePolicy::MinimumExpanding ,FALSE) );
     if ( QApplication::desktop()->height() < 320 ) {
-        headerLayout->addWidget(mLocationEdit,1,3);
+        headerLayout->addWidget(mLocationEdit,0,3);
+        headerLayout->addWidget(mCalendarBox,0,4);
         headerLayout->setColStretch( 1, 10);
         headerLayout->setColStretch( 3, 10);
+        mCalendarBox->setMaximumWidth( 64 );
     }
     else {
-        headerLayout->addWidget(mLocationEdit,2,1);
+        headerLayout->addWidget(mLocationEdit,1,1);
+        headerLayout->addWidget(mCalendarBox,1,2);
         headerLayout->setColStretch( 1, 10);
     }
+    
 }
@@ -438,2 +448,3 @@ void KOEditorGeneral::setDefaults(bool allDay)
     setCategories("");
+    fillCalCombo();
 }
@@ -443,5 +454,44 @@ void KOEditorGeneral::setSecrecy( int num )
 }
-void KOEditorGeneral::readIncidence(Incidence *event)
+void KOEditorGeneral::fillCalCombo( int setToID )
+{
+    mCalendarBox->clear();
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    int std = 0;
+    int count = 0;
+    while ( kkf ) {
+        if ( !kkf->mErrorOnLoad &&! kkf->isReadOnly ) {
+            if ( setToID ) {
+                if ( kkf->mCalNumber == setToID ) 
+                    std = count;
+            } else {
+                if ( kkf->isStandard ) {
+                    std = count;
+                }
+            }
+            ++count;
+            mCalendarBox->insertItem( kkf->mName );
+        }
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+    mCalendarBox->setCurrentItem( std );
+    if ( KOPrefs::instance()->mCalendars.count() == 1 )
+        mCalendarBox->hide();
+    else
+        mCalendarBox->show();
+
+}
+int KOEditorGeneral::getCalendarID()
 {
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        if ( mCalendarBox->currentText() == kkf->mName)
+            return  kkf->mCalNumber;
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+    return 1;
+}
 
+void KOEditorGeneral::readIncidence(Incidence *event)
+{
+    fillCalCombo( event->calID() );
     mAlarmMessage = event->summary(); 
@@ -571,2 +621,3 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
     }
+    event->setCalID( getCalendarID() );
 }
diff --git a/korganizer/koeditorgeneral.h b/korganizer/koeditorgeneral.h
index c463403..d8b15af 100644
--- a/korganizer/koeditorgeneral.h
+++ b/korganizer/koeditorgeneral.h
@@ -37,2 +37,3 @@
 #include <qspinbox.h>
+#include <qcombobox.h>
 
@@ -74,2 +75,3 @@ class KOEditorGeneral : public QObject
     void setSecrecy( int num );
+    int getCalendarID();
   public slots:
@@ -94,2 +96,3 @@ class KOEditorGeneral : public QObject
   protected:
+    void fillCalCombo( int setToID = 0 );
     int                     mNextFocus; 
@@ -99,2 +102,3 @@ class KOEditorGeneral : public QObject
     KOLocationBox             *mLocationEdit;
+    QComboBox                  *mCalendarBox;
     QLabel                  *mAlarmBell;
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 77322e7..fc4d9a4 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -80,3 +80,2 @@ void KOEventPopupMenu::enableDefault( bool enable )
     }
-    
 }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index ca64e66..cce798f 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -225,2 +225,3 @@ bool CalendarLocal::addEvent( Event *event )
   setModified( true );
+  if ( event->calID() == 0 )
   event->setCalID( mDefaultCalendar );
@@ -279,2 +280,3 @@ bool CalendarLocal::addTodo( Todo *todo )
   setModified( true );
+  if ( todo->calID() == 0 )
   todo->setCalID( mDefaultCalendar );
@@ -783,2 +785,3 @@ bool CalendarLocal::addJournal(Journal *journal)
   setModified( true );
+  if ( journal->calID() == 0 )
   journal->setCalID( mDefaultCalendar );