Changeset e7340e1
- Timestamp:
- 01/22/10 15:41:46 (13 years ago)
- Branches:
- master, qt5
- Children:
- 0d4ecc2
- Parents:
- 49c5ad3
- Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/gui/mainwindow.cpp
r49c5ad3 re7340e1 122 122 // event search button clicked 123 123 connect(searchButton, SIGNAL(clicked()), SLOT(searchClicked())); 124 // event conference map button clicked 125 connect(showMapButton, SIGNAL(clicked()), SLOT(conferenceMapClicked())); 124 126 // 125 127 connect(tabWidget, SIGNAL(currentChanged(int)), SLOT(tabHasChanged(int))); … … 292 294 } 293 295 296 void MainWindow::conferenceMapClicked() 297 { 298 299 QString mapPath = QString(":/maps/campus.png"); 300 if(!QFile::exists(mapPath)) 301 mapPath = QString(":/maps/rooms/not-available.png"); 302 303 QString roomName; 304 305 QPixmap map(mapPath); 306 MapWindow window(map,roomName,this); 307 window.exec(); 308 } 309 294 310 void MainWindow::displayWarning(const QModelIndex &aIndex) 295 311 { -
src/gui/mainwindow.h
r49c5ad3 re7340e1 28 28 void displayWarning(const QModelIndex &aIndex); 29 29 void searchClicked(); 30 void conferenceMapClicked(); 30 31 void tabHasChanged(int aIndex); 31 32 void eventHasChanged(int aEventId); -
src/gui/mainwindow.ui
r49c5ad3 re7340e1 230 230 </layout> 231 231 </widget> 232 <widget class="QWidget" name="mapTab" > 233 <attribute name="title" > 234 <string>Map</string> 235 </attribute> 236 </widget> 237 <widget class="QWidget" name="conferenceTab" > 238 <attribute name="title" > 232 <widget class="QWidget" name="conferenceTab" > 233 <attribute name="title" > 239 234 <string>Conference</string> 240 235 </attribute> -
src/mvc/delegate.cpp
r49c5ad3 re7340e1 321 321 return id; 322 322 } 323 else 324 { 325 if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint)) 323 else if ((mControls[id]->drawRect(static_cast<QTreeView*>(parent())->visualRect(aIndex)).contains(aPoint)) 326 324 && (mControls[id]->hasConflict)) 327 { 325 { 326 qDebug() << "tengo conflicto"; 328 327 return id; 329 330 } 328 } 329 331 330 } 332 331
Note: See TracChangeset
for help on using the changeset viewer.