fixess

10 files changed, 86 insertions, 15 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 377a66f..2012e92 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1828,24 +1828,17 @@ bool CalendarView::importQtopia( const QString &categories,
 
 
 #endif
 
 }
     
 void CalendarView::setSyncEventsReadOnly()
 {
-    Event * ev;
-    QPtrList<Event> eL = mCalendar->rawEvents(); 
-    ev = eL.first();
-    while ( ev ) {
-        if ( ev->uid().left(15) == QString("last-syncEvent-") )
-            ev->setReadOnly( true );
-        ev =  eL.next();
-    } 
+    mCalendar->setSyncEventsReadOnly(); 
 }
 
 bool CalendarView::loadCalendars()
 {
     QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
     mCalendar->setDefaultCalendar( 1 );
     openCalendar( MainWindow::defaultFileName(), false );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b2b136a..93ff55e 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 1f3b4c6..c705c73 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -62,19 +62,16 @@
 #endif
 #include "koglobals.h"
 #include "koprefs.h"
 #include "kfiledialog.h"
 
 #include "kolistview.h"
 #include "koeventviewer.h"
 
-
-
-
 class KOListViewWhatsThis :public QWhatsThis
 {
 public:
   KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
 
 protected:
   virtual QString text( const QPoint& p)
   {
@@ -135,16 +132,17 @@ bool ListItemVisitor::visit(Event *e)
     }
     mItem->setText(6, e->recurrence()->recurrenceText());
     if( ! e->doesRecur() )
         mItem->setSortKey( 6, "-" );
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,e->categoriesStr());
+    mItem->setText(11, KOPrefs::instance()->calName( e->calID() ));
 
     QString key;
     QTime t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
     key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
     t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time();
     key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute());
@@ -184,16 +182,17 @@ bool ListItemVisitor::visit(Todo *t)
             mItem->setText(8,t->dtDueTimeStr());
         }
     } else {
         mItem->setText(7,"---");
         mItem->setText(8,"---");
     }
     mItem->setText(9, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(10,t->categoriesStr());
+    mItem->setText(11, KOPrefs::instance()->calName( t->calID() ));
 
     QString key;
     QDate d;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         QTime tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(7,key);
@@ -219,16 +218,17 @@ bool ListItemVisitor::visit(Journal * j)
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,j->dtStartDateStr());
     mItem->setText(8,"---");
     mItem->setText(9,"---");
     mItem->setText(10,i18n("Last Modified: ")+  KGlobal::locale()->formatDateTime( j->lastModified() , true) );
+    mItem->setText(11, KOPrefs::instance()->calName( j->calID() ));
 
     QString key;
     QDate d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
     mItem->setSortKey(7,key);
 
     return true;
@@ -246,33 +246,34 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mListView->addColumn(i18n("End Date"));
     mListView->addColumn(i18n("End Time"));
     mListView->addColumn(i18n("Alarm")); // alarm set?
     mListView->addColumn(i18n("Recurs")); // recurs?
     mListView->addColumn(i18n("Due Date"));
     mListView->addColumn(i18n("Due Time"));
     mListView->addColumn(i18n("Cancelled"));
     mListView->addColumn(i18n("Categories"));
+    mListView->addColumn(i18n("Calendar"));
 
     mListView->setColumnAlignment(0,AlignLeft);
     mListView->setColumnAlignment(1,AlignLeft);
     mListView->setColumnAlignment(2,AlignHCenter);
     mListView->setColumnAlignment(3,AlignLeft);
     mListView->setColumnAlignment(4,AlignHCenter);
     mListView->setColumnAlignment(5,AlignLeft);
     mListView->setColumnAlignment(6,AlignLeft);
     mListView->setColumnAlignment(7,AlignLeft);
     mListView->setColumnAlignment(8,AlignLeft);
     mListView->setColumnAlignment(9,AlignLeft);
     mListView->setColumnAlignment(10,AlignLeft);
-    mListView->setColumnWidthMode(10, QListView::Manual);
+    mListView->setColumnAlignment(11,AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
 
     int iii = 0;
-    for ( iii = 0; iii< 10 ; ++iii )
+    for ( iii = 0; iii< 12 ; ++iii )
         mListView->setColumnWidthMode( iii, QListView::Manual );
 
     QBoxLayout *layoutTop = new QVBoxLayout(this);
     layoutTop->addWidget(mListView);
     mListView->setFont ( KOPrefs::instance()->mListViewFont );
     mPopupMenu = eventPopup();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Select all"),this,
@@ -290,16 +291,23 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 
     mPopupMenu->insertSeparator();
 #ifdef DESKTOP_VERSION
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Print complete list"),this,
                                   SLOT(printList()),true);
     mPopupMenu->insertSeparator();
 #endif
