Event favourite is now tristate in the code now and the corresponding buttons are...

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 67f01d55221385ac7f2a427864f9812f008cc567..dce05bf88938e2282d18fb094495ce1238cfda34 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -88,10 +88,7 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
     connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 
     connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 

-    if(event.isFavourite())
-    {
-        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
-    }
+    updateFavouriteButton(event);

 
     if(event.hasAlarm())
     {
 
     if(event.hasAlarm())
     {


@@ -102,25 +99,12 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
 void EventDialog::favouriteClicked()
 {
     Event event = Event::getById(mEventId, mConferenceId);
 void EventDialog::favouriteClicked()
 {
     Event event = Event::getById(mEventId, mConferenceId);

-
-    QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);
-    if(event.isFavourite())
-    {
-        event.setFavourite(false);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-off.png"));
-    }
-    else
-    {
-        event.setFavourite(true);
-        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
-    }
+    event.cycleFavourite();

     event.update("favourite");
     event.update("favourite");

+    updateFavouriteButton(event);

 
 

-    if(event.isFavourite())
-    {
-        // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(), mConferenceId);
-    }
+    // 'conflicts' list may have changed
+    QList<Event> conflicts = Event::conflictEvents(event.id(), mConferenceId);

 
     // have to emit 'eventChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)
 
     // have to emit 'eventChanged' signal on all events in conflict
     for(int i=0; i<conflicts.count(); i++)


@@ -162,3 +146,12 @@ void EventDialog::alarmClicked()
     emit eventChanged(event.id(), false);
 }
 
     emit eventChanged(event.id(), false);
 }
 

+
+void EventDialog::updateFavouriteButton(const Event& event) {
+    switch (event.favourite()) {
+        case Favourite_no: favouriteButton->setIcon(QIcon(":/icons/favourite-off.png")); break;
+        case Favourite_weak: favouriteButton->setIcon(QIcon(":/icons/favourite-weak.png")); break;
+        case Favourite_strong: favouriteButton->setIcon(QIcon(":/icons/favourite-on.png")); break;
+    }
+}
+

diff --git a/src/gui/eventdialog.h b/src/gui/eventdialog.h
index 6a0f0b4720c46c04a6ac20829611dc3cb73c0b8d..9d31ed877f4fd33e18ff611959e2a30d2f744901 100644 (file)
--- a/src/gui/eventdialog.h
+++ b/src/gui/eventdialog.h
@@ -38,6 +38,7 @@ signals:
 private:
     int mConferenceId;
     int mEventId;
 private:
     int mConferenceId;
     int mEventId;

+    void updateFavouriteButton(const Event& event);

 };
 
 #endif /* EVENTDIALOG_H */
 };
 
 #endif /* EVENTDIALOG_H */

diff --git a/src/icons.qrc b/src/icons.qrc
index 60b563453fc53d8d9f8bd66434601cb6a198ed1c..563300e742b7a9c94fd8f32c8161ed3cc58c7c24 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -9,6 +9,7 @@
         <file>icons/search.png</file>
         <file>icons/today.png</file>
         <file>icons/favourite-off.png</file>
         <file>icons/search.png</file>
         <file>icons/today.png</file>
         <file>icons/favourite-off.png</file>

+        <file>icons/favourite-weak.png</file>

         <file>icons/favourite-on.png</file>
         <file>icons/alarm-on.png</file>
         <file>icons/alarm-off.png</file>
         <file>icons/favourite-on.png</file>
         <file>icons/alarm-on.png</file>
         <file>icons/alarm-off.png</file>

diff --git a/src/icons/favourite-weak.png b/src/icons/favourite-weak.png
new file mode 100644 (file)
index 0000000..79ec011
Binary files /dev/null and b/src/icons/favourite-weak.png differ

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index ef7dc7ac1e4a608f3af2174d5c75e6aecf66db85..065d21d7cb4158aa3e9df043e69df692a719e88b 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -64,7 +64,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // * spacer (aka y position of image)
         // * image
         // * rest is text, which is 1 line of title with big letters and 2 lines of Presenter and Track
         // * spacer (aka y position of image)
         // * image
         // * rest is text, which is 1 line of title with big letters and 2 lines of Presenter and Track

-        int aux = option.rect.height() - SPACER - mControls[FavouriteControlOn]->image()->height();
+        int aux = option.rect.height() - SPACER - mControls[FavouriteControlStrong]->image()->height();

         Event *event = static_cast<Event*>(index.internalPointer());
 
         // font SMALL
         Event *event = static_cast<Event*>(index.internalPointer());
 
         // font SMALL


@@ -105,10 +105,17 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         foreach(Control* c, mControls.values()) {
             c->setEnabled(false);
         }
         foreach(Control* c, mControls.values()) {
             c->setEnabled(false);
         }

