From bcc48ea905cbde6643491556b9f5719d9a011373 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 3 Feb 2009 15:46:25 +0000 Subject: [PATCH] A patch by Nicolas GEIMER for the problem of Qt dialogs not appearing in GEOM (for Ubuntu 8.10 32bits) --- src/BasicGUI/BasicGUI_ArcDlg.cxx | 2 +- src/BasicGUI/BasicGUI_CircleDlg.cxx | 2 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 2 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 2 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 2 +- src/BasicGUI/BasicGUI_PointDlg.cxx | 2 +- src/BasicGUI/BasicGUI_VectorDlg.cxx | 2 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI.cxx | 2 +- src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 2 +- src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 2 +- src/BuildGUI/BuildGUI.cxx | 2 +- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 2 +- src/GroupGUI/GroupGUI.cxx | 2 +- src/MeasureGUI/MeasureGUI.cxx | 2 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 2 +- src/OperationGUI/OperationGUI_FilletDlg.cxx | 2 +- src/OperationGUI/OperationGUI_PartitionDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_PositionDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_RotationDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_ScaleDlg.cxx | 2 +- src/TransformationGUI/TransformationGUI_TranslationDlg.cxx | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index b2f18c3cd..7326a37e2 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -683,7 +683,7 @@ void BasicGUI_ArcDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); myEditCurrentArgument->setFocus(); connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 9cb015a9c..3c1858203 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -269,7 +269,7 @@ void BasicGUI_CircleDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); myEditCurrentArgument->setFocus(); globalSelection(); // close local contexts, if any diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index 992eb6235..03159903b 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -226,7 +226,7 @@ void BasicGUI_LineDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); SelectionIntoArgument(); } diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index 9e9d46b64..ecd49f548 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -301,7 +301,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), this, SLOT( onSelectionDone() ) ); diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index 6e9aaa1f5..8d5b14f37 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -308,7 +308,7 @@ void BasicGUI_PlaneDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); myEditCurrentArgument->setFocus(); connect( myGeomGUI->getApp()->selectionMgr(), SIGNAL( currentSelectionChanged() ), diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index b2475da60..9b2f525ac 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -380,7 +380,7 @@ void BasicGUI_PointDlg::ConstructorsClicked(int constructorId) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); SelectionIntoArgument(); } diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index d441ce891..23a1a8492 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -229,7 +229,7 @@ void BasicGUI_VectorDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); displayPreview(); } diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx index 92c989ba1..5fd3838c9 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx @@ -242,7 +242,7 @@ void BasicGUI_WorkingPlaneDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); updateWPlane(); } diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx index 89a20a56e..547510dc8 100644 --- a/src/BlocksGUI/BlocksGUI.cxx +++ b/src/BlocksGUI/BlocksGUI.cxx @@ -78,7 +78,7 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) if ( aDlg ) { aDlg->updateGeometry(); - aDlg->resize( aDlg->minimumSize() ); + aDlg->resize( aDlg->minimumSizeHint() ); aDlg->show(); } diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx index 332380518..5ebb5f4ce 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx @@ -191,7 +191,7 @@ void BlocksGUI_BlockDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); // on dialog initialization we init the first field with a selected object (if any) SelectionIntoArgument(); diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx index de564bcba..930af1c45 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx @@ -178,7 +178,7 @@ void BlocksGUI_QuadFaceDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); // on dialog initialization we init the first field with a selected object (if any) SelectionIntoArgument(); diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx index fc7a5f720..9e5e91a97 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx @@ -184,7 +184,7 @@ void BlocksGUI_TrsfDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); // on dialog initialization we init the first field with a selected object (if any) SelectionIntoArgument(); diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx index 4b6cdf52b..643cbf11a 100644 --- a/src/BuildGUI/BuildGUI.cxx +++ b/src/BuildGUI/BuildGUI.cxx @@ -79,7 +79,7 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) if ( aDlg ) { aDlg->updateGeometry(); - aDlg->resize( aDlg->minimumSize() ); + aDlg->resize( aDlg->minimumSizeHint() ); aDlg->show(); } diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index 85cc51d31..e4ff74ff3 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -276,7 +276,7 @@ void GenerationGUI_PrismDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx index cf6ef7b40..89d84ebf2 100644 --- a/src/GroupGUI/GroupGUI.cxx +++ b/src/GroupGUI/GroupGUI.cxx @@ -113,7 +113,7 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) if ( aDlg ) { aDlg->updateGeometry(); - aDlg->resize( aDlg->minimumSize() ); + aDlg->resize( aDlg->minimumSizeHint() ); aDlg->show(); } diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index 11f9c4945..a240d7562 100644 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -116,7 +116,7 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) } if ( dlg ) { dlg->updateGeometry(); - dlg->resize( dlg->minimumSize() ); + dlg->resize( dlg->minimumSizeHint() ); dlg->show(); } return true; diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index b75458ec9..af89feddd 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -358,7 +358,7 @@ void OperationGUI_ChamferDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); } //================================================================================= diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx index 4fd97b6be..84a2f3134 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.cxx +++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx @@ -296,7 +296,7 @@ void OperationGUI_FilletDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); } //================================================================================= diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx index fc1d24ad3..e52df271c 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx +++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx @@ -192,7 +192,7 @@ void OperationGUI_PartitionDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); myEditCurrentArgument->setFocus(); connect( myGeomGUI->getApp()->selectionMgr(), diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index aaf190676..ab47b76d3 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -194,7 +194,7 @@ void PrimitiveGUI_BoxDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { // on dialog initialization we init the first field with a selected object (if any) diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index 21afcbac5..5bbe43478 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -209,7 +209,7 @@ void PrimitiveGUI_ConeDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { // on dialog initialization we init the first field with a selected object (if any) diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index e5d76a05b..b77bd11a3 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -200,7 +200,7 @@ void PrimitiveGUI_CylinderDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx index b6131514c..9344092c8 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx @@ -254,7 +254,7 @@ void PrimitiveGUI_DiskDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx index 27e362206..3f6d5fe6a 100755 --- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx @@ -301,7 +301,7 @@ void PrimitiveGUI_FaceDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); SelectionIntoArgument(); //displayPreview(); } diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx index 32192677b..6fc293005 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx @@ -191,7 +191,7 @@ void PrimitiveGUI_SphereDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); displayPreview(); } diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index 7ca9f5d40..a756fdf62 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -199,7 +199,7 @@ void PrimitiveGUI_TorusDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index b1c641131..3425fc433 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -233,7 +233,7 @@ void RepairGUI_GlueDlg::ConstructorsClicked( int constructorId ) qApp->processEvents(); updateGeometry(); - resize( minimumSize() ); + resize( minimumSizeHint() ); displayPreview(); updateButtonState(); diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx index 471fdd0fa..80d028e25 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx @@ -246,7 +246,7 @@ void TransformationGUI_MultiRotationDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index 6cd252598..e4c81518b 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -265,7 +265,7 @@ void TransformationGUI_MultiTranslationDlg::ConstructorsClicked (int constructor qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index bbbd6b6be..e6cd6c213 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -243,7 +243,7 @@ void TransformationGUI_PositionDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index fda7909f4..c56fd9c9b 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -204,7 +204,7 @@ void TransformationGUI_RotationDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index c441f6204..32daa0cb5 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -225,7 +225,7 @@ void TransformationGUI_ScaleDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index 0ded760cb..bdbd96a7c 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -240,7 +240,7 @@ void TransformationGUI_TranslationDlg::ConstructorsClicked (int constructorId) qApp->processEvents(); updateGeometry(); - resize(minimumSize()); + resize(minimumSizeHint()); if (myInitial) { myInitial = false; -- 2.39.2