summaryrefslogtreecommitdiffstats
path: root/korganizer/koeventview.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /korganizer/koeventview.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'korganizer/koeventview.cpp')
-rw-r--r--korganizer/koeventview.cpp67
1 files changed, 35 insertions, 32 deletions
diff --git a/korganizer/koeventview.cpp b/korganizer/koeventview.cpp
index 17708953b..9e01ea4e0 100644
--- a/korganizer/koeventview.cpp
+++ b/korganizer/koeventview.cpp
@@ -60,25 +60,25 @@ KOEventView::~KOEventView()
KOEventPopupMenu *KOEventView::eventPopup()
{
KOEventPopupMenu *eventPopup = new KOEventPopupMenu;
-
- connect(eventPopup,TQT_SIGNAL(editIncidenceSignal(Incidence *)),
- TQT_SIGNAL(editIncidenceSignal(Incidence *)));
- connect(eventPopup,TQT_SIGNAL(showIncidenceSignal(Incidence *)),
- TQT_SIGNAL(showIncidenceSignal(Incidence *)));
- connect(eventPopup,TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
- TQT_SIGNAL(deleteIncidenceSignal(Incidence *)));
- connect(eventPopup,TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
- TQT_SIGNAL(cutIncidenceSignal(Incidence *)));
- connect(eventPopup,TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
- TQT_SIGNAL(copyIncidenceSignal(Incidence *)));
- connect(eventPopup,TQT_SIGNAL(pasteIncidenceSignal()),
- TQT_SIGNAL(pasteIncidenceSignal()));
- connect(eventPopup,TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
- TQT_SIGNAL(toggleAlarmSignal(Incidence*)));
- connect(eventPopup,TQT_SIGNAL(dissociateOccurrenceSignal( Incidence *, const TQDate & )),
- TQT_SIGNAL(dissociateOccurrenceSignal( Incidence *, const TQDate & )));
- connect(eventPopup,TQT_SIGNAL(dissociateFutureOccurrenceSignal( Incidence *, const TQDate & )),
- TQT_SIGNAL(dissociateFutureOccurrenceSignal( Incidence *, const TQDate & )));
+
+ connect( eventPopup, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)),
+ TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)),
+ TQT_SIGNAL(showIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)),
+ TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQT_SIGNAL(cutIncidenceSignal(Incidence *)),
+ TQT_SIGNAL(cutIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQT_SIGNAL(copyIncidenceSignal(Incidence *)),
+ TQT_SIGNAL(copyIncidenceSignal(Incidence *)) );
+ connect( eventPopup, TQT_SIGNAL(pasteIncidenceSignal()),
+ TQT_SIGNAL(pasteIncidenceSignal()) );
+ connect( eventPopup, TQT_SIGNAL(toggleAlarmSignal(Incidence *)),
+ TQT_SIGNAL(toggleAlarmSignal(Incidence*)) );
+ connect( eventPopup, TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)),
+ TQT_SIGNAL(dissociateOccurrenceSignal(Incidence *,const TQDate &)) );
+ connect( eventPopup, TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)),
+ TQT_SIGNAL(dissociateFutureOccurrenceSignal(Incidence *,const TQDate &)) );
return eventPopup;
}
@@ -102,14 +102,14 @@ TQPopupMenu *KOEventView::newEventPopup()
void KOEventView::popupShow()
{
- emit showIncidenceSignal(mCurrentIncidence);
+ emit showIncidenceSignal(mCurrentIncidence, TQDate() );
}
//---------------------------------------------------------------------------
void KOEventView::popupEdit()
{
- emit editIncidenceSignal(mCurrentIncidence);
+ emit editIncidenceSignal( mCurrentIncidence, TQDate() );
}
//---------------------------------------------------------------------------
@@ -137,14 +137,16 @@ void KOEventView::popupCopy()
void KOEventView::showNewEventPopup()
{
- TQPopupMenu *popup = newEventPopup();
- if ( !popup ) {
- kdError() << "KOEventView::showNewEventPopup(): popup creation failed"
- << endl;
- return;
+ if ( !readOnly() ) {
+ TQPopupMenu *popup = newEventPopup();
+ if ( !popup ) {
+ kdError() << "KOEventView::showNewEventPopup(): popup creation failed"
+ << endl;
+ return;
+ }
+
+ popup->popup( TQCursor::pos() );
}
-
- popup->popup( TQCursor::pos() );
}
//---------------------------------------------------------------------------
@@ -157,10 +159,11 @@ void KOEventView::defaultAction( Incidence *incidence )
kdDebug(5850) << " type: " << incidence->type() << endl;
- if ( incidence->isReadOnly() )
- emit showIncidenceSignal(incidence);
- else
- emit editIncidenceSignal(incidence);
+ if ( incidence->isReadOnly() ) {
+ emit showIncidenceSignal( incidence, TQDate() );
+ } else {
+ emit editIncidenceSignal( incidence, TQDate() );
+ }
}
//---------------------------------------------------------------------------