Changeset accae6b in confclerk_git for src

Timestamp:

04/19/12 23:42:57 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

2d11958

Parents:

a697dc1

Message:

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

Location:

src

Files:

• gui/eventdialog.cpp (modified) (3 diffs)
• gui/eventdialog.ui (modified) (1 diff)
• icons.qrc (modified) (2 diffs)
• icons/alarm-off.png (added)
• icons/alarm-on.png (added)
• icons/alarm.blend (added)
• icons/appointment-soon-off.png (deleted)
• icons/appointment-soon.png (deleted)
• mvc/delegate.cpp (modified) (1 diff)

src/gui/eventdialog.cpp

@@ -60 +60 @@
     if(event.hasAlarm())
     {
-        alarmButton->setIcon(QIcon(":/icons/appointment-soon.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
     }
 }
@@ -103 +103 @@
     {
         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
@@ -114 +114 @@
     {
         event.setHasAlarm(true);
-        alarmButton->setIcon(QIcon(":/icons/appointment-soon.png"));
+        alarmButton->setIcon(QIcon(":/icons/alarm-on.png"));
 #ifdef MAEMO
         // add alarm to the 'alarmd'

src/gui/eventdialog.ui

@@ -289 +289 @@
          <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">

src/icons.qrc

@@ -4 +4 @@
         <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>
@@ -11 +9 @@
         <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>

src/mvc/delegate.cpp

@@ -314 +314 @@
     // 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,