From b40a7cc0a8cf0bd06b0f404f58e89980d1291beb Mon Sep 17 00:00:00 2001 From: zautrix Date: Mon, 21 Mar 2005 10:47:16 +0000 Subject: nf --- diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 5cdaa83..5941337 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -206,9 +206,13 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) connectNavigatorView( n ); n->show(); } - - while ( count < ( mExtraViews.count() + 1 ) ) { - mExtraViews.removeLast(); + int iii = 0; + while ( iii < ( mExtraViews.count() ) ) { + if ( iii < count-1 ) + mExtraViews.at( iii )->show(); + else + mExtraViews.at( iii )->hide(); + ++iii; } if ( fontchange ) { //mNavigatorView->changeFont( fo ); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 0ea2860..19cc0e3 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -77,7 +77,7 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool #ifndef DESKTOP_VERSION //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); #endif - new KOAgendaItemWhatsThis(this); + mKOAgendaItemWhatsThis = new KOAgendaItemWhatsThis(this); int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase setWFlags ( wflags); mAllDay = allday; @@ -155,7 +155,7 @@ void KOAgendaItem::init ( Incidence *incidence, QDate qd ) KOAgendaItem::~KOAgendaItem() { // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); - + delete mKOAgendaItemWhatsThis; } void KOAgendaItem::recreateIncidence() diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index b4dba79..53658c0 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -27,6 +27,7 @@ #include +class KOAgendaItemWhatsThis; class QToolTipGroup; class QDragEnterEvent; class QDropEvent; @@ -119,6 +120,7 @@ class KOAgendaItem : public QWidget void resizeEvent ( QResizeEvent *ev ); private: + KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; bool mAllDay; int mCellX; int mCellXWidth; diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index ae0a051..5133519 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -62,7 +62,8 @@ DynamicTip::DynamicTip( QWidget * parent ) class KODaymatrixWhatsThis :public QWhatsThis { public: - KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { }; + KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; + ~KODaymatrixWhatsThis() { ; }; protected: virtual QString text( const QPoint& p ) @@ -109,7 +110,7 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const QFrame(parent, name) #endif { - new KODaymatrixWhatsThis(this); + mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); mPendingUpdateBeforeRepaint = false; mouseDown = false; // initialize dynamic arrays @@ -222,6 +223,7 @@ QColor KODayMatrix::getShadedColor(QColor color) KODayMatrix::~KODayMatrix() { + delete mKODaymatrixWhatsThis; delete [] days; delete [] daylbls; delete [] events; diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index f4016b6..10f4b05 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -41,6 +41,7 @@ class QDragLeaveEvent; class QDropEvent; class KODayMatrix; +class KODaymatrixWhatsThis; using namespace KCal; @@ -226,6 +227,7 @@ protected: void resizeEvent(QResizeEvent *); private: + KODaymatrixWhatsThis* mKODaymatrixWhatsThis; bool mouseDown; QBitArray bDays; QPixmap myPix; diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 5e8ea27..2b01c23 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -413,7 +413,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : mTodoListView->setColumnWidthMode(8, QListView::Manual); - new KOTodoViewWhatsThis(mTodoListView->viewport(),this); + mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); mPriorityPopupMenu = new QPopupMenu(this); for (int i = 1; i <= 5; i++) { @@ -550,6 +550,7 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : KOTodoView::~KOTodoView() { + delete mKOTodoViewWhatsThis; delete mDocPrefs; } QString KOTodoView::getWhatsThisText(QPoint p) diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 462f0a6..eab0754 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -49,6 +49,7 @@ class QDragEnterEvent; class QDragMoveEvent; class QDragLeaveEvent; class QDropEvent; +class KOTodoViewWhatsThis; class DocPrefs; @@ -218,6 +219,7 @@ class KOTodoView : public KOrg::BaseView * 3. add a private method for setting a todo modified + friend here? * -- zecke 2002-07-08 */ + KOTodoViewWhatsThis* mKOTodoViewWhatsThis; friend class KOTodoListView; void paintEvent(QPaintEvent * pevent); bool mPendingUpdateBeforeRepaint; -- cgit v0.9.0.2