author | zautrix <zautrix> | 2005-01-30 00:33:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-30 00:33:46 (UTC) |
commit | a8fae20ad7bcb59df9a603c88accf3a10401c2f9 (patch) (side-by-side diff) | |
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 @@ -1514,29 +1514,29 @@ void CalendarView::insertBirthdays(const QString& uid, const QStringList& birthd } bool CalendarView::addAnniversary( QDate date, QString name, KCal::Attendee* a, bool birthday) { //qDebug("addAnni "); Event * ev = new Event(); + ev->setOrganizer(KOPrefs::instance()->email()); if ( a ) { ev->addAttendee( a ); } QString kind; if ( birthday ) { kind = i18n( "Birthday" ); ev->setSummary( name + " (" + QString::number(date.year()) +")"); } else { 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) ); ev->setFloats( true ); Recurrence * rec = ev->recurrence(); rec->setYearly(Recurrence::rYearlyMonth,1,-1); rec->addYearlyNum( date.month() ); if ( !mCalendar->addAnniversaryNoDup( ev ) ) { diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index cf0a458..ef8025b 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -85,20 +85,24 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) mListView->addColumn(i18n("Name"),180); mListView->addColumn(i18n("Email"),180); mListView->addColumn(i18n("Role"),60); mListView->addColumn(i18n("Status"),100); mListView->addColumn(i18n("RSVP"),35); 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() ); mNameEdit = new QLineEdit(this); connect(mNameEdit,SIGNAL(textChanged(const QString &)), SLOT(updateAttendeeItem())); mUidEdit = new QLineEdit(0); @@ -416,16 +420,23 @@ void KOEditorDetails::setEnabledAttendeeInput( bool enabled ) mEmailEdit->setEnabled( enabled ); mRoleCombo->setEnabled( enabled ); mStatusCombo->setEnabled( enabled ); mRsvpButton->setEnabled( 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; QListViewItem *item = mListView->selectedItem(); AttendeeListItem *aItem = static_cast<AttendeeListItem *>( item ); if ( !aItem ) return; diff --git a/korganizer/koeditordetails.h b/korganizer/koeditordetails.h index 0cc807f..a33ee82 100644 --- a/korganizer/koeditordetails.h +++ b/korganizer/koeditordetails.h @@ -78,16 +78,17 @@ class KOEditorDetails : public QWidget protected slots: void addNewAttendee(); void removeAttendee(); void openAddressBook(); void updateAttendeeInput(); void clearAttendeeInput(); void fillAttendeeInput(AttendeeListItem *); + void itemClicked(QListViewItem *,const QPoint & pnt, int c); void updateAttendeeItem(); void setEnabledAttendeeInput(bool); private: bool mDisableItemUpdate; QLineEdit *mNameEdit; QLineEdit *mUidEdit; diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp index 5de667e..2f0fa9e 100644 --- a/korganizer/koeventviewer.cpp +++ b/korganizer/koeventviewer.cpp @@ -412,16 +412,17 @@ void KOEventViewer::formatCategories(Incidence *event) } void KOEventViewer::formatAttendees(Incidence *event) { QPtrList<Attendee> attendees = event->attendees(); if (attendees.count()) { 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 #ifdef DESKTOP_VERSION KABC::AddressBook *add_book = KABC::StdAddressBook::self(); KABC::Addressee::List addressList; addressList = add_book->findByEmail(event->organizer()); @@ -488,17 +489,20 @@ void KOEventViewer::formatAttendees(Incidence *event) else mText += a->email(); mText += "</a>\n"; #endif 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"; } } if (a->status() != Attendee::NeedsAction ) mText +="[" + a->statusStr() + "] "; if (a->role() == Attendee::Chair ) mText +="(" + a->roleStr().left(1) + ".)"; } diff --git a/libkcal/dndfactory.h b/libkcal/dndfactory.h index 7e2ca04..2df5259 100644 --- a/libkcal/dndfactory.h +++ b/libkcal/dndfactory.h @@ -16,16 +16,18 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifdef DESKTOP_VERSION + #ifndef KCAL_DNDFACTORY_H #define KCAL_DNDFACTORY_H //#include "libkcal_export.h" namespace KCal { class ICalDrag; @@ -67,8 +69,15 @@ class LIBKCAL_EXPORT DndFactory class Private; Private *d; }; } #endif + +#else // dummy implementation for embedded +#include "dndfactory_dummy.h" +#define cutIncidence cutEvent +#define pasteIncidence pasteEvent +#define copyIncidence copyEvent +#endif |