Import Geant4 9.2.0 source tree

source/interfaces/basic/include/G4UIArrayString.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4UIArrayString.hh,v 1.3 2006/06/29 19:09:27 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 
 #ifndef G4UIArrayString_h

source/interfaces/basic/include/G4UIQt.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIQt.hh,v 1.7 2007/11/15 18:53:59 lgarnier Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// $Id: G4UIQt.hh,v 1.15 2008/11/06 10:06:33 lgarnier Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 #ifndef G4UIQt_h
 #define G4UIQt_h 
@@ -38,6 +38,7 @@
 #include "G4VInteractiveSession.hh"
 
 #include <qobject.h>
+#include <qmap.h>
 
 class QMainWindow;
 class QLineEdit;
@@ -56,8 +57,8 @@ class QDialog;
 
 // Class description :
 //
-//  G4UIQt : class to handle a Motif interactive session.
-// G4UIQt is the Motif version of G4UIterminal.
+//  G4UIQt : class to handle a Qt interactive session.
+// G4UIQt is the Qt version of G4UIterminal.
 //
 //  A command box is at disposal for entering/recalling Geant4 commands.
 //  A menubar could be customized through the AddMenu, AddButton methods.
@@ -105,6 +106,12 @@ public:
 private:
   void SecondaryLoop(G4String); // a VIRER
   void TerminalHelp(G4String);
+#if QT_VERSION < 0x040000
+  QListView * CreateHelpTree();
+#else
+  QTreeWidget * CreateHelpTree();
+#endif
+
 #if QT_VERSION < 0x040000
   void CreateChildTree(QListViewItem*,G4UIcommandTree*);
   QListViewItem* FindTreeItem(QListViewItem *,const QString&);
@@ -118,6 +125,9 @@ private:
   G4bool GetHelpChoice(G4int&) ;// have to be implemeted because we heritate from G4VBasicShell
   void ExitHelp();// have to be implemeted because we heritate from G4VBasicShell
   bool eventFilter(QObject*,QEvent*);
+  void ActivateCommand(G4String);
+  QMap<int,QString> LookForHelpStringInChildTree(G4UIcommandTree *,const QString&);
+
 
 private:
 
@@ -138,7 +148,8 @@ private:
   QTreeWidget *fHelpTreeWidget;
 #endif
   QDialog *fHelpDialog;
-
+  QLineEdit *helpLine;
+ 
 signals : 
   void myClicked(const QString &text);
 
@@ -148,13 +159,10 @@ private slots :
   void CommandEnteredCallback();
   void ButtonCallback(const QString&);
   void HelpTreeClicCallback();
-#if QT_VERSION < 0x040000
-  void HelpTreeDoubleClicCallback( QListViewItem*, int);
-#else
-  void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
-#endif
+  void HelpTreeDoubleClicCallback();
   void ShowHelpCallback();
   void CommandHistoryCallback();
+  void lookForHelpStringCallback();
 };
 
 #endif

source/interfaces/basic/include/G4UIWin32.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4UIWin32.hh,v 1.14 2006/06/29 19:09:29 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 #ifndef G4UIWin32_h
 #define G4UIWin32_h 

source/interfaces/basic/include/G4UIXaw.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4UIXaw.hh,v 1.6 2006/06/29 19:09:31 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 #ifndef G4UIXaw_h
 #define G4UIXaw_h 

source/interfaces/basic/include/G4UIXm.hh

@@ -24,8 +24,8 @@
 // ********************************************************************
 //
 //
-// $Id: G4UIXm.hh,v 1.13 2006/06/29 19:09:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// $Id: G4UIXm.hh,v 1.14 2008/11/14 16:21:42 lgarnier Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 #ifndef G4UIXm_h
 #define G4UIXm_h 
@@ -93,7 +93,7 @@ private:
 private:
   Widget form,shell,command,menuBar,text;
   std::map<Widget,G4String, std::less<Widget> > commands;
-  static void commandEnteredCallback(Widget,XtPointer,XtPointer);
+  static void CommandEnteredCallback(Widget,XtPointer,XtPointer);
   static void keyHandler(Widget,XtPointer,XEvent*,Boolean*);
   G4bool fHelp;
   G4int fHelpChoice;

source/interfaces/basic/include/G4UIcsh.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4UIcsh.hh,v 1.4 2006/06/29 19:09:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 
 #ifndef G4UIcsh_h

source/interfaces/basic/include/G4UItcsh.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4UItcsh.hh,v 1.8 2007/06/14 05:44:58 kmura Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 
 #ifndef G4UItcsh_h

source/interfaces/basic/include/G4UIterminal.hh

@@ -24,7 +24,7 @@
 // ********************************************************************
 //
 // $Id: G4UIterminal.hh,v 1.10 2007/05/22 01:51:05 kmura Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // ====================================================================
 //   G4UIterminal.cc

source/interfaces/basic/include/G4VUIshell.hh

@@ -25,7 +25,7 @@
 //
 //
 // $Id: G4VUIshell.hh,v 1.7 2007/06/14 05:44:58 kmura Exp $
-// GEANT4 tag $Name: geant4-09-01 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 
 #ifndef G4VUIshell_h