Changeset 922 for trunk/source/interfaces

Timestamp:

Feb 16, 2009, 12:40:38 PM (15 years ago)

Author:

garnier

Message:

minor addition in Qt. See History

Location:

trunk/source/interfaces

Files:

• History (modified) (2 diffs)
• basic/include/G4UIQt.hh (modified) (2 diffs)
• basic/src/G4UIQt.cc (modified) (3 diffs)

trunk/source/interfaces/History

@@ -1 @@
-$Id: History,v 1.104 2008/11/14 16:21:42 lgarnier Exp $
+$Id: History,v 1.107 2009/02/16 11:40:26 lgarnier Exp $
 -------------------------------------------------------------------
 
@@ -18 +18 @@
      ----------------------------------------------------------
 
-14 November, Laurent Garnier
+16 February 2009, Laurent Garnier
+ - G4UIQt : Add an Interactor to be able to add button on file and help menu
+ - G4UIQt : Add a public method to get the MainWindow
+
+27, November, 2008 K. Murakami (interfaces-V09-01-04)
+ - G4UIQt.cc: warning fix
+
+21, November, 2008 K. Murakami (interfaces-V09-01-03)
+ -tagged for release 9.2
+
+14 November, 2008 Laurent Garnier
  - G4UIXm,G4Win32 : Renaming according to Geant4 code policy
 
-6 November, Laurent Garnier
+6 November, 2008 Laurent Garnier
  - G4Qt : Re-fix problem on some linux with QApplication, should be better
  - G4Qt : Add availabity to launch a G4Qt without a G4UIQt
 
-24 October, Laurent Garnier
+24 October, 2008 Laurent Garnier
  - Change GEANT4_QT_DEBUG flag by QTDEBUG
  - Suppress unuseful DEBUG messages
 
-15 October, Laurent Garnier
+15 October, 2008 Laurent Garnier
  - Fix a problem on some linux with QApplication. But this is NOT the good way to do it...
  - Fix a qt3 backward compatibility on G4UIQt.cc
 
-7 October, Laurent Garnier
+7 October, 2008 Laurent Garnier
  - Fix a G4cout possible problem cause by recursive G4cout call.
 
-2 October, Laurent Garnier
+2 October, 2008 Laurent Garnier
  - Add availability to have a external Qapp
 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.hh,v 1.15 2008/11/06 10:06:33 lgarnier Exp $
+// $Id: G4UIQt.hh,v 1.16 2009/02/16 11:40:26 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -103 +103 @@
   G4int ReceiveG4cerr(G4String);
   //   G4String GetCommand(Widget);
+  QMainWindow * getMainWindow();
 
 private:

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.24 2008/11/24 13:50:34 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.25 2009/02/16 11:40:26 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -248 +248 @@
 #endif
 
+  AddInteractor ("file",(G4Interactor)fileMenu);
+  AddInteractor ("help",(G4Interactor)helpMenu);
+
   // Set the splitter size. The fTextArea sould be 2/3 on the fMainWindow
 #if QT_VERSION < 0x040000
@@ -333 +336 @@
 }
 
+
+QMainWindow * G4UIQt::getMainWindow (
+)
+{
+  return fMainWindow;
+}
 
 void G4UIQt::SessionTerminate (