author | zautrix <zautrix> | 2005-01-30 00:33:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-30 00:33:46 (UTC) |
commit | a8fae20ad7bcb59df9a603c88accf3a10401c2f9 (patch) (unidiff) | |
tree | 12deeef9bae6d470c244ce9a9916c59d6879f9b2 | |
parent | d94b52aa95cc52aa1bef7c9cd99f43c725ed8042 (diff) | |
download | kdepimpi-a8fae20ad7bcb59df9a603c88accf3a10401c2f9.zip kdepimpi-a8fae20ad7bcb59df9a603c88accf3a10401c2f9.tar.gz kdepimpi-a8fae20ad7bcb59df9a603c88accf3a10401c2f9.tar.bz2 |
f
-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 | 4 | ||||
-rw-r--r-- | libkcal/dndfactory.h | 9 |
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 | |||
1519 | { | 1519 | { |
1520 | //qDebug("addAnni "); | 1520 | //qDebug("addAnni "); |
1521 | Event * ev = new Event(); | 1521 | Event * ev = new Event(); |
1522 | ev->setOrganizer(KOPrefs::instance()->email()); | ||
1522 | if ( a ) { | 1523 | if ( a ) { |
1523 | ev->addAttendee( a ); | 1524 | ev->addAttendee( a ); |
1524 | } | 1525 | } |
@@ -1531,7 +1532,6 @@ bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a | |||
1531 | kind = i18n( "Anniversary" ); | 1532 | kind = i18n( "Anniversary" ); |
1532 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); | 1533 | ev->setSummary( name + " (" + QString::number(date.year()) +") " + kind ); |
1533 | } | 1534 | } |
1534 | //ev->setOrganizer(a->email()); | ||
1535 | ev->setCategories( kind ); | 1535 | ev->setCategories( kind ); |
1536 | ev->setDtStart( QDateTime(date) ); | 1536 | ev->setDtStart( QDateTime(date) ); |
1537 | ev->setDtEnd( QDateTime(date) ); | 1537 | 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) | |||
90 | if ( KOPrefs::instance()->mCompactDialogs ) { | 90 | if ( KOPrefs::instance()->mCompactDialogs ) { |
91 | //mListView->setFixedHeight(78); | 91 | //mListView->setFixedHeight(78); |
92 | } | 92 | } |
93 | 93 | mListView->setAllColumnsShowFocus (true ); | |
94 | //mListView->setSingleClick( true ); | ||
94 | connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), | 95 | connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), |
95 | SLOT(updateAttendeeInput())); | 96 | SLOT(updateAttendeeInput())); |
96 | 97 | ||
98 | connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), | ||
99 | SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); | ||
100 | |||
97 | QLabel *attendeeLabel = new QLabel(this); | 101 | QLabel *attendeeLabel = new QLabel(this); |
98 | attendeeLabel->setText(i18n("Name:")); | 102 | attendeeLabel->setText(i18n("Name:")); |
99 | attendeeLabel->setFixedSize( attendeeLabel->sizeHint() ); | 103 | attendeeLabel->setFixedSize( attendeeLabel->sizeHint() ); |
@@ -421,6 +425,13 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled ) | |||
421 | mRemoveButton->setEnabled( enabled ); | 425 | mRemoveButton->setEnabled( enabled ); |
422 | } | 426 | } |
423 | 427 | ||
428 | void KOEditorDetails::itemClicked(QListViewItem * item ,const QPoint & pnt, int c ) | ||
429 | { | ||
430 | if ( item && c == 4 ) { | ||
431 | mRsvpButton->setChecked( !mRsvpButton->isChecked() ); | ||
432 | updateAttendeeItem(); | ||
433 | } | ||
434 | } | ||
424 | void KOEditorDetails::updateAttendeeItem() | 435 | void KOEditorDetails::updateAttendeeItem() |
425 | { | 436 | { |
426 | if (mDisableItemUpdate) return; | 437 | 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 | |||
83 | void updateAttendeeInput(); | 83 | void updateAttendeeInput(); |
84 | void clearAttendeeInput(); | 84 | void clearAttendeeInput(); |
85 | void fillAttendeeInput(AttendeeListItem *); | 85 | void fillAttendeeInput(AttendeeListItem *); |
86 | void itemClicked(QListViewItem *,const QPoint & pnt, int c); | ||
86 | void updateAttendeeItem(); | 87 | void updateAttendeeItem(); |
87 | void setEnabledAttendeeInput(bool); | 88 | void setEnabledAttendeeInput(bool); |
88 | 89 | ||
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) | |||
417 | 417 | ||
418 | 418 | ||
419 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); | 419 | QString iconPath = KGlobal::iconLoader()->iconPath("mailappt",KIcon::Small); |
420 | QString NOiconPath = KGlobal::iconLoader()->iconPath("nomailappt",KIcon::Small); | ||
420 | addTag("h3",i18n("Organizer")); | 421 | addTag("h3",i18n("Organizer")); |
421 | mText.append("<ul><li>"); | 422 | mText.append("<ul><li>"); |
422 | #ifndef KORG_NOKABC | 423 | #ifndef KORG_NOKABC |
@@ -493,7 +494,10 @@ void KOEventViewer::formatAttendees(Incidence *event) | |||
493 | if (!a->email().isEmpty()) { | 494 | if (!a->email().isEmpty()) { |
494 | if (iconPath) { | 495 | if (iconPath) { |
495 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; | 496 | mText += "<a href=\"mailto:" + a->name() +" <" + a->email() + ">:" + mMailSubject + "\">"; |
497 | if ( a->RSVP() ) | ||
496 | mText += "<IMG src=\"" + iconPath + "\">"; | 498 | mText += "<IMG src=\"" + iconPath + "\">"; |
499 | else | ||
500 | mText += "<IMG src=\"" + NOiconPath + "\">"; | ||
497 | mText += "</a>\n"; | 501 | mText += "</a>\n"; |
498 | } | 502 | } |
499 | } | 503 | } |
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 @@ | |||
21 | Boston, MA 02111-1307, USA. | 21 | Boston, MA 02111-1307, USA. |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #ifdef DESKTOP_VERSION | ||
25 | |||
24 | #ifndef KCAL_DNDFACTORY_H | 26 | #ifndef KCAL_DNDFACTORY_H |
25 | #define KCAL_DNDFACTORY_H | 27 | #define KCAL_DNDFACTORY_H |
26 | 28 | ||
@@ -72,3 +74,10 @@ class LIBKCAL_EXPORT DndFactory | |||
72 | } | 74 | } |
73 | 75 | ||
74 | #endif | 76 | #endif |
77 | |||
78 | #else // dummy implementation for embedded | ||
79 | #include "dndfactory_dummy.h" | ||
80 | #define cutIncidence cutEvent | ||
81 | #define pasteIncidence pasteEvent | ||
82 | #define copyIncidence copyEvent | ||
83 | #endif | ||