Changeset 81d87d7

Timestamp:

01/20/17 23:45:56 (6 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

df1ba30

Parents:

1343ea4

Message:

Renamed favourite-on.png to favourite-strong.png and favourite-off.png to favourite-no.png.

Location:

src

Files:

• gui/eventdialog.cpp (modified) (1 diff)
• gui/eventdialog.ui (modified) (1 diff)
• icons.qrc (modified) (1 diff)
• icons/favourite-no.png (moved) (moved from src/icons/favourite-off.png)
• icons/favourite-strong.png (moved) (moved from src/icons/favourite-on.png)
• mvc/delegate.cpp (modified) (1 diff)

src/gui/eventdialog.cpp

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

src/gui/eventdialog.ui

@@ -60 +60 @@
        <property name="icon">
         <iconset resource="../icons.qrc">
-         <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
+         <normaloff>:/icons/favourite-no.png</normaloff>:/icons/favourite-no.png</iconset>
        </property>
        <property name="iconSize">

src/icons.qrc

@@ -9 +9 @@
         <file>icons/search.png</file>
         <file>icons/today.png</file>
-        <file>icons/favourite-off.png</file>
+        <file>icons/favourite-no.png</file>
         <file>icons/favourite-weak.png</file>
-        <file>icons/favourite-on.png</file>
+        <file>icons/favourite-strong.png</file>
         <file>icons/alarm-on.png</file>
         <file>icons/alarm-off.png</file>

src/mvc/delegate.cpp

@@ -331 +331 @@
     // FAVOURITE ICONs
     // strong
-    mControls.insert(FavouriteControlStrong, new Control(FavouriteControlStrong, QString(":icons/favourite-on.png"), NULL));
+    mControls.insert(FavouriteControlStrong, new Control(FavouriteControlStrong, QString(":icons/favourite-strong.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));
+    mControls.insert(FavouriteControlNo, new Control(FavouriteControlNo, QString(":icons/favourite-no.png"), NULL));
 
     // ALARM ICONs