X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=5b26e4e6a8f62b7937613382b6bfcceb36a598b0;hb=3ce4e2cad0e6802282a5a1d10c49c041e8a9f287;hp=ccf0469cfc2944b3d30b38fce8fbc867bbfcca27;hpb=09de1c242b3646b18cc7a412251bd7ab62be27e5;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index ccf0469cf..5b26e4e6a 100644
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -5,8 +5,9 @@
  *      Author: sbh
  */
 
-#include <XGUI_Constants.h>
 #include <XGUI_PropertyPanel.h>
+#include <XGUI_Constants.h>
+#include <ModuleBase_WidgetPoint2D.h>
 
 #include <QWidget>
 #include <QVBoxLayout>
@@ -14,12 +15,15 @@
 #include <QPushButton>
 #include <QIcon>
 #include <QVBoxLayout>
+#include <QEvent>
+#include <QKeyEvent>
 
 #ifdef _DEBUG
 #include <iostream>
 #endif
 
-XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
+XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent) :
+QDockWidget(theParent)
 {
   this->setWindowTitle(tr("Property Panel"));
   QAction* aViewAct = this->toggleViewAction();
@@ -27,8 +31,8 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }");
 
   QWidget* aContent = new QWidget(this);
-  QVBoxLayout* aMainLay = new QVBoxLayout(aContent);
-  aMainLay->setContentsMargins(3, 3, 3, 3);
+  myMainLayout = new QVBoxLayout(aContent);
+  myMainLayout->setContentsMargins(3, 3, 3, 3);
   this->setWidget(aContent);
 
   QFrame* aFrm = new QFrame(aContent);
@@ -36,7 +40,7 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   aFrm->setFrameShape(QFrame::Panel);
   QHBoxLayout* aBtnLay = new QHBoxLayout(aFrm);
   aBtnLay->setContentsMargins(0, 0, 0, 0);
-  aMainLay->addWidget(aFrm);
+  myMainLayout->addWidget(aFrm);
 
   QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
   aBtn->setFlat(true);
@@ -44,25 +48,92 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   aBtnLay->addStretch(1);
   aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
   aBtn->setObjectName(XGUI::PROP_PANEL_OK);
+  aBtn->setToolTip(tr("Ok"));
   aBtn->setFlat(true);
   aBtnLay->addWidget(aBtn);
+  aBtn->installEventFilter(this);
+
   aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
+  aBtn->setToolTip(tr("Cancel"));
   aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
   aBtn->setFlat(true);
   aBtnLay->addWidget(aBtn);
 
   myCustomWidget = new QWidget(aContent);
-  aMainLay->addWidget(myCustomWidget);
-  aMainLay->addStretch(1);
+  myMainLayout->addWidget(myCustomWidget);
+  myMainLayout->addStretch(1);
+
+  aBtn->installEventFilter(this);
 }
 
 XGUI_PropertyPanel::~XGUI_PropertyPanel()
 {
 }
 
+void XGUI_PropertyPanel::cleanContent()
+{
+  myWidgets.clear(); 
+  qDeleteAll(myCustomWidget->children());
+}
+
 void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& theWidgets)
 {
   myWidgets = theWidgets;
+
+  if (!theWidgets.empty()) {
+    QList<ModuleBase_ModelWidget*>::const_iterator anIt = theWidgets.begin(), aLast = theWidgets.end();
+    for (; anIt != aLast; anIt++) {
+      connect(*anIt, SIGNAL(keyReleased(const std::string&, QKeyEvent*)),
+              this, SIGNAL(keyReleased(const std::string&, QKeyEvent*)));
+
+      connect(*anIt, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)),
+              this, SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
+
+      //connect(*anIt, SIGNAL(activated(ModuleBase_ModelWidget*)),
+      //        this, SIGNAL(widgetActivated(ModuleBase_ModelWidget*)));
+
+      ModuleBase_WidgetPoint2D* aPointWidget = dynamic_cast<ModuleBase_WidgetPoint2D*>(*anIt);
+      if (aPointWidget)
+        connect(aPointWidget, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)),
+                this, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)));
+    }
+    ModuleBase_ModelWidget* aLastWidget = theWidgets.last();
+    if (aLastWidget) {
+      QList<QWidget*> aControls = aLastWidget->getControls();
+      if (!aControls.empty()) {
+        QWidget* aLastControl = aControls.last();
+
+        QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+        QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+
+        setTabOrder(aLastControl, anOkBtn);
+        setTabOrder(anOkBtn, aCancelBtn);
+      }
+    }
+    onActivateNextWidget(0);
+  }
+}
+
+const QList<ModuleBase_ModelWidget*>& XGUI_PropertyPanel::modelWidgets() const
+{
+  return myWidgets;
+}
+
+bool XGUI_PropertyPanel::eventFilter(QObject *theObject, QEvent *theEvent)
+{
+  QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+  QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+  if (theObject == anOkBtn || theObject == aCancelBtn) {
+    if (theEvent->type() == QEvent::KeyRelease) {
+      QKeyEvent* aKeyEvent = (QKeyEvent*)theEvent;
+      if (aKeyEvent && aKeyEvent->key() == Qt::Key_Return) {
+        // TODO: this is enter button processing when the focus is on "Apply" or "Cancel" buttons
+        emit keyReleased("", (QKeyEvent*) theEvent);
+        return true;
+      }
+    }
+  }
+  return QDockWidget::eventFilter(theObject, theEvent);
 }
 
 QWidget* XGUI_PropertyPanel::contentWidget()
@@ -70,11 +141,29 @@ QWidget* XGUI_PropertyPanel::contentWidget()
   return myCustomWidget;
 }
 
-void XGUI_PropertyPanel::updateContentWidget(boost::shared_ptr<ModelAPI_Feature> theFeature)
+void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature)
 {
   foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
-    eachWidget->restoreValue(theFeature);
+    eachWidget->setFeature(theFeature);
+    eachWidget->restoreValue();
   }
   // the repaint is used here to immediatelly react in GUI to the values change.
   repaint();
 }
+
+void XGUI_PropertyPanel::onActivateNextWidget(ModuleBase_ModelWidget* theWidget)
+{
+  ModuleBase_ModelWidget* aNextWidget = 0;
+  QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(),
+                                                 aLast = myWidgets.end();
+  bool isFoundWidget = false;
+  for (;anIt != aLast && !aNextWidget; anIt++) {
+    if (isFoundWidget || !theWidget) {
+      if ((*anIt)->focusTo()) {
+        aNextWidget = *anIt;
+      }
+    }
+    isFoundWidget = (*anIt) == theWidget;
+  }
+  emit widgetActivated(aNextWidget);
+}