Changeset 9afc0ee

Timestamp:

01/19/10 10:09:41 (13 years ago)

Author:

pavelpa <pavelpa@…>

Branches:

master, qt5

Children:

c5324ca

Parents:

b1fc17a

Message:

set MapDialog? title

Location:

src

Files:

• gui/mainwindow.cpp (modified) (1 diff)
• gui/mapwindow.cpp (modified) (1 diff)
• gui/mapwindow.h (modified) (1 diff)
• mvc/event.cpp (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -200 +200 @@
 {
     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();
 }

src/gui/mapwindow.cpp

@@ -1 +1 @@
 #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);
 }

src/gui/mapwindow.h

@@ -9 +9 @@
 {
 public:
-    MapWindow(const QPixmap &aImage, QWidget *aParent = NULL);
+    MapWindow(const QPixmap &aImage, const QString &aName, QWidget *aParent = NULL);
     ~MapWindow() {}
 protected:

src/mvc/event.cpp

@@ -79 +79 @@
     //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");