Merge branch 'master' of newgeom:newgeom.git into BR_PYTHON_PLUGIN

[modules/shaper.git] / src / XGUI / XGUI_PropertyPanel.h

diff --git a/src/XGUI/XGUI_PropertyPanel.h b/src/XGUI/XGUI_PropertyPanel.h
index a660b5484bf27c4a1bff6301da766f4f4ed39ced..04c4d1ed3c5521bfe40ab28368bc5de21968f906 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.h
+++ b/src/XGUI/XGUI_PropertyPanel.h
@@ -11,14 +11,14 @@
 #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:
@@ -28,39 +28,50 @@ Q_OBJECT
   /// 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);
+
   /// Returns all property panel's widget created by WidgetFactory
-  const QList<ModuleBase_ModelWidget*>& modelWidgets() const;
+  virtual const QList<ModuleBase_ModelWidget*>& modelWidgets() const;
+
   /// Removes all widgets in the widget area of the property panel
   void cleanContent();
 
+  /// 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();
+
  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 theEvent key release event
-  void keyReleased(QKeyEvent* theEvent);
-  /// The signal about the widget activation
-  /// \param theWidget the activated widget
-  void widgetActivated(ModuleBase_ModelWidget* theWidget);
+ protected slots:
+  // Makes the given widget active, highlights it and removes
+  // highlighting from the previous active widget
+  // emits widgetActivated(theWidget) signal
+  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);
 
+
  private:
   QWidget* myCustomWidget;
   QList<ModuleBase_ModelWidget*> myWidgets;
   QVBoxLayout* myMainLayout;
+  ModuleBase_ModelWidget* myActiveWidget;
 };
 
 #endif /* XGUI_PROPERTYPANEL_H_ */