added GrayScale versions (inactive/OFF) of the icons

diff --git a/src/icons/alarm-off.png b/src/icons/alarm-off.png
index acb7b5c8727f8df6f33a0ab8b51029993094c33e..854661b5617258884ce5b32ecf142e6cb12f4195 100644 (file)
Binary files a/src/icons/alarm-off.png and b/src/icons/alarm-off.png differ

diff --git a/src/icons/favourite-off.png b/src/icons/favourite-off.png
index 1b42dafeb811af8da57d64bbfbeac8d839bf3e60..c10db21d89eb6133fbf804be6161f20a1be13a17 100644 (file)
Binary files a/src/icons/favourite-off.png and b/src/icons/favourite-off.png differ

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index f8fac795bf61d95d0234c58739206e3e9b568b4e..507fae4c4d1fe6acf2a0894517443cd600438b7c 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -207,30 +207,40 @@ Delegate::ControlId Delegate::whichControlClicked(const QModelIndex &aIndex, con
 void Delegate::defineControls()
 {
     Control *control;
+    QPoint p(0,0);
     // FAVOURITE ICONs
     // on
     control = new Control(FavouriteControlOn,QString(":icons/favourite-on.png"));
-    control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER));
+    p = QPoint(0,0);
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
     mControls.insert(FavouriteControlOn,control);
     // off
     control = new Control(FavouriteControlOff,QString(":icons/favourite-off.png"));
-    control->setDrawPoint(QPoint(-control->image()->width()-SPACER,SPACER));
+    p = QPoint(0,0);
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
     mControls.insert(FavouriteControlOff,control);
 
     // ALARM ICONs
     // on
-    control = new Control(AlarmControlOn,QString(":icons/alarm-on.png"));
-    control->setDrawPoint(QPoint(-mControls[FavouriteControlOn]->image()->width()-control->image()->width()-2*SPACER,SPACER));
+    control = new Control(AlarmControlOn,QString(":icons/alarm-off.png"));
+    p = mControls[FavouriteControlOn]->drawPoint();
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
     mControls.insert(AlarmControlOn,control);
     // off
     control = new Control(AlarmControlOff,QString(":icons/alarm-off.png"));
-    control->setDrawPoint(QPoint(-mControls[FavouriteControlOff]->image()->width()-control->image()->width()-2*SPACER,SPACER));
+    p = mControls[FavouriteControlOff]->drawPoint();
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
     mControls.insert(AlarmControlOff,control);
 
     // MAP ICON
     control = new Control(MapControl,QString(":icons/compass.png"));
-    control->setDrawPoint(QPoint(-mControls[AlarmControlOn]->image()->width()-control->image()->width()
-                                 -mControls[FavouriteControlOn]->image()->width()-3*SPACER,SPACER));
+    p = mControls[AlarmControlOn]->drawPoint();
+    p.setX(p.x()-control->image()->width()-SPACER);
+    control->setDrawPoint(p);
     mControls.insert(MapControl,control);
 }
 

diff --git a/src/mvc/delegate.h b/src/mvc/delegate.h
index 63c74dc22536bb99e6c1e9483087ee4c83a66b26..5d7adacb8f45a6487ea0986c4ea8f6de688022a7 100644 (file)
--- a/src/mvc/delegate.h
+++ b/src/mvc/delegate.h
@@ -31,9 +31,12 @@ class Delegate : public QItemDelegate
                 { }
                 inline QImage *image() const { return mImage; }
                 inline void setDrawPoint(const QPoint &aPoint) { mDrawPoint = aPoint; }
-                inline QPoint drawPoint(const QRect &aRect) const // for painter to draw Control
+                inline QPoint drawPoint(const QRect &aRect = QRect()) const // for painter to draw Control
                 {
-                    return QPoint(aRect.x()+aRect.width(),aRect.y()) + mDrawPoint;
+                    if(aRect == QRect()) // null rectangle
+                        return mDrawPoint; // returns relative drawing point
+                    else
+                        return QPoint(aRect.x()+aRect.width(),aRect.y()) + mDrawPoint; // returns absolute drawing point
                 }
                 inline QRect drawRect(const QRect &aRect) const // helper for determining if Control was clicked
                 {