Import Geant4 11.0.0 source tree

source/interfaces/basic/include/G4UIExecutive.hh

@@ -65,13 +65,15 @@ public:
 
   G4bool IsGUI() const;
 
+  void SetVerbose(G4bool val);
+
   void SetPrompt(const G4String& prompt);
   void SetLsColor(TermColorIndex dirColor, TermColorIndex cmdColor);
 
   void SessionStart();
 
 private:
-  enum SessionType { kNone, kQt, kXm, kWin32, kGag, kTcsh, kCsh };
+  enum SessionType { kNone, kQt, kXm, kWin32, kTcsh, kCsh };
   SessionType selected;
 
   G4UIsession* session;
@@ -79,6 +81,8 @@ private:
 
   G4bool isGUI;
 
+  G4bool verbose;
+
   std::map<G4String, G4String> sessionMap;
 
   void SelectSessionByArg(const G4String& stype);
@@ -98,4 +102,9 @@ inline G4bool G4UIExecutive::IsGUI() const
   return isGUI;
 }
 
+inline void G4UIExecutive::SetVerbose(G4bool val)
+{
+  verbose = val;
+}
+
 #endif

source/interfaces/basic/include/G4UIQt.hh

@@ -28,8 +28,6 @@
 #ifndef G4UIQt_h
 #define G4UIQt_h 
 
-#if defined(G4UI_BUILD_QT_SESSION) || defined(G4UI_USE_QT)
-
 #include <map>
 
 #include "G4VBasicShell.hh"
@@ -49,6 +47,7 @@ class QListWidget;
 class QTreeWidget;
 class QTreeWidgetItem;
 class QTextEdit;
+class QTextBrowser;
 class QLabel;
 class QResizeEvent;
 class QTabWidget;
@@ -340,7 +339,7 @@ private:
   QLineEdit* fHelpLine;
   G4QTabWidget* fViewerTabWidget;
   QString fCoutText;
-  QTextEdit *fStartPage;
+  QTextBrowser *fStartPage;
   QSplitter * fHelpVSplitter;
   QTextEdit* fParameterHelpLabel;
   QTableWidget* fParameterHelpTable;
@@ -373,6 +372,7 @@ private:
   QPixmap* fRunIcon;
   QPixmap* fParamIcon;
   QPixmap* fPickTargetIcon;
+  QPixmap* fExitIcon;
   
 #ifdef G4MULTITHREADED
   QComboBox* fThreadsFilterComboBox;
@@ -422,5 +422,3 @@ private Q_SLOTS :
 
 #endif
 
-#endif
-

source/interfaces/basic/include/G4UIWin32.hh

@@ -49,8 +49,6 @@
 #ifndef G4UIWin32_h
 #define G4UIWin32_h
 
-#if defined(G4UI_BUILD_WIN32_SESSION) || defined(G4UI_USE_WIN32)
-
 #define ID_EXIT_APP                     40001
 #define ID_OPEN_MACRO                   40002
 #define ID_SAVE_VIEWER_STATE            40003
@@ -184,5 +182,3 @@ class G4UIWin32 : public G4VBasicShell, public G4VInteractiveSession
 };
 
 #endif
-
-#endif

source/interfaces/basic/include/G4UIXm.hh

@@ -28,8 +28,6 @@
 #ifndef G4UIXm_h
 #define G4UIXm_h 
 
-#if defined(G4UI_BUILD_XM_SESSION) || defined(G4UI_USE_XM)
-
 #include <map>
 
 #include <X11/Intrinsic.h>
@@ -100,5 +98,3 @@ private:
 
 #endif
 
-#endif
-