Changeset 889 for trunk/source/interfaces

Timestamp:

Nov 25, 2008, 5:27:14 PM (16 years ago)

Author:

garnier

Message:

See History

Location:

trunk/source/interfaces

Files:

• basic/src/G4UIQt.cc (modified) (4 diffs)
• common/src/G4Qt.cc (modified) (2 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4UIQt.cc,v 1.22 2008/11/06 10:06:33 lgarnier Exp $
+// $Id: G4UIQt.cc,v 1.24 2008/11/24 13:50:34 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -106 +106 @@
 {
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
+  if (!(QApplication*)interactorManager->GetMainInteractor()) {
+    G4cout        << "G4UIQt : Unable to init Qt. Aborted" << G4endl;
+  }
+  
   G4UImanager* UI = G4UImanager::GetUIpointer();
   if(UI!=NULL) UI->SetSession(this);
@@ -224 +228 @@
   // Add a quit subMenu
   QPopupMenu *fileMenu = new QPopupMenu( fMainWindow);
-  fileMenu->insertItem( "&Quitter",  this, SLOT(ExitSession()), CTRL+Key_Q );
+  fileMenu->insertItem( "&Quit",  this, SLOT(ExitSession()), CTRL+Key_Q );
   fMainWindow->menuBar()->insertItem( QString("&File"), fileMenu );
 
@@ -237 +241 @@
   // Add a quit subMenu
   QMenu *fileMenu = fMainWindow->menuBar()->addMenu("File");
-  fileMenu->addAction("Quitter", this, SLOT(ExitSession()));
+  fileMenu->addAction("Quit", this, SLOT(ExitSession()));
 
   // Add a Help menu

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

@@ -25 +25 @@
 //
 //
-// $Id: G4Qt.cc,v 1.11 2008/11/06 10:06:33 lgarnier Exp $
+// $Id: G4Qt.cc,v 1.12 2008/11/19 16:11:52 lgarnier Exp $
 // GEANT4 tag $Name:  $
 //
@@ -122 +122 @@
       *p_argn = argn;
 #if QT_VERSION < 0x040000
-      qApp = new QApplication (argn, args);
+      qApp = new QApplication (*p_argn, args);
 #else
-      new QApplication (argn, args);
+      new QApplication (*p_argn, args);
 #endif
       if(!qApp) {