*/
#include <XGUI_PropertyPanel.h>
+#include <XGUI_ActionsMgr.h>
+#include <XGUI_OperationMgr.h>
//#include <AppElements_Constants.h>
#include <ModuleBase_WidgetMultiSelector.h>
+#include <ModuleBase_Tools.h>
+#include <ModuleBase_PageBase.h>
+#include <ModuleBase_PageWidget.h>
-#include <QWidget>
-#include <QVBoxLayout>
+#include <QEvent>
#include <QFrame>
-#include <QPushButton>
#include <QIcon>
-#include <QVBoxLayout>
-#include <QEvent>
#include <QKeyEvent>
#include <QLayoutItem>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QWidget>
+#include <QToolButton>
+#include <QAction>
#ifdef _DEBUG
#include <iostream>
#endif
-XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent)
+XGUI_PropertyPanel::XGUI_PropertyPanel(QWidget* theParent, XGUI_OperationMgr* theMgr)
: ModuleBase_IPropertyPanel(theParent),
- myActiveWidget(NULL)
+ myActiveWidget(NULL),
+ myPreselectionWidget(NULL),
+ myPanelPage(NULL),
+ myOperationMgr(theMgr)
{
this->setWindowTitle(tr("Property Panel"));
QAction* aViewAct = this->toggleViewAction();
setStyleSheet("::title { position: relative; padding-left: 5px; text-align: left center }");
QWidget* aContent = new QWidget(this);
- myMainLayout = new QVBoxLayout(aContent);
- myMainLayout->setContentsMargins(3, 3, 3, 3);
+ QGridLayout* aMainLayout = new QGridLayout(aContent);
+ const int kPanelColumn = 0;
+ int aPanelRow = 0;
+ aMainLayout->setContentsMargins(3, 3, 3, 3);
this->setWidget(aContent);
QFrame* aFrm = new QFrame(aContent);
- aFrm->setFrameStyle(QFrame::Sunken);
+ aFrm->setFrameStyle(QFrame::Raised);
aFrm->setFrameShape(QFrame::Panel);
QHBoxLayout* aBtnLay = new QHBoxLayout(aFrm);
- aBtnLay->setContentsMargins(0, 0, 0, 0);
- myMainLayout->addWidget(aFrm);
-
- QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
- aBtn->setFlat(true);
- aBtnLay->addWidget(aBtn);
- aBtnLay->addStretch(1);
- aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
- aBtn->setObjectName(PROP_PANEL_OK);
- aBtn->setToolTip(tr("Ok"));
- aBtn->setFlat(true);
- aBtnLay->addWidget(aBtn);
-
- aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
- aBtn->setToolTip(tr("Cancel"));
- aBtn->setObjectName(PROP_PANEL_CANCEL);
- aBtn->setFlat(true);
- aBtn->setShortcut(QKeySequence(Qt::Key_Escape));
- aBtnLay->addWidget(aBtn);
-
- myCustomWidget = new QWidget(aContent);
- myMainLayout->addWidget(myCustomWidget);
- setStretchEnabled(true);
+ ModuleBase_Tools::zeroMargins(aBtnLay);
+ aMainLayout->addWidget(aFrm, aPanelRow++, kPanelColumn);
+
+ myHeaderWidget = aFrm;
+
+ QStringList aBtnNames;
+ aBtnNames << QString(PROP_PANEL_HELP)
+ << QString(PROP_PANEL_OK)
+ << QString(PROP_PANEL_CANCEL);
+ foreach(QString eachBtnName, aBtnNames) {
+ QToolButton* aBtn = new QToolButton(aFrm);
+ aBtn->setObjectName(eachBtnName);
+ aBtn->setAutoRaise(true);
+ aBtnLay->addWidget(aBtn);
+ }
+ aBtnLay->insertStretch(1, 1);
+
+ myPanelPage = new ModuleBase_PageWidget(aContent);
+ myPanelPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);
+ aMainLayout->addWidget(myPanelPage, aPanelRow, kPanelColumn);
}
XGUI_PropertyPanel::~XGUI_PropertyPanel()
{
if (myActiveWidget)
myActiveWidget->deactivate();
+
+ /// 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
+ /// of restarted operation and after that the mouse release signal come from
+ /// the widget of the previous operation (Point2d widget about mouse is released
+ /// and focus is out of this widget)
+ QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(),
+ aLast = myWidgets.end();
+ for (; anIt != aLast; anIt++) {
+ QWidget* aWidget = *anIt;
+ if (aWidget) {
+ aWidget->blockSignals(true);
+ }
+ }
+
myWidgets.clear();
- qDeleteAll(myCustomWidget->children());
+ myPanelPage->clearPage();
myActiveWidget = NULL;
setWindowTitle(tr("Property Panel"));
}
{
myWidgets = theWidgets;
if (theWidgets.empty()) return;
- bool isEnableStretch = true;
- QList<ModuleBase_ModelWidget*>::const_iterator anIt = theWidgets.begin(), aLast =
- theWidgets.end();
- for (; anIt != aLast; anIt++) {
- connect(*anIt, SIGNAL(keyReleased(QKeyEvent*)), this, SIGNAL(keyReleased(QKeyEvent*)));
- connect(*anIt, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)),
- this, SLOT(activateNextWidget(ModuleBase_ModelWidget*)));
- connect(*anIt, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)),
- this, SLOT(activateWidget(ModuleBase_ModelWidget*)));
-
- //ModuleBase_WidgetPoint2D* aPointWidget = dynamic_cast<ModuleBase_WidgetPoint2D*>(*anIt);
- //if (aPointWidget)
- // connect(aPointWidget, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)), this,
- // SIGNAL(storedPoint2D(ObjectPtr, const std::string&)))
- //}
-
- if (!isEnableStretch) continue;
- foreach(QWidget* eachWidget, (*anIt)->getControls()) {
- QSizePolicy::Policy aVPolicy = eachWidget->sizePolicy().verticalPolicy();
- if(aVPolicy == QSizePolicy::Expanding ||
- aVPolicy == QSizePolicy::MinimumExpanding) {
- isEnableStretch = false;
- }
- }
+ foreach (ModuleBase_ModelWidget* aWidget, theWidgets) {
+ connect(aWidget, SIGNAL(focusInWidget(ModuleBase_ModelWidget*)),
+ this, SLOT(activateWidget(ModuleBase_ModelWidget*)));
+ connect(aWidget, SIGNAL(focusOutWidget(ModuleBase_ModelWidget*)),
+ this, SLOT(activateNextWidget(ModuleBase_ModelWidget*)));
+ connect(aWidget, SIGNAL(keyReleased(QKeyEvent*)),
+ this, SIGNAL(keyReleased(QKeyEvent*)));
}
- setStretchEnabled(isEnableStretch);
ModuleBase_ModelWidget* aLastWidget = theWidgets.last();
if (aLastWidget) {
QList<QWidget*> aControls = aLastWidget->getControls();
if (!aControls.empty()) {
QWidget* aLastControl = aControls.last();
- QPushButton* anOkBtn = findChild<QPushButton*>(PROP_PANEL_OK);
- QPushButton* aCancelBtn = findChild<QPushButton*>(PROP_PANEL_CANCEL);
+ QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
+ QToolButton* aCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
setTabOrder(aLastControl, anOkBtn);
setTabOrder(anOkBtn, aCancelBtn);
return myWidgets;
}
-QWidget* XGUI_PropertyPanel::contentWidget()
+ModuleBase_PageBase* XGUI_PropertyPanel::contentWidget()
{
- return myCustomWidget;
+
+ return static_cast<ModuleBase_PageBase*>(myPanelPage);
}
void XGUI_PropertyPanel::updateContentWidget(FeaturePtr theFeature)
// Invalid feature case on abort of the operation
if (theFeature.get() == NULL)
return;
- if(!theFeature->data())
+ if (theFeature->isAction() || !theFeature->data())
return;
- foreach(ModuleBase_ModelWidget* eachWidget, myWidgets)
- {
- eachWidget->setFeature(theFeature);
+ foreach(ModuleBase_ModelWidget* eachWidget, myWidgets) {
+ if (!eachWidget->feature().get())
+ eachWidget->setFeature(theFeature);
eachWidget->restoreValue();
}
// the repaint is used here to immediately react in GUI to the values change.
activateWidget(NULL);
return;
}
- ModuleBase_ModelWidget* aNextWidget = 0;
QList<ModuleBase_ModelWidget*>::const_iterator anIt = myWidgets.begin(), aLast = myWidgets.end();
bool isFoundWidget = false;
- for (; anIt != aLast && !aNextWidget; anIt++) {
+ activateWindow();
+ for (; anIt != aLast; anIt++) {
if (isFoundWidget || !theWidget) {
if ((*anIt)->focusTo()) {
- aNextWidget = *anIt;
+ return;
}
}
- isFoundWidget = (*anIt) == theWidget;
- }
- // Normaly focusTo is enough to activate widget
- // here is a special case on mouse click in the viewer
- //if(aNextWidget == NULL) {
- activateWidget(aNextWidget);
- //}
-}
-
-void XGUI_PropertyPanel::setStretchEnabled(bool isEnabled)
-{
- if (myMainLayout->count() == 0)
- return;
- int aStretchIdx = myMainLayout->count() - 1;
- bool hasStretch = myMainLayout->itemAt(aStretchIdx)->spacerItem() != NULL;
- QLayoutItem* aChild;
- if (isEnabled) {
- if (!hasStretch) myMainLayout->addStretch(1);
- } else if (hasStretch) {
- aChild = myMainLayout->takeAt(aStretchIdx);
- delete aChild;
+ isFoundWidget = isFoundWidget || (*anIt) == theWidget;
}
+ activateWidget(NULL);
}
void XGUI_PropertyPanel::activateNextWidget()
activateNextWidget(myActiveWidget);
}
-void XGUI_PropertyPanel::setAcceptEnabled(bool isEnabled)
-{
- QPushButton* anOkBtn = findChild<QPushButton*>(PROP_PANEL_OK);
- anOkBtn->setEnabled(isEnabled);
-}
-
void XGUI_PropertyPanel::activateWidget(ModuleBase_ModelWidget* theWidget)
{
// Avoid activation of already actve widget. It could happen on focusIn event many times
- if (theWidget == myActiveWidget)
+ if (theWidget == myActiveWidget) {
return;
+ }
if(myActiveWidget) {
myActiveWidget->deactivate();
myActiveWidget->setHighlighted(false);
}
if(theWidget) {
- theWidget->activate();
+ emit beforeWidgetActivated(theWidget);
theWidget->setHighlighted(true);
+ theWidget->activate();
}
myActiveWidget = theWidget;
- if (myActiveWidget)
+ if (myActiveWidget) {
emit widgetActivated(theWidget);
- else if (!isEditingMode())
+ } else if (!isEditingMode()) {
emit noMoreWidgets();
+ setFocusOnOkButton();
+ }
}
-void XGUI_PropertyPanel::setOkEnabled(bool theEnabled)
-{
- QPushButton* anOkBtn = findChild<QPushButton*>(PROP_PANEL_OK);
- anOkBtn->setEnabled(theEnabled);
-}
-
-bool XGUI_PropertyPanel::isOkEnabled() const
+void XGUI_PropertyPanel::setFocusOnOkButton()
{
- QPushButton* anOkBtn = findChild<QPushButton*>(PROP_PANEL_OK);
- return anOkBtn->isEnabled();
+ QToolButton* anOkBtn = findChild<QToolButton*>(PROP_PANEL_OK);
+ anOkBtn->setFocus();
}
void XGUI_PropertyPanel::setCancelEnabled(bool theEnabled)
{
- QPushButton* anCancelBtn = findChild<QPushButton*>(PROP_PANEL_CANCEL);
+ QToolButton* anCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
anCancelBtn->setEnabled(theEnabled);
}
bool XGUI_PropertyPanel::isCancelEnabled() const
{
- QPushButton* anCancelBtn = findChild<QPushButton*>(PROP_PANEL_CANCEL);
+ QToolButton* anCancelBtn = findChild<QToolButton*>(PROP_PANEL_CANCEL);
return anCancelBtn->isEnabled();
}
aWgt->setEditingMode(isEditing);
}
}
+
+void XGUI_PropertyPanel::setupActions(XGUI_ActionsMgr* theMgr)
+{
+ QStringList aButtonNames;
+ aButtonNames << PROP_PANEL_OK << PROP_PANEL_CANCEL << PROP_PANEL_HELP;
+ QList<XGUI_ActionsMgr::OperationStateActionId> aActionIds;
+ aActionIds << XGUI_ActionsMgr::Accept << XGUI_ActionsMgr::Abort << XGUI_ActionsMgr::Help;
+ for (int i = 0; i < aButtonNames.size(); ++i) {
+ QToolButton* aBtn = findChild<QToolButton*>(aButtonNames.at(i));
+ QAction* anAct = theMgr->operationStateAction(aActionIds.at(i));
+ aBtn->setDefaultAction(anAct);
+ }
+}
+
+ModuleBase_ModelWidget* XGUI_PropertyPanel::preselectionWidget() const
+{
+ return myPreselectionWidget;
+}
+
+void XGUI_PropertyPanel::setPreselectionWidget(ModuleBase_ModelWidget* theWidget)
+{
+ myPreselectionWidget = theWidget;
+}
+
+
+void XGUI_PropertyPanel::closeEvent(QCloseEvent* theEvent)
+{
+ ModuleBase_Operation* aOp = myOperationMgr->currentOperation();
+ if (aOp) {
+ if (myOperationMgr->canStopOperation(aOp)) {
+ myOperationMgr->abortAllOperations();
+ theEvent->accept();
+ } else
+ theEvent->ignore();
+ } else
+ ModuleBase_IPropertyPanel::closeEvent(theEvent);
+}
\ No newline at end of file
