Changed favourite icons as a response to ticket #40.

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index 1d0246afee562074ced6a8c5132aa89954677216..2d268ae623abd156073264c4aa5fdf39f4292bec 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -54,7 +54,7 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
 
     if(event.isFavourite())
     {
-        favouriteButton->setIcon(QIcon(":/icons/emblem-new.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
     }
 
     if(event.hasAlarm())
@@ -71,12 +71,12 @@ void EventDialog::favouriteClicked()
     if(event.isFavourite())
     {
         event.setFavourite(false);
-        favouriteButton->setIcon(QIcon(":/icons/emblem-new-off.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-off.png"));
     }
     else
     {
         event.setFavourite(true);
-        favouriteButton->setIcon(QIcon(":/icons/emblem-new.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
     }
     event.update("favourite");
 

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index 73c2d4b3430629c006918435e2f35123e11acb17..bba76be9a4996df053e87d85d23fb2cf0d618750 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -66,9 +66,9 @@
         <property name="geometry">
          <rect>
           <x>0</x>
-          <y>0</y>
-          <width>461</width>
-          <height>276</height>
+          <y>-1</y>
+          <width>446</width>
+          <height>262</height>
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
@@ -290,6 +290,15 @@
           <iconset resource="../icons.qrc">
            <normaloff>:/icons/appointment-soon-off.png</normaloff>:/icons/appointment-soon-off.png</iconset>
          </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
+         </property>
+         <property name="shortcut">
+          <string>CapsLock</string>
+         </property>
         </widget>
        </item>
        <item>
@@ -299,7 +308,13 @@
          </property>
          <property name="icon">
           <iconset resource="../icons.qrc">
-           <normaloff>:/icons/emblem-new-off.png</normaloff>:/icons/emblem-new-off.png</iconset>
+           <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>32</width>
+           <height>32</height>
+          </size>
          </property>
         </widget>
        </item>

diff --git a/src/icons.qrc b/src/icons.qrc
index 193c23f36379a2eacd2158a12037d3acbff17b1f..cbd7fb989ff4fe00572adc03d47f0b502a23fdaf 100644 (file)
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -1,14 +1,14 @@
 <RCC>
-  <qresource prefix="/">
-    <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/emblem-new-off.png</file>
-    <file>icons/emblem-new.png</file>
-    <file>icons/dialog-warning.png</file>
-    <file>icons/search.png</file>
-    <file>icons/today.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <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>
+    </qresource>
 </RCC>

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

diff --git a/src/icons/emblem-new.blend b/src/icons/emblem-new.blend
deleted file mode 100644 (file)
index 2f76166..0000000
Binary files a/src/icons/emblem-new.blend and /dev/null differ

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

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

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

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

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 6907574a593d7343436d6f1028e477f16f59a076..cc3a9c5e6aa0fa69dcce2022c6227d09d25684af 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -305,9 +305,9 @@ void Delegate::defineControls()
 {
     // FAVOURITE ICONs
     // on
-    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/emblem-new.png"), NULL));
+    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/favourite-on.png"), NULL));
     // off
-    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/emblem-new-off.png"), NULL));
+    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-off.png"), NULL));
 
 #ifdef MAEMO
     // ALARM ICONs