X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_PropertyPanel.cpp;h=82c99cf8c64aaaaeb078ba64a5a2275343fae90b;hb=7428c5765bb1b6e8b21de1e971d7d355e07240c6;hp=e298bd0308d8ef87649ce877809adfc968beeb49;hpb=33fd24909f846d17557ec18aebdc6ac4d34f45f8;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_PropertyPanel.cpp b/src/XGUI/XGUI_PropertyPanel.cpp index e298bd030..82c99cf8c 100755 --- a/src/XGUI/XGUI_PropertyPanel.cpp +++ b/src/XGUI/XGUI_PropertyPanel.cpp @@ -15,6 +15,11 @@ #include #include #include +#include +#include +#include + +#include #include #include @@ -44,9 +49,9 @@ XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* th 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); @@ -54,7 +59,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); @@ -80,6 +85,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() @@ -109,6 +128,8 @@ void XGUI_PropertyPanel::cleanContent() myWidgets.clear(); myPanelPage->clearPage(); myActiveWidget = NULL; + + findButton(PROP_PANEL_PREVIEW)->setVisible(false); /// by default it is hidden setWindowTitle(tr("Property Panel")); } @@ -118,13 +139,13 @@ void XGUI_PropertyPanel::setModelWidgets(const QList& t 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(onActivateNextWidget(ModuleBase_ModelWidget*))); - connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)), - this, SIGNAL(keyReleased(QKeyEvent*))); - connect(aWidget, SIGNAL(enterClicked()), - this, SIGNAL(enterClicked())); + connect(aWidget, SIGNAL(keyReleased(QObject*, QKeyEvent*)), + this, SIGNAL(keyReleased(QObject*, QKeyEvent*))); + connect(aWidget, SIGNAL(enterClicked(QObject*)), + this, SIGNAL(enterClicked(QObject*))); } } @@ -155,6 +176,25 @@ 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(); + } +} + void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) { // it is possible that the property panel widgets have not been visualized @@ -162,6 +202,12 @@ void XGUI_PropertyPanel::activateNextWidget(ModuleBase_ModelWidget* theWidget) activateNextWidget(theWidget, false); } +void XGUI_PropertyPanel::onFocusInWidget(ModuleBase_ModelWidget* theWidget) +{ + 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 @@ -195,7 +241,7 @@ 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; @@ -209,6 +255,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 = findButton(PROP_PANEL_OK); + if (anOkBtn->isEnabled()) + aNewFocusWidget = anOkBtn; + else { + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); + if (aCancelBtn->isEnabled()) + aNewFocusWidget = aCancelBtn; + } + if (aNewFocusWidget) + aNewFocusWidget->setFocus(Qt::TabFocusReason); + activateWidget(NULL); } @@ -222,10 +283,32 @@ void findDirectChildren(QWidget* theParent, QList& 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 + } + } } } } @@ -269,11 +352,11 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) if (theIsNext) { if (aFocusWidgetIndex == aChildrenCount-1) { // after the last widget focus should be set to "Apply" - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (anOkBtn->isEnabled()) aNewFocusWidget = anOkBtn; else { - QToolButton* aCancelBtn = findChild(PROP_PANEL_CANCEL); + QToolButton* aCancelBtn = findButton(PROP_PANEL_CANCEL); if (aCancelBtn->isEnabled()) aNewFocusWidget = aCancelBtn; } @@ -289,7 +372,7 @@ bool XGUI_PropertyPanel::focusNextPrevChild(bool theIsNext) } else { // before the "Apply" button, the last should accept focus for consistency with "Next" - QToolButton* anOkBtn = findChild(PROP_PANEL_OK); + QToolButton* anOkBtn = findButton(PROP_PANEL_OK); if (aFocusWidget == anOkBtn) { aNewFocusWidget = aChildren[aChildrenCount - 1]; } @@ -322,14 +405,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); @@ -346,6 +429,7 @@ bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) std::string aPreviosAttributeID; if(myActiveWidget) { aPreviosAttributeID = myActiveWidget->attributeID(); + myActiveWidget->processValueState(); myActiveWidget->deactivate(); myActiveWidget->setHighlighted(false); } @@ -355,24 +439,27 @@ bool XGUI_PropertyPanel::setActiveWidget(ModuleBase_ModelWidget* theWidget) theWidget->activate(); } myActiveWidget = theWidget; + 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(); } @@ -387,11 +474,12 @@ 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_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::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); } @@ -423,3 +511,8 @@ void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent) } else ModuleBase_IPropertyPanel::closeEvent(theEvent); } + +QToolButton* XGUI_PropertyPanel::findButton(const char* theInternalName) const +{ + return findChild(theInternalName); +}