X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetFactory.h;h=05f3b7b8a2bba7c6fc1c8750ac3e109523047785;hb=7850a95ad1efe835c2266230bdab39bf2e856789;hp=3fa399e986193af203bc0755f4dec906d0cbd749;hpb=72cb66f9c09b0f8fa224f6f8ab43548658015b49;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetFactory.h b/src/ModuleBase/ModuleBase_WidgetFactory.h
index 3fa399e98..05f3b7b8a 100644
--- a/src/ModuleBase/ModuleBase_WidgetFactory.h
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.h
@@ -7,11 +7,11 @@
  *      Author: sbh
  */
 
-#ifndef ModuleBase_WidgetFactory_H_
-#define ModuleBase_WidgetFactory_H_
+#ifndef MODULEBASE_WIDGETFACTORY_H_
+#define MODULEBASE_WIDGETFACTORY_H_
 
-#include "ModuleBase.h"
-#include "ModuleBase_ModelWidget.h"
+#include <ModuleBase.h>
+#include <ModuleBase_ModelWidget.h>
 
 #include <QString>
 #include <QList>
@@ -20,8 +20,10 @@ class QObject;
 class QWidget;
 class Config_WidgetAPI;
 class ModuleBase_IWorkshop;
+class ModuleBase_PageBase;
 
 /**
+* \ingroup GUI
 * A class for creation of widgets instances in for property panel using XML deskription of 
 * a feature
 */
@@ -37,7 +39,8 @@ class MODULEBASE_EXPORT ModuleBase_WidgetFactory
 
   /// Creates content widget for property panel
   /// \param theParent a parent widget
-  void createWidget(QWidget* theParent);
+  void createWidget(ModuleBase_PageBase* theParent);
+
 
   /// Returns list of model widgets
   QList<ModuleBase_ModelWidget*> getModelWidgets() const
@@ -46,51 +49,20 @@ class MODULEBASE_EXPORT ModuleBase_WidgetFactory
   }
 
  protected:
-   /// Create widget by its type
-   /// \param theType a type
-   /// \param theParent a parent widget
-  QWidget* createWidgetByType(const std::string& theType, QWidget* theParent = NULL);
-
-   /// Create a widget of container type
-   /// \param theType a type
-   /// \param theParent a parent widget
-  QWidget* createContainer(const std::string& theType, QWidget* theParent = NULL);
-
-  /// Create label widget
-  /// \param theParent a parent widget
-  QWidget* labelControl(QWidget* theParent);
-
-  /// Create double spin box widget
-  /// \param theParent a parent widget
-  QWidget* doubleSpinBoxControl(QWidget* theParent);
-
-  /// Create double value editor widget
-  /// \param theParent a parent widget
-  QWidget* doubleValueEditor(QWidget* theParent);
-
-  /// Create shape selector widget
-  /// \param theParent a parent widget
-  QWidget* shapeSelectorControl(QWidget* theParent);
-
-  /// Create boolean input widget
-  /// \param theParent a parent widget
-  QWidget* booleanControl(QWidget* theParent);
-
-  /// Create file selector widget
-  /// \param theParent a parent widget
-  QWidget* fileSelectorControl(QWidget* theParent);
-
-  /// Create choice widget (combo box)
-  /// \param theParent a parent widget
-  QWidget* choiceControl(QWidget* theParent);
+  /// check if ModuleBase_Widget has expandable widgets in getControls
+  bool hasExpandingControls(QWidget* theParent);
 
-  /// Create line edit widget
+  /// Create page by its type
+  /// \param theType a type
   /// \param theParent a parent widget
-  QWidget* lineEditControl(QWidget* theParent);
+  ModuleBase_PageBase* createPageByType(const std::string& theType,
+                                        QWidget* theParent);
 
-  /// Create multi selector widget
+  /// Create widget by its type
+  /// \param theType a type
   /// \param theParent a parent widget
-  QWidget* multiSelectorControl(QWidget* theParent);
+  ModuleBase_ModelWidget* createWidgetByType(const std::string& theType,
+                                             QWidget* theParent = NULL);
 
   /// Convert STD string to QT string
   /// \param theStdString is STD string