Changeset 3f3e22d for src/mvc/delegate.cpp

Timestamp:

01/21/10 16:39:43 (12 years ago)

Author:

fortefr <fortefr@…>

Branches:

master, qt5

Children:

76cde75

Parents:

a957cfa

Message:

Warning handling

File:

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

src/mvc/delegate.cpp

@@ -136 +136 @@
         //if(static_cast<Event*>(index.internalPointer())->hasTimeConflict())
         if(bkgrColor == Qt::yellow)
+        {
             painter->drawImage(mControls[WarningControlOn]->drawPoint(option.rect),*mControls[WarningControlOn]->image());
+            mControls[WarningControlOn]->hasConflict=true;
+        }
         else
+        {
             painter->drawImage(mControls[WarningControlOff]->drawPoint(option.rect),*mControls[WarningControlOff]->image());
+            mControls[WarningControlOn]->hasConflict=false;
+        }
 
         // draw texts
@@ -310 +316 @@
     {
         ControlId id = i.next();
-        if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        if((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+            && (id != WarningControlOn) && (id != WarningControlOff))
+        {
             return id;
+        }
+        else
+        {
+            if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+            && (mControls[id]->hasConflict))
+            {
+            return id;
+            }
+        }
     }
 
@@ -369 +386 @@
     control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.png"));
     p = mControls[MapControl]->drawPoint();
+    control->hasConflict = false;
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
@@ -375 +393 @@
     control = new Control(WarningControlOff,QString(":icons/exclamation-iconOff.png"));
     p = mControls[MapControl]->drawPoint();
+    control->hasConflict = false;
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);