Changeset 7b3cd0e in confclerk_git for src/gui

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/gui

Files:

• eventdialog.cpp (modified) (3 diffs)
• eventdialog.h (modified) (1 diff)

src/gui/eventdialog.cpp

@@ -89 +89 @@
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 
-    if(event.isFavourite())
-    {
-        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
-    }
+    updateFavouriteButton(event);
 
     if(event.hasAlarm())
@@ -103 +100 @@
 {
     Event event = Event::getById(mEventId, mConferenceId);
+    event.cycleFavourite();
+    event.update("favourite");
+    updateFavouriteButton(event);
 
+    // 'conflicts' list may have changed
     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.update("favourite");
-
-    if(event.isFavourite())
-    {
-        // event has became 'favourite' and so 'conflicts' list may have changed
-        conflicts = Event::conflictEvents(event.id(), mConferenceId);
-    }
 
     // have to emit 'eventChanged' signal on all events in conflict
@@ -163 +147 @@
 }
 
+
+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;
+    }
+}
+

src/gui/eventdialog.h

@@ -39 +39 @@
     int mConferenceId;
     int mEventId;
+    void updateFavouriteButton(const Event& event);
 };