Changeset 7b3cd0e in confclerk_git for src/mvc

Timestamp:

01/20/17 21:46:55 (6 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

ec7fa22

Parents:

ea8416e

Message:

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

Location:

src/mvc

Files:

• delegate.cpp (modified) (6 diffs)
• delegate.h (modified) (1 diff)
• event.cpp (modified) (3 diffs)
• event.h (modified) (1 diff)
• treeview.cpp (modified) (2 diffs)

src/mvc/delegate.cpp

@@ -65 +65 @@
         // * 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());
 
@@ -106 +106 @@
             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())
@@ -125 +132 @@
         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);
@@ -189 +196 @@
         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()
@@ -307 +314 @@
 {
     // 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,
-                    new Control(AlarmControlOn, QString(":icons/alarm-on.png"), mControls[FavouriteControlOn]));
+                    new Control(AlarmControlOn, QString(":icons/alarm-on.png"), mControls[FavouriteControlStrong]));
     // 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,
@@ -339 +348 @@
     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++;
 

src/mvc/delegate.h

@@ -32 +32 @@
         {
             ControlNone = 0,
-            FavouriteControlOn,
-            FavouriteControlOff,
+            FavouriteControlStrong,
+            FavouriteControlWeak,
+            FavouriteControlNo,
             AlarmControlOn,
             AlarmControlOff,

src/mvc/event.cpp

@@ -91 +91 @@
            ( 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));
@@ -117 +117 @@
     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());
@@ -195 +195 @@
 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 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;
+    }
 }
 

src/mvc/event.h

@@ -89 +89 @@
     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); }

src/mvc/treeview.cpp

@@ -65 +65 @@
     switch(delegate->whichControlClicked(aIndex,aPoint))
     {
-        case Delegate::FavouriteControlOn:
-        case Delegate::FavouriteControlOff:
+        case Delegate::FavouriteControlStrong:
+        case Delegate::FavouriteControlWeak:
+        case Delegate::FavouriteControlNo:
             {
                 // handle Favourite Control clicked
@@ -72 +73 @@
 
                 QList<Event> conflicts = Event::conflictEvents(event.id(),Conference::activeConference());
-                event.setFavourite(!event.isFavourite());
+                event.cycleFavourite();
                 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