From ec813bb5fcb51c56ca2eb66320401b2bdcdda72a Mon Sep 17 00:00:00 2001 From: Philipp Spitzer Date: Tue, 23 Aug 2011 18:57:20 +0000 Subject: [PATCH] This should close ticket #35 ([maemo] conflict icon overlaps alarm icon). --- src/mvc/delegate.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp index 56e775f..1b7dcb6 100644 --- a/src/mvc/delegate.cpp +++ b/src/mvc/delegate.cpp @@ -215,10 +215,6 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons painter->drawText(titlePointF,qVariantValue(index.data())); } - //// HIGHLIGHTING SELECTED ITEM - //if (option.state & QStyle::State_Selected) - //painter->fillRect(option.rect, option.palette.highlight()); - painter->restore(); } @@ -321,11 +317,15 @@ void Delegate::defineControls() // off 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 + } bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const -- 2.39.5