Changeset 1278 for trunk/source
- Timestamp:
- May 28, 2010, 11:36:37 AM (14 years ago)
- Location:
- trunk/source/interfaces
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/interfaces/History
r1274 r1278 1 $Id: History,v 1.13 5 2010/05/26 14:27:14lgarnier Exp $1 $Id: History,v 1.138 2010/05/28 09:14:41 lgarnier Exp $ 2 2 ------------------------------------------------------------------- 3 3 … … 18 18 ---------------------------------------------------------- 19 19 20 26 May, L. Garnier 20 28 May, L. Garnier 21 - G4UIQt : Bug fix when compiling on windows 22 23 28 May, K. Murakami (interfaces-V09-03-04) 24 - G4UIExective : session type order is changed. 25 GUI session is prioritized. 26 27 26 May, L. Garnier (interfaces-V09-03-03) 21 28 - G4UIQt: Fix some compil errors with qt3 22 29 -
trunk/source/interfaces/basic/GNUmakefile
r1134 r1278 13 13 14 14 # For debug mode 15 CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC15 # CPPFLAGS += -DG4DEBUG_INTERFACES_BASIC 16 16 17 17 include $(G4INSTALL)/config/architecture.gmk -
trunk/source/interfaces/basic/include/G4UIExecutive.icc
r1243 r1278 25 25 // 26 26 // 27 // $Id: G4UIExecutive.icc,v 1. 6 2009/11/20 22:10:31kmura Exp $27 // $Id: G4UIExecutive.icc,v 1.7 2010/05/28 08:12:27 kmura Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 // … … 35 35 #include "G4UImanager.hh" 36 36 37 #if defined(G4UI_USE_ TCSH)38 #include "G4UI terminal.hh"39 #include "G4 UItcsh.hh"37 #if defined(G4UI_USE_QT) 38 #include "G4UIQt.hh" 39 #include "G4Qt.hh" 40 40 41 41 #elif defined(G4UI_USE_XM) … … 45 45 #include "G4UIWin32.hh" 46 46 47 #elif defined(G4UI_USE_ QT)48 #include "G4UI Qt.hh"49 #include "G4 Qt.hh"47 #elif defined(G4UI_USE_TCSH) 48 #include "G4UIterminal.hh" 49 #include "G4UItcsh.hh" 50 50 51 51 #else … … 62 62 ///////////////////////////////////////////////////// 63 63 { 64 #if defined(G4UI_USE_TCSH) 65 DISCARD_PARAMETER(argc); 66 DISCARD_PARAMETER(argv); 67 68 shell = new G4UItcsh; 69 session = new G4UIterminal(shell); 64 #if defined(G4UI_USE_QT) 65 session = new G4UIQt(argc, argv); 66 isGUI = true; 70 67 71 68 #elif defined(G4UI_USE_XM) … … 79 76 session = new G4UIWin32(); 80 77 81 #elif defined(G4UI_USE_QT) 82 session = new G4UIQt(argc, argv); 83 isGUI = true; 84 78 #elif defined(G4UI_USE_TCSH) 79 DISCARD_PARAMETER(argc); 80 DISCARD_PARAMETER(argv); 81 82 shell = new G4UItcsh; 83 session = new G4UIterminal(shell); 84 85 85 #else 86 86 DISCARD_PARAMETER(argc); … … 121 121 122 122 ////////////////////////////////////////////////////////////// 123 inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor, 123 inline void G4UIExecutive::SetLsColor(TermColorIndex dirColor, 124 124 TermColorIndex cmdColor) 125 125 ////////////////////////////////////////////////////////////// … … 133 133 { 134 134 session-> SessionStart(); 135 delete session; 135 delete session; 136 136 } 137 137 -
trunk/source/interfaces/basic/src/G4UIQt.cc
r1277 r1278 67 67 #include <qlistwidget.h> 68 68 #include <qtreewidget.h> 69 #include <QResizeEvent> 69 70 #else 70 71 #include <qaction.h> … … 324 325 // Connect signal 325 326 connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback())); 326 #if QT_VERSION >= 0x040500327 327 connect(fTabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int))); 328 #endif329 328 connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 330 329 connect(fToolBox, SIGNAL(currentChanged(int)), SLOT(ToolBoxActivated(int))); -
trunk/source/interfaces/common/GNUmakefile
r1228 r1278 10 10 11 11 # For debug mode 12 CPPFLAGS += -DG4DEBUG_INTERFACES_COMMON12 # CPPFLAGS += -DG4DEBUG_INTERFACES_COMMON 13 13 14 14 include $(G4INSTALL)/config/architecture.gmk -
trunk/source/interfaces/common/src/G4VBasicShell.cc
r1043 r1278 25 25 // 26 26 // 27 // $Id: G4VBasicShell.cc,v 1.1 3 2009/05/15 09:34:36lgarnier Exp $27 // $Id: G4VBasicShell.cc,v 1.15 2010/01/06 14:04:13 lgarnier Exp $ 28 28 // GEANT4 tag $Name: $ 29 29 //
Note: See TracChangeset
for help on using the changeset viewer.