summaryrefslogtreecommitdiff
authorzecke <zecke>2002-06-17 15:57:13 (UTC)
committer zecke <zecke>2002-06-17 15:57:13 (UTC)
commit97aca0c9f5f483d01c685d0d0f126ca554d3b199 (patch) (side-by-side diff)
tree839929bc17e8e86e1a8d35e2b14e02f6343a8823
parent02e724757f13f40d85136c3a14e0a3788d28236e (diff)
downloadopie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.zip
opie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.tar.gz
opie-97aca0c9f5f483d01c685d0d0f126ca554d3b199.tar.bz2
tboc <tboc@gmx.de> provided a cute patch to show a red time mark
in the current day view
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/datebook/datebook.cpp2
-rw-r--r--core/pim/datebook/datebookday.cpp226
-rw-r--r--core/pim/datebook/datebookday.h52
3 files changed, 259 insertions, 21 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
@@ -982,8 +982,10 @@ Event DateBookDBHack::eventByUID(int uid) {
}
for (it = myRepeatEvents.begin(); it != myRepeatEvents.end(); it++) {
if ((*it).uid() == uid) return *it;
}
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
@@ -14,12 +14,13 @@
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
+#include <qmessagebox.h>
#include "datebookday.h"
#include "datebookdayheaderimpl.h"
#include <qpe/datebookdb.h>
#include <qpe/resource.h>
@@ -33,12 +34,14 @@
#include <qpainter.h>
#include <qsimplerichtext.h>
#include <qpopupmenu.h>
#include <qtextcodec.h>
#include <qpalette.h>
+#include <qtimer.h>
+
DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
const char *name )
: QTable( 24, 1, parent, name ),
ampm( whichClock )
{
enableClipper(TRUE);
@@ -54,12 +57,13 @@ DateBookDayView::DateBookDayView( bool whichClock, QWidget *parent,
// get rid of being able to edit things...
QTableItem *tmp;
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)) );
}
@@ -116,15 +120,19 @@ void DateBookDayView::paintCell( QPainter *p, int, int, const QRect &cr, bool )
p->fillRect( 0, 0, w, h, colorGroup().brush( QColorGroup::Base ) );
if ( showGrid() ) {
// Draw our lines
int x2 = w - 1;
int y2 = h - 1;
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 );
}
}
void DateBookDayView::paintFocus( QPainter *, const QRect & )
{
@@ -171,12 +179,39 @@ DateBookDay::DateBookDay( bool ampm, bool startOnMonday,
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
+ 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;
}
void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
{
start.setDate( currDate );
end.setDate( currDate );
@@ -199,17 +234,21 @@ void DateBookDay::selectedDates( QDateTime &start, QDateTime &end )
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 );
if ( currDate == date )
@@ -218,12 +257,18 @@ void DateBookDay::dateChanged( int y, int m, int d )
relayoutPage();
dayView()->clearSelection();
QTableSelection ts;
ts.init( startTime, 0 );
ts.expandTo( startTime, 0 );
dayView()->addSelection( ts );
+
+ selectedWidget = 0;
+
+ if (this->date() == QDate::currentDate())
+ timeMarker->show(); else timeMarker->hide();
+
}
void DateBookDay::redraw()
{
if ( isUpdatesEnabled() )
relayoutPage();
@@ -243,12 +288,13 @@ void DateBookDay::getEvents()
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();
@@ -285,39 +331,80 @@ static int place( const DateBookDayWidget *item, bool *used, int maxn )
void DateBookDay::relayoutPage( bool fromResize )
{
setUpdatesEnabled( FALSE );
if ( !fromResize )
getEvents(); // no need we already have them!
+ 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 );
+
+ 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 );
}
- if ( xp >= n ) {
- n++;
- wid = ( view->columnWidth(0)-1 ) / n;
- i = 0;
- } else {
w->setGeometry( geom );
- i++;
- }
}
+
view->setContentsPos( 0, startTime * view->rowHeight(0) );
+
+
} else {
int hours[24];
memset( hours, 0, 24*sizeof( int ) );
bool overFlow = FALSE;
@@ -349,19 +436,22 @@ void DateBookDay::relayoutPage( bool fromResize )
for ( int i = 0; i < wCount; i++ ) {
DateBookDayWidget *w = widgetList.at(i);
int xp = place( w, used, n );
if ( xp != -1 ) {
QRect geom = w->geometry();
- geom.setX( xp*wid );
+ geom.setX( xp*(wid+2) );
geom.setWidth( wid );
w->setGeometry( geom );
}
}
view->setContentsPos( 0, startTime * view->rowHeight(0) );
}
+
+ timeMarker->setTime( QTime::currentTime() ); //display timeMarker
+ timeMarker->raise(); //on top of all widgets
setUpdatesEnabled( TRUE );
return;
}
DateBookDayWidget *DateBookDay::intersects( const DateBookDayWidget *item, const QRect &geom )
{
@@ -493,25 +583,58 @@ DateBookDayWidget::DateBookDayWidget( const EffectiveEvent &e,
y = y*rh/60;
h = h*rh/60;
if ( h < 3 )
h = 3;
geom.setY( y );
geom.setHeight( h );
+ geom.setX( 0 );
+ geom.setWidth(dateBook->dayView()->columnWidth(0)-1);
+
}
DateBookDayWidget::~DateBookDayWidget()
{
}
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;
int d = 0;
if ( ev.event().hasAlarm() ) {
p.drawPixmap( width() - 16, 0, Resource::loadPixmap( "bell" ) );
y = 20;
@@ -522,17 +645,26 @@ void DateBookDayWidget::paintEvent( QPaintEvent *e )
p.drawPixmap( width() - 16, y, Resource::loadPixmap( "repeat" ) );
d = 20;
}
QSimpleRichText rt( text, font() );
rt.setWidth( geom.width() - d - 6 );
- rt.draw( &p, 3, 0, e->region(), colorGroup() );
+ rt.draw( &p, 7, 0, e->region(), colorGroup() );
}
void DateBookDayWidget::mousePressEvent( QMouseEvent *e )
{
+ DateBookDayWidget *item;
+
+ item = dateBook->getSelectedWidget();
+ if (item) item->update();
+
+ dateBook->setSelectedWidget(this);
+ update();
+ dateBook->repaint();
+
QPopupMenu m;
m.insertItem( tr( "Edit" ), 1 );
m.insertItem( tr( "Delete" ), 2 );
m.insertItem( tr( "Beam" ), 3 );
int r = m.exec( e->globalPos() );
if ( r == 1 ) {
@@ -548,6 +680,60 @@ void DateBookDayWidget::setGeometry( const QRect &r )
{
geom = r;
setFixedSize( r.width()+1, r.height()+1 );
dateBook->dayView()->moveChild( this, r.x(), r.y()-1 );
show();
}
+
+
+//---------------------------------------------------------------------------------------------
+//---------------------------------------------------------------------------------------------
+
+
+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
@@ -50,12 +50,13 @@ signals:
void sigCapturedKey( const QString &txt );
protected slots:
void slotChangeClock( bool );
protected:
virtual void paintCell( QPainter *p, int row, int col, const QRect &cr, bool selected );
virtual void paintFocus( QPainter *p, const QRect &cr );
+
virtual void resizeEvent( QResizeEvent *e );
void keyPressEvent( QKeyEvent *e );
void initHeader();
private:
bool ampm;
};
@@ -87,30 +88,77 @@ private:
const EffectiveEvent ev;
DateBookDay *dateBook;
QString text;
QRect geom;
};
+//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
{
Q_OBJECT
public:
DateBookDay( bool ampm, bool startOnMonday, DateBookDB *newDb,
QWidget *parent, const char *name );
void selectedDates( QDateTime &start, QDateTime &end );
QDate date() const;
DateBookDayView *dayView() const { return view; }
void setStartViewTime( int startHere );
int startViewTime() const;
+ void setSelectedWidget( DateBookDayWidget * );
+ DateBookDayWidget * getSelectedWidget( void );
public slots:
void setDate( int y, int m, int d );
void setDate( QDate );
void redraw();
void slotWeekChanged( bool bStartOnMonday );
+ void updateView(); //updates TimeMarker and DayWidget-colors
signals:
void removeEvent( const Event& );
void editEvent( const Event& );
void beamEvent( const Event& );
void newEvent();
@@ -128,11 +176,13 @@ private:
void relayoutPage( bool fromResize = false );
DateBookDayWidget *intersects( const DateBookDayWidget *item, const QRect &geom );
QDate currDate;
DateBookDayView *view;
DateBookDayHeader *header;
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
};
#endif