Changeset 734 for trunk

Timestamp:

Mar 4, 2008, 3:54:43 PM (16 years ago)

Author:

garnier

Message:

layout oks

Location:

trunk/geant4/visualization/OpenGL/src

Files:

• G4OpenGLQtExportDialog.cc (modified) (1 diff)
• G4OpenGLQtMovieDialog.cc (modified) (11 diffs)

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

@@ -312 +312 @@
 #endif
 
-#if QT_VERSION >= 0x040000
-    imageGroupBox->setLayout(hSliderLayout);
-#endif
-
     globalVLayout->addWidget(imageGroupBox);
   }

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

@@ -85 +85 @@
   // Encoder group box
   QGroupBox *encoderGroupBox = new QGroupBox(tr("Encoder path"));               
-  QVBoxLayout *encoderVBoxLayout = new QVBoxLayout(encoderGroupBox);
-#ifdef GEANT4_QT_DEBUG
-  printf("1111\n");
-#endif
+  QVBoxLayout *encoderVGroupBoxLayout = new QVBoxLayout(encoderGroupBox);
 
   // Encoder Path 
@@ -101 +98 @@
   fEncoderStatus->setText("");
 
-#ifdef GEANT4_QT_DEBUG
-  printf("2222\n");
-#endif
 #if QT_VERSION < 0x040000
   encoderHBoxLayout->add(fEncoderPath);
   encoderHBoxLayout->add(encoderButton);
-  encoderVBoxLayout->add(fEncoderStatus);
+  encoderVGroupBoxLayout->add(encoderHBox);
+  encoderVGroupBoxLayout->add(fEncoderStatus);
 #else
   encoderHBoxLayout->addWidget(fEncoderPath);
   encoderHBoxLayout->addWidget(encoderButton);
-  encoderVBoxLayout->addWidget(fEncoderStatus);
-#endif
-
-#ifdef GEANT4_QT_DEBUG
-  printf("33333\n");
-#endif
-#if QT_VERSION >= 0x040000
-//  encoderHBox->setLayout(encoderHBoxLayout);
-  encoderGroupBox->setLayout(encoderVBoxLayout);
+  encoderVGroupBoxLayout->addWidget(encoderHBox);
+  encoderVGroupBoxLayout->addWidget(fEncoderStatus);
+#endif
+
+#if QT_VERSION >= 0x040000
+  encoderGroupBox->setLayout(encoderVGroupBoxLayout);
 #endif
   connect( encoderButton, SIGNAL( clicked( ) ), this, SLOT(selectEncoderPathAction() ) );
-#ifdef GEANT4_QT_DEBUG
-  printf("4444\n");
-#endif
 
 #if QT_VERSION < 0x040000
@@ -137 +126 @@
   // temp folder group box
   QGroupBox *tempFolderGroupBox = new QGroupBox(tr("Temporary folder path"));           
-  QVBoxLayout *tempFolderVBoxLayout = new QVBoxLayout(tempFolderGroupBox);
+  QVBoxLayout *tempFolderVGroupBoxLayout = new QVBoxLayout(tempFolderGroupBox);
 
   // temp folder Path 
   QWidget *tempFolderHBox = new QWidget(tempFolderGroupBox);
-  QHBoxLayout *tempFolderHBoxLayout = new QHBoxLayout(tempFolderGroupBox);
+  QHBoxLayout *tempFolderHBoxLayout = new QHBoxLayout(tempFolderHBox);
 
   fTempFolderPath = new QLineEdit("",tempFolderHBox);
@@ -151 +140 @@
   fTempFolderStatus->setText("");
 
-#ifdef GEANT4_QT_DEBUG
-  printf("5555\n");
-#endif
 #if QT_VERSION < 0x040000
   tempFolderHBoxLayout->add(fTempFolderPath);
   tempFolderHBoxLayout->add(tempButton);
-  tempFolderVBoxLayout->add(fTempFolderStatus);
+  tempFolderVGroupBoxLayout->add(tempFolderHBox);
+  tempFolderVGroupBoxLayout->add(fTempFolderStatus);
 #else
   tempFolderHBoxLayout->addWidget(fTempFolderPath);
   tempFolderHBoxLayout->addWidget(tempButton);
