-rw-r--r-- | core/pim/datebook/datebook.cpp | 48 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.cpp | 236 | ||||
-rw-r--r-- | core/pim/datebook/datebookday.h | 54 |
3 files changed, 288 insertions, 50 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 2c2965e..c0d45c9 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp @@ -130,3 +130,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) a->addTo( view ); - + a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 ); @@ -175,3 +175,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) int current=config.readNumEntry("defaultview", DAY); - + QActionGroup *ag = new QActionGroup(this); @@ -189,8 +189,8 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) ag->insert(a); - + ag->addTo(default_view); - connect(ag, SIGNAL( selected ( QAction * ) ), - this, SLOT( newDefaultView(QAction *) ) + connect(ag, SIGNAL( selected ( QAction * ) ), + this, SLOT( newDefaultView(QAction *) ) ); - + connect( qApp, SIGNAL(clockChanged(bool)), @@ -199,3 +199,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) this, SLOT(changeWeek(bool)) ); - + #if defined(Q_WS_QWS) && !defined(QT_NO_COP) @@ -204,3 +204,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) #endif - + // listen on QPE/System @@ -214,6 +214,6 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) this, SLOT(receive(const QCString&, const QByteArray&)) ); - qDebug("olle\n"); + qDebug("olle\n"); #endif #endif - + qDebug("done t=%d", t.elapsed() ); @@ -311,3 +311,3 @@ QDate DateBook::currentDate() QDate d = QDate::currentDate(); - + if ( dayView && views->visibleWidget() == dayView ) { @@ -408,3 +408,3 @@ void DateBook::editEvent( const Event &e ) if (QMessageBox::warning(this, "error box", - error, "Fix it", "Continue", + error, "Fix it", "Continue", 0, 0, 1) == 0) @@ -490,3 +490,3 @@ void DateBook::initWeek() calcWeek( d, totWeeks, yearNumber, onMonday ); - + while ( totWeeks == 1 ) { @@ -500,6 +500,6 @@ void DateBook::initWeekLst() { if ( !weekLstView ) { - weekLstView = new DateBookWeekLst( ampm, onMonday, db, + weekLstView = new DateBookWeekLst( ampm, onMonday, db, views, "weeklst view" ); views->addWidget( weekLstView, WEEKLST ); - + //weekLstView->setStartViewTime( startTime ); @@ -507,7 +507,7 @@ void DateBook::initWeekLst() { this, SLOT( showDay( int, int, int ) ) ); - connect( weekLstView, SIGNAL( addEvent( const QDateTime &, - const QDateTime &, + connect( weekLstView, SIGNAL( addEvent( const QDateTime &, + const QDateTime &, const QString & ) ), - this, SLOT( slotNewEntry( const QDateTime &, - const QDateTime &, + this, SLOT( slotNewEntry( const QDateTime &, + const QDateTime &, const QString & ) ) ); @@ -542,3 +542,3 @@ void DateBook::loadSettings() } - + { @@ -568,3 +568,3 @@ void DateBook::newDefaultView(QAction *a) { if (a->text() == "Month") val=MONTH; - + Config configDB( "DateBook" ); @@ -690,3 +690,3 @@ void DateBook::timerEvent( QTimerEvent *e ) Sound::soundAlarm(); - } + } else @@ -978,3 +978,3 @@ Event DateBookDBHack::eventByUID(int uid) { QValueList<Event>::ConstIterator it; - + for (it = myEventList.begin(); it != myEventList.end(); it++) { @@ -987,2 +987,4 @@ Event DateBookDBHack::eventByUID(int uid) { qDebug("Event not found: uid=%d\n", uid); + Event ev; + return ev; // return at least } diff --git a/core/pim/datebook/datebookday.cpp b/core/pim/datebook/datebookday.cpp index 67a88e9..c15ccef 100644 --- a/core/pim/datebook/datebookday.cpp +++ b/core/pim/datebook/datebookday.cpp @@ -19,2 +19,3 @@ **********************************************************************/ +#include <qmessagebox.h> @@ -38,2 +39,4 @@ +#include <qtimer.h> + DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, @@ -59,2 +62,3 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent, setItem( row, 0, tmp ); + setRowHeight( row, 40); } @@ -121,5 +125,9 @@ void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool ) QPen pen( p->pen() ); - p->setPen( colorGroup().mid() ); + p->setPen( colorGroup().dark() ); p->drawLine( x2, 0, x2, y2 ); p->drawLine( 0, y2, x2, y2 ); + + p->setPen( colorGroup().midlight() ); + p->drawLine( 0, y2 - h/2, x2, y2 - h/2); + p->setPen( pen ); @@ -176,2 +184,29 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday, this, SIGNAL(sigNewEvent(const QString&)) ); + + QTimer *timer = new QTimer( this ); + + 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() ); +} + +void DateBookDay::updateView( void ) +{ + timeMarker->setTime( QTime::currentTime() ); + //need to find a way to update all DateBookDayWidgets +} + +void DateBookDay::setSelectedWidget( DateBookDayWidget *w ) +{ + selectedWidget = w; +} + +DateBookDayWidget * DateBookDay::getSelectedWidget( void ) +{ + return selectedWidget; } @@ -204,2 +239,4 @@ void DateBookDay::setDate( int y, int m, int d ) header->setDate( y, m, d ); + + selectedWidget = 0; } @@ -209,2 +246,4 @@ void DateBookDay::setDate( QDate d) header->setDate( d.year(), d.month(), d.day() ); + + selectedWidget = 0; } @@ -223,2 +262,8 @@ void DateBookDay::dateChanged( int y, int m, int d ) dayView()->addSelection( ts ); + + selectedWidget = 0; + + if (this->date() == QDate::currentDate()) + timeMarker->show(); else timeMarker->hide(); + } @@ -248,2 +293,3 @@ void DateBookDay::getEvents() } + } @@ -290,32 +336,73 @@ void DateBookDay::relayoutPage( bool fromResize ) + widgetList.sort(); + //sorts the widgetList by the heights of the widget so that the tallest widgets are at the beginning + //this is needed for the simple algo below to work correctly, otherwise some widgets would be drawn outside the view + int wCount = widgetList.count(); int wid = view->columnWidth(0)-1; + int wd; int n = 1; + QArray<int> anzIntersect(wCount); //this stores the number of maximal intersections of each widget + + for (int i = 0; i<wCount; anzIntersect[i] = 1, i++); + if ( wCount < 20 ) { - for ( int i = 0; i < wCount; ) { + + 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++) + { + QValueList<int> intersectedWidgets; + + //find all widgets intersecting with widgetList.at(i) + 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++) + if (j != k && intersectedWidgets[k] != -1) + 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); - int x = 0; - int xp = 0; QRect geom = w->geometry(); - geom.setX( x ); - geom.setWidth( wid ); - while ( xp < n && intersects( w, geom ) ) { - x += wid; - xp++; - geom.moveBy( wid, 0 ); - } - if ( xp >= n ) { - n++; - wid = ( view->columnWidth(0)-1 ) / n; - i = 0; - } else { - w->setGeometry( geom ); - i++; + + 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 ); } + view->setContentsPos( 0, startTime * view->rowHeight(0) ); + + } else { - - + + int hours[24]; @@ -345,6 +432,6 @@ void DateBookDay::relayoutPage( bool fromResize ) wid = ( view->columnWidth(0)-1 ) / n; - + bool used[24*10]; memset( used, FALSE, 24*10*sizeof( bool ) ); - + for ( int i = 0; i < wCount; i++ ) { @@ -354,3 +441,3 @@ void DateBookDay::relayoutPage( bool fromResize ) QRect geom = w->geometry(); - geom.setX( xp*wid ); + geom.setX( xp*(wid+2) ); geom.setWidth( wid ); @@ -361,2 +448,5 @@ void DateBookDay::relayoutPage( bool fromResize ) } + + timeMarker->setTime( QTime::currentTime() ); //display timeMarker + timeMarker->raise(); //on top of all widgets setUpdatesEnabled( TRUE ); @@ -498,2 +588,5 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e, geom.setHeight( h ); + geom.setX( 0 ); + geom.setWidth(dateBook->dayView()->columnWidth(0)-1); + } @@ -507,6 +600,36 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e ) QPainter p( this ); + + if (dateBook->getSelectedWidget() == this) + { + p.setBrush( QColor( 155, 240, 230 ) ); // selected item + } else + { + if (dateBook->date() == QDate::currentDate()) + { + QTime curTime = QTime::currentTime(); + + if (ev.end() < curTime) + { + p.setBrush( QColor( 180, 180, 180 ) ); // grey, inactive + } 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 + { + 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) ); - p.setBrush( QColor( 255, 240, 230 ) ); // based on priority? p.drawRect(rect()); + // p.drawRect(0,0, 5, height()); + int y = 0; @@ -527,3 +650,3 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e ) rt.setWidth( geom.width() - d - 6 ); - rt.draw( &p, 3, 0, e->region(), colorGroup() ); + rt.draw( &p, 7, 0, e->region(), colorGroup() ); } @@ -532,2 +655,11 @@ void DateBookDayWidget::mousePressEvent( QMouseEvent *e ) { + DateBookDayWidget *item; + + item = dateBook->getSelectedWidget(); + if (item) item->update(); + + dateBook->setSelectedWidget(this); + update(); + dateBook->repaint(); + QPopupMenu m; @@ -553 +685,55 @@ void DateBookDayWidget::setGeometry( const QRect &r ) } + + +//--------------------------------------------------------------------------------------------- +//--------------------------------------------------------------------------------------------- + + +DateBookDayTimeMarker::DateBookDayTimeMarker( DateBookDay *db ) + : QWidget( db->dayView()->viewport() ), dateBook( db ) +{ + setBackgroundMode( PaletteBase ); +} + +DateBookDayTimeMarker::~DateBookDayTimeMarker() +{ +} + +void DateBookDayTimeMarker::paintEvent( QPaintEvent */*e*/ ) +{ + QPainter p( this ); + p.setBrush( QColor( 255, 0, 0 ) ); + + QPen pen; + pen.setStyle(NoPen); + + p.setPen( pen ); + p.drawRect(rect()); +} + +void DateBookDayTimeMarker::setTime( const QTime &t ) +{ + int y = t.hour()*60+t.minute(); + int rh = dateBook->dayView()->rowHeight(0); + y = y*rh/60; + + geom.setX( 0 ); + + int x = dateBook->dayView()->columnWidth(0)-1; + geom.setWidth( x ); + + geom.setY( y ); + geom.setHeight( 1 ); + + setGeometry( geom ); + + time = t; +} + +void DateBookDayTimeMarker::setGeometry( const QRect &r ) +{ + geom = r; + setFixedSize( r.width()+1, r.height()+1 ); + dateBook->dayView()->moveChild( this, r.x(), r.y()-1 ); + show(); +} diff --git a/core/pim/datebook/datebookday.h b/core/pim/datebook/datebookday.h index 531fded..db0f3b6 100644 --- a/core/pim/datebook/datebookday.h +++ b/core/pim/datebook/datebookday.h @@ -55,2 +55,3 @@ protected: virtual void paintFocus( QPainter *p, const QRect &cr ); + virtual void resizeEvent( QResizeEvent *e ); @@ -75,3 +76,3 @@ public: const EffectiveEvent &event() const { return ev; } - + signals: @@ -92,2 +93,46 @@ private: +//Marker for current time in the dayview +class DateBookDayTimeMarker : public QWidget +{ + Q_OBJECT + +public: + DateBookDayTimeMarker( DateBookDay *db ); + ~DateBookDayTimeMarker(); + + const QRect &geometry() { return geom; } + void setGeometry( const QRect &r ); + void setTime( const QTime &t ); + +signals: + +protected: + void paintEvent( QPaintEvent *e ); + +private: + QRect geom; + QTime time; + DateBookDay *dateBook; +}; + +//reimplemented the compareItems function so that it sorts DayWidgets by geometry heights +class WidgetListClass : public QList<DateBookDayWidget> +{ + private: + + int compareItems( QCollection::Item s1, QCollection::Item s2 ) + { + //hmm, don't punish me for that ;) + if (reinterpret_cast<DateBookDayWidget*>(s1)->geometry().height() > reinterpret_cast<DateBookDayWidget*>(s2)->geometry().height()) + { + return -1; + } else + { + return 1; + } + } + + +}; + class DateBookDay : public QVBox @@ -104,2 +149,4 @@ public: int startViewTime() const; + void setSelectedWidget( DateBookDayWidget * ); + DateBookDayWidget * getSelectedWidget( void ); @@ -110,2 +157,3 @@ public slots: void slotWeekChanged( bool bStartOnMonday ); + void updateView(); //updates TimeMarker and DayWidget-colors @@ -133,4 +181,6 @@ private: DateBookDB *db; - QList<DateBookDayWidget> widgetList; + WidgetListClass widgetList; //reimplemented QList for sorting widgets by height int startTime; + DateBookDayWidget *selectedWidget; //actual selected widget (obviously) + DateBookDayTimeMarker *timeMarker; //marker for current time }; |