-rw-r--r-- | core/pim/datebook/datebookday.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index f4008e9..4d64099 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp | |||
@@ -18,5 +18,4 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qmessagebox.h> | ||
21 | 20 | ||
22 | #include "datebookday.h" | 21 | #include "datebookday.h" |
@@ -24,21 +23,11 @@ | |||
24 | #include "datebookdayallday.h" | 23 | #include "datebookdayallday.h" |
25 | 24 | ||
26 | #include <qpe/datebookdb.h> | ||
27 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
28 | #include <qpe/event.h> | ||
29 | #include <qpe/qpeapplication.h> | 26 | #include <qpe/qpeapplication.h> |
30 | #include <qpe/timestring.h> | ||
31 | #include <qpe/qpedebug.h> | ||
32 | #include <qpe/ir.h> | 27 | #include <qpe/ir.h> |
33 | 28 | ||
34 | #include <qheader.h> | ||
35 | #include <qdatetime.h> | ||
36 | #include <qpainter.h> | ||
37 | #include <qsimplerichtext.h> | 29 | #include <qsimplerichtext.h> |
38 | #include <qpopupmenu.h> | 30 | #include <qpopupmenu.h> |
39 | #include <qtextcodec.h> | ||
40 | #include <qpalette.h> | ||
41 | 31 | ||
42 | #include <qlineedit.h> | ||
43 | 32 | ||
44 | #include <qtimer.h> | 33 | #include <qtimer.h> |
@@ -54,5 +43,5 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char * | |||
54 | setHScrollBarMode( QScrollView::AlwaysOff ); | 43 | setHScrollBarMode( QScrollView::AlwaysOff ); |
55 | verticalHeader()->setPalette(white); | 44 | verticalHeader()->setPalette(white); |
56 | verticalHeader()->setResizeEnabled(FALSE); | 45 | verticalHeader()->setResizeEnabled(FALSE); |
57 | setSelectionMode( Single ); | 46 | setSelectionMode( Single ); |
58 | 47 | ||
@@ -73,4 +62,5 @@ void DateBookDayView::initHeader() | |||
73 | { | 62 | { |
74 | QString strTmp; | 63 | QString strTmp; |
64 | int preferredWidth = 0; | ||
75 | for ( int i = 0; i < 24; ++i ) { | 65 | for ( int i = 0; i < 24; ++i ) { |
76 | if ( ampm ) { | 66 | if ( ampm ) { |
@@ -91,6 +81,16 @@ void DateBookDayView::initHeader() | |||
91 | strTmp = strTmp.rightJustify( 6, ' ' ); | 81 | strTmp = strTmp.rightJustify( 6, ' ' ); |
92 | verticalHeader()->setLabel( i, strTmp ); | 82 | verticalHeader()->setLabel( i, strTmp ); |
83 | |||
84 | // Compute correct width for current Font (Add some space right) | ||
85 | int actWidth = QFontMetrics( QFont::defaultFont() ).width( strTmp + QString(" ") ); | ||
86 | if ( preferredWidth < actWidth ) | ||
87 | preferredWidth = actWidth; | ||
93 | setRowStretchable( i, FALSE ); | 88 | setRowStretchable( i, FALSE ); |
94 | } | 89 | } |
90 | |||
91 | // It seems as if the header has a bug. It does not resize | ||
92 | // correct horizontally if it is used vertical.. | ||
93 | // Thus, we do it manually.. | ||
94 | setLeftMargin( preferredWidth ); | ||
95 | } | 95 | } |
96 | 96 | ||
@@ -174,5 +174,5 @@ void DateBookDayView::setRowStyle( int style ) | |||
174 | } | 174 | } |
175 | 175 | ||
176 | void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent *e ) | 176 | void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent* /* e */ ) |
177 | { | 177 | { |
178 | int sh=99,eh=-1; | 178 | int sh=99,eh=-1; |
@@ -220,5 +220,5 @@ void DateBookDayViewQuickLineEdit::finallyCallClose() { | |||
220 | } | 220 | } |
221 | 221 | ||
222 | void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent * e ) | 222 | void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */) |
223 | { | 223 | { |
224 | slotReturnPressed(); // Reuse code to add event and close this widget. | 224 | slotReturnPressed(); // Reuse code to add event and close this widget. |