restore viewing of conference map

diff --git a/src/gui/conferenceeditor.cpp b/src/gui/conferenceeditor.cpp
index 8e89d36b1c710fbc5d0973efa250c4f33d74103a..7d654840344ba4269f2f8dbe1abb2a9b83fff925 100644 (file)
--- a/src/gui/conferenceeditor.cpp
+++ b/src/gui/conferenceeditor.cpp
@@ -20,6 +20,7 @@
 
 #include "conferencemodel.h"
 #include "urlinputdialog.h"
+#include "mapwindow.h"
 
 #include <QInputDialog>
 #include <QItemSelectionModel>
@@ -47,6 +48,7 @@ ConferenceEditor::ConferenceEditor(ConferenceModel* model, QWidget* parent)
     connect(removeBtn, SIGNAL(clicked()), SLOT(removeClicked()));
     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
     // because they are not yet connected to anybody
@@ -206,3 +208,16 @@ void ConferenceEditor::importFinished(const QString& title)
     }
     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();
+}

diff --git a/src/gui/conferenceeditor.h b/src/gui/conferenceeditor.h
index 336375bbbe0f49c3a50484d35920198e4d8b96b9..de83d476b3d8354ceabeb6b2f5c3b3b52aac6bbc 100644 (file)
--- a/src/gui/conferenceeditor.h
+++ b/src/gui/conferenceeditor.h
@@ -63,6 +63,7 @@ private slots:
     void removeClicked();
     void changeUrlClicked();
     void refreshClicked();
+    void conferenceMapClicked();
 
 private:
     ConferenceModel* model;

diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui
index 8a632befa66f38238302f88754d3a38d90be1066..2f3a9ed0bfe0f4be6c5e04b48d93f6dc592234dc 100644 (file)
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -216,7 +216,7 @@
              </widget>
             </item>
             <item row="1" column="3">
-             <widget class="QPushButton" name="showMapButton_2">
+             <widget class="QPushButton" name="showMapButton">
               <property name="text">
                <string>MAP</string>
               </property>

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 5f38fcc20e46f12d314af47dab400969fb74d300..2cee85cd38410b210ee231660e262fa5531ebbe7 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -38,7 +38,6 @@
 #include "ui_about.h"
 #include <eventdialog.h>
 #include "daynavigatorwidget.h"
-#include "mapwindow.h"
 #include "settingsdialog.h"
 #include "conferenceeditor.h"
 #include "schedulexmlparser.h"
@@ -138,19 +137,6 @@ void MainWindow::aboutApp()
     dialog.exec();
 }
 
-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)
 {
     dayTabContainer->updateTreeViewModel(aEventId);
@@ -271,9 +257,6 @@ void MainWindow::showConferences()
 
     connect(this, SIGNAL(conferenceRemoved()), &dialog, SLOT(conferenceRemoved()));
 
-    // TODO: propagate press of showMapButton here
-    // connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));
-
     dialog.exec();
 
     // optimization, see useConference() code

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 1d1c4a8404755a09061fb809f45ead4aabf7d2dd..c21d7d8785c4f67c4876cd2b8dc9f9c55f954364 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -41,7 +41,6 @@ signals:
     void conferenceRemoved();
 private slots:
     void aboutApp();
-    void conferenceMapClicked();
     void eventHasChanged(int aEventId, bool aReloadModel);
     void setup();
     // TODO: remove