author | waspe <waspe> | 2003-11-04 16:37:14 (UTC) |
---|---|---|
committer | waspe <waspe> | 2003-11-04 16:37:14 (UTC) |
commit | efcd8d6a743261194b55df3afeec956fde9886d4 (patch) (unidiff) | |
tree | 7bf7232a92c40c8236813fc06aac18b4f8d16d1d /core/pim | |
parent | d2c52ff34d0ef37d055f74bb9fd957c6ffc583a9 (diff) | |
download | opie-efcd8d6a743261194b55df3afeec956fde9886d4.zip opie-efcd8d6a743261194b55df3afeec956fde9886d4.tar.gz opie-efcd8d6a743261194b55df3afeec956fde9886d4.tar.bz2 |
remove merge conflict
-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 | |||
@@ -19,3 +19,2 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qmessagebox.h> | ||
21 | 20 | ||
@@ -25,19 +24,9 @@ | |||
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 | ||
@@ -55,3 +44,3 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char * | |||
55 | verticalHeader()->setPalette(white); | 44 | verticalHeader()->setPalette(white); |
56 | verticalHeader()->setResizeEnabled(FALSE); | 45 | verticalHeader()->setResizeEnabled(FALSE); |
57 | setSelectionMode( Single ); | 46 | setSelectionMode( Single ); |
@@ -74,2 +63,3 @@ void DateBookDayView::initHeader() | |||
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 ) { |
@@ -92,4 +82,14 @@ void DateBookDayView::initHeader() | |||
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 | } |
@@ -175,3 +175,3 @@ void DateBookDayView::setRowStyle( int style ) | |||
175 | 175 | ||
176 | void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent *e ) | 176 | void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent* /* e */ ) |
177 | { | 177 | { |
@@ -221,3 +221,3 @@ void DateBookDayViewQuickLineEdit::finallyCallClose() { | |||
221 | 221 | ||
222 | void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent * e ) | 222 | void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent* /* e */) |
223 | { | 223 | { |