Changeset 1262 for trunk

Timestamp:

May 26, 2010, 3:04:40 PM (14 years ago)

Author:

garnier

Message:

test qt3

File:

• trunk/source/interfaces/basic/src/G4UIQt.cc (modified) (7 diffs)

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

@@ -253 +253 @@
   fTabWidget->setSizePolicy(policy);
 
-  fEmptyViewerTabLabel = new QLabel(QString("         If you want to have a Viewer, please use /vis/open commands. "));
+#if QT_VERSION < 0x040000
+  fEmptyViewerTabLabel = new QLabel(fToolBox,"         If you want to have a Viewer, please use /vis/open commands. ");
+#else
+  fEmptyViewerTabLabel = new QLabel("         If you want to have a Viewer, please use /vis/open commands. ");
+#endif
 
   // Only at creation. Will be set visible when sessionStart();
@@ -416 +420 @@
   QWidget *helpWidget = new QWidget(fHelpTBWidget);
   QHBoxLayout *helpLayout = new QHBoxLayout(helpWidget);
-  QVBoxLayout *vLayout = new QVBoxLayout(fHelpTBWidget);
   fHelpVSplitter = new QSplitter(Qt::Horizontal,fHelpTBWidget);
 #else
@@ -543 +546 @@
 
   // Remove QLabel 
+#if QT_VERSION < 0x040000
+  // L.Garnier 26/05/2010 : not exactly the same in qt4. Could cause some
+  // troubles
+  if ( fMyVSplitter->idAfter(fEmptyViewerTabLabel) != -1) {
+#else
   if ( fMyVSplitter->indexOf(fEmptyViewerTabLabel) != -1) {
+#endif
 #if QT_VERSION < 0x040000
     fEmptyViewerTabLabel->reparent(0,0,QPoint(0,0));  
 #else
     fEmptyViewerTabLabel->setParent(0);
-#endif
     fMyVSplitter->addWidget(fTabWidget);
+#endif
 #if QT_VERSION < 0x040000
     aWidget->reparent(fTabWidget,0,QPoint(0,0));  
@@ -563 +572 @@
 #endif
   
-#ifdef G4DEBUG_INTERFACES_BASIC
-  printf("G4UIQt::AddTabWidget resize VVVVVVVVVVVG4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt G4UIQt \n");
-  printf("G4UIQt::AddTabWidget resize 22222222222 W---:%d + sx:%d -fwx:%d   H---:%d + sy:%d -fwy:%d    TabW:%d TabH:%d G4UIQt G4UIQt aWX:%d aWY:%d\n",fMainWindow->width(),sizeX,fTabWidget->width(),fMainWindow->height(),sizeY,fTabWidget->height(),fTabWidget->width(),fTabWidget->height(),aWidget->size().height(),aWidget->size().width());
 #endif
 
@@ -573 +579 @@
   // then we have to force them on order to check the size
 
+#if QT_VERSION < 0x040000
+  fTabWidget->insertTab(aWidget,name,fTabWidget->count());
+#else
   fTabWidget->insertTab(fTabWidget->count(),aWidget,name);
-  
-  //   if (fTabWidget->count() == 1) {
-  //    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int)));
-  //  connect(fTabWidget, SIGNAL(resizeEvent (  QResizeEvent* ) ), SLOT(ResizeTabWidget( QResizeEvent*)));
-  //   }
-
+#endif
+  
+#if QT_VERSION < 0x040000
+  fTabWidget->setCurrentPage(fTabWidget->count()-1);
+#else
   fTabWidget->setCurrentIndex(fTabWidget->count()-1);
-  //  UpdateTabWidget(fTabWidget->count()-1);
+#endif
+
   // Set visible
 #if QT_VERSION >= 0x040000
@@ -594 +603 @@
   fTabWidget->setLastTabCreated(fTabWidget->currentPageIndex());
   fMainWindow->show();
+#endif
+  
+#if QT_VERSION >= 0x040000
+ #if QT_VERSION >= 0x040200
+   fTabWidget->setVisible(true);
+ #else
+   fTabWidget->show;
  #endif
-  
-  
-
-// //   // Check size
-// //   int offX = (sizeX-aWidget->size().width());
-// //   int offY = (sizeY-aWidget->size().height());
-
-// // #ifdef G4DEBUG_INTERFACES_BASIC
-// //   printf("G4UIQt::AddTabWidget resize AFTER FIRST W:%d + sx:%d -fwx:%d   H:%d + sy:%d -fwy:%d    TabW:%d TabH:%d G4UIQt G4UIQt offX:%d  offY:%d aWX:%d aWY:%d\n",fMainWindow->width(),sizeX,fTabWidget->width(),fMainWindow->height(),sizeY,fTabWidget->height(),fTabWidget->width(),fTabWidget->height(),offX,offY,aWidget->size().height(),aWidget->size().width());
-// // #endif
-
-// //   // and correct if necessairy
-// //   if ((offX != 0) ||(offY != 0)) {
-// //     fMainWindow->resize(fMainWindow->width()+offX,fMainWindow->height()+offY);
-// //     // Re-Set visible
-// // #if QT_VERSION >= 0x040000
-// // #if QT_VERSION >= 0x040200
-// //     fMainWindow->setVisible(true);
-// // #else
-// //     fMainWindow->show();
-// // #endif
-// // #else
-// //     fMainWindow->show();
-// // #endif
-// //   }
-
-// // #ifdef G4DEBUG_INTERFACES_BASIC
-// //   printf("G4UIQt::AddTabWidget resize ^^^^^^^^^^^^ W:%d + sx:%d -fwx:%d   H:%d + sy:%d -fwy:%d    TabW:%d TabH:%d G4UIQt G4UIQt offX:%d  offY:%d aWX:%d aWY:%d\n",fMainWindow->width(),sizeX,fTabWidget->width(),fMainWindow->height(),sizeY,fTabWidget->height(),fTabWidget->width(),fTabWidget->height(),offX,offY,aWidget->size().height(),aWidget->size().width());
-// // #endif
-// // #endif
-  
-  fTabWidget->setVisible(true);
+#else
+  fTabWidget->show;
+#endif
 
   return true;
@@ -645 +632 @@
 #endif
 
+#if QT_VERSION < 0x040000
+  fTabWidget->setCurrentPage(tabNumber);
+#else
   fTabWidget->setCurrentIndex(tabNumber);
+#endif
 
   // Send this signal to unblock graphic updates !
-  fTabWidget->setVisible(true);
+#if QT_VERSION >= 0x040000
+ #if QT_VERSION >= 0x040200
+   fTabWidget->setVisible(true);
+ #else
+   fTabWidget->show;
+ #endif
+#else
+  fTabWidget->show;
+#endif
 
   // This will send a paintEvent to OGL Viewers