Changeset 1228 for trunk/source/interfaces/basic

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (4 diffs)

trunk/source/interfaces/basic/include/G4UIQt.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.16 2009/02/16 11:40:26 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4UIQt.hh,v 1.17 2010/01/06 14:13:08 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 #ifndef G4UIQt_h

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.28 2009/11/05 14:34:18 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4UIQt.cc,v 1.30 2010/01/06 14:13:08 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 // L. Garnier
@@ -358 +358 @@
 {
 
+  
+#if QT_VERSION < 0x040000
   QWidget *helpWidget = new QWidget(fHelpTBWidget);
-  
-  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
-#if QT_VERSION < 0x040000
   QHBoxLayout *helpLayout = new QHBoxLayout(helpWidget);
   QVBoxLayout *vLayout = new QVBoxLayout(fHelpTBWidget);
-  helpLayout->add(new QLabel("Search :",helpWidget));
-#else
+  QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
+#else
+  QWidget *helpWidget = new QWidget();
   QHBoxLayout *helpLayout = new QHBoxLayout();
   QVBoxLayout *vLayout = new QVBoxLayout();
+  QSplitter *splitter = new QSplitter(Qt::Horizontal);
+#endif
+  helpLine = new QLineEdit(fHelpTBWidget);
   helpLayout->addWidget(new QLabel("Search :",helpWidget));
-#endif
-  helpLine = new QLineEdit(fHelpTBWidget);
-#if QT_VERSION < 0x040000
-  helpLayout->add(helpLine);
+  helpLayout->addWidget(helpLine);
+#if QT_VERSION < 0x040000
   connect( helpLine, SIGNAL( returnPressed () ), this, SLOT( LookForHelpStringCallback() ) );
 #else
-  helpLayout->addWidget(helpLine);
   connect( helpLine, SIGNAL( editingFinished () ), this, SLOT( LookForHelpStringCallback() ) );
 #endif
@@ -402 +402 @@
   vLayout->addWidget(helpWidget);
   vLayout->addWidget(splitter,1);
-#else
-  vLayout->addWidget(helpWidget);
-  vLayout->addWidget(splitter,1);
-#endif
-  
+#endif
+  
+  fHelpTBWidget->setMinimumSize(50,50);
+  fHelpTBWidget->setSizePolicy (QSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum));
   // set the splitter size
 #if QT_VERSION >= 0x040000
@@ -413 +412 @@
   QValueList<int> list;
 #endif
-  list.append( 400 );
-  list.append( 400 );
+  list.append( 50 );
+  list.append( 50 );
   splitter->setSizes(list);
-
+  
 #if QT_VERSION >= 0x040000
   helpWidget->setLayout(helpLayout);