Changeset 1261 for trunk

Timestamp:

May 26, 2010, 2:48:18 PM (14 years ago)

Author:

garnier

Message:

test qt3

Location:

trunk/source/interfaces

Files:

• History (modified) (1 diff)
• basic/src/G4UIQt.cc (modified) (4 diffs)

trunk/source/interfaces/History

@@ -18 +18 @@
      ----------------------------------------------------------
 
+26 May, L. Garnier
+ - G4UIQt: Fix some compil errors with qt3
+
 20 May, L. Garnier
  Co-working tag : intercoms-V09-03-01

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

@@ -60 +60 @@
 #include <qtabwidget.h>
 #include <qtabbar.h>
-#include <QResizeEvent>
 #include <qstringlist.h>
 
@@ -68 +67 @@
 #include <qlistwidget.h>
 #include <qtreewidget.h>
+#include <QResizeEvent>
 #else
 #include <qaction.h>
@@ -164 +164 @@
 #if QT_VERSION < 0x040000
   fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
-  fToolBox = new QToolBox(Qt::Horizontal,fMyVSplitter);
+  fToolBox = new QToolBox(fMyVSplitter);
 #else
   fMyVSplitter = new QSplitter(Qt::Horizontal,fMainWindow);
-  fToolBox = new QToolBox(mainWidget);
+  fToolBox = new QToolBox();
 #endif
 
@@ -244 +244 @@
 
   QSizePolicy policy = fTabWidget->sizePolicy();
+#if QT_VERSION < 0x040000
+  policy.setHorStretch(1);
+  policy.setVerStretch(1);
+#else
   policy.setHorizontalStretch(1);
   policy.setVerticalStretch(1);
+#endif
   fTabWidget->setSizePolicy(policy);
 
-  fEmptyViewerTabLabel = new QLabel("         If you want to have a Viewer, please use /vis/open commands. ");
+  fEmptyViewerTabLabel = new QLabel(QString("         If you want to have a Viewer, please use /vis/open commands. "));
 
   // Only at creation. Will be set visible when sessionStart();
+#if QT_VERSION >= 0x040000
+#if QT_VERSION >= 0x040200
   fTabWidget->setVisible(false);
   fEmptyViewerTabLabel->setVisible(false);
-
+#else
+  fTabWidget->hide();
+  fEmptyViewerTabLabel->hide();
+#endif
+#else
+  fTabWidget->hide();
+  fEmptyViewerTabLabel->hide();
+#endif
+
+
+  //  fMyVSplitter->addWidget(fTabWidget);
+
+  // unset parent fot TabWidget
+#if QT_VERSION < 0x040000
+  fTabWidget->reparent(0,0,QPoint(0,0));  
+#else
   fMyVSplitter->addWidget(fToolBox);
   fMyVSplitter->addWidget(fEmptyViewerTabLabel);
-  //  fMyVSplitter->addWidget(fTabWidget);
-
-  // unset parent fot TabWidget
-#if QT_VERSION < 0x040000
-  fTabWidget->reparent(0,0,QPoint(0,0));  
-#else
   fTabWidget->setParent(0);
 #endif