X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=65180f91a4761a0aea3893114e149fb32a6c600f;hb=33d191c57ab22ff6e84ea27e69537670d242d336;hp=413059e2ab41c545f4c3e723f52e43799ee7e2b8;hpb=3d5d336ca5036683c3c255805a1d5b749932af1f;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp old mode 100755 new mode 100644 index 413059e2a..65180f91a --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -1,20 +1,44 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// -/* - * XGUI_PropertyPanel.cpp - * - * Created on: Apr 29, 2014 - * Author: sbh - */ - -#include #include +#include +#include +#include +#include +#include #include +#include +#include + //#include #include #include #include #include +#include +#include +#include +#include +#include + +#include #include #include @@ -28,23 +52,27 @@ #include #include #include -#include #include #ifdef _DEBUG #include #endif +//#define DEBUG_TAB_WIDGETS + +//#define DEBUG_ACTIVE_WIDGET + XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr) - : ModuleBase_IPropertyPanel(theParent), + : ModuleBase_IPropertyPanel(theParent), myActiveWidget(NULL), myPreselectionWidget(NULL), + myInternalActiveWidget(NULL), myPanelPage(NULL), myOperationMgr(theMgr) { - this->setWindowTitle(tr("Property Panel")); - QAction* aViewAct = this->toggleViewAction(); - this->setObjectName(PROP_PANEL); + setWindowTitle(tr("Property Panel")); + QAction* aViewAct = toggleViewAction(); + setObjectName(PROP_PANEL); setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }"); QWidget* aContent = new QWidget(this); @@ -52,7 +80,7 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th const int kPanelColumn = 0; int aPanelRow = 0; aMainLayout->setContentsMargins(3, 3, 3, 3); - this->setWidget(aContent); + setWidget(aContent); QFrame* aFrm = new QFrame(aContent); aFrm->setFrameStyle(QFrame::Raised); @@ -66,6 +94,7 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th QStringList aBtnNames; aBtnNames << QString(PROP_PANEL_HELP) << QString(PROP_PANEL_OK) + << QString(PROP_PANEL_OK_PLUS) << QString(PROP_PANEL_CANCEL); foreach(QString eachBtnName, aBtnNames) { QToolButton* aBtn = new QToolButton(aFrm); @@ -78,6 +107,20 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th myPanelPage = new ModuleBase_PageWidget(aContent); myPanelPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); aMainLayout->addWidget(myPanelPage, aPanelRow, kPanelColumn); + + // spit to make the preview button on the bottom of the panel + aMainLayout->setRowStretch(aPanelRow++, 1); + + // preview button on the bottom of panel + aFrm = new QFrame(aContent); + aBtnLay = new QHBoxLayout(aFrm); + aBtnLay->addStretch(1); + ModuleBase_Tools::zeroMargins(aBtnLay); + aMainLayout->addWidget(aFrm, aPanelRow++, kPanelColumn); + + QToolButton* aBtn = new QToolButton(aFrm); + aBtn->setObjectName(PROP_PANEL_PREVIEW); + aBtnLay->addWidget(aBtn); } XGUI_PropertyPanel::~XGUI_PropertyPanel() @@ -89,6 +132,10 @@ void XGUI_PropertyPanel::cleanContent() if (myActiveWidget) myActiveWidget->deactivate(); + XGUI_ActiveControlSelector* aPPSelector = XGUI_Tools::workshop(myOperationMgr->workshop())-> + activeControlMgr()->getSelector(XGUI_PropertyPanelSelector::Type()); + aPPSelector->reset(); // it removes need to be updated widget link + /// as the widgets are deleted later, it is important that the signals /// of these widgets are not processed. An example of the error is issue 986. /// In the given case, the property panel is firstly filled by new widgets @@ -107,23 +154,31 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; + emit propertyPanelDeactivated(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "myActiveWidget = NULL" << std::endl; +#endif + + findButton(PROP_PANEL_PREVIEW)->setVisible(false); /// by default it is hidden setWindowTitle(tr("Property Panel")); } void XGUI_PropertyPanel::setModelWidgets(const QList& theWidgets) { myWidgets = theWidgets; - if (theWidgets.empty()) return; + if (theWidgets.empty()) + return; foreach (ModuleBase_ModelWidget* aWidget, theWidgets) { connect(aWidget, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)), - this, SLOT(activateWidget(ModuleBase_ModelWidget*))); + this, SLOT(onFocusInWidget(ModuleBase_ModelWidget*))); connect(aWidget, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)), - this, SLOT(activateNextWidget(ModuleBase_ModelWidget*))); - connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)), - this, SIGNAL(keyReleased(QKeyEvent*))); - connect(aWidget, SIGNAL(enterClicked()), - this, SIGNAL(enterClicked())); - + this, SLOT(onActivateNextWidget(ModuleBase_ModelWidget*))); + connect(aWidget, SIGNAL(keyReleased(QObject*, QKeyEvent*)), + this, SIGNAL(keyReleased(QObject*, QKeyEvent*))); + connect(aWidget, SIGNAL(enterClicked(QObject*)), + this, SIGNAL(enterClicked(QObject*))); } } @@ -153,7 +208,81 @@ void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature) repaint(); } +void XGUI_PropertyPanel::createContentPanel(FeaturePtr theFeature) +{ + // Invalid feature case on abort of the operation + if (theFeature.get() == NULL) + return; + if (theFeature->isAction() || !theFeature->data()) + return; + + if (myWidgets.empty()) { + ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); + QString aXmlRepr = anOperation->getDescription()->xmlRepresentation(); + + ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myOperationMgr->workshop()); + aFactory.createPanel(contentWidget(), theFeature); + /// Apply button should be update if the feature was modified by the panel + myOperationMgr->onValidateOperation(); + } + updateApplyPlusButton(theFeature); +} + +void XGUI_PropertyPanel::updateApplyPlusButton(FeaturePtr theFeature) +{ + if (theFeature.get()) { + std::shared_ptr aFeatureInfo = + myOperationMgr->workshop()->featureInfo(theFeature->getKind().c_str()); + if (aFeatureInfo.get()) { + findButton(PROP_PANEL_OK_PLUS)->setVisible(aFeatureInfo->isApplyContinue()); + return; + } + } + findButton(PROP_PANEL_OK_PLUS)->setVisible(false); +} + +ModuleBase_ModelWidget* XGUI_PropertyPanel::activeWidget(const bool isUseCustomWidget) const +{ + if (isUseCustomWidget && myInternalActiveWidget) + return myInternalActiveWidget; + + return myActiveWidget; +} + void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) +{ + // it is possible that the property panel widgets have not been visualized + // (e.g. on start operation), so it is strictly important to do not check visualized state + activateNextWidget(theWidget, false); +} + +void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget) +{ +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "onFocusInWidget" << std::endl; +#endif + if (theWidget->canAcceptFocus()) + activateWidget(theWidget); +} + +void XGUI_PropertyPanel::onActivateNextWidget(ModuleBase_ModelWidget* theWidget) +{ + // this slot happens when some widget lost focus, the next widget which accepts the focus + // should be shown, so the second parameter is true + // 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) + // 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); +} + + +void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget, + const bool isCheckVisibility) { // TO CHECK: Editing operation does not have automatical activation of widgets if (isEditingMode()) { @@ -170,72 +299,183 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) if (isFoundWidget || !theWidget) { if (!aValidators->isCase(aCurrentWidget->feature(), aCurrentWidget->attributeID())) - continue; // this attribute is not participated in the current case + continue; // this attribute does not participate in the current case + if (isCheckVisibility && !aCurrentWidget->isInternal()) { + if (!aCurrentWidget->isVisible()) + continue; + } + if (!aCurrentWidget->isObligatory()) + continue; // not obligatory widgets are not activated automatically + + if (!aCurrentWidget->canAcceptFocus()) + continue; // do not set focus if it can not be accepted, case: optional choice if (aCurrentWidget->focusTo()) { + aCurrentWidget->emitFocusInWidget(); return; } } 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 = findButton(PROP_PANEL_OK); + if (anOkBtn->isEnabled()) + aNewFocusWidget = anOkBtn; + else { + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); + if (aCancelBtn->isEnabled()) + aNewFocusWidget = aCancelBtn; + } + if (aNewFocusWidget) + ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::activateNextWidget"); + activateWidget(NULL); } +void findDirectChildren(QWidget* theParent, QList& theWidgets, const bool theDebug) +{ + QList aWidgets; + + if (theParent) { + QLayout* aLayout = theParent->layout(); + if (aLayout) { + 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 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 + } + } + } + } + } + } +#ifdef DEBUG_TAB_WIDGETS + if (theDebug) { + QStringList aWidgetTypes; + QList::const_iterator anIt = theWidgets.begin(), aLast = theWidgets.end(); + for (; anIt != aLast; anIt++) { + QWidget* aWidget = *anIt; + if (aWidget) + aWidgetTypes.append(aWidget->objectName()); + } + QString anInfo = QString("theWidgets[%1]: %2") + .arg(theWidgets.count()).arg(aWidgetTypes.join(",")); + qDebug(anInfo.toStdString().c_str()); + } +#endif +} + +bool XGUI_PropertyPanel::setFocusNextPrevChild(bool theIsNext) +{ + return focusNextPrevChild(theIsNext); +} + 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(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; + + QWidget* aFocusWidget = focusWidget(); +#ifdef DEBUG_TAB_WIDGETS + if (aFocusWidget) { + QString anInfo = QString("focus Widget: %1").arg(aFocusWidget->objectName()); + qDebug(anInfo.toStdString().c_str()); + } +#endif + ModuleBase_ModelWidget* aFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this, + aFocusWidget); + //if (aFocusMWidget) + // aFocusMWidget->setHighlighted(false); + + QWidget* aNewFocusWidget = 0; + if (aFocusWidget) { + QList aChildren; + findDirectChildren(this, aChildren, true); + int aChildrenCount = aChildren.count(); + int aFocusWidgetIndex = aChildren.indexOf(aFocusWidget); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); + if (aFocusWidgetIndex >= 0) { + if (theIsNext) { + if (aFocusWidgetIndex == aChildrenCount-1) { + // after the last widget focus should be set to "Apply" + if (anOkBtn->isEnabled()) + aNewFocusWidget = anOkBtn; + else { + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); + if (aCancelBtn->isEnabled()) + aNewFocusWidget = aCancelBtn; + } + } + else { + aNewFocusWidget = aChildren[aFocusWidgetIndex+1]; + } + } + else { + if (aFocusWidgetIndex == 0) { + // before the first widget, the last should accept focus + aNewFocusWidget = aChildren[aChildrenCount - 1]; + } + else { + // before the "Apply" button, the last should accept focus for consistency with "Next" + if (aFocusWidget == anOkBtn) { + aNewFocusWidget = aChildren[aChildrenCount - 1]; + } + else { + aNewFocusWidget = aChildren[aFocusWidgetIndex-1]; + } + } } } } - else { // backward by SHIFT + Tab - QToolButton* anOkBtn = findChild(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(PROP_PANEL_CANCEL); - ModuleBase_Tools::setFocus(aCancelBtn, "XGUI_PropertyPanel::focusNextPrevChild()"); - isChangedFocus = true; + if (aNewFocusWidget) { + if (myActiveWidget) { + bool isFirstControl = !theIsNext; + QWidget* aLastFocusControl = myActiveWidget->getControlAcceptingFocus(isFirstControl); + if (aFocusWidget == aLastFocusControl) { + setActiveWidget(NULL, false); } } - } - if (!isChangedFocus) - isChangedFocus = ModuleBase_IPropertyPanel::focusNextPrevChild(theIsNext); + // we want to have property panel as an active window to enter values in double control + ModuleBase_Tools::setFocus(aNewFocusWidget, "XGUI_PropertyPanel::focusNextPrevChild()"); + ModuleBase_ModelWidget* aNewFocusMWidget = ModuleBase_ModelWidget::findModelWidget(this, + aNewFocusWidget); + if (aNewFocusMWidget) { + if (aFocusMWidget) { + aFocusMWidget->setHighlighted(false); + } + aNewFocusMWidget->emitFocusInWidget(); + isChangedFocus = true; + } + } return isChangedFocus; } @@ -244,57 +484,86 @@ 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)) { - emit widgetActivated(myActiveWidget); - if (!myActiveWidget && !isEditingMode()) { - emit noMoreWidgets(aPreviosAttributeID); - } - } + setActiveWidget(theWidget, theEmitSignal); } -bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) +bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget, const bool isEmitSignal) { // Avoid activation of already actve widget. It could happen on focusIn event many times if (theWidget == myActiveWidget) { return false; } std::string aPreviosAttributeID; + ModuleBase_ModelWidget* aDeactivatedWidget = NULL, *anActivatedWidget = NULL; if(myActiveWidget) { aPreviosAttributeID = myActiveWidget->attributeID(); + myActiveWidget->processValueState(); myActiveWidget->deactivate(); myActiveWidget->setHighlighted(false); + aDeactivatedWidget = myActiveWidget; } if(theWidget) { emit beforeWidgetActivated(theWidget); theWidget->setHighlighted(true); theWidget->activate(); + anActivatedWidget = theWidget; } myActiveWidget = theWidget; + +#ifdef DEBUG_ACTIVE_WIDGET + std::cout << "myActiveWidget = " << (theWidget ? theWidget->context().c_str() : "") << std::endl; +#endif + bool aHasMoreWidgets = true; + if (isEmitSignal) { + //emit widgetActivated(myActiveWidget); + if (!myActiveWidget && !isEditingMode()) { + aHasMoreWidgets = false; + emit noMoreWidgets(aPreviosAttributeID); + } + } + if (myActiveWidget) + emit propertyPanelActivated(); + else + emit propertyPanelDeactivated(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); + + if (aHasMoreWidgets && aDeactivatedWidget) + aDeactivatedWidget->updateAfterDeactivation(); + if (aHasMoreWidgets && anActivatedWidget) + anActivatedWidget->updateAfterActivation(); + + if (aHasMoreWidgets && myActiveWidget) + { + // restore widget selection should be done after selection modes of widget activating + static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION); + Events_Loop::loop()->flush(anEvent); + } return true; } void XGUI_PropertyPanel::setFocusOnOkButton() { - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); ModuleBase_Tools::setFocus(anOkBtn, "XGUI_PropertyPanel::setFocusOnOkButton()"); } void XGUI_PropertyPanel::setCancelEnabled(bool theEnabled) { - QToolButton* anCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL); anCancelBtn->setEnabled(theEnabled); } bool XGUI_PropertyPanel::isCancelEnabled() const { - QToolButton* anCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* anCancelBtn = findButton(PROP_PANEL_CANCEL); return anCancelBtn->isEnabled(); } @@ -309,16 +578,45 @@ void XGUI_PropertyPanel::setEditingMode(bool isEditing) void XGUI_PropertyPanel::setupActions(XGUI_ActionsMgr* theMgr) { QStringList aButtonNames; - aButtonNames << PROP_PANEL_OK << PROP_PANEL_CANCEL << PROP_PANEL_HELP; + aButtonNames << PROP_PANEL_OK<< PROP_PANEL_OK_PLUS << PROP_PANEL_CANCEL + << PROP_PANEL_HELP << PROP_PANEL_PREVIEW; QList aActionIds; - aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help; + aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::AcceptPlus << XGUI_ActionsMgr::Abort + << XGUI_ActionsMgr::Help << XGUI_ActionsMgr::Preview; for (int i = 0; i < aButtonNames.size(); ++i) { - QToolButton* aBtn = findChild(aButtonNames.at(i)); + QToolButton* aBtn = findButton(aButtonNames.at(i).toStdString().c_str()); QAction* anAct = theMgr->operationStateAction(aActionIds.at(i)); aBtn->setDefaultAction(anAct); } } +void XGUI_PropertyPanel::onAcceptData() +{ + foreach (ModuleBase_ModelWidget* aWidget, myWidgets) { + aWidget->onFeatureAccepted(); + } +} + +void XGUI_PropertyPanel::setInternalActiveWidget(ModuleBase_ModelWidget* theWidget) +{ + if (theWidget) + { + myInternalActiveWidget = theWidget; + emit propertyPanelActivated(); + } + else + { + if (myInternalActiveWidget) + { + delete myInternalActiveWidget; + myInternalActiveWidget = 0; + } + emit propertyPanelDeactivated(); + } + myOperationMgr->workshop()->selectionActivate()->updateSelectionModes(); + myOperationMgr->workshop()->selectionActivate()->updateSelectionFilters(); +} + ModuleBase_ModelWidget* XGUI_PropertyPanel::preselectionWidget() const { return myPreselectionWidget; @@ -334,10 +632,19 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) { ModuleBase_Operation* aOp = myOperationMgr->currentOperation(); if (aOp) { - if (myOperationMgr->abortAllOperations()) { - theEvent->accept(); - } else + if (myOperationMgr->canStopOperation(aOp)) { + myOperationMgr->abortOperation(aOp); + if (myOperationMgr->hasOperation()) + theEvent->ignore(); + else + theEvent->accept(); + } else theEvent->ignore(); } else ModuleBase_IPropertyPanel::closeEvent(theEvent); } + +QToolButton* XGUI_PropertyPanel::findButton(const char* theInternalName) const +{ + return findChild(theInternalName); +}