Changeset ec813bb for src/mvc/delegate.cpp

Timestamp:

08/23/11 20:57:20 (11 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

12fe870

Parents:

be12b9f

Message:

This should close ticket #35 ([maemo] conflict icon overlaps alarm icon).

File:

• src/mvc/delegate.cpp (modified) (2 diffs)

src/mvc/delegate.cpp

@@ -216 +216 @@
     }
 
-    //// HIGHLIGHTING SELECTED ITEM
-    //if (option.state & QStyle::State_Selected)
-        //painter->fillRect(option.rect, option.palette.highlight());
-
     painter->restore();
 }
@@ -322 +318 @@
     mControls.insert(AlarmControlOff,
                     new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff]));
-#endif
-
+    // WARNING ICON
+    mControls.insert(WarningControl,
+                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[AlarmControlOff]));
+#else
     // WARNING ICON
     mControls.insert(WarningControl,
                     new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[FavouriteControlOn]));
+#endif
+
 }