set MapDialog title

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 049c52daca51adaf2091cf0e9f4f0ddf4c2f1efc..0092c1afd08fa30fa154b019fc63a2f323f34106 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -199,11 +199,21 @@ void MainWindow::itemDoubleClicked(const QModelIndex &aIndex)
 void MainWindow::displayMap(const QModelIndex &aIndex)
 {
     Event *event = static_cast<Event*>(aIndex.internalPointer());
-    QString mapPath = QString(":/maps/rooms/%1.png").arg(event->room());
+
+    // 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();
+
     QPixmap map(mapPath);
-    MapWindow window(map,this);
+    MapWindow window(map,roomName,this);
     window.exec();
 }
 

diff --git a/src/gui/mapwindow.cpp b/src/gui/mapwindow.cpp
index 9141d202df2fc5f407600723c01870b33504fffb..7869f970122710ad51f1a39efff3c1dd44ab3dc1 100644 (file)
--- a/src/gui/mapwindow.cpp
+++ b/src/gui/mapwindow.cpp
@@ -1,10 +1,11 @@
 #include "mapwindow.h"
 
-MapWindow::MapWindow(const QPixmap &aImage, QWidget *aParent)
+MapWindow::MapWindow(const QPixmap &aImage, const QString &aName, QWidget *aParent)
     : QDialog(aParent)
 {
     setupUi(this);
     setMouseTracking(true); // to receive mouse events
+    setWindowTitle(aName);
     map->setPixmap(aImage);
 }
 

diff --git a/src/gui/mapwindow.h b/src/gui/mapwindow.h
index 7e5a8ffbd69dd44bfd9461d86234157114f22ac9..560da63971cd66d7ed677d3bfe0492436fe81c94 100644 (file)
--- a/src/gui/mapwindow.h
+++ b/src/gui/mapwindow.h
@@ -8,7 +8,7 @@
 class MapWindow : public QDialog, Ui::MapWindow
 {
 public:
-    MapWindow(const QPixmap &aImage, QWidget *aParent = NULL);
+    MapWindow(const QPixmap &aImage, const QString &aName, QWidget *aParent = NULL);
     ~MapWindow() {}
 protected:
     virtual void mouseDoubleClickEvent(QMouseEvent *event);

diff --git a/src/mvc/event.cpp b/src/mvc/event.cpp
index 007a04cfc63cc87a8e19229893fbe38d85eb15ef..d2c31c418bf6de113a93eca541422eb27894ac14 100644 (file)
--- a/src/mvc/event.cpp
+++ b/src/mvc/event.cpp
@@ -78,12 +78,7 @@ QString Event::room() const
     // TODO: handle qeury error
     //qDebug() << query.lastError();
     if(query.next())
-    {
-        QString map = query.record().value("name").toString();
-        map=map.toLower(); // room names are stored in lower-case format
-        map=map.remove("."); // room names are stored without dots in the name, eg. "aw.1124.png" -> "aw1124.png"
-        return map;
-    }
+        return query.record().value("name").toString();
     else
         return QString("not-available");
 }