Changeset 619 for trunk/geant4

Timestamp:

Nov 27, 2007, 6:04:59 PM (17 years ago)

Author:

garnier

Message:

modifs pour Qt3

Location:

trunk/geant4/interfaces/basic

Files:

• include/G4UIQt.hh (modified) (1 diff)
• src/G4UIQt.cc (modified) (10 diffs)
• src/G4UIQt_moc.cc (modified) (6 diffs)

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

@@ -150 +150 @@
   void HelpTreeClicCallback();
 #if QT_VERSION < 0x040000
-  void HelpTreeDoubleClicCallback( QListViewItem*, int);
+  void HelpTreeDoubleClicCallback( QListViewItem*);
 #else
-  void HelpTreeDoubleClicCallback( QTreeWidgetItem*, int);
+  void HelpTreeDoubleClicCallback( QTreeWidgetItem*,int);
 #endif
   void ShowHelpCallback();

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

@@ -171 +171 @@
   connect(fCommandHistoryArea, SIGNAL(itemSelectionChanged()), SLOT(CommandHistoryCallback()));
 #endif
+  fCommandHistoryArea->addColumn("");
+  fCommandHistoryArea->header()->hide();
+
   fCommandHistoryArea->installEventFilter(this);
   fCommandLabel = new QLabel("",bottomWidget);
@@ -566 +569 @@
     fHelpDialog = new QDialog(fMainWindow,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
     QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
-    QWidget* global = new QWidget(fHelpDialog);
+    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
 #else
     QVBoxLayout *vLayout = new QVBoxLayout();
     fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
-#endif
-    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
-
-    QPushButton *exitButton = new QPushButton("Exit",fMainWindow);
+    QSplitter *splitter = new QSplitter(Qt::Horizontal);
+#endif
+    QPushButton *exitButton = new QPushButton("Exit",fHelpDialog);
     connect(exitButton, SIGNAL(clicked()), fHelpDialog,SLOT(close()));
 
@@ -585 +587 @@
     fHelpTreeWidget = new QListView(splitter);
     fHelpTreeWidget->setSelectionMode(QListView::Single);
+    fHelpTreeWidget->setRootIsDecorated(true);
     fHelpTreeWidget->addColumn("Command");
-    fHelpTreeWidget->addColumn("Description");
-    fHelpTreeWidget->setColumnWidth (1,0);
+    fHelpTreeWidget->addColumn("Description",0);
+    //    fHelpTreeWidget->setColumnWidth (1,0);
     fHelpTreeWidget->header()->setResizeEnabled(FALSE,1);
     //    QList<QListViewItem *> items;
@@ -651 +654 @@
     }
 
+#if QT_VERSION < 0x040000
+    connect(fHelpTreeWidget, SIGNAL(selectionChanged ()),this, SLOT(HelpTreeClicCallback()));  
+    connect(fHelpTreeWidget, SIGNAL(doubleClicked (QListViewItem*)),this, SLOT(HelpTreeDoubleClicCallback(QListViewItem*)));
+#else
     connect(fHelpTreeWidget, SIGNAL(itemSelectionChanged ()),this, SLOT(HelpTreeClicCallback()));  
-    connect(fHelpTreeWidget, SIGNAL(itemDoubleClicked (QTreeWidgetItem*,int)),this, SLOT(HelpTreeDoubleClicCallback(QTreeWidgetItem*,int)));  
+    connect(fHelpTreeWidget, SIGNAL(itemDoubleClicked (QTreeWidgetItem*,int)),this, SLOT(HelpTreeDoubleClicCallback(QTreeWidgetItem*)));  
+#endif
 
     // Set layouts
@@ -662 +670 @@
 
 
-#if QT_VERSION < 0x040000
-    vLayout->addWidget(global);
-#else
+#if QT_VERSION >= 0x040000
     vLayout->addWidget(splitter);
-#endif
     vLayout->addWidget(exitButton);
+#else
+    vLayout->add(splitter);
+    vLayout->addWidget(exitButton);
+#endif
+
+    // set the splitter size
+#if QT_VERSION >= 0x040000
+    QList<int> list;
+#else
+    QValueList<int> list;
+#endif
+    list.append( 400 );
+    list.append( 400 );
+    splitter->setSizes(list);
+
 #if QT_VERSION >= 0x040000
     fHelpDialog->setLayout(vLayout);
