Changeset e7340e1

Timestamp:

01/22/10 15:41:46 (12 years ago)

Author:

fortefr <fortefr@…>

Branches:

master, qt5

Children:

0d4ecc2

Parents:

49c5ad3

Message:

Conference map

Location:

src

Files:

• gui/mainwindow.cpp (modified) (2 diffs)
• gui/mainwindow.h (modified) (1 diff)
• gui/mainwindow.ui (modified) (1 diff)
• mvc/delegate.cpp (modified) (1 diff)

src/gui/mainwindow.cpp

@@ -122 +122 @@
     // event search button clicked
     connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked()));
+    // event conference map button clicked
+    connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
     //
     connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(tabHasChanged(int)));
@@ -292 +294 @@
 }
 
+void MainWindow::conferenceMapClicked()
+{
+
+    QString mapPath = QString(":/maps/campus.png");
+    if(!QFile::exists(mapPath))
+        mapPath = QString(":/maps/rooms/not-available.png");
+
+    QString roomName;
+
+    QPixmap map(mapPath);
+    MapWindow window(map,roomName,this);
+    window.exec();
+}
+
 void MainWindow::displayWarning(const QModelIndex &aIndex)
 {

src/gui/mainwindow.h

@@ -28 +28 @@
     void displayWarning(const QModelIndex &aIndex);
     void searchClicked();
+    void conferenceMapClicked();
     void tabHasChanged(int aIndex);
     void eventHasChanged(int aEventId);

src/gui/mainwindow.ui

@@ -230 +230 @@
        </layout>
       </widget>
-      <widget class="QWidget" name="mapTab" >
-       <attribute name="title" >
-        <string>Map</string>
-       </attribute>
-      </widget>
-      <widget class="QWidget" name="conferenceTab" >
-       <attribute name="title" >
+     <widget class="QWidget" name="conferenceTab" >
+      <attribute name="title" >
         <string>Conference</string>
        </attribute>

src/mvc/delegate.cpp

@@ -321 +321 @@
             return id;
         }
-        else
-        {
-            if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
+        else if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint))
             && (mControls[id]->hasConflict))
-            {
+        {
+            qDebug() << "tengo conflicto";
             return id;
-            }
-        }
+        }
+
     }