#include <ModuleBase_PageBase.h>
#include <ModuleBase_PageWidget.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
+
#include <QEvent>
#include <QFrame>
#include <QIcon>
this, SLOT(activateNextWidget(ModuleBase_ModelWidget*)));
connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)),
this, SIGNAL(keyReleased(QKeyEvent*)));
- connect(aWidget, SIGNAL(focusNextPrev()),
- this, SLOT(onFocusNextPrev()));
+ connect(aWidget, SIGNAL(enterClicked()),
+ this, SIGNAL(enterClicked()));
+
}
}
activateWidget(NULL);
return;
}
+ ModelAPI_ValidatorsFactory* aValidators = ModelAPI_Session::get()->validators();
+
QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end();
bool isFoundWidget = false;
- activateWindow();
+ ModuleBase_Tools::activateWindow(this, "XGUI_PropertyPanel::activateNextWidget()");
for (; anIt != aLast; anIt++) {
+ ModuleBase_ModelWidget* aCurrentWidget = *anIt;
if (isFoundWidget || !theWidget) {
- if ((*anIt)->focusTo()) {
+
+ if (!aValidators->isCase(aCurrentWidget->feature(), aCurrentWidget->attributeID()))
+ continue; // this attribute is not participated in the current case
+
+ if (aCurrentWidget->focusTo()) {
return;
}
}
activateWidget(NULL);
}
-void XGUI_PropertyPanel::onFocusNextPrev()
-{
- setActiveWidget(NULL);
-}
-
bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext)
{
// it wraps the Tabs clicking to follow in the chain:
for (int i = 0, aSize = myWidgets.size(); i < aSize && !aFirstControl; i++)
aFirstControl = myWidgets[i]->getControlAcceptingFocus(true);
if (aFirstControl)
- aFirstControl->setFocus();
+ ModuleBase_Tools::setFocus(aFirstControl, "XGUI_PropertyPanel::focusNextPrevChild()");
isChangedFocus = true;
}
else {
for (int i = myWidgets.size()-1; i >= 0 && !aLastControl; i--)
aLastControl = myWidgets[i]->getControlAcceptingFocus(false);
if (aLastControl)
- aLastControl->setFocus();
+ ModuleBase_Tools::setFocus(aLastControl, "XGUI_PropertyPanel::focusNextPrevChild()");
isChangedFocus = true;
}
else {
aFirstControl = myWidgets[i]->getControlAcceptingFocus(true);
if (aFirstControl && aFirstControl->hasFocus()) {
QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
- aCancelBtn->setFocus();
+ ModuleBase_Tools::setFocus(aCancelBtn, "XGUI_PropertyPanel::focusNextPrevChild()");
isChangedFocus = true;
}
}
void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget)
{
+ 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 (myActiveWidget) {
- emit widgetActivated(myActiveWidget);
- } else if (!isEditingMode()) {
- emit noMoreWidgets();
- setFocusOnOkButton();
+ emit widgetActivated(myActiveWidget);
+ if (!myActiveWidget && !isEditingMode()) {
+ emit noMoreWidgets(aPreviosAttributeID);
}
}
}
if (theWidget == myActiveWidget) {
return false;
}
+ std::string aPreviosAttributeID;
if(myActiveWidget) {
+ aPreviosAttributeID = myActiveWidget->attributeID();
myActiveWidget->deactivate();
myActiveWidget->setHighlighted(false);
}
void XGUI_PropertyPanel::setFocusOnOkButton()
{
QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
- anOkBtn->setFocus();
+ ModuleBase_Tools::setFocus(anOkBtn, "XGUI_PropertyPanel::setFocusOnOkButton()");
}
void XGUI_PropertyPanel::setCancelEnabled(bool theEnabled)
{
ModuleBase_Operation* aOp = myOperationMgr->currentOperation();
if (aOp) {
- if (myOperationMgr->canStopOperation(aOp)) {
- myOperationMgr->abortAllOperations();
+ if (myOperationMgr->abortAllOperations()) {
theEvent->accept();
} else
theEvent->ignore();
} else
ModuleBase_IPropertyPanel::closeEvent(theEvent);
-}
\ No newline at end of file
+}