Changeset 1228 for trunk/source/interfaces

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/interfaces

Files:

• History (modified) (2 diffs)
• basic/include/G4UIQt.hh (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (4 diffs)
• common/GNUmakefile (modified) (1 diff)
• common/include/G4Qt.hh (modified) (1 diff)
• common/src/G4Qt.cc (modified) (4 diffs)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.116 2009/11/05 14:34:18 lgarnier Exp $
+$Id: History,v 1.125 2010/01/06 14:13:08 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
-=======
+6 January, 2010 L. Garnier
+ - G4VBasicShell : improvments for command completion
+ - G4Qt : Add a link to G4UIQt
+ - G4UIQt : Add tab widgets in order to put Vis in
+
+20 November, 2009 K. Murakami (interfaces-V09-02-07)
+ - G4UIExecutive.hh:  no default arguments of the constructor
+ - G4UIExecutive.icc: more cleaver way for suppressing compiler warnings
+
+20 November, 2009 J. Allison (interfaces-V09-02-06)
+ - G4UIExecutive.icc: Fixed complier warnings for some cases when more
+  than one flag is set.
+
+19 November, 2009 J. Allison (interfaces-V09-02-05)
+ - Tagged for the release.
+
+18 November, 2009 L. Garnier
+ - G4UIQt: Add CTRL+A and CTRL+E to move to begin/end of command line
+
+17 November, 2009 L. Garnier
+ - G4VBasicShell: Fix commands strings that match some shorter 
+   commands are trimmed and executed as those shorter commands.
+
 5 November, 2009 L. Garnier
  - G4UIQt Fix a problem introduce the 6th October 2009 and cause

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);

trunk/source/interfaces/common/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.4 2009/10/19 07:37:48 lgarnier Exp $
+# $Id: GNUmakefile,v 1.5 2010/01/06 14:08:20 lgarnier Exp $
 # -------------------------------------------------------------
 # GNUmakefile for interfaces/common library.  John Allison, 6/7/98.

trunk/source/interfaces/common/include/G4Qt.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.hh,v 1.4 2008/11/06 10:06:33 lgarnier Exp $
-// GEANT4 tag $Name:  $
+// $Id: G4Qt.hh,v 1.5 2010/01/06 14:07:34 lgarnier Exp $
+// GEANT4 tag $Name: laurent-QtUI_with_tabs_v1 $
 //
 //  To unify Qt event treatment between 

trunk/source/interfaces/common/src/G4Qt.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.14 2009/10/07 09:12:35 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.15 2010/01/06 14:07:34 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -131 +131 @@
 #else
 #ifdef G4DEBUG_INTERFACES_COMMON
-    printf("G4Qt::G4Qt QAppl \n");
+      printf("G4Qt::G4Qt QAppl \n");
 #endif
       new QApplication (*p_argn, args);
+#ifdef G4DEBUG_INTERFACES_COMMON
+        printf("G4Qt::G4Qt 0\n");
+#endif
 #endif
       if(!qApp) {
@@ -139 +142 @@
         G4cout        << "G4Qt : Unable to init Qt." << G4endl;
       } else {
+#ifdef G4DEBUG_INTERFACES_COMMON
+        printf("G4Qt::G4Qt 1\n");
+#endif
         QtInited  = TRUE;
         if (a_argn != 0) {
@@ -242 +248 @@
 
 
-