-  tempFolderVBoxLayout->addWidget(fTempFolderStatus);
-#endif
-
-#ifdef GEANT4_QT_DEBUG
-  printf("6666\n");
-#endif
-#if QT_VERSION >= 0x040000
-//  tempFolderHBox->setLayout(tempFolderHBoxLayout);
-  tempFolderGroupBox->setLayout(tempFolderVBoxLayout);
+  tempFolderVGroupBoxLayout->addWidget(tempFolderHBox);
+  tempFolderVGroupBoxLayout->addWidget(fTempFolderStatus);
+#endif
+
+#if QT_VERSION >= 0x040000
+  tempFolderGroupBox->setLayout(tempFolderVGroupBoxLayout);
 #endif
   connect( tempButton, SIGNAL( clicked( ) ), this, SLOT(selectTempPathAction() ) );
 
-#ifdef GEANT4_QT_DEBUG
-  printf("77777\n");
-#endif
 #if QT_VERSION < 0x040000
   globalVLayout->add(tempFolderGroupBox);
@@ -183 +164 @@
 
   fTempFolderPath->setText(fParentViewer->getTempFolderPath());
+
+
 
   // save file group box
   QGroupBox *saveFileGroupBox = new QGroupBox(tr("Save as"));           
-  QVBoxLayout *saveFileVBoxLayout = new QVBoxLayout(saveFileGroupBox);
+  QVBoxLayout *saveFileVGroupBoxLayout = new QVBoxLayout(saveFileGroupBox);
 
   // save file 
@@ -200 +183 @@
   fSaveFileStatus->setText("");
 
-#ifdef GEANT4_QT_DEBUG
-  printf("8888\n");
-#endif
-#if QT_VERSION < 0x040000
-  saveFileHBoxLayout->add(fTempFolderPath);
+#if QT_VERSION < 0x040000
+  saveFileHBoxLayout->add(fSaveFileName);
   saveFileHBoxLayout->add(saveButton);
-  saveFileVBoxLayout->add(fSaveFileStatus);
-#else
-  saveFileHBoxLayout->addWidget(fTempFolderPath);
+  saveFileVGroupBoxLayout->add(saveFileHBox);
+  saveFileVGroupBoxLayout->add(fSaveFileStatus);
+#else
+  saveFileHBoxLayout->addWidget(fSaveFileName);
   saveFileHBoxLayout->addWidget(saveButton);
-  saveFileVBoxLayout->addWidget(fSaveFileStatus);
-#endif
-
-#ifdef GEANT4_QT_DEBUG
-  printf("99999\n");
-#endif
-#if QT_VERSION >= 0x040000
-//  saveFileHBox->setLayout(saveFileHBoxLayout);
-  saveFileGroupBox->setLayout(saveFileVBoxLayout);
+  saveFileVGroupBoxLayout->addWidget(saveFileHBox);
+  saveFileVGroupBoxLayout->addWidget(fSaveFileStatus);
+#endif
+
+#if QT_VERSION >= 0x040000
+  saveFileGroupBox->setLayout(saveFileVGroupBoxLayout);
 #endif
   connect( saveButton, SIGNAL( clicked( ) ), this, SLOT(selectSaveFileNameAction() ) );
 
-#ifdef GEANT4_QT_DEBUG
-  printf("11110000\n");
-#endif
 #if QT_VERSION < 0x040000
   globalVLayout->add(saveFileGroupBox);
@@ -231 +206 @@
 #endif
 
-#ifdef GEANT4_QT_DEBUG
-  printf("11111111111&\n");
-#endif
 
   // label
@@ -248 +220 @@
   globalVLayout->addWidget(infoLabel);
   globalVLayout->addWidget(fGlobalStatus);
-#endif
-#ifdef GEANT4_QT_DEBUG
-  printf("11112222222222é\n");
 #endif
 
@@ -271 +240 @@
   buttonBoxLayout->addWidget(buttonEncode);
 
-#ifdef GEANT4_QT_DEBUG
-  printf("1111333333333333\n");
-#endif
 #if QT_VERSION >= 0x040000
   buttonBox->setLayout(buttonBoxLayout);
@@ -280 +246 @@
 
 
-#ifdef GEANT4_QT_DEBUG
-  printf("1111444444444\n");
-#endif
 
 #if QT_VERSION >= 0x040000
@@ -292 +255 @@
   connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
   connect( buttonEncode, SIGNAL( clicked() ), this, SLOT( encode() ) );
-#ifdef GEANT4_QT_DEBUG
-  printf("111155555555\n");
-#endif
 }