Changeset 336fa33 in confclerk_git for src/mvc

Timestamp:

01/26/10 21:12:21 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

9f367eb

Parents:

3a8dc71

Message:

conflicts refactoring

• has to be finished

Location:

src/mvc

Files:

• delegate.cpp (modified) (5 diffs)
• delegate.h (modified) (1 diff)
• treeview.cpp (modified) (1 diff)

src/mvc/delegate.cpp

@@ -66 +66 @@
 
         //Time conflicts are colored differently
-        if ((static_cast<Event*>(index.internalPointer())->isFavourite())
-            && (hasTimeConflict(index, index.parent())))
+        if(hasTimeConflict(index, index.parent()))
         {
             bkgrColor = Qt::yellow;
@@ -135 +134 @@
         // Time conflict
         //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;
-        }
+
+        if(hasTimeConflict(index, index.parent()))
+            painter->drawImage(mControls[WarningControl]->drawPoint(option.rect),*mControls[WarningControl]->image());
 
         // draw texts
@@ -316 +308 @@
     {
         ControlId id = i.next();
-        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))
-        {
-            qDebug() << "tengo conflicto";
-            return id;
-        }
-
+        if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        {
+            if(id == WarningControl)
+            {
+                if(mControls[id]->hasConflict)
+                    return id;
+            }
+            else
+                return id;
+        }
     }
 
@@ -381 +371 @@
 #endif
 
-    // WARNING ICONs
-    // on
-    control = new Control(WarningControlOn,QString(":icons/exclamation-iconOn.png"));
+    // WARNING ICON
+    control = new Control(WarningControl,QString(":icons/exclamation.png"));
     p = mControls[MapControl]->drawPoint();
     control->hasConflict = false;
     p.setX(p.x()-control->image()->width()-SPACER);
     control->setDrawPoint(p);
-    mControls.insert(WarningControlOn,control);
-    // off
-    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);
-    mControls.insert(WarningControlOff,control);
+    mControls.insert(WarningControl,control);
 }
 
@@ -457 +439 @@
     return false;
 }
+

src/mvc/delegate.h

@@ -20 +20 @@
             AlarmControlOff,
             MapControl,
-            WarningControlOn,
-            WarningControlOff
+            WarningControl
         };
 

src/mvc/treeview.cpp

@@ -101 +101 @@
             }
         break;
-        case Delegate::WarningControlOff:
-        case Delegate::WarningControlOn:
+        case Delegate::WarningControl:
         {