X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.h;h=28c62461856c5a0c64fd5833c40127076133c334;hb=fc2acc7bd36f7bff6ec1f5095bf7c44be15e2574;hp=7331bc53136ecdec2a184c985c090f6ec397408d;hpb=cd9217d7e87997ec8bc150a6d8c389e742ca0f84;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_PropertyPanel.h b/src/XGUI/XGUI_PropertyPanel.h
index 7331bc531..28c624618 100644
--- a/src/XGUI/XGUI_PropertyPanel.h
+++ b/src/XGUI/XGUI_PropertyPanel.h
@@ -11,57 +11,68 @@
 #include "XGUI.h"
 
 #include <ModuleBase_ModelWidget.h>
+#include <ModuleBase_IPropertyPanel.h>
 
-#include <QDockWidget>
 #include <QList>
 
 class QKeyEvent;
 class QVBoxLayout;
 
-class XGUI_EXPORT XGUI_PropertyPanel : public QDockWidget
+class XGUI_EXPORT XGUI_PropertyPanel : public ModuleBase_IPropertyPanel
 {
 Q_OBJECT
  public:
   XGUI_PropertyPanel(QWidget* theParent);
   virtual ~XGUI_PropertyPanel();
 
+  /// Returns main widget of the property panel, which children will be created
+  /// by WidgetFactory using the XML definition
   QWidget* contentWidget();
+
+  /// Brings back all widget created by widget factory for signal/slot
+  /// connections and further processing
   void setModelWidgets(const QList<ModuleBase_ModelWidget*>& theWidgets);
-  const QList<ModuleBase_ModelWidget*>& modelWidgets() const;
 
+  /// Returns all property panel's widget created by WidgetFactory
+  virtual const QList<ModuleBase_ModelWidget*>& modelWidgets() const;
+
+  /// Removes all widgets in the widget area of the property panel
   void cleanContent();
 
- protected:
-  virtual bool eventFilter(QObject *theObject, QEvent *theEvent);
+  /// Returns currently active widget
+  virtual ModuleBase_ModelWidget* activeWidget() const { return myActiveWidget; }
+
+  /// Activate the next widget in the property panel
+  /// \param theWidget a widget. The next widget should be activated
+  virtual void activateNextWidget(ModuleBase_ModelWidget* theWidget);
+
+  /// Activate the next from current widget in the property panel
+  virtual void activateNextWidget();
+
+  void setStretchEnabled(bool isEnabled);
 
  public slots:
   void updateContentWidget(FeaturePtr theFeature);
-  /// slot to activate the next widget in the property panel
-  /// \param theWidget a widget. The next widget should be activated
-  void onActivateNextWidget(ModuleBase_ModelWidget* theWidget);
   // Enables / disables "ok" ("accept") button
   void setAcceptEnabled(bool);
 
-signals:
-  /// The signal about key release on the control, that corresponds to the attribute
-  /// \param theAttributeName a name of the attribute
-  /// \param theEvent key release event
-  void keyReleased(const std::string& theAttributeName, QKeyEvent* theEvent);
-  /// The signal about the widget activation
-  /// \param theWidget the activated widget
-  void widgetActivated(ModuleBase_ModelWidget* theWidget);
+  // Makes the given widget active, highlights it and removes
+  // highlighting from the previous active widget
+  // emits widgetActivated(theWidget) signal
+  virtual void activateWidget(ModuleBase_ModelWidget* theWidget);
 
+ signals:
   /// Signal about the point 2d set to the feature
   /// \param the feature
   /// \param the attribute of the feature
-  void storedPoint2D(ObjectPtr theFeature, const std::string& theAttribute);
+  //void storedPoint2D(ObjectPtr theFeature, const std::string& theAttribute);
+
 
  private:
   QWidget* myCustomWidget;
-
   QList<ModuleBase_ModelWidget*> myWidgets;
-
   QVBoxLayout* myMainLayout;
+  ModuleBase_ModelWidget* myActiveWidget;
 };
 
 #endif /* XGUI_PROPERTYPANEL_H_ */