Changeset 1118 for trunk/source/interfaces/basic/src

Timestamp:

Oct 6, 2009, 5:05:23 PM (15 years ago)

Author:

garnier

Message:

en test

File:

• trunk/source/interfaces/basic/src/G4UIQt.cc (modified) (7 diffs)

trunk/source/interfaces/basic/src/G4UIQt.cc

@@ -142 +142 @@
   fMainWindow = new QMainWindow();
 
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::Initialise after main window creation\n");
 #endif
@@ -155 +155 @@
 #endif
 
-  QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow);
+  QWidget *mainWidget = new QWidget(fMainWindow);
+  QSplitter *splitter = new QSplitter(mainWidget);
+  splitter->setOrientation(Qt::Vertical);
 
   // Set layouts
@@ -208 +210 @@
 
 #if QT_VERSION >= 0x040000
-  topWidget->setLayout(layoutTop);
+  //  topWidget->setLayout(layoutTop);
 #endif
 
@@ -216 +218 @@
 #if QT_VERSION >= 0x040000
 
-  bottomWidget->setLayout(layoutBottom);
+  //  bottomWidget->setLayout(layoutBottom);
+  QVBoxLayout *mainLayout = new QVBoxLayout(mainWidget);
+
   splitter->addWidget(topWidget);
   splitter->addWidget(bottomWidget);
-#endif
-
-
-  fMainWindow->setCentralWidget(splitter);
+
+  mainLayout->addWidget(splitter);
+
+#endif
+
+    fMainWindow->setCentralWidget(mainWidget);
+    //fMainWindow->setCentralWidget(splitter);
 
 #if QT_VERSION < 0x040000
@@ -257 +264 @@
   QList<int> vals = splitter->sizes();
 #endif
-  if(vals.size()==2) {
-    vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
-    vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
-    splitter->setSizes(vals);
-  }
+//    if(vals.size()==2) {
+//      vals[0] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*3/4;
+//      vals[1] = (splitter->orientation()==Qt::Vertical ? splitter->height() : splitter->width())*1/4;
+//      splitter->setSizes(vals);
+//    }
 
   if(UI!=NULL) UI->SetCoutDestination(this);  // TO KEEP
@@ -997 +1004 @@
 )
 {
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::GetHelpChoice SHOULD NEVER GO HERE");
 #endif
@@ -1009 +1016 @@
 )
 {
-#ifdef G4DEBUG
+#ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::ExitHelp SHOULD NEVER GO HERE");
 #endif