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

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index dce05bf88938e2282d18fb094495ce1238cfda34..7d2cf6c05165e6ea93a9ff66b99ea8bb55d40d9f 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -149,9 +149,9 @@ void EventDialog::alarmClicked()
 
 void EventDialog::updateFavouriteButton(const Event& event) {
     switch (event.favourite()) {
 
 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_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;

     }
 }
 
     }
 }
 

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index 73e0f90320e51aa8056e1cfa1da5741de37312d8..b55c8798217846501434d2904c125c5be0c9fe04 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -59,7 +59,7 @@
        </property>
        <property name="icon">
         <iconset resource="../icons.qrc">
        </property>
        <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">
         <size>
        </property>
        <property name="iconSize">
         <size>

diff --git a/src/icons.qrc b/src/icons.qrc
index 563300e742b7a9c94fd8f32c8161ed3cc58c7c24..dacc91f28bda6c92b0ed5a2057f94a2f4417c633 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -8,9 +8,9 @@
         <file>icons/dialog-warning.png</file>
         <file>icons/search.png</file>
         <file>icons/today.png</file>
         <file>icons/dialog-warning.png</file>
         <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-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>
     </qresource>
         <file>icons/alarm-on.png</file>
         <file>icons/alarm-off.png</file>
     </qresource>

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

diff --git a/src/icons/favourite-off.png b/src/icons/favourite-off.png
deleted file mode 100644 (file)
index 62ec510..0000000
Binary files a/src/icons/favourite-off.png and /dev/null differ

diff --git a/src/icons/favourite-on.png b/src/icons/favourite-on.png
deleted file mode 100644 (file)
index fed3ffc..0000000
Binary files a/src/icons/favourite-on.png and /dev/null differ

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

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index c2dd111dbf6d7873a30d31b970cbda84af2b5ef0..66f473fbabc4724e83bbda782c401d6b964c025e 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -330,11 +330,11 @@ void Delegate::defineControls()
 {
     // FAVOURITE ICONs
     // strong
 {
     // 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
     // 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
     // on
 
     // ALARM ICONs
     // on