Changeset 522

Timestamp:

Jun 21, 2007, 5:42:49 PM (17 years ago)

Author:

garnier

Message:

r648@mac-90108: laurentgarnier | 2007-06-21 14:53:57 +0200
desormais l envoie d une commande vide ne s ajoute pas a la liste

File:

• trunk/geant4/interfaces/basic/src/G4UIQt.cc (modified) (6 diffs)

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

@@ -118 +118 @@
   fCommandArea->activateWindow();
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(commandEnteredCallback()));
-  fCommandArea->setFocusPolicy ( Qt::StrongFocus );
-  fCommandArea->setFocus(Qt::TabFocusReason);
+  //  fCommandArea->setFocusPolicy ( Qt::StrongFocus );
+  //  fCommandArea->setFocus(Qt::TabFocusReason);
   fTextArea->setReadOnly(true);
 
 
   // Set layouts
-  QVBoxLayout *layoutSplitter = new QVBoxLayout;
 
   QWidget* topWidget = new QWidget();
@@ -143 +142 @@
 
 
-  layoutSplitter->addWidget(topWidget);
-  layoutSplitter->addWidget(bottomWidget);
-  splitter->setLayout(layoutSplitter);
-
+  splitter->addWidget(topWidget);
+  splitter->addWidget(bottomWidget);
   fMainWindow->setCentralWidget(splitter);
 
@@ -402 +399 @@
 
     // Set layouts
-    QHBoxLayout *splitterLayout = new QHBoxLayout;
 
     QVBoxLayout *vLayout = new QVBoxLayout;
 
-    splitterLayout->addWidget(fHelpTreeWidget);
-    splitterLayout->addWidget(fHelpArea);
-    splitter->setLayout(splitterLayout);
+    splitter->addWidget(fHelpTreeWidget);
+    splitter->addWidget(fHelpArea);
 
     vLayout->addWidget(splitter);
@@ -635 +630 @@
     }
   }
-  
   // pass the event on to the parent class
   return QObject::eventFilter(obj, event);
@@ -678 +672 @@
 {
   G4String command (fCommandArea->text().toStdString().c_str());
-  if (fCommandArea->text().toStdString().c_str() != "") {
+  if (fCommandArea->text().trimmed() != "") {
     fCommandHistoryArea->addItem(fCommandArea->text());
     fCommandHistoryArea->clearSelection();
@@ -685 +679 @@
 
     if (command(0,4) != "help") {
-      ApplyShellCommand (command,exitSession,exitPause);
+        ApplyShellCommand (command,exitSession,exitPause);
     } else {
       TerminalHelp(command);