summaryrefslogtreecommitdiff
authorzecke <zecke>2004-01-19 18:38:28 (UTC)
committer zecke <zecke>2004-01-19 18:38:28 (UTC)
commite32b27c9f5153dfb68221712ddca612315d6c4cb (patch) (unidiff)
treec43c130cf5dfc9355311890e576709ac25ae94d1
parentdc9c0fbaf91e3648e63e192a490c3ac033e6a7de (diff)
downloadopie-e32b27c9f5153dfb68221712ddca612315d6c4cb.zip
opie-e32b27c9f5153dfb68221712ddca612315d6c4cb.tar.gz
opie-e32b27c9f5153dfb68221712ddca612315d6c4cb.tar.bz2
Fix bug 0001248 by disabling the horizontal scrollbar.
So we truncate by screen width
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookdayallday.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/pim/datebook/datebookdayallday.cpp b/core/pim/datebook/datebookdayallday.cpp
index 6014eca..2294f3c 100644
--- a/core/pim/datebook/datebookdayallday.cpp
+++ b/core/pim/datebook/datebookdayallday.cpp
@@ -37,13 +37,14 @@ DatebookdayAllday::DatebookdayAllday(DateBookDB* db, QWidget* parent, const cha
37 setMinimumSize( QSize( 0, 0 ) ); 37 setMinimumSize( QSize( 0, 0 ) );
38 setMaximumHeight(3* (QFontMetrics(font()).height()+4) ); 38 setMaximumHeight(3* (QFontMetrics(font()).height()+4) );
39 39
40 m_MainFrame = new QFrame(viewport()); 40 m_MainFrame = new QFrame(viewport());
41 m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain); 41 m_MainFrame->setFrameStyle(QFrame::NoFrame|QFrame::Plain);
42 setFrameStyle(QFrame::NoFrame|QFrame::Plain); 42 setFrameStyle(QFrame::NoFrame|QFrame::Plain);
43 setResizePolicy( QScrollView::AutoOneFit ); 43 setResizePolicy( QScrollView::Default );
44 setHScrollBarMode( AlwaysOff );
44 addChild(m_MainFrame); 45 addChild(m_MainFrame);
45 46
46 datebookdayalldayLayout = new QVBoxLayout( m_MainFrame ); 47 datebookdayalldayLayout = new QVBoxLayout( m_MainFrame );
47 datebookdayalldayLayout->setSpacing( 0 ); 48 datebookdayalldayLayout->setSpacing( 0 );
48 datebookdayalldayLayout->setMargin( 0 ); 49 datebookdayalldayLayout->setMargin( 0 );
49 50
@@ -62,15 +63,16 @@ DatebookdayAllday::~DatebookdayAllday()
62} 63}
63 64
64DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev) 65DatebookAlldayDisp* DatebookdayAllday::addEvent(const EffectiveEvent&ev)
65{ 66{
66 DatebookAlldayDisp * lb; 67 DatebookAlldayDisp * lb;
67 lb = new DatebookAlldayDisp(dateBook,ev,m_MainFrame,NULL); 68 lb = new DatebookAlldayDisp(dateBook,ev,m_MainFrame,NULL);
69 lb->show();
68 datebookdayalldayLayout->addWidget(lb); 70 datebookdayalldayLayout->addWidget(lb);
69 subWidgets.append(lb); 71 subWidgets.append(lb);
70 72
71 connect(lb,SIGNAL(displayMe(const Event &)),lblDesc,SLOT(disp_event(const Event&))); 73 connect(lb,SIGNAL(displayMe(const Event &)),lblDesc,SLOT(disp_event(const Event&)));
72 ++item_count; 74 ++item_count;
73 75
74 return lb; 76 return lb;
75} 77}
76 78
@@ -86,13 +88,13 @@ DatebookAlldayDisp::DatebookAlldayDisp(DateBookDB *db,const EffectiveEvent& ev,
86{ 88{
87 QString strDesc = m_Ev.description(); 89 QString strDesc = m_Ev.description();
88 strDesc = strDesc.replace(QRegExp("<"),"&#60;"); 90 strDesc = strDesc.replace(QRegExp("<"),"&#60;");
89 setBackgroundColor(yellow); 91 setBackgroundColor(yellow);
90 setText(strDesc); 92 setText(strDesc);
91 setFrameStyle(QFrame::Raised|QFrame::Panel); 93 setFrameStyle(QFrame::Raised|QFrame::Panel);
92 94
93 int s = QFontMetrics(font()).height()+4; 95 int s = QFontMetrics(font()).height()+4;
94 setMaximumHeight( s ); 96 setMaximumHeight( s );
95 setMinimumSize( QSize( 0, s ) ); 97 setMinimumSize( QSize( 0, s ) );
96} 98}
97 99
98DatebookAlldayDisp::~DatebookAlldayDisp() 100DatebookAlldayDisp::~DatebookAlldayDisp()