Adjust shown event time when displayTimeShift is set.

[toast/confclerk.git] / src / mvc / delegate.cpp

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index ebf421111c32e4dbe010cb54e90c1d3c9be5672b..33b59c86d3c422277f07b0b7713ef40207a6ce06 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -23,10 +23,11 @@
 
 #include <QDebug>
 #include <QPainter>
 
 #include <QDebug>
 #include <QPainter>

+#include <application.h>

 
 

+#include "conference.h"

 #include "room.h"
 
 #include "room.h"
 

-const int RADIUS = 10;

 const int SPACER = 10;
 
 const double scaleFactor1 = 0.4;
 const int SPACER = 10;
 
 const double scaleFactor1 = 0.4;


@@ -148,7 +149,8 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         painter->setPen(QPen(conflictSeverity != csNone ? Qt::black : textColor));
         QPointF titlePointF(option.rect.x() + SPACER,
                             option.rect.y() + SPACER + mControls[FavouriteControlStrong]->image()->height());
         painter->setPen(QPen(conflictSeverity != csNone ? Qt::black : textColor));
         QPointF titlePointF(option.rect.x() + SPACER,
                             option.rect.y() + SPACER + mControls[FavouriteControlStrong]->image()->height());

-        QTime start = event->start().time();
+        Conference& conference = ((Application*) qApp)->activeConference();
+        QTime start = conference.shiftTime(event->start().time());

         painter->setFont(fontBig);
         painter->drawText(titlePointF,start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->roomName());
 
         painter->setFont(fontBig);
         painter->drawText(titlePointF,start.toString("hh:mm") + "-" + start.addSecs(event->duration()).toString("hh:mm") + ", " + event->roomName());
 


@@ -185,7 +187,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
 
     else // doesn't have parent - time-groups' elements (top items)
     {
 
     else // doesn't have parent - time-groups' elements (top items)
     {

-        int numFav = numberOfFavourities(index);
+        int numFav = numberOfFavourites(index);

         int numAlarm = numberOfAlarms(index);
 
         QStyleOptionButton styleOptionButton;
         int numAlarm = numberOfAlarms(index);
 
         QStyleOptionButton styleOptionButton;


@@ -237,7 +239,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
                 option.rect.x()+SPACER,
                 option.rect.y()+option.rect.height()-fmBig.descent());
         painter->setFont(fontBig);
                 option.rect.x()+SPACER,
                 option.rect.y()+option.rect.height()-fmBig.descent());
         painter->setFont(fontBig);

-        painter->drawText(titlePointF,qVariantValue<QString>(index.data()));
+        painter->drawText(titlePointF,index.data().value<QString>());

     }
 
     painter->restore();
     }
 
     painter->restore();


@@ -356,14 +358,14 @@ bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
     return false;
 }
 
     return false;
 }
 

-int Delegate::numberOfFavourities(const QModelIndex &index) const
+int Delegate::numberOfFavourites(const QModelIndex &index) const

 {
     if(index.parent().isValid()) // it's event, not time-group
         return 0;
 
     int nrofFavs = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)
 {
     if(index.parent().isValid()) // it's event, not time-group
         return 0;
 
     int nrofFavs = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)

-        if(static_cast<Event*>(index.child(i,0).internalPointer())->favourite() != Favourite_no)
+        if(static_cast<Event*>(index.model()->index(i, 0, index).internalPointer())->favourite() != Favourite_no)

             nrofFavs++;
 
     return nrofFavs;
             nrofFavs++;
 
     return nrofFavs;


@@ -376,7 +378,7 @@ int Delegate::numberOfAlarms(const QModelIndex &index) const
 
     int nrofAlarms = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)
 
     int nrofAlarms = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)

-        if(static_cast<Event*>(index.child(i,0).internalPointer())->hasAlarm())
+        if(static_cast<Event*>(index.model()->index(i, 0, index).internalPointer())->hasAlarm())

             nrofAlarms++;
 
     return nrofAlarms;
             nrofAlarms++;
 
     return nrofAlarms;