-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Config_Keywords.h>
Config_FeatureReader::Config_FeatureReader(const std::string& theXmlFile,
const std::string& theLibraryName,
+ const std::string& theDocSection,
const char* theEventGenerated)
: Config_XMLReader(theXmlFile),
myLibraryName(theLibraryName),
+ myLibraryDocSection(theDocSection),
myEventGenerated(theEventGenerated ? theEventGenerated : Config_FeatureMessage::GUI_EVENT()),
myIsProcessWidgets(theEventGenerated != NULL)
{
//The m_last* variables always defined before fillFeature() call. XML is a tree.
} else if (isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL)) {
storeAttribute(theNode, _ID);
+ storeAttribute(theNode, GROUP_TOOLBAR);
storeAttribute(theNode, WORKBENCH_DOC, true);
} else if (myIsProcessWidgets) {
// widgets, like shape_selector or containers, like toolbox
aMessage->setConcealment(isConcealment);
bool isMainArg = isConcealment && getBooleanAttribute(theNode, ATTR_MAIN_ARG, false);
aMessage->setMainArgument(isMainArg);
+ aMessage->setGeometricalSelection(getBooleanAttribute(theNode,
+ ATTR_GEOMETRICAL_SELECTION,
+ false));
std::list<std::pair<std::string, std::string> > aCases;
- xmlNodePtr aCaseNode =
- hasParentRecursive(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL);
+ xmlNodePtr aCaseNode = hasParentRecursive(theNode,
+ WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, WDG_RADIOBOX_ITEM, NULL);
while(aCaseNode) {
std::string aCaseNodeID = getProperty(aCaseNode, _ID);
std::string aSwitchNodeID = "";
const xmlChar* aName = aCaseNode->name;
- xmlNodePtr aSwitchNode;
+ xmlNodePtr aSwitchNode = 0;
if (!xmlStrcmp(aName, (const xmlChar *) WDG_SWITCH_CASE)) {
aSwitchNode = hasParentRecursive(aCaseNode, WDG_SWITCH, NULL);
}
else if (!xmlStrcmp(aName, (const xmlChar *) WDG_TOOLBOX_BOX)) {
aSwitchNode = hasParentRecursive(aCaseNode, WDG_TOOLBOX, NULL);
}
+ else if (!xmlStrcmp(aName, (const xmlChar *)WDG_RADIOBOX_ITEM)) {
+ aSwitchNode = hasParentRecursive(aCaseNode, WDG_RADIOBOX, NULL);
+ }
if (!xmlStrcmp(aName, (const xmlChar *) WDG_OPTIONALBOX)) {
/// the box is optional, attribute is in case
/// if the optional attribute value is not empty
aCases.push_back(std::make_pair(aSwitchNodeID, aCaseNodeID));
aCaseNode = hasParentRecursive(aSwitchNode, WDG_SWITCH_CASE,
- WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL);
+ WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, WDG_RADIOBOX_ITEM, NULL);
}
aMessage->setCases(aCases);
Events_Loop::loop()->send(aMessage);
}
// container pages, like "case" or "box"
} else if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE,
- WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+ WDG_TOOLBOX, WDG_TOOLBOX_BOX,
+ WDG_RADIOBOX, WDG_RADIOBOX_ITEM, NULL)) {
storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
}
}
void Config_FeatureReader::cleanup(xmlNodePtr theNode)
{
if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE,
- WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+ WDG_TOOLBOX, WDG_TOOLBOX_BOX, WDG_RADIOBOX_ITEM, WDG_RADIOBOX, NULL)) {
// cleanup id of cases when leave case node
cleanupAttribute(theNode, _ID);
}
result = isNode(theNode, NODE_FEATURE,
WDG_GROUP, WDG_OPTIONALBOX,
WDG_TOOLBOX, WDG_TOOLBOX_BOX,
+ WDG_RADIOBOX, WDG_RADIOBOX_ITEM,
WDG_SWITCH, WDG_SWITCH_CASE, NULL);
}
return result;
outFeatureMessage->setModal(getBooleanAttribute(theFeatureNode, FEATURE_MODAL, false));
bool isAutoPreview = getBooleanAttribute(theFeatureNode, FEATURE_AUTO_PREVIEW, true);
outFeatureMessage->setAutoPreview(isAutoPreview);
+ outFeatureMessage->setApplyContinue(
+ getBooleanAttribute(theFeatureNode, FEATURE_APPLY_CONTINUE, false));
bool isInternal = getBooleanAttribute(theFeatureNode, ATTR_INTERNAL, false);
outFeatureMessage->setInternal(isInternal);
- if (isInternal) {
- //Internal feature has no visual representation.
- return;
+
+ std::string aHelpFile = getProperty(theFeatureNode, HELP_FILE);
+ if (!aHelpFile.empty()) {
+ aHelpFile =
+ (myLibraryDocSection.empty() ? myLibraryName : myLibraryDocSection) + "/" + aHelpFile;
+ outFeatureMessage->setHelpFileName(aHelpFile);
}
+ bool isHideFaces = getBooleanAttribute(theFeatureNode, HIDEFACES_PANEL, false);
+ outFeatureMessage->setHideFacesPanel(isHideFaces);
+
+ bool isConfirmAbort = getBooleanAttribute(theFeatureNode, ABORT_CONFIRMATION, true);
+ outFeatureMessage->setAbortConfirmation(isConfirmAbort);
+
+ //if (isInternal) {
+ // //Internal feature has no visual representation.
+ // return;
+ //}
+
std::string aText = Config_Translator::translate(anId, getProperty(theFeatureNode, FEATURE_TEXT));
outFeatureMessage->setText(aText);
- std::string aToolTip = Config_Translator::translate(anId,
- getProperty(theFeatureNode, FEATURE_TOOLTIP));
+ bool isTitleInToolbar = getBooleanAttribute(theFeatureNode, FEATURE_TITLE_IN_TOOLBAR, true);
+ outFeatureMessage->setTitleInToolbar(isTitleInToolbar);
+ std::string aToolTip = Config_Translator::translate(
+ anId, getProperty(theFeatureNode, FEATURE_TOOLTIP));
outFeatureMessage->setTooltip(aToolTip);
outFeatureMessage->setIcon(getProperty(theFeatureNode, FEATURE_ICON));
outFeatureMessage->setKeysequence(getProperty(theFeatureNode, FEATURE_KEYSEQUENCE));
- outFeatureMessage->setGroupId(restoreAttribute(NODE_GROUP, _ID));
- outFeatureMessage->setWorkbenchId(restoreAttribute(NODE_WORKBENCH, _ID));
+
+ std::string aGroupName = restoreAttribute(NODE_GROUP, _ID);
+ std::string aWBNName = restoreAttribute(NODE_WORKBENCH, _ID);
+ std::string isGroupToolbarId = restoreAttribute(NODE_GROUP, GROUP_TOOLBAR);
+ bool isGroupToolbar = false;
+ if (isGroupToolbarId.length() > 0)
+ isGroupToolbar = (isGroupToolbarId == "yes");
+ outFeatureMessage->setGroupId(aGroupName);
+ outFeatureMessage->setWorkbenchId(aWBNName);
+ outFeatureMessage->setToolBarId(isGroupToolbar ? aGroupName : aWBNName);
+
// Get document kind of a feature, if empty set workbench's kind (might be empty too)
std::string aDocKind = getProperty(theFeatureNode, FEATURE_DOC);
if(aDocKind.empty()) {