@@ -1142 +1162 @@
 )
 {
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::CommandEnteredCallback\n");
+#endif
 #if QT_VERSION < 0x040000
   G4String command (fCommandArea->text().ascii());
@@ -1148 +1171 @@
     QListViewItem *newItem = new QListViewItem(fCommandHistoryArea);
     newItem->setText(0,fCommandArea->text());
+    fCommandHistoryArea->insertItem(newItem);
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::CommandEnteredCallback 2\n");
+#endif
 #else
   G4String command (fCommandArea->text().toStdString().c_str());
@@ -1166 +1193 @@
       TerminalHelp(command);
     }
-#ifdef GEANT4_QT_DEBUG
-    printf("after \n");
-#endif
     if(exitSession==true) 
       SessionTerminate();
@@ -1200 +1224 @@
 )
 {
-  //  printf("G4UIQt::HelpTreeClicCallback");
+#ifdef GEANT4_QT_DEBUG
+  printf("G4UIQt::HelpTreeClicCallback");
+#endif
+
 #if QT_VERSION < 0x040000
   QListViewItem* item =  NULL;
@@ -1265 +1292 @@
 #else
 QTreeWidgetItem* item
-#endif
- ,int
-)
-{
-#ifdef GEANT4_QT_DEBUG
-  printf("G4UIQt::HelpTreeDoubleClicCallback");
-#endif
+,int
+#endif
+)
+{
   HelpTreeClicCallback();
   fCommandArea->setText(item->text (1));

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

@@ -15 +15 @@
 #include <qapplication.h>
 
-#if QT_VERSION < 0x040000
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 26)
 
 #include <private/qucomextra_p.h>
@@ -66 +66 @@
     static const QUMethod slot_4 = {"HelpTreeClicCallback", 0, 0 };
     static const QUParameter param_slot_5[] = {
-        { 0, &static_QUType_ptr, "QListViewItem", QUParameter::In },
-        { 0, &static_QUType_int, 0, QUParameter::In }
-    };
-    static const QUMethod slot_5 = {"HelpTreeDoubleClicCallback", 2, param_slot_5 };
+        { 0, &static_QUType_ptr, "QListViewItem", QUParameter::In }
+    };
+    static const QUMethod slot_5 = {"HelpTreeDoubleClicCallback", 1, param_slot_5 };
     static const QUMethod slot_6 = {"ShowHelpCallback", 0, 0 };
     static const QUMethod slot_7 = {"CommandHistoryCallback", 0, 0 };
@@ -78 +77 @@
         { "ButtonCallback(const QString&)", &slot_3, QMetaData::Private },
         { "HelpTreeClicCallback()", &slot_4, QMetaData::Private },
-        { "HelpTreeDoubleClicCallback(QListViewItem*,int)", &slot_5, QMetaData::Private },
+        { "HelpTreeDoubleClicCallback(QListViewItem*)", &slot_5, QMetaData::Private },
         { "ShowHelpCallback()", &slot_6, QMetaData::Private },
         { "CommandHistoryCallback()", &slot_7, QMetaData::Private }
@@ -127 +126 @@
     case 3: ButtonCallback((const QString&)static_QUType_QString.get(_o+1)); break;
     case 4: HelpTreeClicCallback(); break;
-    case 5: HelpTreeDoubleClicCallback((QListViewItem*)static_QUType_ptr.get(_o+1),(int)static_QUType_int.get(_o+2)); break;
+    case 5: HelpTreeDoubleClicCallback((QListViewItem*)static_QUType_ptr.get(_o+1)); break;
     case 6: ShowHelpCallback(); break;
     case 7: CommandHistoryCallback(); break;
@@ -160 +159 @@
 
 
-#if QT_VERSION < 0x040200
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 58)
+
 /****************************************************************************
 ** Meta object code from reading C++ file 'G4UIQt.hh'
@@ -262 +262 @@
 #else
 
-#if QT_VERSION >= 0x040000
+#if defined(Q_MOC_OUTPUT_REVISION) && (Q_MOC_OUTPUT_REVISION = 59)
+
 /****************************************************************************
 ** Meta object code from reading C++ file 'G4UIQt.hh'