-        if(event->isFavourite())
-            mControls[FavouriteControlOn]->paint(painter, option.rect);
-        else
-            mControls[FavouriteControlOff]->paint(painter, option.rect);
+        switch (event->favourite()) {
+        case Favourite_strong:
+            mControls[FavouriteControlStrong]->paint(painter, option.rect);
+            break;
+        case Favourite_weak:
+            mControls[FavouriteControlWeak]->paint(painter, option.rect);
+            break;
+        case Favourite_no:
+            mControls[FavouriteControlNo]->paint(painter, option.rect);
+            break;
+        }

 
         if(event->hasAlarm())
             mControls[AlarmControlOn]->paint(painter, option.rect);
 
         if(event->hasAlarm())
             mControls[AlarmControlOn]->paint(painter, option.rect);


@@ -124,7 +131,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         //  so the first line is actually at the same height as the image)
         painter->setPen(QPen(event->hasTimeConflict() ? Qt::black : textColor));
         QPointF titlePointF(option.rect.x() + SPACER,
         //  so the first line is actually at the same height as the image)
         painter->setPen(QPen(event->hasTimeConflict() ? Qt::black : textColor));
         QPointF titlePointF(option.rect.x() + SPACER,

-                            option.rect.y() + SPACER + mControls[FavouriteControlOn]->image()->height());
+                            option.rect.y() + SPACER + mControls[FavouriteControlStrong]->image()->height());

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


@@ -188,7 +195,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         // draw icons
         painter->setPen(QPen(textColor));
         painter->setFont(fontSmall);
         // draw icons
         painter->setPen(QPen(textColor));
         painter->setFont(fontSmall);

-        QImage *image = mControls[numFav ? FavouriteControlOn : FavouriteControlOff]->image();
+        QImage *image = mControls[numFav ? FavouriteControlStrong : FavouriteControlNo]->image();

         QPoint drawPoint =
             option.rect.topRight()
             - QPoint(
         QPoint drawPoint =
             option.rect.topRight()
             - QPoint(


@@ -306,18 +313,20 @@ void Delegate::Control::paint(QPainter* painter, const QRect rect)
 void Delegate::defineControls()
 {
     // FAVOURITE ICONs
 void Delegate::defineControls()
 {
     // FAVOURITE ICONs

-    // on
-    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/favourite-on.png"), NULL));
-    // off
-    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
+    // strong
+    mControls.insert(FavouriteControlStrong, new Control(FavouriteControlStrong, QString(":icons/favourite-on.png"), NULL));
+    // weak
+    mControls.insert(FavouriteControlWeak, new Control(FavouriteControlWeak, QString(":icons/favourite-weak.png"), NULL));
+    // no
+    mControls.insert(FavouriteControlNo, new Control(FavouriteControlNo, QString(":icons/favourite-off.png"), NULL));

 
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,
 
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,

-                    new Control(AlarmControlOn, QString(":icons/alarm-on.png"), mControls[FavouriteControlOn]));
+                    new Control(AlarmControlOn, QString(":icons/alarm-on.png"), mControls[FavouriteControlStrong]));

     // off
     mControls.insert(AlarmControlOff,
     // off
     mControls.insert(AlarmControlOff,

-                    new Control(AlarmControlOff, QString(":icons/alarm-off.png"), mControls[FavouriteControlOff]));
+                    new Control(AlarmControlOff, QString(":icons/alarm-off.png"), mControls[FavouriteControlNo]));

     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));
     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));


