[svn-upgrade] new version fosdem-schedule (0.4.1+svn262+ds)

[debian/fosdem-schedule.git] / src / gui / tabcontainer.cpp

diff --git a/src/gui/tabcontainer.cpp b/src/gui/tabcontainer.cpp
index 04c1bd94842172faa8a58a0c68cfe1781aab630c..3f5d4ce31220ab094861c9440151109e696ad0d8 100644 (file)
--- a/src/gui/tabcontainer.cpp
+++ b/src/gui/tabcontainer.cpp
@@ -27,6 +27,8 @@
 
 #include "eventdialog.h"
 #include "mapwindow.h"
 
 #include "eventdialog.h"
 #include "mapwindow.h"

+#include "room.h"
+#include "errormessage.h"

 
 #include "conflictsdialog.h"
 
 
 #include "conflictsdialog.h"
 


@@ -55,9 +57,13 @@ TabContainer::TabContainer(QWidget *aParent)
 
 void TabContainer::updateTreeView(const QDate &aDate)
 {
 
 void TabContainer::updateTreeView(const QDate &aDate)
 {

+    int active_id = Conference::activeConference();

     dayNavigator->show();
     dayNavigator->show();

-    loadEvents( aDate, Conference::activeConference() );
-    treeView->reset();
+    if (active_id > 0) {
+        loadEvents(aDate, active_id);
+    } else {
+        static_cast<EventModel*>(treeView->model())->clearModel();
+    }

 }
 
 void TabContainer::itemClicked(const QModelIndex &aIndex)
 }
 
 void TabContainer::itemClicked(const QModelIndex &aIndex)


@@ -79,20 +85,21 @@ void TabContainer::displayMap(const QModelIndex &aIndex)
 {
     Event *event = static_cast<Event*>(aIndex.internalPointer());
 
 {
     Event *event = static_cast<Event*>(aIndex.internalPointer());
 

-    // room names are stored in lower-case format
-    // room names are stored without dots in the name, eg. "aw.1124.png" -> "aw1124.png"
-    QString mapPath = QString(":/maps/rooms/%1.png").arg(event->room().toLower().remove("."));
-    if(!QFile::exists(mapPath))
-        mapPath = QString(":/maps/rooms/not-available.png");
-
-    QString roomName;
-    if(mapPath.contains("not-available", Qt::CaseInsensitive))
-        roomName = QString("Map is not available: %1").arg(event->room());
-    else
-        roomName = event->room();
+    QVariant mapPathV = event->room()->map();
+    QString mapPath;
+    if (!mapPathV.isValid()) {
+        error_message("No map for this room");
+        return;
+    } else {
+        mapPath = mapPathV.toString();
+        if (!QFile::exists(mapPath)) {
+            error_message("Map for this room not found: " + mapPath);
+            return;
+        }
+    }

 
     QPixmap map(mapPath);
 
     QPixmap map(mapPath);

-    MapWindow window(map,roomName,this);
+    MapWindow window(map, event->room()->name(),this);

     window.exec();
 }
 
     window.exec();
 }
 


@@ -132,3 +139,8 @@ void TabContainer::setDates(const QDate &aStart, const QDate &aEnd)
     dayNavigator->setDates(aStart, aEnd);
 }
 
     dayNavigator->setDates(aStart, aEnd);
 }
 

+void TabContainer::clearModel()
+{
+    static_cast<EventModel*>(treeView->model())->clearModel();
+}
+