From: Philipp Spitzer Date: Fri, 20 Jan 2017 22:45:56 +0000 (+0100) Subject: Renamed favourite-on.png to favourite-strong.png and favourite-off.png to favourite... X-Git-Tag: 0.6.2~22 X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/81d87d7646d5d8ddbadbca60d0d89dde03cf7a3d Renamed favourite-on.png to favourite-strong.png and favourite-off.png to favourite-no.png. --- diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp index dce05bf..7d2cf6c 100644 --- 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()) { - 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; } } diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui index 73e0f90..b55c879 100644 --- a/src/gui/eventdialog.ui +++ b/src/gui/eventdialog.ui @@ -59,7 +59,7 @@ - :/icons/favourite-off.png:/icons/favourite-off.png + :/icons/favourite-no.png:/icons/favourite-no.png diff --git a/src/icons.qrc b/src/icons.qrc index 563300e..dacc91f 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -8,9 +8,9 @@ icons/dialog-warning.png icons/search.png icons/today.png - icons/favourite-off.png + icons/favourite-no.png icons/favourite-weak.png - icons/favourite-on.png + icons/favourite-strong.png icons/alarm-on.png icons/alarm-off.png diff --git a/src/icons/favourite-no.png b/src/icons/favourite-no.png new file mode 100644 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 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 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 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 c2dd111..66f473f 100644 --- a/src/mvc/delegate.cpp +++ b/src/mvc/delegate.cpp @@ -330,11 +330,11 @@ void Delegate::defineControls() { // 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 // on