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

Timestamp:

Nov 26, 2007, 6:10:35 PM (17 years ago)

Author:

garnier

Message:

r670@mac-90108: laurentgarnier | 2007-11-26 18:13:28 +0100
mise a jour pour Qt3 linux

File:

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

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

@@ -109 +109 @@
   printf("G4UIQt::Initialise %d %s\n",argc,argv[0]);
 #endif
-  printf("G4UIQt::Initialise ******\n");
   G4Qt* interactorManager = G4Qt::getInstance (argc,argv,(char*)"Qt");
   G4UImanager* UI = G4UImanager::GetUIpointer();
@@ -129 +128 @@
 #endif
 
-  QSplitter *splitter = new QSplitter(Qt::Vertical);
+  QSplitter *splitter = new QSplitter(Qt::Vertical,fMainWindow);
 
   // Set layouts
@@ -488 +487 @@
 )
 {
+#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);
@@ -529 +534 @@
   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
   QAction *action = new QAction(QString(aLabel),QKeySequence::QKeySequence (),signalMapper, SLOT(map()));
+#endif
   action->addTo(parent);
 #else
@@ -556 +565 @@
 #if QT_VERSION < 0x040000
     fHelpDialog = new QDialog(fMainWindow,0,FALSE,Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax );
-#else
+    QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
+    QWidget* global = new QWidget(fHelpDialog);
+#else
+    QVBoxLayout *vLayout = new QVBoxLayout();
     fHelpDialog = new QDialog(fMainWindow,Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint);
 #endif
-    QSplitter *splitter = new QSplitter(Qt::Horizontal);
+    QSplitter *splitter = new QSplitter(Qt::Horizontal,fHelpDialog);
+
     QPushButton *exitButton = new QPushButton("Exit",fMainWindow);
     connect(exitButton, SIGNAL(clicked()), fHelpDialog,SLOT(close()));
@@ -574 +587 @@
     fHelpTreeWidget->addColumn("Command");
     fHelpTreeWidget->addColumn("Description");
-    fHelpTreeWidget->hideColumn(1);
+    fHelpTreeWidget->setColumnWidth (1,0);
     fHelpTreeWidget->header()->setResizeEnabled(FALSE,1);
     //    QList<QListViewItem *> items;
@@ -643 +656 @@
     // Set layouts
 
-#if QT_VERSION < 0x040000
-    QVBoxLayout *vLayout = new QVBoxLayout(fHelpDialog);
-#else
-    QVBoxLayout *vLayout = new QVBoxLayout;
+#if QT_VERSION >= 0x040000
     splitter->addWidget(fHelpTreeWidget);
     splitter->addWidget(fHelpArea);
@@ -652 +662 @@
 
 
+#if QT_VERSION < 0x040000
+    vLayout->addWidget(global);
+#else
     vLayout->addWidget(splitter);
+#endif
     vLayout->addWidget(exitButton);
 #if QT_VERSION >= 0x040000
@@ -1186 +1200 @@
 )
 {
-#ifdef GEANT4_QT_DEBUG
-    printf("G4UIQt::HelpTreeClicCallback");
-#endif
+  //  printf("G4UIQt::HelpTreeClicCallback");
 #if QT_VERSION < 0x040000
   QListViewItem* item =  NULL;
@@ -1254 +1266 @@
 QTreeWidgetItem* item
 #endif
- ,int nb
+ ,int
 )
 {