Icons part 1: replace all icons (except the FOSDEM ones) with icons from current...

diff --git a/README b/README
index 05f9bd4359c7fcb8c24092fe7c8de2b42a6e8b33..aa84bf6b0e9d542441fd215e3ed8c94bf33e42e3 100644 (file)
--- 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 <kitame@debian.org> on
-> Fri, 17 Jan 2003 14:57:28 +0900.
-> 
-> It was downloaded from <http://download.gnome.org/sources/gnome-icon-theme/>
-> 
-> Copyright © 2002-2008:
->    Ulisse Perusin <uli.peru@gmail.com>
->    Riccardo Buzzotta <raozuzu@yahoo.it>
->    Josef Vybíral <cornelius@vybiral.info>
->    Hylke Bons <h.bons@student.rug.nl>
->    Ricardo González <rick@jinlabs.com>
->    Lapo Calamandrei <calamandrei@gmail.com>
->    Rodney Dawes <dobey@novell.com>
->    Luca Ferretti <elle.uca@libero.it>
->    Tuomas Kuosmanen <tigert@gimp.org>
->    Andreas Nilsson <nisses.mail@home.se>
->    Jakub Steiner <jimmac@novell.com>
-
+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 <uli.peru@gmail.com>
+    Riccardo Buzzotta <raozuzu@yahoo.it>
+    Josef Vybíral <cornelius@vybiral.info>
+    Hylke Bons <h.bons@student.rug.nl>
+    Ricardo González <rick@jinlabs.com>
+    Lapo Calamandrei <calamandrei@gmail.com>
+    Rodney Dawes <dobey@novell.com>
+    Luca Ferretti <elle.uca@libero.it>
+    Tuomas Kuosmanen <tigert@gimp.org>
+    Andreas Nilsson <nisses.mail@home.se>
+    Jakub Steiner <jimmac@novell.com>
+
+  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 f6d4d90ebf3f72e7c8868127fc3a28eace6ee2c6..f2eeafe9bc91fb7a208a47963c874cbb724381ff 100644 (file)
--- 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 8ee3908118e1962e2bdef87845a79ae0d35e8dec..fcbecddb30cb13561f28c0dcbd66b9dee0c59d0d 100644 (file)
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -222,7 +222,7 @@
               </property>
               <property name="icon">
                <iconset resource="../icons.qrc">
-                <normaloff>:/icons/compassBig.png</normaloff>:/icons/compassBig.png</iconset>
+                <normaloff>:/icons/applications-internet.png</normaloff>:/icons/applications-internet.png</iconset>
               </property>
               <property name="flat">
                <bool>true</bool>

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 0a186434b71662e5ae1e3240676789c3ae3c0d61..a133d25daa77862f05dd299065c7a2b26f679d55 100644 (file)
--- 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 0a268c31a02e959e6d81877c8fadf712ec7598e3..c45b059ace0d2926efefa7c25513fea0e8b9981f 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -273,7 +273,7 @@
          </property>
          <property name="icon">
           <iconset resource="../icons.qrc">
-           <normaloff>:/icons/alarm-offBig.png</normaloff>:/icons/alarm-offBig.png</iconset>
+           <normaloff>:/icons/appointment-soon-off.png</normaloff>:/icons/appointment-soon-off.png</iconset>
          </property>
         </widget>
        </item>
@@ -284,7 +284,7 @@
          </property>
          <property name="icon">
           <iconset resource="../icons.qrc">
-           <normaloff>:/icons/favourite-offBig.png</normaloff>:/icons/favourite-offBig.png</iconset>
+           <normaloff>:/icons/emblem-new-off.png</normaloff>:/icons/emblem-new-off.png</iconset>
          </property>
         </widget>
        </item>

diff --git a/src/icons.qrc b/src/icons.qrc
index 2326d79e084e8490d96dd5b512dd657d8361e6ee..12faa0d4368056c1f005f6b13d1097aa2404d1f0 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -5,12 +5,12 @@
         <file>icons/reload.png</file>
         <file>icons/fosdem.png</file>
         <file>icons/brain-alone.png</file>
-        <file>icons/alarm-offBig.png</file>
-        <file>icons/alarm-onBig.png</file>
-        <file>icons/compassBig.png</file>
-        <file>icons/favourite-offBig.png</file>
-        <file>icons/favourite-onBig.png</file>
-        <file>icons/exclamation.png</file>
+        <file>icons/appointment-soon-off.png</file>
+        <file>icons/appointment-soon.png</file>
+        <file>icons/applications-internet.png</file>
+        <file>icons/emblem-new-off.png</file>
+        <file>icons/emblem-new.png</file>
+        <file>icons/dialog-warning.png</file>
         <file>icons/search.png</file>
     </qresource>
 </RCC>

diff --git a/src/icons/add.png b/src/icons/add.png
index 297ef4500381c8579d0cd86ba880eb0837a6af0d..184afa8d35f90061900d940efb99b7de9e4ad48a 100644 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 768375d4213b13d4f6c883447f9375669562c9d7..2c00ffb1cec21564c667f63a90f883a1587b415c 100644 (file)
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 abc465e62201adc1f36b20178c9e374cdcab6af6..9af91bc2aaa4fb54eb18b0a794705f1686dee300 100644 (file)
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 0dacd0006e418db574af0946fe276569015b2804..bbb6931edc67c65740c92cefce4591db084b86c0 100644 (file)
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 56674bb26c45dfe1885973ba94b46a5cda22c1ef..d14daa2518c4824ddec43cc072d3bc0cc6b6dba0 100644 (file)
--- 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