+    mCalPopup = new QPopupMenu ( this );
+    mPopupMenu->insertItem( i18n("Set Calendar"),  mCalPopup );
+
+    QObject::connect(mCalPopup,SIGNAL(aboutToShow()),this,
+                     SLOT( populateCalPopup() ));
+    QObject::connect(mCalPopup,SIGNAL(activated( int )),this,
+                     SLOT( setCalendar( int ) ));
     QPopupMenu * exportPO = new QPopupMenu ( this );
     mPopupMenu->insertItem( i18n("Export selected"),  exportPO );
     exportPO->insertItem( i18n("As iCal (ics) file..."),this,
                                   SLOT(saveToFile()));
     exportPO->insertItem( i18n("As vCal (vcs) file..."),this,
                                   SLOT(saveToFileVCS()));
     exportPO->insertItem( i18n("Journal/Details..."),this,
                                   SLOT(saveDescriptionToFile()));
@@ -311,16 +319,17 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                                   i18n("Set Categ. for selected..."),this,
                                   SLOT(setCat()),true);
     //mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Set alarm for selected..."),this,
                                   SLOT(setAlarm()),true);
 
 
+    
 #ifndef DESKTOP_VERSION
     mPopupMenu->insertSeparator();
     mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
                                   i18n("Beam selected via IR"),this,
                                   SLOT(beamSelected()),true);
 #endif
     /*
       mPopupMenu = new QPopupMenu;
@@ -366,16 +375,63 @@ QString KOListView::getWhatsThisText(QPoint p)
         return KIncidenceFormatter::instance()->getFormattedText( item->data(),
                                                                   KOPrefs::instance()->mWTshowDetails,
                                                                   KOPrefs::instance()->mWTshowCreated,
                                                                   KOPrefs::instance()->mWTshowChanged);
     return i18n("That is the list view" );
 
 }
 
+void KOListView::setCalendar( int c )
+{
+    int result = QMessageBox::warning( this, i18n("KO/Pi: Information!"),
+                                       i18n("This adds the selected\nitems to the calendar\n%1\nand removes them from\ntheir current calendar!").arg( KOPrefs::instance()->calName( c ) ),
+                                       i18n("Continue"), i18n("Cancel"), 0,
+                                       0, 1 );
+    if ( result != 0 ) {
+        return;
+    }
+    
+    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    int icount = delSel.count();
+    if ( icount ) {
+        Incidence *incidence = delSel.first();
+        while ( incidence ) {
+            incidence->setCalID( c );
+            KOListViewItem * item = getItemForEvent( incidence );
+            if ( item ) {
+                ListItemVisitor v(item, mStartDate );
+                incidence->accept(v);
+            }
+            incidence = delSel.next();
+        }
+    }
+    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    KopiCalendarFile * cal = calendars.first();
+    while ( cal ) {
+        mCalendar->setCalendarEnabled( cal->mCalNumber,cal->isEnabled );
+        mCalendar->setAlarmEnabled( cal->mCalNumber, cal->isAlarmEnabled );
+        mCalendar->setReadOnly( cal->mCalNumber, cal->isReadOnly );
+        if ( cal->isStandard )
+            mCalendar->setDefaultCalendar( cal->mCalNumber );
+        cal = calendars.next();
+    }
+    mCalendar->setSyncEventsReadOnly();
+    mCalendar->reInitAlarmSettings();
+
+}
+void KOListView::populateCalPopup()
+{
+    mCalPopup->clear();
+    KopiCalendarFile * kkf = KOPrefs::instance()->mCalendars.first();
+    while ( kkf ) {
+        mCalPopup->insertItem( kkf->mName, kkf->mCalNumber);
+        kkf = KOPrefs::instance()->mCalendars.next();
+    }
+}
 void KOListView::updateList()
 {
     // qDebug(" KOListView::updateList() ");
 
 }
 
 void KOListView::clearList()
 {
@@ -1034,17 +1090,17 @@ void KOListView::changeEventDisplay(Event *event, int action)
             delete item;
         }
         break;
     default:
         ;
     }
 }
 
-KOListViewItem *KOListView::getItemForEvent(Event *event)
+KOListViewItem *KOListView::getItemForEvent(Incidence *event)
 {
     KOListViewItem *item = (KOListViewItem *)mListView->firstChild();
     while (item) {
         if (item->data() == event) return item;
         item = (KOListViewItem *)item->nextSibling();
     }
     return 0;
 }
diff --git a/korganizer/kolistview.h b/korganizer/kolistview.h
index 9da5497..d384af0 100644
--- a/korganizer/kolistview.h
+++ b/korganizer/kolistview.h
@@ -290,27 +290,30 @@ class KOListView : public KOEventView
     void addCat();
     void setCat();
     void setAlarm();
     void setCategories( bool removeOld );
     void changeEventDisplay(Event *, int);
   
     void defaultItemAction(QListViewItem *item);
     void popupMenu(QListViewItem *item,const QPoint &,int);
+    void setCalendar( int c );
+    void populateCalPopup();
 
   protected slots:
     void processSelectionChange(QListViewItem *);
 
   protected:
     void writeToFile( bool iCal );
     void addEvents(QPtrList<Event> eventList);
     void addIncidence(Incidence *);
-    KOListViewItem *getItemForEvent(Event *event);
+    KOListViewItem *getItemForEvent(Incidence *event);
 
   private:
+    QPopupMenu* mCalPopup;
     KOListViewWhatsThis *mKOListViewWhatsThis;
     KOListViewListView *mListView;
     KOEventPopupMenu *mPopupMenu;
     KOListViewItem *mActiveItem;
     QDict<Incidence> mUidDict;
     QDate mStartDate;
     void keyPressEvent ( QKeyEvent * ) ;
 };
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 65f0342..a4ea3d3 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -490,16 +490,20 @@ void  KOPrefs::deleteCalendar( int num )
             qDebug("KOPrefs::deleteCalendar %d ", num );
             mCalendars.remove( kkf );
             delete kkf;
             return;
         }
         kkf = mCalendars.next();
     }
 }
+QString KOPrefs::calName( int calNum) const
+{
+    return (mDefCalColors[calNum-1])->mName;
+}
 QColor  KOPrefs::defaultColor( int calNum ) const
 {
     if ( calNum == 1 ) return mEventColor;
     return (mDefCalColors[calNum-1])->mDefaultColor;
 }
 void KOPrefs::usrWriteConfig()
 {
   config()->setGroup("General");
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index 463fc33..5cc9bfa 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -94,16 +94,17 @@ class KOPrefs : public KPimPrefs
     /** Write preferences to config file */
     void usrWriteConfig();
     void setCategoryDefaults();
     void setAllDefaults();
     KopiCalendarFile * getNewCalendar();
     KopiCalendarFile * getCalendar( int );
     void  deleteCalendar( int );
     QColor defaultColor( int ) const;
