summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/calendarview.cpp2
-rw-r--r--korganizer/koeditordetails.cpp13
-rw-r--r--korganizer/koeditordetails.h1
-rw-r--r--korganizer/koeventviewer.cpp4
-rw-r--r--libkcal/dndfactory.h9
5 files changed, 27 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 74aefb7..96fb5ca 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -1519,6 +1519,7 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a
{
//qDebug("addAnni ");
Event * ev = new Event();
+ ev->setOrganizer(KOPrefs::instance()->email());
if ( a ) {
ev->addAttendee( a );
}
@@ -1531,7 +1532,6 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a
kind = i18n( "Anniversary" );
ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind );
}
- //ev->setOrganizer(a->email());
ev->setCategories( kind );
ev->setDtStart( QDateTime(date) );
ev->setDtEnd( QDateTime(date) );
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index cf0a458..ef8025b 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -90,10 +90,14 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
if ( KOPrefs::instance()->mCompactDialogs ) {
//mListView->setFixedHeight(78);
}
-
+ mListView->setAllColumnsShowFocus (true );
+ //mListView->setSingleClick( true );
connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
SLOT(updateAttendeeInput()));
+ connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
+ SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
+
QLabel *attendeeLabel = new QLabel(this);
attendeeLabel->setText(i18n("Name:"));
attendeeLabel->setFixedSize( attendeeLabel->sizeHint() );
@@ -421,6 +425,13 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled )
mRemoveButton->setEnabled( enabled );
}
+void KOEditorDetails::itemClicked(QListViewItem * item ,const QPoint & pnt, int c )
+{
+ if ( item && c == 4 ) {
+ mRsvpButton->setChecked( !mRsvpButton->isChecked() );
+ updateAttendeeItem();
+ }
+}
void KOEditorDetails::updateAttendeeItem()
{
if (mDisableItemUpdate) return;
diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h
index 0cc807f..a33ee82 100644
--- a/korganizer/koeditordetails.h
+++ b/korganizer/koeditordetails.h
@@ -83,6 +83,7 @@ class KOEditorDetails : public QWidget
void updateAttendeeInput();
void clearAttendeeInput();
void fillAttendeeInput(AttendeeListItem *);
+ void itemClicked(QListViewItem *,const QPoint & pnt, int c);
void updateAttendeeItem();
void setEnabledAttendeeInput(bool);
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 5de667e..2f0fa9e 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -417,6 +417,7 @@ 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"));
mText.append("<ul><li>");
#ifndef KORG_NOKABC
@@ -493,7 +494,10 @@ void KOEventViewer::formatAttendees(Incidence *event)
if (!a->email().isEmpty()) {
if (iconPath) {
mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">";
+ 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
@@ -21,6 +21,8 @@
Boston, MA 02111-1307, USA.
*/
+#ifdef DESKTOP_VERSION
+
#ifndef KCAL_DNDFACTORY_H
#define KCAL_DNDFACTORY_H
@@ -72,3 +74,10 @@ class LIBKCAL_EXPORT DndFactory
}
#endif
+
+#else // dummy implementation for embedded
+#include "dndfactory_dummy.h"
+#define cutIncidence cutEvent
+#define pasteIncidence pasteEvent
+#define copyIncidence copyEvent
+#endif