-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 10 | ||||
-rw-r--r-- | korganizer/koagendaitem.cpp | 4 | ||||
-rw-r--r-- | korganizer/koagendaitem.h | 2 | ||||
-rw-r--r-- | korganizer/kodaymatrix.cpp | 6 | ||||
-rw-r--r-- | korganizer/kodaymatrix.h | 2 | ||||
-rw-r--r-- | korganizer/kotodoview.cpp | 3 | ||||
-rw-r--r-- | korganizer/kotodoview.h | 2 |
7 files changed, 21 insertions, 8 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index 5cdaa83..5941337 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp @@ -207,7 +207,11 @@ void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) 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 ) { diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index 0ea2860..19cc0e3 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -78,5 +78,5 @@ KOAgendaItem::KOAgendaItem(Incidence *incidence, QDate qd, QWidget *parent,bool //QPEApplication::setStylusOperation( this, QPEApplication::RightOnHold ); #endif - new KOAgendaItemWhatsThis(this); + mKOAgendaItemWhatsThis = new KOAgendaItemWhatsThis(this); int wflags = getWFlags() |WRepaintNoErase;// WResizeNoErase setWFlags ( wflags); @@ -156,5 +156,5 @@ KOAgendaItem::~KOAgendaItem() { // qDebug("deleteKOAgendaItem::~KOAgendaItem( "); - + delete mKOAgendaItemWhatsThis; } diff --git a/korganizer/koagendaitem.h b/korganizer/koagendaitem.h index b4dba79..53658c0 100644 --- a/korganizer/koagendaitem.h +++ b/korganizer/koagendaitem.h @@ -28,4 +28,5 @@ #include <libkcal/incidence.h> +class KOAgendaItemWhatsThis; class QToolTipGroup; class QDragEnterEvent; @@ -120,4 +121,5 @@ class KOAgendaItem : public QWidget private: + KOAgendaItemWhatsThis* mKOAgendaItemWhatsThis; bool mAllDay; int mCellX; diff --git a/korganizer/kodaymatrix.cpp b/korganizer/kodaymatrix.cpp index ae0a051..5133519 100644 --- a/korganizer/kodaymatrix.cpp +++ b/korganizer/kodaymatrix.cpp @@ -63,5 +63,6 @@ class KODaymatrixWhatsThis :public QWhatsThis { public: - KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { }; + KODaymatrixWhatsThis( KODayMatrix* view ) : QWhatsThis( view ),_view (view) { ;}; + ~KODaymatrixWhatsThis() { ; }; protected: @@ -110,5 +111,5 @@ KODayMatrix::KODayMatrix(QWidget *parent, Calendar* calendar, QDate date, const #endif { - new KODaymatrixWhatsThis(this); + mKODaymatrixWhatsThis = new KODaymatrixWhatsThis(this); mPendingUpdateBeforeRepaint = false; mouseDown = false; @@ -223,4 +224,5 @@ QColor KODayMatrix::getShadedColor(QColor color) KODayMatrix::~KODayMatrix() { + delete mKODaymatrixWhatsThis; delete [] days; delete [] daylbls; diff --git a/korganizer/kodaymatrix.h b/korganizer/kodaymatrix.h index f4016b6..10f4b05 100644 --- a/korganizer/kodaymatrix.h +++ b/korganizer/kodaymatrix.h @@ -42,4 +42,5 @@ class QDropEvent; class KODayMatrix; +class KODaymatrixWhatsThis; using namespace KCal; @@ -227,4 +228,5 @@ protected: private: + KODaymatrixWhatsThis* mKODaymatrixWhatsThis; bool mouseDown; QBitArray bDays; diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index 5e8ea27..2b01c23 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp @@ -414,5 +414,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : - new KOTodoViewWhatsThis(mTodoListView->viewport(),this); + mKOTodoViewWhatsThis = new KOTodoViewWhatsThis(mTodoListView->viewport(),this); mPriorityPopupMenu = new QPopupMenu(this); @@ -551,4 +551,5 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) : KOTodoView::~KOTodoView() { + delete mKOTodoViewWhatsThis; delete mDocPrefs; } diff --git a/korganizer/kotodoview.h b/korganizer/kotodoview.h index 462f0a6..eab0754 100644 --- a/korganizer/kotodoview.h +++ b/korganizer/kotodoview.h @@ -50,4 +50,5 @@ class QDragMoveEvent; class QDragLeaveEvent; class QDropEvent; +class KOTodoViewWhatsThis; class DocPrefs; @@ -219,4 +220,5 @@ class KOTodoView : public KOrg::BaseView * -- zecke 2002-07-08 */ + KOTodoViewWhatsThis* mKOTodoViewWhatsThis; friend class KOTodoListView; void paintEvent(QPaintEvent * pevent); |