- Timestamp:
- 04/23/10 08:04:08 (13 years ago)
- Branches:
- master, qt5
- Children:
- 3cdaf7d
- Parents:
- 66428e7
- Location:
- src/gui
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/conferenceeditor.cpp
r66428e7 rcb7b999 21 21 #include "conferencemodel.h" 22 22 #include "urlinputdialog.h" 23 #include "mapwindow.h" 23 24 24 25 #include <QInputDialog> … … 48 49 connect(changeUrl, SIGNAL(clicked()), SLOT(changeUrlClicked())); 49 50 connect(refreshBtn, SIGNAL(clicked()), SLOT(refreshClicked())); 51 connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked())); 50 52 51 53 // it's OK to emit selection signals here … … 207 209 itemSelected(QModelIndex(), QModelIndex()); 208 210 } 211 212 void ConferenceEditor::conferenceMapClicked() 213 { 214 QString mapPath = QString(":/maps/campus.png"); 215 if(!QFile::exists(mapPath)) 216 mapPath = QString(":/maps/rooms/not-available.png"); 217 218 QString roomName; 219 220 QPixmap map(mapPath); 221 MapWindow window(map,roomName,this); 222 window.exec(); 223 } -
src/gui/conferenceeditor.h
r66428e7 rcb7b999 64 64 void changeUrlClicked(); 65 65 void refreshClicked(); 66 void conferenceMapClicked(); 66 67 67 68 private: -
src/gui/conferenceeditor.ui
r66428e7 rcb7b999 217 217 </item> 218 218 <item row="1" column="3"> 219 <widget class="QPushButton" name="showMapButton _2">219 <widget class="QPushButton" name="showMapButton"> 220 220 <property name="text"> 221 221 <string>MAP</string> -
src/gui/mainwindow.cpp
r66428e7 rcb7b999 39 39 #include <eventdialog.h> 40 40 #include "daynavigatorwidget.h" 41 #include "mapwindow.h"42 41 #include "settingsdialog.h" 43 42 #include "conferenceeditor.h" … … 139 138 } 140 139 141 void MainWindow::conferenceMapClicked()142 {143 QString mapPath = QString(":/maps/campus.png");144 if(!QFile::exists(mapPath))145 mapPath = QString(":/maps/rooms/not-available.png");146 147 QString roomName;148 149 QPixmap map(mapPath);150 MapWindow window(map,roomName,this);151 window.exec();152 }153 154 140 void MainWindow::eventHasChanged(int aEventId, bool aReloadModel) 155 141 { … … 272 258 connect(this, SIGNAL(conferenceRemoved()), &dialog, SLOT(conferenceRemoved())); 273 259 274 // TODO: propagate press of showMapButton here275 // connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked()));276 277 260 dialog.exec(); 278 261 -
src/gui/mainwindow.h
r66428e7 rcb7b999 42 42 private slots: 43 43 void aboutApp(); 44 void conferenceMapClicked();45 44 void eventHasChanged(int aEventId, bool aReloadModel); 46 45 void setup();
Note: See TracChangeset
for help on using the changeset viewer.