Changeset dadb922 in confclerk_git for src

Timestamp:

04/19/12 23:12:50 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

687d76f

Parents:

1ba9324

Message:

Changed favourite icons as a response to ticket #40.

Location:

src

Files:

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

src/gui/eventdialog.cpp

@@ -55 +55 @@
     if(event.isFavourite())
     {
-        favouriteButton->setIcon(QIcon(":/icons/emblem-new.png"));
+        favouriteButton->setIcon(QIcon(":/icons/favourite-on.png"));
     }
 
@@ -72 +72 @@
     {
         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");

src/gui/eventdialog.ui

@@ -67 +67 @@
          <rect>
           <x>0</x>
-          <y>0</y>
-          <width>461</width>
-          <height>276</height>
+          <y>-1</y>
+          <width>446</width>
+          <height>262</height>
          </rect>
         </property>
@@ -291 +291 @@
            <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>
@@ -300 +309 @@
          <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>

src/icons.qrc

@@ -1 +1 @@
 <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>

src/mvc/delegate.cpp

@@ -306 +306 @@
     // 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