Changeset cb7b999 for src/gui

Timestamp:

04/23/10 08:04:08 (13 years ago)

Author:

kirilma <kirilma@…>

Branches:

master, qt5

Children:

3cdaf7d

Parents:

66428e7

Message:

restore viewing of conference map

Location:

src/gui

Files:

• conferenceeditor.cpp (modified) (3 diffs)
• conferenceeditor.h (modified) (1 diff)
• conferenceeditor.ui (modified) (1 diff)
• mainwindow.cpp (modified) (3 diffs)
• mainwindow.h (modified) (1 diff)

src/gui/conferenceeditor.cpp

@@ -21 +21 @@
 #include "conferencemodel.h"
 #include "urlinputdialog.h"
+#include "mapwindow.h"
 
 #include <QInputDialog>
@@ -48 +49 @@
     connect(changeUrl, SIGNAL(clicked()), SLOT(changeUrlClicked()));
     connect(refreshBtn, SIGNAL(clicked()), SLOT(refreshClicked()));
+    connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
 
     // it's OK to emit selection signals here
@@ -207 +209 @@
     itemSelected(QModelIndex(), QModelIndex());
 }
+
+void ConferenceEditor::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();
+}

src/gui/conferenceeditor.h

@@ -64 +64 @@
     void changeUrlClicked();
     void refreshClicked();
+    void conferenceMapClicked();
 
 private:

src/gui/conferenceeditor.ui

@@ -217 +217 @@
             </item>
             <item row="1" column="3">
-             <widget class="QPushButton" name="showMapButton_2">
+             <widget class="QPushButton" name="showMapButton">
               <property name="text">
                <string>MAP</string>

src/gui/mainwindow.cpp

@@ -39 +39 @@
 #include <eventdialog.h>
 #include "daynavigatorwidget.h"
-#include "mapwindow.h"
 #include "settingsdialog.h"
 #include "conferenceeditor.h"
@@ -139 +138 @@
 }
 
-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::eventHasChanged(int aEventId, bool aReloadModel)
 {
@@ -272 +258 @@
     connect(this, SIGNAL(conferenceRemoved()), &dialog, SLOT(conferenceRemoved()));
 
-    // TODO: propagate press of showMapButton here
-    // connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
-
     dialog.exec();
 

src/gui/mainwindow.h

@@ -42 +42 @@
 private slots:
     void aboutApp();
-    void conferenceMapClicked();
     void eventHasChanged(int aEventId, bool aReloadModel);
     void setup();