Removed the ability to show "pictures" (maps) of rooms and maps of conferences.

[toast/confclerk.git] / src / mvc / delegate.cpp

diff --git a/src/mvc/delegate.cpp b/src/mvc/delegate.cpp
index 54ab0462faed415a39a2bf09355000991c236741..9d4c8dfc346510cd438d204c8bb89b0a9238417f 100644 (file)
--- a/src/mvc/delegate.cpp
+++ b/src/mvc/delegate.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Ixonos Plc.
 /*
  * Copyright (C) 2010 Ixonos Plc.

+ * Copyright (C) 2011 Philipp Spitzer, gregor herrmann

  *
  * This file is part of ConfClerk.
  *
  *
  * This file is part of ConfClerk.
  *


@@ -148,8 +149,6 @@ void Delegate::paint(QPainter *painter, const QStyleOptionViewItem &option, cons
         else
             mControls[AlarmControlOff]->paint(painter, option.rect);
 #endif
         else
             mControls[AlarmControlOff]->paint(painter, option.rect);
 #endif

-        if (event->room()->hasMap())
-            mControls[MapControl]->paint(painter, option.rect);

         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
 
         if(event->hasTimeConflict())
             mControls[WarningControl]->paint(painter, option.rect);
 


@@ -362,31 +361,23 @@ void Delegate::defineControls()
 {
     // FAVOURITE ICONs
     // on
 {
     // FAVOURITE ICONs
     // on

-    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/favourite-onBig.png"), NULL));
+    mControls.insert(FavouriteControlOn, new Control(FavouriteControlOn, QString(":icons/emblem-new.png"), NULL));

     // off
     // off

-    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/favourite-offBig.png"), NULL));
+    mControls.insert(FavouriteControlOff, new Control(FavouriteControlOff, QString(":icons/emblem-new-off.png"), NULL));

 
 #ifdef MAEMO
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,
 
 #ifdef MAEMO
     // ALARM ICONs
     // on
     mControls.insert(AlarmControlOn,

-                    new Control(AlarmControlOn, QString(":icons/alarm-onBig.png"), mControls[FavouriteControlOn]));
+                    new Control(AlarmControlOn, QString(":icons/appointment-soon.png"), mControls[FavouriteControlOn]));

     // off
     mControls.insert(AlarmControlOff,
     // off
     mControls.insert(AlarmControlOff,

-                    new Control(AlarmControlOff, QString(":icons/alarm-offBig.png"), mControls[FavouriteControlOff]));
-
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/compassBig.png"), mControls[AlarmControlOn]));
-#else
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/compassBig.png"), mControls[FavouriteControlOn]));
+                    new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff]));

 #endif
 
     // WARNING ICON
     mControls.insert(WarningControl,
 #endif
 
     // WARNING ICON
     mControls.insert(WarningControl,

-                    new Control(WarningControl, QString(":icons/exclamation.png"), mControls[MapControl]));
+                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[FavouriteControlOn]));

 }
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const
 }
 
 bool Delegate::isPointFromRect(const QPoint &aPoint, const QRect &aRect) const