@@ -338,7 +347,7 @@ int Delegate::numberOfFavourities(const QModelIndex &index) const
 
     int nrofFavs = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)
 
     int nrofFavs = 0;
     for(int i=0; i<index.model()->rowCount(index); i++)

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

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

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index e2857952baf04d6696cde0a818daa4e5b462864b..ec6773179eea91e73b87ec765e590607017e27d9 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -31,8 +31,9 @@ class Delegate : public QItemDelegate
         enum ControlId
         {
             ControlNone = 0,
         enum ControlId
         {
             ControlNone = 0,

-            FavouriteControlOn,
-            FavouriteControlOff,
+            FavouriteControlStrong,
+            FavouriteControlWeak,
+            FavouriteControlNo,

             AlarmControlOn,
             AlarmControlOff,
             WarningControl
             AlarmControlOn,
             AlarmControlOff,
             WarningControl

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 4ac2f6806b1c45b3deb8fe3ffcf0d72a9ea8950d..47a749463bb41b14c1e11e01f0d648ea5f79ac2b 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -90,7 +90,7 @@ QList<Event> Event::conflictEvents(int aEventId, int conferenceId) {
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
            ( start >= :s1 AND ( start + duration ) < :e1 ) \
         OR ( ( start + duration ) > :s2 AND start < :e2 ) ) \
     query.prepare(selectQuery() + "WHERE xid_conference = :conf AND ( \
            ( start >= :s1 AND ( start + duration ) < :e1 ) \
         OR ( ( start + duration ) > :s2 AND start < :e2 ) ) \

-        AND favourite = 1 AND NOT id = :id ORDER BY start, duration");
+        AND favourite >= 1 AND NOT id = :id ORDER BY start, duration");

     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":s1", convertToDb(event.start(), QVariant::DateTime));
     query.bindValue(":e1", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));
     query.bindValue(":conf", event.conferenceId());
     query.bindValue(":s1", convertToDb(event.start(), QVariant::DateTime));
     query.bindValue(":e1", convertToDb(event.start().toTime_t()+event.duration(), QVariant::DateTime));


@@ -116,7 +116,7 @@ QList<Event> Event::getFavByDate(const QDate& date, int conferenceId) {
     Conference conference = Conference::getById(conferenceId);
     QDateTime dayStart(date, conference.dayChangeTime(), Qt::UTC);
     QSqlQuery query;
     Conference conference = Conference::getById(conferenceId);
     QDateTime dayStart(date, conference.dayChangeTime(), Qt::UTC);
     QSqlQuery query;

-    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite = 1 ORDER BY start, duration"));
+    query.prepare(selectQuery() + QString("WHERE xid_conference = :conf AND start >= :start AND start < :end AND favourite >= 1 ORDER BY start, duration"));

     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());
     query.bindValue(":conf", conferenceId);
     query.bindValue(":start", dayStart.toTime_t());
     query.bindValue(":end", dayStart.addDays(1).toTime_t());


@@ -194,10 +194,18 @@ QMap<QString,QString> Event::links()
 
 bool Event::hasTimeConflict() const
 {
 
 bool Event::hasTimeConflict() const
 {

-    if(!isFavourite()) // if it's not favourite, it can't have time-conflict
+    if(favourite() == Favourite_no) // if it's not favourite, it can't have time-conflict

         return false;
 
         return false;
 

-    return conflictEvents(id(),conferenceId()).count() > 0 ? true : false;
+    return conflictEvents(id(),conferenceId()).count() > 0;
+}
+
+void Event::cycleFavourite() {
+    switch (favourite()) {
+        case Favourite_no: setFavourite(Favourite_strong); break;
+        case Favourite_strong: setFavourite(Favourite_weak); break;
+        case Favourite_weak: setFavourite(Favourite_no); break;
+    }

 }
 
 void Event::setRoom(const QString &room)
 }
 
 void Event::setRoom(const QString &room)

diff --git a/src/mvc/event.h b/src/mvc/event.h
index 481db5255322c373ab831af67c753b107c0b98a7..6322d04a1d13a9f6f96da00ba903331e01b9826c 100644 (file)
--- a/src/mvc/event.h
+++ b/src/mvc/event.h
@@ -88,6 +88,7 @@ public:
     void setLanguage(const QString & language) { setValue("language", language); }
     void setFavourite(Favourite favourite) { setValue("favourite", (int) favourite); }
     void setFavourite(bool favourite) { setFavourite(favourite ? Favourite_strong : Favourite_no); } // deprecated
     void setLanguage(const QString & language) { setValue("language", language); }
     void setFavourite(Favourite favourite) { setValue("favourite", (int) favourite); }
     void setFavourite(bool favourite) { setFavourite(favourite ? Favourite_strong : Favourite_no); } // deprecated

+    void cycleFavourite();

     void setHasAlarm(bool alarm) { setValue("alarm", (int)((alarm))); }
     void setTag(const QString& tag) { setValue("tag", tag); }
     void setTitle(const QString& title) { setValue("title", title); }
     void setHasAlarm(bool alarm) { setValue("alarm", (int)((alarm))); }
     void setTag(const QString& tag) { setValue("tag", tag); }
     void setTitle(const QString& title) { setValue("title", title); }

diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index a3c081adb8d222ea15e5c9f736a59f87f0a66fe3..b4510ce3cb9eb517940821e0ea6e9c67055c1827 100644 (file)
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -64,21 +64,19 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
     Delegate *delegate = static_cast<Delegate*>(itemDelegate(aIndex));
     switch(delegate->whichControlClicked(aIndex,aPoint))
     {
     Delegate *delegate = static_cast<Delegate*>(itemDelegate(aIndex));
     switch(delegate->whichControlClicked(aIndex,aPoint))
     {

-        case Delegate::FavouriteControlOn:
-        case Delegate::FavouriteControlOff:
+        case Delegate::FavouriteControlStrong:
+        case Delegate::FavouriteControlWeak:
+        case Delegate::FavouriteControlNo:

             {
                 // handle Favourite Control clicked
                 Event event = Event::getById(aIndex.data().toInt(),confId);
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
             {
                 // handle Favourite Control clicked
                 Event event = Event::getById(aIndex.data().toInt(),confId);
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());

-                event.setFavourite(!event.isFavourite());
+                event.cycleFavourite();

                 event.update("favourite");
 
                 event.update("favourite");
 

-                if(event.isFavourite())
-                {
-                    // event has became 'favourite' and so 'conflicts' list may have changed
-                    conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
-                }
+                // event has became 'favourite' and so 'conflicts' list may have changed
+                conflicts = Event::conflictEvents(event.id(),Conference::activeConference());

 
                 // have to emit 'eventChanged' signal on all events in conflict
                 for(int i=0; i<conflicts.count(); i++)
 
                 // have to emit 'eventChanged' signal on all events in conflict
                 for(int i=0; i<conflicts.count(); i++)