summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookday.cpp28
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
@@ -14,35 +14,24 @@
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include <qmessagebox.h>
21 20
22#include "datebookday.h" 21#include "datebookday.h"
23#include "datebookdayheaderimpl.h" 22#include "datebookdayheaderimpl.h"
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>
45 34
46DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *name ) 35DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *name )
47 : QTable( 24, 1, parent, name ), ampm( whichClock ), currDate( QDate::currentDate() ) 36 : QTable( 24, 1, parent, name ), ampm( whichClock ), currDate( QDate::currentDate() )
48{ 37{
@@ -50,13 +39,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *
50 setTopMargin( 0 ); 39 setTopMargin( 0 );
51 horizontalHeader()->hide(); 40 horizontalHeader()->hide();
52 setLeftMargin(38); 41 setLeftMargin(38);
53 setColumnStretchable( 0, TRUE ); 42 setColumnStretchable( 0, TRUE );
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
59 // get rid of being able to edit things... 48 // get rid of being able to edit things...
60 QTableItem *tmp; 49 QTableItem *tmp;
61 int row; 50 int row;
62 for ( row = 0; row < numRows(); row++ ) { 51 for ( row = 0; row < numRows(); row++ ) {
@@ -69,12 +58,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *
69 QObject::connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotChangeClock(bool)) ); 58 QObject::connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotChangeClock(bool)) );
70} 59}
71 60
72void DateBookDayView::initHeader() 61void 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 ) {
77 if ( i == 0 ) 67 if ( i == 0 )
78 strTmp = QString::number(12) + ":00"; 68 strTmp = QString::number(12) + ":00";
79 else if ( i == 12 ) 69 else if ( i == 12 )
80 strTmp = QString::number(12) + tr(":00p"); 70 strTmp = QString::number(12) + tr(":00p");
@@ -87,14 +77,24 @@ void DateBookDayView::initHeader()
87 strTmp = "0" + QString::number(i) + ":00"; 77 strTmp = "0" + QString::number(i) + ":00";
88 else 78 else
89 strTmp = QString::number(i) + ":00"; 79 strTmp = QString::number(i) + ":00";
90 } 80 }
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
97void DateBookDayView::slotDateChanged( int y, int m, int d ) 97void DateBookDayView::slotDateChanged( int y, int m, int d )
98{ 98{
99 currDate.setYMD(y,m,d); 99 currDate.setYMD(y,m,d);
100} 100}
@@ -170,13 +170,13 @@ void DateBookDayView::setRowStyle( int style )
170 if (style<0) style = 0; 170 if (style<0) style = 0;
171 171
172 for (int i=0; i<numRows(); i++) 172 for (int i=0; i<numRows(); i++)
173 setRowHeight(i, style*10+20); 173 setRowHeight(i, style*10+20);
174} 174}
175 175
176void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent *e ) 176void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent* /* e */ )
177{ 177{
178 int sh=99,eh=-1; 178 int sh=99,eh=-1;
179 179
180 for(int i=0;i<this->numSelections();i++) { 180 for(int i=0;i<this->numSelections();i++) {
181 QTableSelection sel = this->selection( i ); 181 QTableSelection sel = this->selection( i );
182 sh = QMIN(sh,sel.topRow()); 182 sh = QMIN(sh,sel.topRow());
@@ -216,13 +216,13 @@ void DateBookDayViewQuickLineEdit::slotReturnPressed()
216 QTimer::singleShot(500, this, SLOT(finallyCallClose()) );// Close and also delete this widget 216 QTimer::singleShot(500, this, SLOT(finallyCallClose()) );// Close and also delete this widget
217} 217}
218void DateBookDayViewQuickLineEdit::finallyCallClose() { 218void DateBookDayViewQuickLineEdit::finallyCallClose() {
219 close(true); // also deletes this widget... 219 close(true); // also deletes this widget...
220} 220}
221 221
222void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent * e ) 222void 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.
225} 225}
226 226
227//=========================================================================== 227//===========================================================================
228 228