Diffstat (limited to 'core/pim/datebook/datebookday.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | core/pim/datebook/datebookday.cpp | 177 |
1 files changed, 93 insertions, 84 deletions
diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index db4c2fd..0a40ea9 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp @@ -35,18 +35,18 @@ #include <qpainter.h> #include <qsimplerichtext.h> #include <qpopupmenu.h> #include <qtextcodec.h> #include <qpalette.h> +#include <qlineedit.h> + #include <qtimer.h> -DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, - const char *name ) - : QTable( 24, 1, parent, name ), - ampm( whichClock ) +DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, const char *name ) + : QTable( 24, 1, parent, name ), ampm( whichClock ), currDate( QDate::currentDate() ) { enableClipper(TRUE); setTopMargin( 0 ); horizontalHeader()->hide(); setLeftMargin(38); setColumnStretchable( 0, TRUE ); @@ -60,15 +60,15 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, int row; for ( row = 0; row < numRows(); row++ ) { tmp = new QTableItem( this, QTableItem::Never, QString::null); setItem( row, 0, tmp ); //setRowHeight( row, 40); } + initHeader(); - QObject::connect( qApp, SIGNAL(clockChanged(bool)), - this, SLOT(slotChangeClock(bool)) ); + QObject::connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(slotChangeClock(bool)) ); } void DateBookDayView::initHeader() { QString strTmp; for ( int i = 0; i < 24; ++i ) { @@ -90,12 +90,17 @@ void DateBookDayView::initHeader() strTmp = strTmp.rightJustify( 6, ' ' ); verticalHeader()->setLabel( i, strTmp ); setRowStretchable( i, FALSE ); } } +void DateBookDayView::slotDateChanged( int y, int m, int d ) +{ + currDate.setYMD(y,m,d); +} + void DateBookDayView::slotChangeClock( bool newClock ) { ampm = newClock; initHeader(); } @@ -136,13 +141,12 @@ void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool ) } void DateBookDayView::paintFocus( QPainter *, const QRect & ) { } - void DateBookDayView::resizeEvent( QResizeEvent *e ) { QTable::resizeEvent( e ); columnWidthChanged( 0 ); emit sigColWidthChanged(); } @@ -165,40 +169,69 @@ void DateBookDayView::setRowStyle( int style ) if (style<0) style = 0; for (int i=0; i<numRows(); i++) setRowHeight(i, style*10+20); } +void DateBookDayView::contentsMouseReleaseEvent( QMouseEvent *e ) +{ + int y=e->y(); + int diff=y%(this->rowHeight(0)); + int hour=y/this->rowHeight(0); + quickLineEdit=new DateBookDayViewQuickLineEdit(QDateTime(currDate,QTime(hour,0,0,0)),QDateTime(currDate,QTime(hour,59,0,0)),this->viewport(),"quickedit"); + quickLineEdit->setGeometry(0,0,this->columnWidth(0)-1,this->rowHeight(0)); + this->moveChild(quickLineEdit,0,y-diff); + quickLineEdit->setFocus(); + quickLineEdit->show(); +} + //=========================================================================== -DateBookDay::DateBookDay( bool ampm, bool startOnMonday, - DateBookDB *newDb, QWidget *parent, - const char *name ) - : QVBox( parent, name ), - currDate( QDate::currentDate() ), - db( newDb ), - startTime( 0 ) +DateBookDayViewQuickLineEdit::DateBookDayViewQuickLineEdit(const QDateTime &start, const QDateTime &end,QWidget * parent, const char *name=0) : QLineEdit(parent,name) +{ + active=1; + quickEvent.setStart(start); + quickEvent.setEnd(end); + connect(this,SIGNAL(returnPressed()),this,SLOT(slotReturnPressed())); +} + +void DateBookDayViewQuickLineEdit::slotReturnPressed() +{ + if(active && (!this->text().isEmpty())) { // Fix to avoid having this event beeing added multiple times. + quickEvent.setDescription(this->text()); + connect(this,SIGNAL(insertEvent(const Event &)),this->topLevelWidget(),SLOT(insertEvent(const Event &))); + emit(insertEvent(quickEvent)); + active=0; + } + this->close(true); // Close and also delete this widget +} + +void DateBookDayViewQuickLineEdit::focusOutEvent ( QFocusEvent * e ) +{ + slotReturnPressed(); // Reuse code to add event and close this widget. +} + +//=========================================================================== + +DateBookDay::DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb, QWidget *parent, const char *name ) + : QVBox( parent, name ), currDate( QDate::currentDate() ), db( newDb ), startTime( 0 ) { widgetList.setAutoDelete( true ); header = new DateBookDayHeader( startOnMonday, this, "day header" ); header->setDate( currDate.year(), currDate.month(), currDate.day() ); view = new DateBookDayView( ampm, this, "day view" ); - connect( header, SIGNAL( dateChanged( int, int, int ) ), - this, SLOT( dateChanged( int, int, int ) ) ); - connect( view, SIGNAL( sigColWidthChanged() ), - this, SLOT( slotColWidthChanged() ) ); - connect( qApp, SIGNAL(weekChanged(bool)), - this, SLOT(slotWeekChanged(bool)) ); - connect( view, SIGNAL(sigCapturedKey(const QString &)), - this, SIGNAL(sigNewEvent(const QString&)) ); + connect( header, SIGNAL( dateChanged( int, int, int ) ), this, SLOT( dateChanged( int, int, int ) ) ); + connect( header, SIGNAL( dateChanged( int, int, int ) ), view, SLOT( slotDateChanged( int, int, int ) ) ); + connect( view, SIGNAL( sigColWidthChanged() ), this, SLOT( slotColWidthChanged() ) ); + connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(slotWeekChanged(bool)) ); + connect( view, SIGNAL(sigCapturedKey(const QString &)), this, SIGNAL(sigNewEvent(const QString&)) ); QTimer *timer = new QTimer( this ); - connect( timer, SIGNAL(timeout()), - this, SLOT(updateView()) ); //connect timer for updating timeMarker & daywidgetcolors + connect( timer, SIGNAL(timeout()), this, SLOT(updateView()) ); //connect timer for updating timeMarker & daywidgetcolors timer->start( 1000*60*5, FALSE ); //update every 5min selectedWidget = 0; timeMarker = new DateBookDayTimeMarker( this ); timeMarker->setTime( QTime::currentTime() ); @@ -243,32 +276,31 @@ void DateBookDay::selectedDates( QDateTime &start, QDateTime &end ) for (int i=0; i<n; i++) { QTableSelection sel = dayView()->selection( i ); sh = QMIN(sh,sel.topRow()); eh = QMAX(sh,sel.bottomRow()+1); } + if (sh > 23 || eh < 1) { sh=8; eh=9; } start.setTime( QTime( sh, 0, 0 ) ); end.setTime( QTime( eh, 0, 0 ) ); } void DateBookDay::setDate( int y, int m, int d ) { header->setDate( y, m, d ); - selectedWidget = 0; } void DateBookDay::setDate( QDate d) { header->setDate( d.year(), d.month(), d.day() ); - selectedWidget = 0; } void DateBookDay::dateChanged( int y, int m, int d ) { QDate date( y, m, d ); @@ -280,22 +312,19 @@ void DateBookDay::dateChanged( int y, int m, int d ) QTableSelection ts; if (jumpToCurTime && this->date() == QDate::currentDate()) { ts.init( QTime::currentTime().hour(), 0); ts.expandTo( QTime::currentTime().hour(), 0); - } else - { + } else { ts.init( startTime, 0 ); ts.expandTo( startTime, 0 ); } dayView()->addSelection( ts ); - selectedWidget = 0; - } void DateBookDay::redraw() { if ( isUpdatesEnabled() ) relayoutPage(); @@ -308,24 +337,19 @@ void DateBookDay::getEvents() QValueList<EffectiveEvent> eventList = db->getEffectiveEvents( currDate, currDate ); QValueListIterator<EffectiveEvent> it; for ( it = eventList.begin(); it != eventList.end(); ++it ) { EffectiveEvent ev=*it; if(!((ev.end().hour()==0) && (ev.end().minute()==0) && (ev.startDate()!=ev.date()))) { // Skip events ending at 00:00 starting at another day. DateBookDayWidget* w = new DateBookDayWidget( *it, this ); - connect( w, SIGNAL( deleteMe( const Event & ) ), - this, SIGNAL( removeEvent( const Event & ) ) ); - connect( w, SIGNAL( duplicateMe( const Event & ) ), - this, SIGNAL( duplicateEvent( const Event & ) ) ); - connect( w, SIGNAL( editMe( const Event & ) ), - this, SIGNAL( editEvent( const Event & ) ) ); - connect( w, SIGNAL( beamMe( const Event & ) ), - this, SIGNAL( beamEvent( const Event & ) ) ); + connect( w, SIGNAL( deleteMe( const Event & ) ), this, SIGNAL( removeEvent( const Event & ) ) ); + connect( w, SIGNAL( duplicateMe( const Event & ) ), this, SIGNAL( duplicateEvent( const Event & ) ) ); + connect( w, SIGNAL( editMe( const Event & ) ), this, SIGNAL( editEvent( const Event & ) ) ); + connect( w, SIGNAL( beamMe( const Event & ) ), this, SIGNAL( beamEvent( const Event & ) ) ); widgetList.append( w ); } } - } static int place( const DateBookDayWidget *item, bool *used, int maxn ) { int place = 0; int start = item->event().start().hour(); @@ -342,13 +366,14 @@ static int place( const DateBookDayWidget *item, bool *used, int maxn ) if ( used[10*s+place] ) { free = FALSE; break; } s++; } - if ( free ) break; + if ( free ) + break; place++; } if ( place == maxn ) { return -1; } while( start <= end ) { @@ -380,68 +405,60 @@ void DateBookDay::relayoutPage( bool fromResize ) if ( wCount < 20 ) { QArray<QRect> geometries(wCount); for (int i = 0; i < wCount; geometries[i] = widgetList.at(i)->geometry(), i++); //stores geometry for each widget in vector - for ( int i = 0; i < wCount; i++) - { + for ( int i = 0; i < wCount; i++) { QValueList<int> intersectedWidgets; //find all widgets intersecting with widgetList.at(i) - for ( int j = 0; j < wCount; j++) + for ( int j = 0; j < wCount; j++) { if (i != j) if (geometries[j].intersects(geometries[i])) intersectedWidgets.append(j); + } //for each of these intersecting widgets find out how many widgets are they intersecting with for ( uint j = 0; j < intersectedWidgets.count(); j++) { QArray<int> inter(wCount); inter[j]=1; if (intersectedWidgets[j] != -1) - for ( uint k = j; k < intersectedWidgets.count(); k++) + for ( uint k = j; k < intersectedWidgets.count(); k++) { if (j != k && intersectedWidgets[k] != -1) - if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]])) - { + if (geometries[intersectedWidgets[k]].intersects(geometries[intersectedWidgets[j]])) { inter[j]++; intersectedWidgets[k] = -1; } if (inter[j] > anzIntersect[i]) anzIntersect[i] = inter[j] + 1; } - + } if (anzIntersect[i] == 1 && intersectedWidgets.count()) anzIntersect[i]++; } for ( int i = 0; i < wCount; i++) { DateBookDayWidget *w = widgetList.at(i); QRect geom = w->geometry(); - geom.setX( 0 ); - wd = (view->columnWidth(0)-1) / anzIntersect[i] - (anzIntersect[i]>1?2:0); - geom.setWidth( wd ); - while ( intersects( w, geom ) ) { geom.moveBy( wd + 2 + 1, 0 ); } w->setGeometry( geom ); } - if (jumpToCurTime && this->date() == QDate::currentDate()) + if (jumpToCurTime && this->date() == QDate::currentDate()) { view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour - else + } else { view->setContentsPos( 0, startTime * view->rowHeight(0) ); - - + } } else { - - int hours[24]; memset( hours, 0, 24*sizeof( int ) ); bool overFlow = FALSE; for ( int i = 0; i < wCount; i++ ) { DateBookDayWidget *w = widgetList.at(i); int start = w->event().start().hour(); @@ -476,17 +493,18 @@ void DateBookDay::relayoutPage( bool fromResize ) geom.setX( xp*(wid+2) ); geom.setWidth( wid ); w->setGeometry( geom ); } } - if (jumpToCurTime && this->date() == QDate::currentDate()) + if (jumpToCurTime && this->date() == QDate::currentDate()) { view->setContentsPos( 0, QTime::currentTime().hour() * view->rowHeight(0) ); //set listview to current hour - else + } else { view->setContentsPos( 0, startTime * view->rowHeight(0) ); } + } timeMarker->setTime( QTime::currentTime() ); //display timeMarker timeMarker->raise(); //on top of all widgets if (this->date() == QDate::currentDate()) //only show timeMarker on current day timeMarker->show(); else timeMarker->hide(); @@ -518,18 +536,16 @@ QDate DateBookDay::date() const void DateBookDay::setStartViewTime( int startHere ) { startTime = startHere; dayView()->clearSelection(); QTableSelection ts; - if (jumpToCurTime && this->date() == QDate::currentDate()) //this should probably be in datebook.cpp where it's called? - { + if (jumpToCurTime && this->date() == QDate::currentDate()) { //this should probably be in datebook.cpp where it's called? ts.init( QTime::currentTime().hour(), 0); ts.expandTo( QTime::currentTime().hour(), 0); - } else - { + } else { ts.init( startTime, 0 ); ts.expandTo( startTime, 0 ); } dayView()->addSelection( ts ); } @@ -564,18 +580,15 @@ void DateBookDay::keyPressEvent(QKeyEvent *e) e->ignore(); } } //=========================================================================== -DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, - DateBookDay *db ) +DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, DateBookDay *db ) : QWidget( db->dayView()->viewport() ), ev( e ), dateBook( db ) { - - // why would someone use "<"? Oh well, fix it up... // I wonder what other things may be messed up... QString strDesc = ev.description(); int where = strDesc.find( "<" ); while ( where != -1 ) { strDesc.remove( where, 1 ); @@ -602,16 +615,17 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, } text = "<b>" + strDesc + "</b><br>" + "<i>"; if ( !strCat.isEmpty() ) { text += strCat + "</i><br>"; } - if (ev.event().type() == Event::Normal ) + if (ev.event().type() == Event::Normal ) { setEventText( text ); - else + } else { setAllDayText( text ); + } text += "<br><br>" + strNote; setBackgroundMode( PaletteBase ); QTime start = ev.start(); @@ -627,15 +641,17 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, geom.setY( y ); geom.setHeight( h ); geom.setX( 0 ); geom.setWidth(dateBook->dayView()->columnWidth(0)-1); } + void DateBookDayWidget::setAllDayText( QString &text ) { text += "<b>" + tr("This is an all day event.") + "</b>"; } + void DateBookDayWidget::setEventText( QString& text ) { bool whichClock = dateBook->dayView()->whichClock(); if ( ev.startDate() != ev.endDate() ) { text += "<b>" + tr("Start") + "</b>: "; text += TimeString::timeString( ev.event().start().time(), whichClock, FALSE ); text += " - " + TimeString::longDateString( ev.startDate() ) + "<br>"; @@ -655,35 +671,27 @@ DateBookDayWidget::~DateBookDayWidget() } void DateBookDayWidget::paintEvent( QPaintEvent *e ) { QPainter p( this ); - if (dateBook->getSelectedWidget() == this) - { + if (dateBook->getSelectedWidget() == this) { p.setBrush( QColor( 155, 240, 230 ) ); // selected item - } else - { - if (dateBook->date() == QDate::currentDate()) - { + } else { + if (dateBook->date() == QDate::currentDate()) { QTime curTime = QTime::currentTime(); - - if (ev.end() < curTime) - { + if (ev.end() < curTime) { p.setBrush( QColor( 180, 180, 180 ) ); // grey, inactive - } else - { + } else { //change color in dependence of the time till the event starts int duration = curTime.secsTo(ev.start()); if (duration < 0) duration = 0; int colChange = duration*160/86400; //86400: secs per day, 160: max color shift - p.setBrush( QColor( 200-colChange, 200-colChange, 255 ) ); //blue } - } else - { + } else { p.setBrush( QColor( 220, 220, 220 ) ); //light grey, inactive (not current date) //perhaps make a distinction between future/past dates } } p.setPen( QColor(100, 100, 100) ); @@ -713,13 +721,14 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e ) void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) { DateBookDayWidget *item; item = dateBook->getSelectedWidget(); - if (item) item->update(); + if (item) + item->update(); dateBook->setSelectedWidget(this); update(); dateBook->repaint(); QPopupMenu m; |