Changeset e6ab8a2 in confclerk_git for src/mvc

Timestamp:

07/04/11 23:42:02 (12 years ago)

Author:

Philipp Spitzer <philipp@…>

Branches:

master, qt5

Children:

526128c

Parents:

8dd3dd2

Message:

Removed the ability to show "pictures" (maps) of rooms and maps of conferences.
The XML file does not contain picture/map/image information of conferences or rooms.
We left the room.picture definition in the database SQL because there is no "drop column"
in sqlite.

Location:

src/mvc

Files:

• conference.cpp (modified) (1 diff)
• conference.h (modified) (1 diff)
• delegate.cpp (modified) (2 diffs)
• delegate.h (modified) (1 diff)
• room.cpp (modified) (1 diff)
• room.h (modified) (1 diff)
• treeview.cpp (modified) (1 diff)
• treeview.h (modified) (1 diff)

src/mvc/conference.cpp

@@ -34 +34 @@
     << QSqlField("active", QVariant::Bool)
     << QSqlField("url", QVariant::String)
-    << QSqlField("map", QVariant::String)
     );
 

src/mvc/conference.h

@@ -52 +52 @@
     bool isActive() const { return value("active").toBool(); }
     QString url() const { return stringFromNullable(value("url")); }
-    QString map() const { return stringFromNullable(value("map")); }
 
     #if 0

src/mvc/delegate.cpp

@@ -150 +150 @@
             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);
@@ -376 +374 @@
     mControls.insert(AlarmControlOff,
                     new Control(AlarmControlOff, QString(":icons/appointment-soon-off.png"), mControls[FavouriteControlOff]));
-
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/applications-internet.png"), mControls[AlarmControlOn]));
-#else
-    // MAP ICON
-    mControls.insert(MapControl,
-                    new Control(MapControl, QString(":icons/applications-internet.png"), mControls[FavouriteControlOn]));
 #endif
 
     // WARNING ICON
     mControls.insert(WarningControl,
-                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[MapControl]));
+                    new Control(WarningControl, QString(":icons/dialog-warning.png"), mControls[FavouriteControlOn]));
 }
 

src/mvc/delegate.h

@@ -38 +38 @@
             AlarmControlOn,
             AlarmControlOff,
-            MapControl,
             WarningControl
         };

src/mvc/room.cpp

@@ -22 +22 @@
 
 QString const Room::sTableName = QString("room");
-int const Room::sTableColCount = 3;
+int const Room::sTableColCount = 2;
 const QString Room::NAME = "name";
 
 QSqlRecord const Room::sColumns = Room::toRecord(QList<QSqlField>()
     << QSqlField("id", QVariant::Int)
-    << QSqlField(NAME, QVariant::String)
-    << QSqlField("picture", QVariant::String));
+    << QSqlField(NAME, QVariant::String));
 
 Room Room::retrieveByName(QString name)

src/mvc/room.h

@@ -36 +36 @@
     QString name() const { return value("name").toString(); }
     void setName(const QString & type) { setValue("name", type); }
-    // TODO: make naming consistent - either "picture" or "map"
-    QVariant map() const { return value("picture"); }
-    bool hasMap() const
-    {
-        // empty strings also treasted as NULL,
-        // as storing NULLs requires rewrite of storing code and DB scheme
-        return !isNull("picture") and !value("picture").toString().isEmpty();
-    }
     int insert();
 public:

src/mvc/treeview.cpp

@@ -126 +126 @@
             }
             break;
-        case Delegate::MapControl:
-            {
-                // handle Alarm Control clicked
-                emit(requestForMap(aIndex));
-                handled = true;
-            }
-        break;
         case Delegate::WarningControl:
         {

src/mvc/treeview.h

@@ -37 +37 @@
     void handleItemClicked(const QModelIndex &index);
 signals:
-    void requestForMap(const QModelIndex &aIndex);
     void requestForConflicts(const QModelIndex &aIndex);
     void eventHasChanged(int aEventId, bool aReloadModel = false); // emited when user changes some event details, eg. sets it Favourite