Make finishing operation in python console produce no warnings: isOperation of root...

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

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index 9a6e9500c288f99d491a27974764bed34656301b..9a5877369ba5a51254ba151fc696429a48688a00 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -51,7 +51,6 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   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"));
@@ -62,8 +61,6 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
   myCustomWidget = new QWidget(aContent);
   myMainLayout->addWidget(myCustomWidget);
   myMainLayout->addStretch(1);
-
-  aBtn->installEventFilter(this);
 }
 
 XGUI_PropertyPanel::~XGUI_PropertyPanel()
@@ -79,39 +76,35 @@ void XGUI_PropertyPanel::cleanContent()
 void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& theWidgets)
 {
   myWidgets = theWidgets;
+  if (theWidgets.empty()) return;
+
+  QList<ModuleBase_ModelWidget*>::const_iterator anIt = theWidgets.begin(), aLast =
+      theWidgets.end();
+  for (; anIt != aLast; anIt++) {
+    connect(*anIt, SIGNAL(keyReleased(QKeyEvent*)), this, SIGNAL(keyReleased(QKeyEvent*)));
+
+    connect(*anIt, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)), this,
+            SLOT(onActivateNextWidget(ModuleBase_ModelWidget*)));
+    connect(*anIt, SIGNAL(focusInWidget(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();
 
-  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);
+      QPushButton* anOkBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+      QPushButton* aCancelBtn = findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
 
-        setTabOrder(aLastControl, anOkBtn);
-        setTabOrder(anOkBtn, aCancelBtn);
-      }
+      setTabOrder(aLastControl, anOkBtn);
+      setTabOrder(anOkBtn, aCancelBtn);
     }
-    onActivateNextWidget(0);
   }
 }
 
@@ -120,23 +113,6 @@ 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()
 {
   return myCustomWidget;