Changeset 1329

Timestamp:

Jul 28, 2010, 4:57:46 PM (14 years ago)

Author:

garnier

Message:

bug fix 2?

File:

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

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

@@ -506 +506 @@
 )
 {
+  bool shouldConnect = false;
+
 #ifdef G4DEBUG_INTERFACES_BASIC
   printf("G4UIQt::AddTabWidget %d %d\n",sizeX, sizeY);
@@ -535 +537 @@
     fTabWidget->setSizePolicy(policy);
     
-#if QT_VERSION >= 0x040500
-    connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
-#endif
-    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
+    shouldConnect = true;
   }
 
@@ -584 +583 @@
   printf("G4UIQt::AddTabWidget ADD %d %d + %d %d---------------------------------------------------\n",sizeX, sizeY,sizeX-fTabWidget->width(),sizeY-fTabWidget->height());
 #endif
-  
+
   if (fMainWindow->isVisible()) {
 
@@ -591 +590 @@
     int tabBarY = 0;
     if (fTabWidget->count() >0) {
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget -1-1-1\n");
+#endif
+
 #if QT_VERSION < 0x040000
       tabBarX = fTabWidget->width()-fTabWidget->page(0)->width();
@@ -600 +603 @@
     }
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget 00000\n");
+#endif
+
     fMainWindow->resize(tabBarX+fMainWindow->width()+sizeX-fTabWidget->width(),tabBarY+fMainWindow->height()+sizeY-fTabWidget->height());
   }
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget 1111111\n");
+#endif
   // Problems with resize. The widgets are not realy drawn at this step,
   // then we have to force them on order to check the size
@@ -612 +622 @@
 #endif
   
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget 222222\n");
+#endif
 #if QT_VERSION < 0x040000
   fTabWidget->setCurrentPage(fTabWidget->count()-1);
@@ -618 +631 @@
 #endif
 
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget 333333\n");
+#endif
   // Set visible
 #if QT_VERSION >= 0x040000
@@ -629 +645 @@
 #endif
   
+#ifdef G4DEBUG_INTERFACES_BASIC
+  printf("G4UIQt::AddTabWidget -------\n");
+#endif
+  if (shouldConnect) {
+#if QT_VERSION >= 0x040500
+    connect(fTabWidget,   SIGNAL(tabCloseRequested(int)), this, SLOT(TabCloseCallback(int)));
+#endif
+    connect(fTabWidget, SIGNAL(currentChanged ( int ) ), SLOT(UpdateTabWidget(int))); 
+  }
   return true;
 }