Changeset 528 for trunk/geant4/interfaces

Timestamp:

Jun 25, 2007, 5:30:10 PM (17 years ago)

Author:

garnier

Message:

r657@mac-90108: laurentgarnier | 2007-06-22 16:32:25 +0200
desormais la premiere fleche tapee dans la commandArea selectionne le dernier item

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (2 diffs)

trunk/geant4/interfaces/basic/include/G4UIQt.hh

@@ -108 +108 @@
   G4bool GetHelpChoice(G4int&) ;// have to be implemeted because we heritate from G4VBasicShell
   void ExitHelp();// have to be implemeted because we heritate from G4VBasicShell
-  bool EventFilter(QObject*,QEvent*);
+  bool eventFilter(QObject*,QEvent*);
 
 private:

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

@@ -663 +663 @@
    @param event Kind of event
 */
-bool G4UIQt::EventFilter(
+bool G4UIQt::eventFilter( // Should stay with a minuscule eventFilter because of Qt
  QObject *aObj
 ,QEvent *aEvent
@@ -684 +684 @@
           (e->key() == (Qt::Key_PageUp))) {
         int selection = fCommandHistoryArea->currentRow();
-        for (int a=0;a<fCommandHistoryArea->count();a++) {
-          
-        }
         if (fCommandHistoryArea->count()) {
           if (selection == -1) {
             selection = fCommandHistoryArea->count()-1;
-          }
-          if (e->key() == (Qt::Key_Down)) {
-            if (selection <(fCommandHistoryArea->count()-1))
-              selection++;
-          } else if (e->key() == (Qt::Key_PageDown)) {
-            selection = fCommandHistoryArea->count()-1;
-          } else if (e->key() == (Qt::Key_Up)) {
-            if (selection >0)
-              selection --;
-          } else if (e->key() == (Qt::Key_PageUp)) {
-            selection = 0;
+          } else {
+            if (e->key() == (Qt::Key_Down)) {
+              if (selection <(fCommandHistoryArea->count()-1))
+                selection++;
+            } else if (e->key() == (Qt::Key_PageDown)) {
+              selection = fCommandHistoryArea->count()-1;
+            } else if (e->key() == (Qt::Key_Up)) {
+              if (selection >0)
+                selection --;
+            } else if (e->key() == (Qt::Key_PageUp)) {
+              selection = 0;
+            }
           }
           fCommandHistoryArea->clearSelection();