Simplification of the code: it removes focusNextPrevChild processing.

It is not enough to emit signal about focus change here because it can be changed by mouse click in another control. It is not processed in this method.
The same functionality(to store modified value on focus lost) is realized in ::deactivate() of the model widget and processEnter method of the widge.

diff --git a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
index 114a27d6ca8f12a539ead1b8250152a8c2141512..081ca65b3fb12dad6800a131d18cda5e0c95a9c1 100644 (file)
--- a/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
+++ b/src/ModuleBase/ModuleBase_DoubleSpinBox.cpp
@@ -217,15 +217,6 @@ void ModuleBase_DoubleSpinBox::keyPressEvent(QKeyEvent *theEvent)
   QDoubleSpinBox::keyPressEvent(theEvent);
 }
 
-bool ModuleBase_DoubleSpinBox::focusNextPrevChild(bool theIsNext)
-{
-  //myIsModified = false;
-
-  //emit valueStored();
-  emit focusNextPrev();
-  return QDoubleSpinBox::focusNextPrevChild(theIsNext);
-}
-
 /*!
  \brief Perform \a steps increment/decrement steps.
 

diff --git a/src/ModuleBase/ModuleBase_DoubleSpinBox.h b/src/ModuleBase/ModuleBase_DoubleSpinBox.h
index 51c36cc70257523a909e10cf94a2c9c6977208ec..e1fd8bd61f7341e2cb8419fbdd0b850e576ed73d 100644 (file)
--- a/src/ModuleBase/ModuleBase_DoubleSpinBox.h
+++ b/src/ModuleBase/ModuleBase_DoubleSpinBox.h
@@ -60,11 +60,6 @@ Q_OBJECT
   /// \return the previous value
   bool enableKeyPressEvent(const bool& theEnable);
 
-signals:
-  /// A signal that is emitted by the "Tab" key event. It is emitted before the key is processed.
-  void focusNextPrev();
-  void valueStored();
-
  protected slots:
    /// Called on text changed
   virtual void onTextChanged(const QString&);
@@ -75,11 +70,6 @@ signals:
   QString removeTrailingZeroes(const QString&) const;
   virtual void keyPressEvent(QKeyEvent* theEvent);
 
-  /// The parent method that processes the "Tab"/"SHIF + Tab" keyboard events
-  /// Emits a signal about focus change
-  /// If theIsNext is true, this function searches forward, if next is false, it searches backward.
-  virtual bool focusNextPrevChild(bool theIsNext);
-
  private:
   // boolen flag whether the key event is emitted. The default value is false
   bool myIsEmitKeyPressEvent;

diff --git a/src/ModuleBase/ModuleBase_ModelWidget.h b/src/ModuleBase/ModuleBase_ModelWidget.h
index 0942fcce77549ef74a33e33570da3ea53f7ec503..dd2c9edd3a1817899a8cddbdeafce020525f1005 100644 (file)
--- a/src/ModuleBase/ModuleBase_ModelWidget.h
+++ b/src/ModuleBase/ModuleBase_ModelWidget.h
@@ -204,9 +204,6 @@ signals:
   /// The signal about value state modification
   void valueStateChanged(int theState);
 
-  void focusNextPrev();
-  void valueStored();
-
 protected:
   /// Sets default value of widget. Normally, widget should fetch this value
   /// from the xml. However, some widgets derived widgets could define it

diff --git a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
index 0486674270a027d0ea8134605c6d6faa86f885e1..807fbad6d6c5ac3092dc7eb34d564461a600134a 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetDoubleValue.cpp
@@ -85,10 +85,7 @@ ModuleBase_WidgetDoubleValue::ModuleBase_WidgetDoubleValue(QWidget* theParent,
   mySpinBox->setToolTip(aTTip);
 
   aControlLay->addRow(myLabel, mySpinBox);
-  // Apply widget value change by enter/tab event.
-  connect(mySpinBox, SIGNAL(valueStored()), this, SIGNAL(valuesChanged()));
   connect(mySpinBox, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
-  connect(mySpinBox, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev()));
 }
 
 ModuleBase_WidgetDoubleValue::~ModuleBase_WidgetDoubleValue()

diff --git a/src/ModuleBase/ModuleBase_WidgetExprEditor.cpp b/src/ModuleBase/ModuleBase_WidgetExprEditor.cpp
index 624e047441564ae8cd918e649806cea5c2c8521a..4c37116b2a9fb15487402461c43ca7bdb0d283cf 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetExprEditor.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetExprEditor.cpp
@@ -212,13 +212,6 @@ void ExpressionEditor::paintEvent( QPaintEvent* theEvent )
   }
 }
 
-bool ExpressionEditor::focusNextPrevChild(bool theIsNext)
-{
-  //emit valueStored();
-  //emit focusNextPrev();
-  return QPlainTextEdit::focusNextPrevChild(theIsNext);
-}
-
 void ExpressionEditor::onTextChanged()
 {
   myIsModified = true;
@@ -248,12 +241,7 @@ ModuleBase_WidgetExprEditor::ModuleBase_WidgetExprEditor( QWidget* theParent,
   this->setLayout(aMainLay);
 
   connect(myEditor, SIGNAL(valueModified()), this, SIGNAL(valuesModified()));
-  //connect(myEditor, SIGNAL(valueStored()), this, SLOT(onTextChanged()));
-  //connect(myEditor, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev()));
-
   connect(myEditor, SIGNAL(keyReleased(QKeyEvent*)), this, SIGNAL(keyReleased(QKeyEvent*)));
-    /// The signal about key release on the control, that corresponds to the attribute
-  /// \param theEvent key release event
 }
 
 ModuleBase_WidgetExprEditor::~ModuleBase_WidgetExprEditor()

diff --git a/src/ModuleBase/ModuleBase_WidgetExprEditor.h b/src/ModuleBase/ModuleBase_WidgetExprEditor.h
index 0e81242bb98b6859c1f0197bc1d71b1f3f984a41..d51f45805992be503d90a6acff9363eefbbb9b2a 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetExprEditor.h
+++ b/src/ModuleBase/ModuleBase_WidgetExprEditor.h
@@ -64,10 +64,8 @@ class ExpressionEditor: public QPlainTextEdit
   void onTextChanged();
 
 signals:
+  /// The signal about text change in the text editor
   void valueModified();
-  /// A signal that is emitted by the "Tab" key event. It is emitted before the key is processed.
-  //void valueStored();
-  //void focusNextPrev();
 
   /// The signal about key release on the control, that corresponds to the attribute
   /// \param theEvent key release event
@@ -89,12 +87,7 @@ signals:
   /// Redefinition of virtual method
   virtual void paintEvent( QPaintEvent* );
 
-  /// The parent method that processes the "Tab"/"SHIF + Tab" keyboard events
-  /// Emits a signal about focus change
-  /// If theIsNext is true, this function searches forward, if next is false, it searches backward.
-  virtual bool focusNextPrevChild(bool theIsNext);
-
- private:
+private:
   QStringListModel* myCompleterModel;
   QCompleter* myCompleter;
   bool myCompletedAndSelected;

diff --git a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
index f9abf8af637a812c003f603084af816288a2e1a7..efa2c52e134eb0766676743ca9430db4cd5a26ee 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetIntValue.cpp
@@ -84,10 +84,7 @@ ModuleBase_WidgetIntValue::ModuleBase_WidgetIntValue(QWidget* theParent,
   mySpinBox->setToolTip(aTTip);
 
   aControlLay->addRow(myLabel, mySpinBox);
-  // Apply widget value change by enter/tab event.
-  connect(mySpinBox, SIGNAL(valueStored()), this, SIGNAL(valuesChanged()));
   connect(mySpinBox, SIGNAL(valueChanged(int)), this, SIGNAL(valuesModified()));
-  connect(mySpinBox, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev()));
 }
 
 ModuleBase_WidgetIntValue::~ModuleBase_WidgetIntValue()

diff --git a/src/PartSet/PartSet_WidgetPoint2d.cpp b/src/PartSet/PartSet_WidgetPoint2d.cpp
index 6cd4fb22afc36dcc77c01609c19e9113d99a2742..66a67efc418a917d2d4085aa1e9ad7452db47f02 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.cpp
+++ b/src/PartSet/PartSet_WidgetPoint2d.cpp
@@ -86,10 +86,7 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
     myXSpin->setToolTip(tr("X"));
     aGroupLay->addWidget(myXSpin, 0, 1);
 
-    // Apply widget value change by enter/tab event.
-    connect(myXSpin, SIGNAL(valueStored()), this, SLOT(onValuesChanged()));
     connect(myXSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
-    connect(myXSpin, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev()));
   }
   {
     QLabel* aLabel = new QLabel(myGroupBox);
@@ -102,10 +99,7 @@ PartSet_WidgetPoint2D::PartSet_WidgetPoint2D(QWidget* theParent,
     myYSpin->setToolTip(tr("Y"));
     aGroupLay->addWidget(myYSpin, 1, 1);
 
-    // Apply widget value change by enter/tab event.
-    connect(myYSpin, SIGNAL(valueStored()), this, SLOT(onValuesChanged()));
     connect(myYSpin, SIGNAL(valueChanged(const QString&)), this, SIGNAL(valuesModified()));
-    connect(myYSpin, SIGNAL(focusNextPrev()), this, SIGNAL(focusNextPrev()));
   }
   QVBoxLayout* aLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aLayout);
@@ -461,17 +455,18 @@ bool PartSet_WidgetPoint2D::isFeatureContainsPoint(const FeaturePtr& theFeature,
   return aPointIsFound;
 }
 
-void PartSet_WidgetPoint2D::onValuesChanged()
+/*void PartSet_WidgetPoint2D::onValuesChanged()
 {
   emit valuesChanged();
-}
+}*/
 
 bool PartSet_WidgetPoint2D::processEnter()
 {
   bool isModified = myXSpin->isModified() || myYSpin->isModified();
   if (isModified) {
     bool isXModified = myXSpin->isModified();
-    onValuesChanged();
+    emit valuesChanged();
+    //onValuesChanged();
     myXSpin->clearModified();
     myYSpin->clearModified();
     if (isXModified)

diff --git a/src/PartSet/PartSet_WidgetPoint2d.h b/src/PartSet/PartSet_WidgetPoint2d.h
index e4c426ba7d775c4e3c18d21a9daa0d57c9ef142a..72bca8dc202f961b1262907b221d9a165557b429 100644 (file)
--- a/src/PartSet/PartSet_WidgetPoint2d.h
+++ b/src/PartSet/PartSet_WidgetPoint2d.h
@@ -124,9 +124,9 @@ protected:
   /// \return boolean result
   bool isFeatureContainsPoint(const FeaturePtr& theFeature, double theX, double theY);
 
-private slots:
+//private slots:
   /// Process value changed event
-  void onValuesChanged();
+  //void onValuesChanged();
 
  private:
    /// Returns point 2d from selected vertex

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index e75b441305deb9d9f7817d48cf0014c421cc4f92..e5bd646044507af11300130f2d36b9659ded001a 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -116,8 +116,6 @@ void XGUI_PropertyPanel::setModelWidgets(const QList<ModuleBase_ModelWidget*>& t
             this,    SLOT(activateNextWidget(ModuleBase_ModelWidget*)));
     connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)),
             this,    SIGNAL(keyReleased(QKeyEvent*)));
