X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_CreateStdHypothesisDlg.cxx;h=29205f4d11796f988689f69819478f7aed811feb;hp=32aa02df3938459e3d6a37f0dda20b2549127aa2;hb=5c933ecde0251d3c4894d0cdeab8dc67b6c4c3a5;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f diff --git a/src/StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.cxx b/src/StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.cxx index 32aa02df3..29205f4d1 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_CreateStdHypothesisDlg.cxx @@ -35,10 +35,10 @@ using namespace std; #include "utilities.h" -#include "SALOMEGUI_QtCatchCorbaException.hxx" -#include "QAD_MessageBox.h" -#include "QAD_WaitCursor.h" -#include "QAD_Desktop.h" +#include "SUIT_MessageBox.h" +#include "SUIT_ResourceMgr.h" +#include "SUIT_OverrideCursor.h" +#include "SUIT_Desktop.h" //================================================================================= // class : StdMeshersGUI_CreateStdHypothesisDlg() @@ -47,9 +47,9 @@ using namespace std; StdMeshersGUI_CreateStdHypothesisDlg::StdMeshersGUI_CreateStdHypothesisDlg (const QString& hypType, QWidget* parent, const char* name, - bool modal, + bool /*modal*/, WFlags fl) - : StdMeshersGUI_CreateHypothesisDlg (hypType, parent, name, modal, fl) + : StdMeshersGUI_CreateHypothesisDlg (hypType, parent, name, true, fl) { QString hypTypeStr; if (hypType.compare("LocalLength") == 0) @@ -66,15 +66,17 @@ StdMeshersGUI_CreateStdHypothesisDlg::StdMeshersGUI_CreateStdHypothesisDlg (cons hypTypeStr = "DEFLECTION1D"; else if (hypType.compare("Arithmetic1D") == 0) hypTypeStr = "ARITHMETIC_1D"; + else if (hypType.compare("AutomaticLength") == 0) + hypTypeStr = "AUTOMATIC_LENGTH"; else return; QString caption( tr ( QString( "SMESH_%1_TITLE" ).arg( hypTypeStr ))); QString hypTypeName( tr ( QString( "SMESH_%1_HYPOTHESIS" ).arg( hypTypeStr ))); QString hypIconName( tr ( QString( "ICON_DLG_%1" ).arg( hypTypeStr ))); - - CreateDlgLayout(caption, - QAD_Desktop::getResourceManager()->loadPixmap( "SMESH", hypIconName ), + + CreateDlgLayout(caption, + SMESHGUI::resourceMgr()->loadPixmap( "SMESH", hypIconName ), hypTypeName); }