#include <iostream>
#endif
+//#define DEBUG_TAB_WIDGETS
+
XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr)
: ModuleBase_IPropertyPanel(theParent),
myActiveWidget(NULL),
// it is important for features where in cases the same attributes are used, isCase for this
// attribute returns true, however it can be placed in hidden stack widget(extrusion: elements,
// sketch multi rotation -> single/full point)
- activateNextWidget(theWidget, false); // true
+ // it is important to check the widget visibility to do not check of the next widget visible
+ // state if the current is not shown. (example: sketch circle re-entrant operation after mouse
+ // release in the viewer, next, radius, widget should be activated but the first is not visualized)
+ bool isVisible = theWidget->isVisible();
+ activateNextWidget(theWidget, isVisible);
}
if (!aValidators->isCase(aCurrentWidget->feature(), aCurrentWidget->attributeID()))
continue; // this attribute is not participated in the current case
- if (isCheckVisibility) {
+ if (isCheckVisibility && !aCurrentWidget->isInternal()) {
if (!aCurrentWidget->isVisible())
continue;
}
}
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);
- //focusNextPrevChild(true);
}
-//#define DEBUG_TAB_WIDGETS
-
-#define DEBUG_TAB
-#ifdef DEBUG_TAB
void findDirectChildren(QWidget* theParent, QList<QWidget*>& theWidgets, const bool theDebug)
{
QList<QWidget*> aWidgets;
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
+ }
+ }
}
}
}
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;
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];
}
return isChangedFocus;
}
-#else
-bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
-{
- // it wraps the Tabs clicking to follow in the chain:
- // controls, last control, Apply, Cancel, first control, controls
- bool isChangedFocus = false;
-
- if (theIsNext) { // forward by Tab
- QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
- if (aCancelBtn->hasFocus()) {
- // after cancel, the first control should be focused
- QWidget* aFirstControl = 0;
- for (int i = 0, aSize = myWidgets.size(); i < aSize && !aFirstControl; i++)
- aFirstControl = myWidgets[i]->getControlAcceptingFocus(true);
- if (aFirstControl)
- ModuleBase_Tools::setFocus(aFirstControl, "XGUI_PropertyPanel::focusNextPrevChild()");
- isChangedFocus = true;
- }
- else {
- // after the last control, the Apply button should be focused
- QWidget* aLastControl = 0;
- for (int i = myWidgets.size()-1; i >= 0 && !aLastControl; i--)
- aLastControl = myWidgets[i]->getControlAcceptingFocus(false);
- if (aLastControl && aLastControl->hasFocus()) {
- setFocusOnOkButton();
- isChangedFocus = true;
- }
- }
- }
- else { // backward by SHIFT + Tab
- QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
- if (anOkBtn->hasFocus()) {
- // after Apply, the last control should be focused
- QWidget* aLastControl = 0;
- for (int i = myWidgets.size()-1; i >= 0 && !aLastControl; i--)
- aLastControl = myWidgets[i]->getControlAcceptingFocus(false);
- if (aLastControl)
- ModuleBase_Tools::setFocus(aLastControl, "XGUI_PropertyPanel::focusNextPrevChild()");
- isChangedFocus = true;
- }
- else {
- // after the first control, the Cancel button should be focused
- QWidget* aFirstControl = 0;
- for (int i = 0, aSize = myWidgets.size(); i < aSize && !aFirstControl; i++)
- aFirstControl = myWidgets[i]->getControlAcceptingFocus(true);
- if (aFirstControl && aFirstControl->hasFocus()) {
- QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
- ModuleBase_Tools::setFocus(aCancelBtn, "XGUI_PropertyPanel::focusNextPrevChild()");
- isChangedFocus = true;
- }
- }
- }
-
- if (!isChangedFocus)
- isChangedFocus = ModuleBase_IPropertyPanel::focusNextPrevChild(theIsNext);
- return isChangedFocus;
-}
-#endif
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);
{
ModuleBase_Operation* aOp = myOperationMgr->currentOperation();
if (aOp) {
- if (myOperationMgr->abortAllOperations()) {
- theEvent->accept();
+ if (myOperationMgr->canStopOperation(aOp)) {
+ myOperationMgr->abortOperation(aOp);
+ if (myOperationMgr->hasOperation())
+ theEvent->ignore();
+ else
+ theEvent->accept();
} else
theEvent->ignore();
} else