-    //connect(aWidget, SIGNAL(focusNextPrev()),
-    //        this, SLOT(onFocusNextPrev()));
   }
 }
 
@@ -173,11 +171,6 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget)
   }
 }
 
-void XGUI_PropertyPanel::onFocusNextPrev()
-{
-  setActiveWidget(NULL);
-}
-
 bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
 {
   // it wraps the Tabs clicking to follow in the chain:
@@ -249,7 +242,7 @@ void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget)
       emit widgetActivated(myActiveWidget);
     } else if (!isEditingMode()) {
       emit noMoreWidgets();
-      setFocusOnOkButton();
+      //setFocusOnOkButton();
     }
   }
 }

diff --git a/src/XGUI/XGUI_PropertyPanel.h b/src/XGUI/XGUI_PropertyPanel.h
index fe6eb0ec87fb6e1fab910df143a2002a4f27a2fc..9eebfa1aee4bfbd36d7d3d04a30ce3d8dbcae1d8 100644 (file)
--- a/src/XGUI/XGUI_PropertyPanel.h
+++ b/src/XGUI/XGUI_PropertyPanel.h
@@ -114,8 +114,6 @@ Q_OBJECT
   */
   virtual void activateWidget(ModuleBase_ModelWidget* theWidget);
 
-  void onFocusNextPrev();
-
 protected:
   /// Makes the widget active, deactivate the previous, activate and hightlight the given one
   /// \param theWidget a widget