summaryrefslogtreecommitdiffstats
path: root/korganizer/kojournalview.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/kojournalview.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/kojournalview.cpp')
-rw-r--r--korganizer/kojournalview.cpp57
1 files changed, 33 insertions, 24 deletions
diff --git a/korganizer/kojournalview.cpp b/korganizer/kojournalview.cpp
index e8de3daed..74a0f17cd 100644
--- a/korganizer/kojournalview.cpp
+++ b/korganizer/kojournalview.cpp
@@ -71,20 +71,24 @@ void KOJournalView::appendJournal( Journal*journal, const TQDate &dt)
entry->setDate( dt );
entry->setIncidenceChanger( mChanger );
entry->show();
- connect( this, TQT_SIGNAL(flushEntries()), entry, TQT_SIGNAL(flushEntries()) );
- connect( this, TQT_SIGNAL(setIncidenceChangerSignal( IncidenceChangerBase * ) ),
- entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase * ) ) );
- connect( this, TQT_SIGNAL( journalEdited( Journal* ) ),
- entry, TQT_SLOT( journalEdited( Journal* ) ) );
- connect( this, TQT_SIGNAL( journalDeleted( Journal* ) ),
- entry, TQT_SLOT( journalDeleted( Journal* ) ) );
-
- connect( entry, TQT_SIGNAL( editIncidence( Incidence* ) ),
- this, TQT_SIGNAL( editIncidenceSignal( Incidence* ) ) );
- connect( entry, TQT_SIGNAL( deleteIncidence( Incidence* ) ),
- this, TQT_SIGNAL( deleteIncidenceSignal( Incidence* ) ) );
- connect( entry, TQT_SIGNAL( newJournal( const TQDate & ) ),
- this, TQT_SIGNAL( newJournalSignal( const TQDate & ) ) );
+ connect( this, TQT_SIGNAL(flushEntries()),
+ entry, TQT_SIGNAL(flushEntries()) );
+
+ connect( this, TQT_SIGNAL(setIncidenceChangerSignal(IncidenceChangerBase *)),
+ entry, TQT_SLOT(setIncidenceChanger( IncidenceChangerBase *)) );
+
+ connect( this, TQT_SIGNAL(journalEdited(Journal *)),
+ entry, TQT_SLOT(journalEdited(Journal *)) );
+ connect( this, TQT_SIGNAL(journalDeleted(Journal *)),
+ entry, TQT_SLOT(journalDeleted(Journal *)) );
+
+ connect( entry, TQT_SIGNAL(editIncidence(Incidence *,const TQDate &)),
+ this, TQT_SIGNAL(editIncidenceSignal(Incidence *,const TQDate &)) );
+ connect( entry, TQT_SIGNAL(deleteIncidence(Incidence *)),
+ this, TQT_SIGNAL(deleteIncidenceSignal(Incidence *)) );
+
+ connect( entry, TQT_SIGNAL(newJournal(ResourceCalendar *,const TQString &,const TQDate &)),
+ this, TQT_SIGNAL(newJournalSignal(ResourceCalendar *,const TQString &,const TQDate &)) );
mEntries.insert( dt, entry );
}
@@ -134,16 +138,18 @@ void KOJournalView::flushView()
emit flushEntries();
}
-void KOJournalView::showDates(const TQDate &start, const TQDate &end)
+void KOJournalView::showDates( const TQDate &start, const TQDate &end )
{
// kdDebug(5850) << "KOJournalView::showDates(): "<<start.toString().latin1()<<" - "<<end.toString().latin1() << endl;
clearEntries();
- if ( end<start ) return;
+ if ( end < start ) {
+ return;
+ }
Journal::List::ConstIterator it;
Journal::List jnls;
- TQDate d=start;
- for ( TQDate d=start; d<=end; d=d.addDays(1) ) {
+ TQDate d = start;
+ for ( TQDate d = start; d <= end; d = d.addDays( 1 ) ) {
jnls = calendar()->journals( d );
for ( it = jnls.begin(); it != jnls.end(); ++it ) {
appendJournal( *it, d );
@@ -155,15 +161,17 @@ void KOJournalView::showDates(const TQDate &start, const TQDate &end)
}
}
-void KOJournalView::showIncidences( const Incidence::List &incidences )
+void KOJournalView::showIncidences( const Incidence::List &incidences, const TQDate & )
{
// kdDebug(5850) << "KOJournalView::showIncidences(): "<< endl;
clearEntries();
Incidence::List::const_iterator it;
- for ( it=incidences.constBegin(); it!=incidences.constEnd(); ++it) {
- if ((*it) && ( (*it)->type()=="Journal" ) ) {
- Journal*j = static_cast<Journal*>(*it);
- if ( j ) appendJournal( j, j->dtStart().date() );
+ for ( it = incidences.constBegin(); it != incidences.constEnd(); ++it ) {
+ if ( (*it) && ( (*it)->type() == "Journal" ) ) {
+ Journal *j = static_cast<Journal*>(*it);
+ if ( j ) {
+ appendJournal( j, j->dtStart().date() );
+ }
}
}
}
@@ -202,7 +210,8 @@ void KOJournalView::setIncidenceChanger( IncidenceChangerBase *changer )
void KOJournalView::newJournal()
{
- emit newJournalSignal( TQDate::currentDate() );
+ emit newJournalSignal( 0/*ResourceCalendar*/, TQString()/*subResource*/,
+ TQDate::currentDate() );
}
#include "kojournalview.moc"