Limit the number of shown All Day Events to approxiametely three

Patch by Rajko Albrecht

2 files changed, 19 insertions, 10 deletions

diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index 985f31a..6014eca 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -28,16 +28,23 @@
 /*
  *  Constructs a DatebookdayAllday which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
-DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name,fl ),item_count(0),dateBook(db)
+DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent,  const char* name, WFlags  )
+    : QScrollView( parent, name ),item_count(0),dateBook(db)
 {
     if ( !name )
         setName( "DatebookdayAllday" );
     setMinimumSize( QSize( 0, 0 ) );
+    setMaximumHeight(3* (QFontMetrics(font()).height()+4) );
 
-    datebookdayalldayLayout = new QVBoxLayout( this );
+    m_MainFrame = new QFrame(viewport());
+    m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
+    setFrameStyle(QFrame::NoFrame|QFrame::Plain);
+    setResizePolicy( QScrollView::AutoOneFit );
+    addChild(m_MainFrame);
+
+    datebookdayalldayLayout = new QVBoxLayout( m_MainFrame );
     datebookdayalldayLayout->setSpacing( 0 );
     datebookdayalldayLayout->setMargin( 0 );
 
     lblDesc = new DatebookEventDesc(parent->parentWidget(),"");
@@ -56,12 +63,12 @@ DatebookdayAllday::~DatebookdayAllday()
 
 DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
 {
     DatebookAlldayDisp * lb;
-    lb = new DatebookAlldayDisp(dateBook,ev,this,NULL);
+    lb = new DatebookAlldayDisp(dateBook,ev,m_MainFrame,NULL);
     datebookdayalldayLayout->addWidget(lb);
     subWidgets.append(lb);
-
+    
     connect(lb,SIGNAL(displayMe(const Event &)),lblDesc,SLOT(disp_event(const Event&)));
     ++item_count;
 
     return lb;
@@ -81,11 +88,12 @@ DatebookAlldayDisp::DatebookAlldayDisp(DateBookDB *db,const EffectiveEvent& ev,
     strDesc = strDesc.replace(QRegExp("<"),"&#60;");
     setBackgroundColor(yellow);
     setText(strDesc);
     setFrameStyle(QFrame::Raised|QFrame::Panel);
-    QSize s = sizeHint();
-    setMaximumSize( QSize( 32767, s.height()-4 ) );
-    setMinimumSize( QSize( 0, s.height()-4 ) );
+    
+    int s = QFontMetrics(font()).height()+4;
+    setMaximumHeight( s );
+    setMinimumSize( QSize( 0, s ) );
 }
 
 DatebookAlldayDisp::~DatebookAlldayDisp()
 {
@@ -222,5 +230,4 @@ void DatebookEventDesc::disp_event(const Event&e)
             (parentWidget()->height()-height())/2 );
     show();
     m_Timer->start(2000,true);
 }
-
diff --git a/core/pim/datebook/datebookdayallday.h b/core/pim/datebook/datebookdayallday.h
index c781785..f5867e5 100644
--- a/core/pim/datebook/datebookdayallday.h
+++ b/core/pim/datebook/datebookdayallday.h
@@ -2,8 +2,9 @@
 #define DATEBOOKDAYALLDAYBASE_H
 
 #include <qvariant.h>
 #include <qframe.h>
+#include <qscrollview.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qpe/event.h>
 
@@ -13,9 +14,9 @@ class QGridLayout;
 class DatebookAlldayDisp;
 class DatebookEventDesc;
 class DateBookDB;
 
-class DatebookdayAllday : public QWidget
+class DatebookdayAllday : public QScrollView
 {
     Q_OBJECT
 
 public:
@@ -28,8 +29,9 @@ public:
 public slots:
     void removeAllEvents();
 
 protected:
+    QFrame * m_MainFrame;
     QVBoxLayout* datebookdayalldayLayout;
     DatebookEventDesc * lblDesc;
     unsigned int item_count;
     QList<DatebookAlldayDisp> subWidgets;