From 336fa33e20b71c122b3f29d9eb65587ac57c1b4e Mon Sep 17 00:00:00 2001
From: pavelpa <pavelpa@localhost>
Date: Tue, 26 Jan 2010 20:12:21 +0000
Subject: [PATCH] conflicts refactoring  - has to be finished

---
 src/icons.qrc                                 |   3 +-
 src/icons/exclamation-iconOff.png             | Bin 4126 -> 0 bytes
 ...exclamation-iconOn.png => exclamation.png} | Bin
 src/mvc/delegate.cpp                          |  49 ++++++------------
 src/mvc/delegate.h                            |   3 +-
 src/mvc/treeview.cpp                          |   3 +-
 6 files changed, 19 insertions(+), 39 deletions(-)
 delete mode 100644 src/icons/exclamation-iconOff.png
 rename src/icons/{exclamation-iconOn.png => exclamation.png} (100%)

diff --git a/src/icons.qrc b/src/icons.qrc
index 808d862..192f8bc 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -8,8 +8,7 @@
         <file>icons/compassBig.png</file>
         <file>icons/favourite-offBig.png</file>
         <file>icons/favourite-onBig.png</file>
-        <file>icons/exclamation-iconOn.png</file>
-        <file>icons/exclamation-iconOff.png</file>
+        <file>icons/exclamation.png</file>
         <file>icons/info.png</file>
         <file>icons/search.png</file>
     </qresource>
diff --git a/src/icons/exclamation-iconOff.png b/src/icons/exclamation-iconOff.png
deleted file mode 100644
index dc56ba8271b6a09194928fb514b6f17f7493fb9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4126
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

diff --git a/src/icons/exclamation-iconOn.png b/src/icons/exclamation.png
similarity index 100%
rename from src/icons/exclamation-iconOn.png
rename to src/icons/exclamation.png
diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 8e25929..79d94db 100644
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -65,8 +65,7 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         //int spacer = (fmSmall.boundingRect("999").width() < SPACER) ? SPACER : fmSmall.boundingRect("999").width();
 
         //Time conflicts are colored differently
-        if ((static_cast<Event*>(index.internalPointer())->isFavourite())
-            && (hasTimeConflict(index, index.parent())))
+        if(hasTimeConflict(index, index.parent()))
         {
             bkgrColor = Qt::yellow;
         }
@@ -134,16 +133,9 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         painter->drawImage(mControls[MapControl]->drawPoint(option.rect),*mControls[MapControl]->image());
         // 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
         Event *event = static_cast<Event*>(index.internalPointer());
@@ -315,18 +307,16 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
     while (i.hasNext())
     {
         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))
+        if(mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
         {
-            qDebug() << "tengo conflicto";
-            return id;
+            if(id == WarningControl)
+            {
+                if(mControls[id]->hasConflict)
+                    return id;
+            }
+            else
+                return id;
         }
-
     }
 
     return ControlNone;
@@ -380,21 +370,13 @@ void Delegate::defineControls()
     mControls.insert(MapControl,control);
 #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);
 }
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
@@ -456,3 +438,4 @@ bool Delegate::hasTimeConflict(const QModelIndex &index, const QModelIndex &pare
     }
     return false;
 }
+
diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index d8cc1a4..42cce94 100644
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -19,8 +19,7 @@ class Delegate : public QItemDelegate
             AlarmControlOn,
             AlarmControlOff,
             MapControl,
-            WarningControlOn,
-            WarningControlOff
+            WarningControl
         };
 
         class Control
diff --git a/src/mvc/treeview.cpp b/src/mvc/treeview.cpp
index 8e32690..d18c873 100644
--- a/src/mvc/treeview.cpp
+++ b/src/mvc/treeview.cpp
@@ -100,8 +100,7 @@ bool TreeView::testForControlClicked(const QModelIndex &aIndex, const QPoint &aP
                 handled = true;
             }
         break;
-        case Delegate::WarningControlOff:
-        case Delegate::WarningControlOn:
+        case Delegate::WarningControl:
         {
 
             qDebug() << "WARNING CLICKED: " << qVariantValue<QString>(aIndex.data());
-- 
2.39.5