Changeset 755 for trunk/geant4
- Timestamp:
- Mar 11, 2008, 6:35:29 PM (17 years ago)
- Location:
- trunk/geant4/visualization/OpenGL/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc
r754 r755 25 25 // 26 26 // 27 // $Id: G4OpenGLQtMovieDialog.cc,v 1. 3 2008/03/11 16:05:56lgarnier Exp $27 // $Id: G4OpenGLQtMovieDialog.cc,v 1.5 2008/03/11 17:35:11 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 86 86 87 87 // Encoder group box 88 QGroupBox *encoderGroupBox = new QGroupBox(tr("Encoder path") );88 QGroupBox *encoderGroupBox = new QGroupBox(tr("Encoder path"),this); 89 89 QVBoxLayout *encoderVGroupBoxLayout = new QVBoxLayout(encoderGroupBox); 90 90 … … 101 101 #if QT_VERSION > 0x040000 102 102 fEncoderStatus->setWordWrap(true); 103 encoderVGroupBoxLayout->setMargin(15); 103 104 #else 104 105 fEncoderStatus->setAlignment ( Qt::AlignAuto |Qt::WordBreak ); 106 encoderGroupBox->setInsideMargin(15); 105 107 #endif 106 108 … … 128 130 129 131 // temp folder group box 130 QGroupBox *tempFolderGroupBox = new QGroupBox(tr("Temporary folder path") );132 QGroupBox *tempFolderGroupBox = new QGroupBox(tr("Temporary folder path"),this); 131 133 QVBoxLayout *tempFolderVGroupBoxLayout = new QVBoxLayout(tempFolderGroupBox); 132 134 … … 143 145 #if QT_VERSION > 0x040000 144 146 fTempFolderStatus->setWordWrap(true); 147 tempFolderVGroupBoxLayout->setMargin(15); 145 148 #else 146 149 fTempFolderStatus->setAlignment ( Qt::AlignAuto |Qt::WordBreak ); 150 tempFolderGroupBox->setInsideMargin(15); 147 151 #endif 148 152 fTempFolderStatus->setText(""); … … 171 175 172 176 // save file group box 173 QGroupBox *saveFileGroupBox = new QGroupBox(tr("Save as") );177 QGroupBox *saveFileGroupBox = new QGroupBox(tr("Save as"),this); 174 178 QVBoxLayout *saveFileVGroupBoxLayout = new QVBoxLayout(saveFileGroupBox); 175 179 … … 186 190 #if QT_VERSION > 0x040000 187 191 fSaveFileStatus->setWordWrap(true); 192 saveFileVGroupBoxLayout->setMargin(15); 188 193 #else 189 194 fSaveFileStatus->setAlignment ( Qt::AlignAuto |Qt::WordBreak ); 195 saveFileGroupBox->setInsideMargin(15); 190 196 #endif 191 197 fSaveFileStatus->setText(""); … … 217 223 218 224 // global status 219 QGroupBox *statusGroupBox = new QGroupBox(tr("Status") );225 QGroupBox *statusGroupBox = new QGroupBox(tr("Status"),this); 220 226 QVBoxLayout *statusVGroupBoxLayout = new QVBoxLayout(statusGroupBox); 221 227 222 228 fRecordingStatus = new QLabel(statusGroupBox); 223 229 #if QT_VERSION > 0x040000 230 statusVGroupBoxLayout->setMargin(15); 224 231 fRecordingStatus->setWordWrap(true); 225 232 #else 233 statusGroupBox->setInsideMargin(15); 226 234 fRecordingStatus->setAlignment ( Qt::AlignAuto |Qt::WordBreak ); 227 235 #endif … … 303 311 304 312 // connect line edit signals 305 connect (fEncoderPath,SIGNAL(textEdited ( const QString&)),this,SLOT(enabledApplyButton())); 306 connect (fTempFolderPath,SIGNAL(textEdited ( const QString&)),this,SLOT(enabledApplyButton())); 307 connect (fSaveFileName,SIGNAL(textEdited ( const QString&)),this,SLOT(enabledApplyButton())); 308 313 connect (fEncoderPath,SIGNAL(textChanged ( const QString&)),this,SLOT(enabledApplyButton())); 314 connect (fTempFolderPath,SIGNAL(textChanged ( const QString&)),this,SLOT(enabledApplyButton())); 315 connect (fSaveFileName,SIGNAL(textChanged ( const QString&)),this,SLOT(enabledApplyButton())); 316 317 #if QT_VERSION >= 0x040000 309 318 connect (fEncoderPath,SIGNAL(editingFinished ()),this,SLOT(checkAllParameters())); 310 319 connect (fTempFolderPath,SIGNAL(editingFinished ()),this,SLOT(checkAllParameters())); 311 320 connect (fSaveFileName,SIGNAL(editingFinished ()),this,SLOT(checkAllParameters())); 321 #else 322 connect (fEncoderPath,SIGNAL(lostFocus ()),this,SLOT(checkAllParameters())); 323 connect (fTempFolderPath,SIGNAL(lostFocus ()),this,SLOT(checkAllParameters())); 324 connect (fSaveFileName,SIGNAL(lostFocus ()),this,SLOT(checkAllParameters())); 325 #endif 312 326 313 327 if (fParentViewer->getEncoderPath() == "") { … … 350 364 { 351 365 #if QT_VERSION < 0x040000 352 QString nomFich = QFileDialog::getOpenFileName ( ".", 353 NULL, 366 QString nomFich = QFileDialog::getExistingDirectory (NULL, 354 367 this, 355 368 "Select temporary folder", 356 369 tr("Select temporary folder ...")); 357 370 #else 358 QString nomFich = QFileDialog::get OpenFileName( this,371 QString nomFich = QFileDialog::getExistingDirectory ( this, 359 372 "Select temporary folder", 360 373 tr("Select temporary folder ...")); -
trunk/geant4/visualization/OpenGL/src/G4OpenGLQtViewer.cc
r754 r755 25 25 // 26 26 // 27 // $Id: G4OpenGLQtViewer.cc,v 1.1 5 2008/03/11 16:31:09lgarnier Exp $27 // $Id: G4OpenGLQtViewer.cc,v 1.17 2008/03/11 17:35:11 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 2001 2001 void G4OpenGLQtViewer::G4keyPressEvent (QKeyEvent * event) 2002 2002 { 2003 #ifdef GEANT4_QT_DEBUG 2004 printf("G4OpenGLQtViewer::G4keyPressEvent \n"); 2005 #endif 2003 2006 if (fHoldKeyEvent) 2004 2007 return; … … 2245 2248 2246 2249 #if QT_VERSION < 0x040000 2247 QObject ::connect(fProcess,SIGNAL( LaunchFinished ()),2250 QObject ::connect(fProcess,SIGNAL(launchFinished ()), 2248 2251 this,SLOT(processLookForFinished())); 2249 2252 fProcess->setCommunication(QProcess::DupStderr); … … 2407 2410 QString sep = QChar(QDir::separator()); 2408 2411 #else 2409 QString sep = Q Dir::separator();2412 QString sep = QString(QDir::separator()); 2410 2413 #endif 2411 2414 QString path = sep+"QtMovie_"+QDateTime::currentDateTime ().toString("dd-MM-yyyy_hh-mm-ss")+sep;
Note: See TracChangeset
for help on using the changeset viewer.