Changed the alarm icon due to ticket #40. I haven't tried it because I don't have...

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 2d268ae623abd156073264c4aa5fdf39f4292bec..8e5d1b5aa49e1a0310c57599625c1c0dd57209d3 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -59,7 +59,7 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
 
     if(event.hasAlarm())
     {
-        alarmButton->setIcon(QIcon(":/icons/appointment-soon.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
     }
 }
 
@@ -102,7 +102,7 @@ void EventDialog::alarmClicked()
     if(event.hasAlarm())
     {
         event.setHasAlarm(false); // update DB
-        alarmButton->setIcon(QIcon(":/icons/appointment-soon-off.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-off.png"));
 #ifdef MAEMO
         // remove alarm from the 'alarmd' alrms list
         Alarm alarm;
@@ -113,7 +113,7 @@ void EventDialog::alarmClicked()
     else
     {
         event.setHasAlarm(true);
-        alarmButton->setIcon(QIcon(":/icons/appointment-soon.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
 #ifdef MAEMO
         // add alarm to the 'alarmd'
         Alarm alarm;

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index bba76be9a4996df053e87d85d23fb2cf0d618750..1ab6a55a26d0aedbd9fdcdf337ed03ae3c547d76 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -288,7 +288,7 @@
          </property>
          <property name="icon">
           <iconset resource="../icons.qrc">
-           <normaloff>:/icons/appointment-soon-off.png</normaloff>:/icons/appointment-soon-off.png</iconset>
+           <normaloff>:/icons/alarm-off.png</normaloff>:/icons/alarm-off.png</iconset>
          </property>
          <property name="iconSize">
           <size>

diff --git a/src/icons.qrc b/src/icons.qrc
index cbd7fb989ff4fe00572adc03d47f0b502a23fdaf..6d8239025129276c72ba9705b88c1bd381fa701e 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -3,12 +3,12 @@
         <file>icons/add.png</file>
         <file>icons/remove.png</file>
         <file>icons/reload.png</file>
-        <file>icons/appointment-soon-off.png</file>
-        <file>icons/appointment-soon.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-on.png</file>
+        <file>icons/alarm-on.png</file>
+        <file>icons/alarm-off.png</file>
     </qresource>
 </RCC>

diff --git a/src/icons/alarm-off.png b/src/icons/alarm-off.png
new file mode 100644 (file)
index 0000000..34be22d
Binary files /dev/null and b/src/icons/alarm-off.png differ

diff --git a/src/icons/alarm-on.png b/src/icons/alarm-on.png
new file mode 100644 (file)
index 0000000..2eb9a9f
Binary files /dev/null and b/src/icons/alarm-on.png differ

diff --git a/src/icons/alarm.blend b/src/icons/alarm.blend
new file mode 100644 (file)
index 0000000..19b1c74
Binary files /dev/null and b/src/icons/alarm.blend differ

diff --git a/src/icons/appointment-soon-off.png b/src/icons/appointment-soon-off.png
deleted file mode 100644 (file)
index 2803c25..0000000
Binary files a/src/icons/appointment-soon-off.png and /dev/null differ

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

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index cc3a9c5e6aa0fa69dcce2022c6227d09d25684af..5c2e217d24ec454b002ec95822645c1aab9b7572 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -313,10 +313,10 @@ void Delegate::defineControls()
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,
-                    new Control(AlarmControlOn, QString(":icons/appointment-soon.png"), mControls[FavouriteControlOn]));
+                    new Control(AlarmControlOn, QString(":icons/alarm-on.png"), mControls[FavouriteControlOn]));
     // off
     mControls.insert(AlarmControlOff,
-                    new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff]));
+                    new Control(AlarmControlOff, QString(":icons/alarm-off.png"), mControls[FavouriteControlOff]));
     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));