Changeset 735 for trunk/geant4/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc

Timestamp:

Mar 4, 2008, 5:27:31 PM (16 years ago)

Author:

garnier

Message:

on avance

File:

• trunk/geant4/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc (modified) (9 diffs)

trunk/geant4/visualization/OpenGL/src/G4OpenGLQtMovieDialog.cc

@@ -103 +103 @@
   encoderVGroupBoxLayout->add(encoderHBox);
   encoderVGroupBoxLayout->add(fEncoderStatus);
+
+  globalVLayout->add(encoderGroupBox);
 #else
   encoderHBoxLayout->addWidget(fEncoderPath);
@@ -108 +110 @@
   encoderVGroupBoxLayout->addWidget(encoderHBox);
   encoderVGroupBoxLayout->addWidget(fEncoderStatus);
-#endif
-
-#if QT_VERSION >= 0x040000
+
   encoderGroupBox->setLayout(encoderVGroupBoxLayout);
-#endif
+  globalVLayout->addWidget(encoderGroupBox);
+#endif
+
   connect( encoderButton, SIGNAL( clicked( ) ), this, SLOT(selectEncoderPathAction() ) );
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(encoderGroupBox);
-#else
-  globalVLayout->addWidget(encoderGroupBox);
-#endif
 
   fEncoderPath->setText(fParentViewer->getEncoderPath());
@@ -145 +141 @@
   tempFolderVGroupBoxLayout->add(tempFolderHBox);
   tempFolderVGroupBoxLayout->add(fTempFolderStatus);
+
+  globalVLayout->add(tempFolderGroupBox);
 #else
   tempFolderHBoxLayout->addWidget(fTempFolderPath);
@@ -150 +148 @@
   tempFolderVGroupBoxLayout->addWidget(tempFolderHBox);
   tempFolderVGroupBoxLayout->addWidget(fTempFolderStatus);
-#endif
-
-#if QT_VERSION >= 0x040000
+
   tempFolderGroupBox->setLayout(tempFolderVGroupBoxLayout);
-#endif
+  globalVLayout->addWidget(tempFolderGroupBox);
+#endif
+
   connect( tempButton, SIGNAL( clicked( ) ), this, SLOT(selectTempPathAction() ) );
-
-#if QT_VERSION < 0x040000
-  globalVLayout->add(tempFolderGroupBox);
-#else
-  globalVLayout->addWidget(tempFolderGroupBox);
-#endif
 
   fTempFolderPath->setText(fParentViewer->getTempFolderPath());
@@ -188 +180 @@
   saveFileVGroupBoxLayout->add(saveFileHBox);
   saveFileVGroupBoxLayout->add(fSaveFileStatus);
+
+  globalVLayout->add(saveFileGroupBox);
 #else
   saveFileHBoxLayout->addWidget(fSaveFileName);
@@ -193 +187 @@
   saveFileVGroupBoxLayout->addWidget(saveFileHBox);
   saveFileVGroupBoxLayout->addWidget(fSaveFileStatus);
-#endif
-
-#if QT_VERSION >= 0x040000
+
   saveFileGroupBox->setLayout(saveFileVGroupBoxLayout);
-#endif
+  globalVLayout->addWidget(saveFileGroupBox);
+#endif
+
   connect( saveButton, SIGNAL( clicked( ) ), this, SLOT(selectSaveFileNameAction() ) );
 
-#if QT_VERSION < 0x040000
-  globalVLayout->add(saveFileGroupBox);
-#else
-  globalVLayout->addWidget(saveFileGroupBox);
-#endif
 
 
@@ -212 +201 @@
 
   // global status
-  fGlobalStatus = new QLabel("");
-
-#if QT_VERSION < 0x040000
+  QGroupBox *statusGroupBox = new QGroupBox(tr("Status"));
+  QVBoxLayout *statusVGroupBoxLayout = new QVBoxLayout(statusGroupBox);
+  fGlobalStatus = new QLabel(statusGroupBox);
+  fGlobalStatus->setText("");
+
+#if QT_VERSION < 0x040000
+  statusVGroupBoxLayout->add(fGlobalStatus);
+
   globalVLayout->add(infoLabel);
-  globalVLayout->add(fGlobalStatus);
-#else
+  globalVLayout->add(statusGroupBox);
+#else
+  statusVGroupBoxLayout->addWidget(fGlobalStatus);
+
+  statusGroupBox->setLayout(statusVGroupBoxLayout);
   globalVLayout->addWidget(infoLabel);
-  globalVLayout->addWidget(fGlobalStatus);
+  globalVLayout->addWidget(statusGroupBox);
 #endif
 
@@ -236 +233 @@
 
   QPushButton * buttonEncode = new QPushButton( tr( "&Encode" ),buttonBox );
+  buttonEncode->setEnabled(false); 
   buttonEncode->setAutoDefault( TRUE );
   buttonEncode->setDefault( TRUE );
@@ -320 +318 @@
   if (temp != "") {
     palette.setColor( QPalette::Base, Qt::red);
-    fGlobalStatus->setText("If no valid encode defined, screnn /ncapture files will be saved in /nthe temp folder in ppm format.");
+    fGlobalStatus->setText("If no valid encode defined, screnn \ncapture files will be saved in the\ntemp folder in ppm format.");
   } else {
     palette.setColor( QPalette::Base, Qt::white);