[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/kdepim/enterprise/kdepim
From: Sergio Luis Martins <iamsergio () gmail ! com>
Date: 2010-09-20 12:29:23
Message-ID: 20100920122923.DF94EAC88C () svn ! kde ! org
[Download RAW message or body]
SVN commit 1177515 by smartins:
Fix borken signals
M +2 -1 korganizer/calendarview.cpp
M +2 -1 korganizer/incidencechanger.cpp
M +12 -8 korganizer/koagenda.cpp
M +5 -5 korganizer/koagendaitem.cpp
M +2 -2 korganizer/koagendaitem.h
M +4 -4 korganizer/koagendaview.cpp
M +1 -0 korganizer/korgac/alarmdialog.cpp
M +1 -0 kresources/kolab/kcal/resourcekolab.cpp
M +6 -3 libkcal/calendarresources.cpp
--- branches/kdepim/enterprise/kdepim/korganizer/calendarview.cpp #1177514:1177515
@@ -2719,7 +2719,8 @@
startMultiModify( i18n("Dissociate event from recurrence") );
incSaved = inc->clone();
incToReturn = mCalendar->dissociateOccurrence( inc, dt );
- kdDebug() << "Incidence to return has startDate = " << incToReturn->dtStart() \
<< endl; + kdDebug() << "Incidence to return has startDate = " << \
incToReturn->dtStart() + << "; dt is " << dt << endl;
if ( incToReturn ) {
dissociationOccurred = true;
} else {
--- branches/kdepim/enterprise/kdepim/korganizer/incidencechanger.cpp \
#1177514:1177515 @@ -102,10 +102,11 @@
}
kdDebug(5850) << "IncidenceChanger::endChange for incidence \""
- << incidence->summary() << "\"" << endl;
+ << incidence->summary() << "\"" << incidence->dtStart() << endl;
CalendarResources *calRes = dynamic_cast<CalendarResources*>( mCalendar );
if ( !calRes ) {
+ kdDebug() << "CalRes is null!" << endl;
return false;
}
--- branches/kdepim/enterprise/kdepim/korganizer/koagenda.cpp #1177514:1177515
@@ -1115,6 +1115,8 @@
Incidence *incToChange = inc;
if ( mActionItem->incidence()->doesRecur() ) {
+ kdDebug() << "mActionItem->incidence()->dtStart() is " << inc->dtStart() << \
endl; +
Incidence* oldIncSaved = inc->clone();
KOGlobals::WhichOccurrences chosenOption;
incToChange = mCalendarView->singleOccurrenceOrAll( inc,
@@ -1166,6 +1168,7 @@
// Notify about change
// the agenda view will apply the changes to the actual Incidence*!
mChanger->endChange( inc, mResPair.first, mResPair.second );
+ kdDebug() << "Modified." << endl;
emit itemModified( modif );
} else {
@@ -1175,6 +1178,7 @@
// the item was moved, but not further modified, since it's not recurring
// make sure the view updates anyhow, with the right item
mChanger->endChange( inc, mResPair.first, mResPair.second );
+ kdDebug() << "Not modified." << endl;
emit itemModified( mActionItem );
}
}
@@ -1615,10 +1619,10 @@
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, incidence, qd, viewport(), \
itemPos, itemCount );
- connect( agendaItem, SIGNAL( removeAgendaItem( KOAgendaItem * ) ),
- SLOT( removeAgendaItem( KOAgendaItem * ) ) );
- connect( agendaItem, SIGNAL( showAgendaItem( KOAgendaItem * ) ),
- SLOT( showAgendaItem( KOAgendaItem * ) ) );
+ connect( agendaItem, SIGNAL( removeAgendaItem( KOAgendaItem::GPtr ) ),
+ SLOT( removeAgendaItem( KOAgendaItem::GPtr ) ) );
+ connect( agendaItem, SIGNAL( showAgendaItem( KOAgendaItem::GPtr ) ),
+ SLOT( showAgendaItem( KOAgendaItem::GPtr ) ) );
if ( YBottom <= YTop ) {
kdDebug(5850) << "KOAgenda::insertItem(): Text: " << agendaItem->text() << " \
YSize<0" << endl; @@ -1660,10 +1664,10 @@
mActionType = NOP;
KOAgendaItem *agendaItem = new KOAgendaItem( mCalendar, event, qd, viewport(), 1, \
1 );
- connect( agendaItem, SIGNAL( removeAgendaItem( KOAgendaItem* ) ),
- SLOT( removeAgendaItem( KOAgendaItem* ) ) );
- connect( agendaItem, SIGNAL( showAgendaItem( KOAgendaItem* ) ),
- SLOT( showAgendaItem( KOAgendaItem* ) ) );
+ connect( agendaItem, SIGNAL( removeAgendaItem( KOAgendaItem::GPtr ) ),
+ SLOT( removeAgendaItem( KOAgendaItem::GPtr ) ) );
+ connect( agendaItem, SIGNAL( showAgendaItem( KOAgendaItem::GPtr ) ),
+ SLOT( showAgendaItem( KOAgendaItem::GPtr ) ) );
agendaItem->setCellXY( XBegin, 0, 0 );
agendaItem->setCellXRight( XEnd );
--- branches/kdepim/enterprise/kdepim/korganizer/koagendaitem.cpp #1177514:1177515
@@ -416,7 +416,7 @@
if (nowDel->moveInfo()) {
toDel=nowDel->moveInfo()->mPrevMultiItem;
}
- emit removeAgendaItem( nowDel );
+ emit removeAgendaItem( KOAgendaItem::GPtr( nowDel ) );
}
mMultiItemInfo->mFirstMultiItem = 0L;
mMultiItemInfo->mPrevMultiItem = 0L;
@@ -430,7 +430,7 @@
if (nowDel->moveInfo()) {
toDel=nowDel->moveInfo()->mNextMultiItem;
}
- emit removeAgendaItem( nowDel );
+ emit removeAgendaItem( KOAgendaItem::GPtr( nowDel ) );
}
mMultiItemInfo->mLastMultiItem = 0L;
mMultiItemInfo->mNextMultiItem = 0L;
@@ -445,7 +445,7 @@
delete mStartMoveInfo;
mStartMoveInfo = 0;
}
- emit showAgendaItem( this );
+ emit showAgendaItem( KOAgendaItem::GPtr( this ) );
if ( nextMultiItem() ) {
nextMultiItem()->resetMovePrivate();
}
@@ -470,7 +470,7 @@
if (nowDel->moveInfo()) {
toDel=nowDel->moveInfo()->mPrevMultiItem;
}
- emit removeAgendaItem( nowDel );
+ emit removeAgendaItem( KOAgendaItem::GPtr( nowDel ) );
}
}
// if last, delete all next
@@ -482,7 +482,7 @@
if (nowDel->moveInfo()) {
toDel=nowDel->moveInfo()->mNextMultiItem;
}
- emit removeAgendaItem( nowDel );
+ emit removeAgendaItem( KOAgendaItem::GPtr( nowDel ) );
}
}
// also delete the moving info
--- branches/kdepim/enterprise/kdepim/korganizer/koagendaitem.h #1177514:1177515
@@ -153,8 +153,8 @@
void setResourceColor( const QColor& color ) { mResourceColor = color; }
QColor resourceColor() {return mResourceColor;}
signals:
- void removeAgendaItem( KOAgendaItem* );
- void showAgendaItem( KOAgendaItem* );
+ void removeAgendaItem( KOAgendaItem::GPtr );
+ void showAgendaItem( KOAgendaItem::GPtr );
public slots:
void updateIcons();
--- branches/kdepim/enterprise/kdepim/korganizer/koagendaview.cpp #1177514:1177515
@@ -872,11 +872,10 @@
// startDt.setDate( startDate );
Incidence *incidence = item->incidence();
- if ( !incidence ) {
- return;
- }
- if ( !mChanger ||
+
+ if ( !incidence || !mChanger ||
!mChanger->beginChange( incidence, resourceCalendar(), subResourceCalendar() \
) ) { + kdDebug() << "Weird, application has a bug?" << endl;
return;
}
Incidence *oldIncidence = incidence->clone();
@@ -1110,6 +1109,7 @@
KOIncidenceToolTip::remove( item );
KOIncidenceToolTip::add( item, calendar(), incidence, thisDate, \
KOAgendaItem::toolTipGroup() );
+ kdDebug() << "New date is " << incidence->dtStart() << endl;
const bool result = mChanger->changeIncidence( oldIncidence, incidence,
KOGlobals::DATE_MODIFIED, this );
mChanger->endChange( incidence, resourceCalendar(), subResourceCalendar() );
--- branches/kdepim/enterprise/kdepim/korganizer/korgac/alarmdialog.cpp \
#1177514:1177515 @@ -738,3 +738,4 @@
}
}
}
+
--- branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/resourcekolab.cpp \
#1177514:1177515 @@ -568,6 +568,7 @@
<< "; subresource = " << _subresource
<< "; sernum = " << sernum
<< "; mBatchAddingInProgress = " << mBatchAddingInProgress
+ << "; dtStart() = " << incidence->dtStart()
<< endl;
QString uid = incidence->uid();
--- branches/kdepim/enterprise/kdepim/libkcal/calendarresources.cpp #1177514:1177515
@@ -795,17 +795,20 @@
{
kdDebug(5800) << "CalendarResources::save( Ticket *)" << endl;
- if ( !ticket || !ticket->resource() )
+ if ( !ticket || !ticket->resource() ) {
+ kdDebug(5800) << "saved: failure" << endl;
return false;
+ }
kdDebug(5800) << "tick " << ticket->resource()->resourceName() << endl;
// @TODO: Check if the resource was changed at all. If not, don't save.
if ( ticket->resource()->save( incidence ) ) {
releaseSaveTicket( ticket );
+ kdDebug(5800) << "save: success" << endl;
return true;
}
-
+ kdDebug(5800) << "save: failure2" << endl;
return false;
}
@@ -868,7 +871,7 @@
{
Q_UNUSED( subres ); // possible future use
- kdDebug(5800) << "CalendarResource::endChange()" << endl;
+ kdDebug(5800) << "CalendarResource::endChange()" << incidence->dtStart() << endl;
if ( !res ) {
res = resource( incidence );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic