Delete key regression corrections: in previous implementation sketch entities did...

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

diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp
index 2902755d4ef9dd9e2d2f3160474aa3fcf9524dd7..2ebf8973f72d2e5e922eab8d92f87f8281bd8f07 100755 (executable)
--- a/src/XGUI/XGUI_PropertyPanel.cpp
+++ b/src/XGUI/XGUI_PropertyPanel.cpp
@@ -209,6 +209,21 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget,
     }
     isFoundWidget = isFoundWidget || (*anIt) == theWidget;
   }
+  // set focus to Ok/Cancel button in Property panel if there are no more active widgets
+  // it should be performed before activateWidget(NULL) because it emits some signals which
+  // can be processed by moudule for example as to activate another widget with setting focus
+  QWidget* aNewFocusWidget = 0;
+  QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
+  if (anOkBtn->isEnabled())
+    aNewFocusWidget = anOkBtn;
+  else {
+    QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
+    if (aCancelBtn->isEnabled())
+      aNewFocusWidget = aCancelBtn;
+  }
+  if (aNewFocusWidget)
+    aNewFocusWidget->setFocus(Qt::TabFocusReason);
+
   activateWidget(NULL);
 }
 
@@ -222,10 +237,32 @@ void findDirectChildren(QWidget* theParent, QList<QWidget*>& theWidgets, const b
       for (int i = 0, aCount = aLayout->count(); i < aCount; i++) {
         QLayoutItem* anItem = aLayout->itemAt(i);
         QWidget* aWidget = anItem ? anItem->widget() : 0;
-        if (aWidget && aWidget->isVisible()) {
-          if (aWidget->focusPolicy() != Qt::NoFocus)
-            theWidgets.append(aWidget);
-          findDirectChildren(aWidget, theWidgets, false);
+        if (aWidget) {
+          if (aWidget->isVisible()) {
+            if (aWidget->focusPolicy() != Qt::NoFocus)
+              theWidgets.append(aWidget);
+            findDirectChildren(aWidget, theWidgets, false);
+          }
+        }
+        else if (anItem->layout()) {
+          QLayout* aLayout = anItem->layout();
+          for (int i = 0, aCount = aLayout->count(); i < aCount; i++) {
+            QLayoutItem* anItem = aLayout->itemAt(i);
+            QWidget* aWidget = anItem ? anItem->widget() : 0;
+            if (aWidget) {
+              if (aWidget->isVisible()) {
+                if (aWidget->focusPolicy() != Qt::NoFocus)
+                  theWidgets.append(aWidget);
+                findDirectChildren(aWidget, theWidgets, false);
+              }
+            }
+            else {
+              // TODO: improve recursive search for the case when here QLayout is used
+              // currently, the switch widget uses only 1 level of qlayout in qlayout using for
+              // example for construction plane feature. If there are more levels,
+              // it should be implemented here
+            }
+          }
         }
       }
     }
@@ -247,9 +284,6 @@ void findDirectChildren(QWidget* theParent, QList<QWidget*>& theWidgets, const b
 
 bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
 {
-  //bool isChangedFocus = ModuleBase_IPropertyPanel::focusNextPrevChild(theIsNext);
-  //return true;//isChangedFocus;
-
   // it wraps the Tabs clicking to follow in the chain:
   // controls, last control, Apply, Cancel, first control, controls
   bool isChangedFocus = false;
@@ -273,7 +307,13 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
         if (aFocusWidgetIndex == aChildrenCount-1) {
           // after the last widget focus should be set to "Apply"
           QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
-          aNewFocusWidget = anOkBtn;
+          if (anOkBtn->isEnabled())
+            aNewFocusWidget = anOkBtn;
+          else {
+            QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
+            if (aCancelBtn->isEnabled())
+              aNewFocusWidget = aCancelBtn;
+          }
         }
         else {
           aNewFocusWidget = aChildren[aFocusWidgetIndex+1];
@@ -319,14 +359,14 @@ void XGUI_PropertyPanel::activateNextWidget()
   activateNextWidget(myActiveWidget);
 }
 
-void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget)
+void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget, const bool theEmitSignal)
 {
   std::string aPreviosAttributeID;
   if(myActiveWidget)
     aPreviosAttributeID = myActiveWidget->attributeID();
 
   // Avoid activation of already actve widget. It could happen on focusIn event many times
-  if (setActiveWidget(theWidget)) {
+  if (setActiveWidget(theWidget) && theEmitSignal) {
     emit widgetActivated(myActiveWidget);
     if (!myActiveWidget && !isEditingMode()) {
       emit noMoreWidgets(aPreviosAttributeID);