From: gregor herrmann Date: Thu, 23 Jun 2011 22:38:42 +0000 (+0000) Subject: Icons part 1: replace all icons (except the FOSDEM ones) with icons from current... X-Git-Tag: 0.5.0~33 X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/77f8bffdc1f0b544a61af156431472b538caa240 Icons part 1: replace all icons (except the FOSDEM ones) with icons from current gnome-icon-theme --- diff --git a/README b/README index 05f9bd4..aa84bf6 100644 --- a/README +++ b/README @@ -58,32 +58,25 @@ data/confclerk.*: with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - - -//! TODO - -Files add.png, reload.png, remove.png in src/icons/ directory -are taken from Ubuntu package gnome-icon-theme. Copyright notice -for them copied here: - -> This package was debianized by Takuo KITAME on -> Fri, 17 Jan 2003 14:57:28 +0900. -> -> It was downloaded from -> -> Copyright © 2002-2008: -> Ulisse Perusin -> Riccardo Buzzotta -> Josef Vybíral -> Hylke Bons -> Ricardo González -> Lapo Calamandrei -> Rodney Dawes -> Luca Ferretti -> Tuomas Kuosmanen -> Andreas Nilsson -> Jakub Steiner - +src/icons/*: +All icons are taken from the Debian package gnome-icon-theme, which contains +the following notice (as of 2011-06-24): + + Copyright © 2002-2008: + Ulisse Perusin + Riccardo Buzzotta + Josef Vybíral + Hylke Bons + Ricardo González + Lapo Calamandrei + Rodney Dawes + Luca Ferretti + Tuomas Kuosmanen + Andreas Nilsson + Jakub Steiner + + GNOME icon theme is distributed under the terms of either + GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. History: diff --git a/TODO b/TODO index f6d4d90..f2eeafe 100644 --- a/TODO +++ b/TODO @@ -22,6 +22,8 @@ other: - add contact info - .pro: maybe play with install target - manpage + ~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite + ~/.config/Toastfreeware/ConfClerk.conf -- @@ -29,6 +31,3 @@ schedules: - FOSDEM (2011): http://fosdem.org/schedule/xml - DebConf (2010): http://penta.debconf.org/dc10_schedule/schedule.en.xml - 27C3: http://events.ccc.de/congress/2010/Fahrplan/schedule.en.xml - -~/.local/share/data/Toastfreeware/ConfClerk/ConfClerk.sqlite -~/.config/Toastfreeware/ConfClerk.conf diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui index 8ee3908..fcbecdd 100644 --- a/src/gui/conferenceeditor.ui +++ b/src/gui/conferenceeditor.ui @@ -222,7 +222,7 @@ - :/icons/compassBig.png:/icons/compassBig.png + :/icons/applications-internet.png:/icons/applications-internet.png true diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp index 0a18643..a133d25 100644 --- a/src/gui/eventdialog.cpp +++ b/src/gui/eventdialog.cpp @@ -51,12 +51,12 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent) if(event.isFavourite()) { - favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png")); + favouriteButton->setIcon(QIcon(":/icons/emblem-new.png")); } if(event.hasAlarm()) { - alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png")); + alarmButton->setIcon(QIcon(":/icons/appointment-soon.png")); } } @@ -68,12 +68,12 @@ void EventDialog::favouriteClicked() if(event.isFavourite()) { event.setFavourite(false); - favouriteButton->setIcon(QIcon(":/icons/favourite-offBig.png")); + favouriteButton->setIcon(QIcon(":/icons/emblem-new-off.png")); } else { event.setFavourite(true); - favouriteButton->setIcon(QIcon(":/icons/favourite-onBig.png")); + favouriteButton->setIcon(QIcon(":/icons/emblem-new.png")); } event.update("favourite"); @@ -101,7 +101,7 @@ void EventDialog::alarmClicked() if(event.hasAlarm()) { event.setHasAlarm(false); // update DB - alarmButton->setIcon(QIcon(":/icons/alarm-offBig.png")); + alarmButton->setIcon(QIcon(":/icons/appointment-soon-off.png")); #ifdef MAEMO // remove alarm from the 'alarmd' alrms list Alarm alarm; @@ -112,7 +112,7 @@ void EventDialog::alarmClicked() else { event.setHasAlarm(true); - alarmButton->setIcon(QIcon(":/icons/alarm-onBig.png")); + alarmButton->setIcon(QIcon(":/icons/appointment-soon.png")); #ifdef MAEMO // add alarm to the 'alarmd' Alarm alarm; diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui index 0a268c3..c45b059 100644 --- a/src/gui/eventdialog.ui +++ b/src/gui/eventdialog.ui @@ -273,7 +273,7 @@ - :/icons/alarm-offBig.png:/icons/alarm-offBig.png + :/icons/appointment-soon-off.png:/icons/appointment-soon-off.png @@ -284,7 +284,7 @@ - :/icons/favourite-offBig.png:/icons/favourite-offBig.png + :/icons/emblem-new-off.png:/icons/emblem-new-off.png diff --git a/src/icons.qrc b/src/icons.qrc index 2326d79..12faa0d 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -5,12 +5,12 @@ icons/reload.png icons/fosdem.png icons/brain-alone.png - icons/alarm-offBig.png - icons/alarm-onBig.png - icons/compassBig.png - icons/favourite-offBig.png - icons/favourite-onBig.png - icons/exclamation.png + icons/appointment-soon-off.png + icons/appointment-soon.png + icons/applications-internet.png + icons/emblem-new-off.png + icons/emblem-new.png + icons/dialog-warning.png icons/search.png diff --git a/src/icons/add.png b/src/icons/add.png index 297ef45..184afa8 100644 Binary files a/src/icons/add.png and b/src/icons/add.png differ diff --git a/src/icons/alarm-offBig.png b/src/icons/alarm-offBig.png deleted file mode 100644 index 3efd1a3..0000000 Binary files a/src/icons/alarm-offBig.png and /dev/null differ diff --git a/src/icons/alarm-onBig.png b/src/icons/alarm-onBig.png deleted file mode 100644 index 417263b..0000000 Binary files a/src/icons/alarm-onBig.png and /dev/null differ diff --git a/src/icons/applications-internet.png b/src/icons/applications-internet.png new file mode 100644 index 0000000..cc989b6 Binary files /dev/null and b/src/icons/applications-internet.png differ diff --git a/src/icons/appointment-soon-off.png b/src/icons/appointment-soon-off.png new file mode 100644 index 0000000..2803c25 Binary files /dev/null and b/src/icons/appointment-soon-off.png differ diff --git a/src/icons/appointment-soon.png b/src/icons/appointment-soon.png new file mode 100644 index 0000000..c065baf Binary files /dev/null and b/src/icons/appointment-soon.png differ diff --git a/src/icons/compassBig.png b/src/icons/compassBig.png deleted file mode 100644 index 1dcc34d..0000000 Binary files a/src/icons/compassBig.png and /dev/null differ diff --git a/src/icons/dialog-warning.png b/src/icons/dialog-warning.png new file mode 100644 index 0000000..3d7cdb5 Binary files /dev/null and b/src/icons/dialog-warning.png differ diff --git a/src/icons/emblem-new-off.png b/src/icons/emblem-new-off.png new file mode 100644 index 0000000..36feedc Binary files /dev/null and b/src/icons/emblem-new-off.png differ diff --git a/src/icons/emblem-new.png b/src/icons/emblem-new.png new file mode 100644 index 0000000..9c59c9a Binary files /dev/null and b/src/icons/emblem-new.png differ diff --git a/src/icons/exclamation.png b/src/icons/exclamation.png deleted file mode 100644 index 91065fb..0000000 Binary files a/src/icons/exclamation.png and /dev/null differ diff --git a/src/icons/favourite-offBig.png b/src/icons/favourite-offBig.png deleted file mode 100644 index 5dd9f70..0000000 Binary files a/src/icons/favourite-offBig.png and /dev/null differ diff --git a/src/icons/favourite-onBig.png b/src/icons/favourite-onBig.png deleted file mode 100644 index 6f27481..0000000 Binary files a/src/icons/favourite-onBig.png and /dev/null differ diff --git a/src/icons/reload.png b/src/icons/reload.png index 768375d..2c00ffb 100644 Binary files a/src/icons/reload.png and b/src/icons/reload.png differ diff --git a/src/icons/remove.png b/src/icons/remove.png index abc465e..9af91bc 100644 Binary files a/src/icons/remove.png and b/src/icons/remove.png differ diff --git a/src/icons/search.png b/src/icons/search.png index 0dacd00..bbb6931 100644 Binary files a/src/icons/search.png and b/src/icons/search.png differ diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index 56674bb..d14daa2 100644 --- a/src/mvc/delegate.cpp +++ b/src/mvc/delegate.cpp @@ -363,31 +363,31 @@ void Delegate::defineControls() { // FAVOURITE ICONs // on - mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/favourite-onBig.png"), NULL)); + mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/emblem-new.png"), NULL)); // off - mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-offBig.png"), NULL)); + mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/emblem-new-off.png"), NULL)); #ifdef MAEMO // ALARM ICONs // on mControls.insert(AlarmControlOn, - new Control(AlarmControlOn, QString(":icons/alarm-onBig.png"), mControls[FavouriteControlOn])); + new Control(AlarmControlOn, QString(":icons/appointment-soon.png"), mControls[FavouriteControlOn])); // off mControls.insert(AlarmControlOff, - new Control(AlarmControlOff, QString(":icons/alarm-offBig.png"), mControls[FavouriteControlOff])); + new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff])); // MAP ICON mControls.insert(MapControl, - new Control(MapControl, QString(":icons/compassBig.png"), mControls[AlarmControlOn])); + new Control(MapControl, QString(":icons/applications-internet.png"), mControls[AlarmControlOn])); #else // MAP ICON mControls.insert(MapControl, - new Control(MapControl, QString(":icons/compassBig.png"), mControls[FavouriteControlOn])); + new Control(MapControl, QString(":icons/applications-internet.png"), mControls[FavouriteControlOn])); #endif // WARNING ICON mControls.insert(WarningControl, - new Control(WarningControl, QString(":icons/exclamation.png"), mControls[MapControl])); + new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[MapControl])); } bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const