| -rw-r--r-- | korganizer/calendarview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koeditordetails.cpp | 13 | ||||
| -rw-r--r-- | korganizer/koeditordetails.h | 1 | ||||
| -rw-r--r-- | korganizer/koeventviewer.cpp | 6 | ||||
| -rw-r--r-- | libkcal/dndfactory.h | 9 |
5 files changed, 28 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 74aefb7..96fb5ca 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1521,2 +1521,3 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a Event * ev = new Event(); + ev->setOrganizer(KOPrefs::instance()->email()); if ( a ) { @@ -1533,3 +1534,2 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a } - //ev->setOrganizer(a->email()); ev->setCategories( kind ); diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index cf0a458..ef8025b 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -92,3 +92,4 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) } - + mListView->setAllColumnsShowFocus (true ); + //mListView->setSingleClick( true ); connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), @@ -96,2 +97,5 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) + connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), + SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); + QLabel *attendeeLabel = new QLabel(this); @@ -423,2 +427,9 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled ) +void KOEditorDetails::itemClicked(QListViewItem * item ,const QPoint & pnt, int c ) +{ + if ( item && c == 4 ) { + mRsvpButton->setChecked( !mRsvpButton->isChecked() ); + updateAttendeeItem(); + } +} void KOEditorDetails::updateAttendeeItem() diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 0cc807f..a33ee82 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -85,2 +85,3 @@ class KOEditorDetails : public QWidget void fillAttendeeInput(AttendeeListItem *); + void itemClicked(QListViewItem *,const QPoint & pnt, int c); void updateAttendeeItem(); diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 5de667e..2f0fa9e 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -419,2 +419,3 @@ void KOEventViewer::formatAttendees(Incidence *event) QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); + QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); addTag("h3",i18n("Organizer")); @@ -495,3 +496,6 @@ void KOEventViewer::formatAttendees(Incidence *event) mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; - mText += "<IMG src=\"" + iconPath + "\">"; + if ( a->RSVP() ) + mText += "<IMG src=\"" + iconPath + "\">"; + else + mText += "<IMG src=\"" + NOiconPath + "\">"; mText += "</a>\n"; diff --git a/libkcal/dndfactory.h b/libkcal/dndfactory.h index 7e2ca04..2df5259 100644 --- a/libkcal/dndfactory.h +++ b/libkcal/dndfactory.h @@ -23,2 +23,4 @@ +#ifdef DESKTOP_VERSION + #ifndef KCAL_DNDFACTORY_H @@ -74 +76,8 @@ class LIBKCAL_EXPORT DndFactory #endif + +#else // dummy implementation for embedded +#include "dndfactory_dummy.h" +#define cutIncidence cutEvent +#define pasteIncidence pasteEvent +#define copyIncidence copyEvent +#endif |