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

Timestamp:

Nov 28, 2007, 11:28:38 AM (17 years ago)

Author:

garnier

Message:

correction du ticket #92

File:

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

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

@@ -164 +164 @@
 #if QT_VERSION < 0x040000
   fCommandHistoryArea = new QListView(bottomWidget);
+
+  fCommandHistoryArea->setSorting (-1, FALSE);
   fCommandHistoryArea->setSelectionMode(QListView::Single);
+  fCommandHistoryArea->addColumn("");
+  fCommandHistoryArea->header()->hide();
   connect(fCommandHistoryArea, SIGNAL(selectionChanged()), SLOT(CommandHistoryCallback()));
 #else
@@ -171 +175 @@
   connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
 #endif
-  fCommandHistoryArea->addColumn("");
-  fCommandHistoryArea->header()->hide();
 
   fCommandHistoryArea->installEventFilter(this);
@@ -188 +190 @@
 #endif
   connect(fCommandArea, SIGNAL(returnPressed()), SLOT(CommandEnteredCallback()));
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::   1 connect returnPressed\n");
+#endif
 #if QT_VERSION < 0x040000
   fCommandArea->setFocusPolicy ( QWidget::StrongFocus );
@@ -490 +495 @@
 )
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::AddMenu 1\n");
-#endif
   if (aName == NULL) return;
   if (aLabel == NULL) return;
 
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::AddMenu 2 %s %s\n",aName,aLabel);
-#endif
 #if QT_VERSION < 0x040000
   QPopupMenu *fileMenu = new QPopupMenu( fMainWindow);
@@ -536 +535 @@
   
   QSignalMapper *signalMapper = new QSignalMapper(this);
-#if QT_VERSION < 0x040000
 #if QT_VERSION < 0x030200
   QAction *action = new QAction(QString(aLabel),QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map()));
-#else
+  action->addTo(parent);
+ connect(action,SIGNAL(activated()),signalMapper,SLOT(map()));
+
+#elif QT_VERSION < 0x040000
   QAction *action = new QAction(QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map()));
-#endif
   action->addTo(parent);
+ connect(action,SIGNAL(clicked()),signalMapper,SLOT(map()));
+
 #else
   QAction *action = parent->addAction(aLabel, signalMapper, SLOT(map()));
-#endif
+
+#endif
+  connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(ButtonCallback(const QString&)));
   signalMapper->setMapping(action, QString(aCommand));
-  connect(signalMapper, SIGNAL(mapped(const QString &)),this, SLOT(ButtonCallback(const QString&)));
 }
 
@@ -1162 +1165 @@
 )
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::CommandEnteredCallback\n");
-#endif
 #if QT_VERSION < 0x040000
   G4String command (fCommandArea->text().ascii());
@@ -1172 +1172 @@
     newItem->setText(0,fCommandArea->text());
     fCommandHistoryArea->insertItem(newItem);
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::CommandEnteredCallback 2\n");
-#endif
+    // now we have to arrange 
+    QListViewItem *temp= fCommandHistoryArea->lastItem();
+    for (int i=0; i<fCommandHistoryArea->childCount()-1;i++) {
+      fCommandHistoryArea->takeItem(temp);
+      fCommandHistoryArea->insertItem(temp);
+      temp= fCommandHistoryArea->lastItem();
+    }
 #else
   G4String command (fCommandArea->text().toStdString().c_str());
@@ -1207 +1211 @@
 )
 {
+
 #if QT_VERSION < 0x040000
   G4String ss = G4String(aCommand.ascii());
@@ -1224 +1229 @@
 )
 {
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::HelpTreeClicCallback");
-#endif
-
 #if QT_VERSION < 0x040000
   QListViewItem* item =  NULL;
@@ -1314 +1315 @@
   if (!fCommandHistoryArea)
     return ;
-
   
 #if QT_VERSION < 0x040000
-  item =fHelpTreeWidget->selectedItem();
+  item =fCommandHistoryArea->selectedItem();
 #else
   QList<QListWidgetItem *> list =fCommandHistoryArea->selectedItems();