Changeset 624 for trunk/geant4/interfaces/basic/src

Timestamp:

Nov 29, 2007, 5:13:27 PM (17 years ago)

Author:

garnier

Message:

corrections de bugs

Location:

trunk/geant4/interfaces/basic/src

Files:

• G4UIQt.cc (modified) (4 diffs)
• G4UIQt_moc.cc (modified) (3 diffs)

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

@@ -237 +237 @@
 #endif
   fMainWindow->setCentralWidget(splitter);
+  ((QApplication*)interactorManager->GetMainInteractor())->setMainWidget(fMainWindow);
 
 #if QT_VERSION < 0x040000
@@ -448 +449 @@
   fTextArea->verticalScrollBar()->setSliderPosition(fTextArea->verticalScrollBar()->maximum());
 #endif
+  // Slow down everything : disababled
   interactorManager->FlushAndWaitExecution();
   return 0;
@@ -543 +545 @@
   QAction *action = new QAction(QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map()));
   action->addTo(parent);
- connect(action,SIGNAL(clicked()),signalMapper,SLOT(map()));
+ connect(action,SIGNAL(activated()),signalMapper,SLOT(map()));
 
 #else
@@ -570 +572 @@
   if (!fHelpDialog) {
 #if QT_VERSION < 0x040000
-    fHelpDialog = new QDialog(fMainWindow,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
+    fHelpDialog = new QDialog(0,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
     QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
     QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);

trunk/geant4/interfaces/basic/src/G4UIQt_moc.cc

@@ -15 +15 @@
 #include <qapplication.h>
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 26)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 26)
 
 #include <private/qucomextra_p.h>
@@ -159 +159 @@
 
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 58)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 58)
 
 /****************************************************************************
@@ -262 +262 @@
 #else
 
-#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 59)
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION == 59)
 
 /****************************************************************************