+    QString calName( int ) const;
   protected:
     void setTimeZoneIdDefault();
 
     /** Fill empty mail fields with default values. */
     void fillMailDefaults();
 
   private:
     /** Constructor disabled for public. Use instance() to create a KOPrefs
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 2243e28..3b7b183 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -71,16 +71,17 @@ public:
     void resetTempSyncStat();
     void resetPilotStat(int id);
     /**
       Clears out the current calendar, freeing all used memory etc.
     */
     virtual void close() = 0;
     virtual void addCalendar( Calendar*  ) = 0;
     virtual bool addCalendarFile( QString name, int id ) = 0;
+    virtual void setSyncEventsReadOnly() = 0;
   
     /**
       Sync changes in memory to persistant storage.
     */
     virtual void save() = 0;
     virtual QPtrList<Event> getExternLastSyncEvents() = 0;
     virtual void removeSyncInfo( QString syncProfile) = 0; 
     virtual bool isSaving() { return false; }
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 336c3e8..8c4dde1 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -73,16 +73,26 @@ bool CalendarLocal::addCalendarFile( QString name, int id )
     CalendarLocal calendar( timeZoneId() );
     calendar.setDefaultCalendar( id );
     if ( calendar.load( name ) ) {
         addCalendar( &calendar  );
         return true;
     }
     return false;
 }
+void CalendarLocal::setSyncEventsReadOnly()
+{
+    Event * ev;
+    ev = mEventList.first();
+    while ( ev ) {
+        if ( ev->uid().left(15) == QString("last-syncEvent-") )
+            ev->setReadOnly( true );
+        ev =  mEventList.next();
+    } 
+}
 void CalendarLocal::addCalendar( Calendar* cal )
 {
     cal->setDontDeleteIncidencesOnClose();
     {
         QPtrList<Event> EventList = cal->rawEvents();
         Event * ev = EventList.first();
         while ( ev ) {
             ev->unRegisterObserver( cal );
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 5bbe55f..0286b48 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -40,16 +40,17 @@ class CalendarLocal : public Calendar
     CalendarLocal();
     /**
       Constructs a new calendar, with variables initialized to sane values.
     */
     CalendarLocal( const QString &timeZoneId );
     ~CalendarLocal();
     void addCalendar( Calendar*  );
     bool addCalendarFile( QString name, int id );
+    void setSyncEventsReadOnly();
     /**
       Loads a calendar on disk in vCalendar or iCalendar format into the current
       calendar. Any information already present is lost.
       @return true, if successfull, false on error.
       @param fileName the name of the calendar on disk.
     */
     bool load( const QString &fileName );
     /**
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 2ddbb01..96039df 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -136,16 +136,18 @@ QDateTime IncidenceBase::getEvenTime( QDateTime dt )
 {
     QTime t =  dt.time();
     dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     return dt;
 }     
 
 void IncidenceBase::setCalID( int id )
 {
+    if ( mCalID > 0 )
+        updated();
     mCalID = id;
 }
 int IncidenceBase::calID() const
 {
     return mCalID;
 }
 void IncidenceBase::setCalEnabled( bool b )
 {