Changeset 624 for trunk/geant4
- Timestamp:
- Nov 29, 2007, 5:13:27 PM (17 years ago)
- Location:
- trunk/geant4
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/interfaces/basic/src/G4UIQt.cc
r620 r624 237 237 #endif 238 238 fMainWindow->setCentralWidget(splitter); 239 ((QApplication*)interactorManager->GetMainInteractor())->setMainWidget(fMainWindow); 239 240 240 241 #if QT_VERSION < 0x040000 … … 448 449 fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum()); 449 450 #endif 451 // Slow down everything : disababled 450 452 interactorManager->FlushAndWaitExecution(); 451 453 return 0; … … 543 545 QAction *action = new QAction(QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map())); 544 546 action->addTo(parent); 545 connect(action,SIGNAL( clicked()),signalMapper,SLOT(map()));547 connect(action,SIGNAL(activated()),signalMapper,SLOT(map())); 546 548 547 549 #else … … 570 572 if (!fHelpDialog) { 571 573 #if QT_VERSION < 0x040000 572 fHelpDialog = new QDialog( fMainWindow,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );574 fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax ); 573 575 QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog); 574 576 QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog); -
trunk/geant4/interfaces/basic/src/G4UIQt_moc.cc
r619 r624 15 15 #include <qapplication.h> 16 16 17 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 26)17 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 26) 18 18 19 19 #include <private/qucomextra_p.h> … … 159 159 160 160 161 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 58)161 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 58) 162 162 163 163 /**************************************************************************** … … 262 262 #else 263 263 264 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 59)264 #if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 59) 265 265 266 266 /**************************************************************************** -
trunk/geant4/specific-geant4-dev.sh
r617 r624 28 28 export G4LEDATA=$G4DATA/G4EMLOW3.0 29 29 # export QTHOME=/usr/local/Qt/3.3.8 30 export QTHOME=/usr/local/Qt/4.2.2 30 # export QTHOME=/usr/local/Qt/4.2.2 31 export QTHOME=/sw 32 export QTLIBS="-L/sw/lib -lqt-mt" 33 31 34 #////////////////////////////////////////////////////////// 32 35 # GUI, Visualization : -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r617 r624 171 171 bool found = false; 172 172 #if QT_VERSION < 0x040000 173 QWidgetList *list = QApplication::allWidgets(); 174 QWidgetListIt it( *list ); // iterate over the widgets 175 QWidget * widget; 176 while ( (widget=it.current()) != 0 ) { // for each widget... 177 ++it; 178 if ((found== false) && (widget->inherits("QMainWindow"))) { 179 #ifdef GEANT4_QT_DEBUG 180 printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n"); 181 #endif 182 GLWindow = new QDialog(widget,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax ); 183 found = true; 184 } 185 } 186 delete list; // delete the list, not the widgets 187 #else 188 foreach (QWidget *widget, QApplication::allWidgets()) { 189 if ((found== false) && (widget->inherits("QMainWindow"))) { 190 #ifdef GEANT4_QT_DEBUG 191 printf("G4OpenGLQtViewer::CreateMainWindow case Qapp exist\n"); 192 #endif 193 GLWindow = new QDialog(widget,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); 194 found = true; 195 } 196 } 173 // QWidgetList *list = QApplication::allWidgets(); 174 // QWidgetListIt it( *list ); // iterate over the widgets 175 // QWidget * widget; 176 // while ( (widget=it.current()) != 0 ) { // for each widget... 177 // ++it; 178 // if ((found== false) && (widget->inherits("QMainWindow"))) { 179 GLWindow = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax ); 180 // found = true; 181 // } 182 // } 183 // delete list; // delete the list, not the widgets 184 #else 185 // foreach (QWidget *widget, QApplication::allWidgets()) { 186 // if ((found== false) && (widget->inherits("QMainWindow"))) { 187 GLWindow = new QDialog(0,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint); 188 // found = true; 189 // } 190 // } 197 191 #endif 198 192
Note: See TracChangeset
for help on using the changeset viewer.