| -rw-r--r-- | kaddressbook/kabcore.cpp | 34 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 11 |
2 files changed, 16 insertions, 29 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index fa9f130..9c40142 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -631,27 +631,7 @@ KAboutData *KABCore::createAboutData() void KABCore::createAboutData() #endif //KAB_EMBEDDED { -#ifndef KAB_EMBEDDED - KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ), - "3.1", I18N_NOOP( "The KDE Address Book" ), - KAboutData::License_GPL_V2, - I18N_NOOP( "(c) 1997-2003, The KDE PIM Team" ) ); - about->addAuthor( "Tobias Koenig", I18N_NOOP( "Current maintainer " ), "tokoe@kde.org" ); - about->addAuthor( "Don Sanders", I18N_NOOP( "Original author " ) ); - about->addAuthor( "Cornelius Schumacher", - I18N_NOOP( "Co-maintainer, libkabc port, CSV import/export " ), - "schumacher@kde.org" ); - about->addAuthor( "Mike Pilone", I18N_NOOP( "GUI and framework redesign " ), - "mpilone@slac.com" ); - about->addAuthor( "Greg Stern", I18N_NOOP( "DCOP interface" ) ); - about->addAuthor( "Mark Westcott", I18N_NOOP( "Contact pinning" ) ); - about->addAuthor( "Michel Boyer de la Giroday", I18N_NOOP( "LDAP Lookup\n" ), - "michel@klaralvdalens-datakonsult.se" ); - about->addAuthor( "Steffen Hansen", I18N_NOOP( "LDAP Lookup " ), - "hansen@kde.org" ); - - return about; -#endif //KAB_EMBEDDED + QString version; #include <../version> @@ -666,16 +646,16 @@ void KABCore::createAboutData() #endif "(c) 2004 Ulf Schenk\n" - "(c) 2004 Lutz Rogowski\n" + "(c) 2004-2005 Lutz Rogowski\nrogowski@kde.org\n" "(c) 1997-2003, The KDE PIM Team\n" - "Tobias Koenig Current maintainer\ntokoe@kde.org\n" + "Tobias Koenig Maintainer\n" "Don Sanders Original author\n" - "Cornelius Schumacher Co-maintainer\nschumacher@kde.org\n" - "Mike Pilone GUI and framework redesign\nmpilone@slac.com\n" + "Cornelius Schumacher Co-maintainer\n" + "Mike Pilone GUI and framework redesign\n" "Greg Stern DCOP interface\n" "Mark Westcot Contact pinning\n" - "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n" - "Steffen Hansen LDAP Lookup\nhansen@kde.org\n" + "Michel Boyer de la Giroday LDAP Lookup\n" + "Steffen Hansen LDAP Lookup" #ifdef _WIN32_ "(c) 2004 Lutz Rogowski Import from OL\nrogowski@kde.org\n" #endif diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 20a5b74..76d5c4b 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -952,8 +952,15 @@ void KOAgendaView::updateConfig() void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) { - // kdDebug() << "KOAgendaView::updateEventDates(): " << item->text() << endl; - //qDebug("KOAgendaView::updateEventDates "); + + + int xxx = item->cellX(); + //qDebug("KOAgendaView::updateEventDates %d %d %d %d %d", xxx, mMinY.at(xxx),mMaxY.at(xxx),item->cellYTop(),item->cellYBottom() ); + if ( mMinY.at(xxx) > item->cellYTop() ) + mMinY.at(xxx) = item->cellYTop(); + if ( mMaxY.at(xxx) < item->cellYBottom() ) + mMaxY.at(xxx) = item->cellYBottom(); + QDateTime startDt,endDt; QDate startDate; int lenInSecs; |