Fix for the issue #2753 : error when dump/load script

[modules/shaper.git] / src / Config / Config_FeatureReader.cpp

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 1bc35c4e98a965d633bc244db76e52557f65394b..ac7fdbe6caac5b10537d5caeb06531f93ee8750e 100644 (file)
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -73,6 +73,7 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
     //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
@@ -88,10 +89,13 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
         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, WDG_RADIOBOX_ITEM, 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 = "";
@@ -180,11 +184,22 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
   outFeatureMessage->setText(aText);
   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 aHelpFile = getProperty(theFeatureNode, HELP_FILE);
+  if (!aHelpFile.empty())
+    outFeatureMessage->setHelpFileName(myLibraryName + "/" + aHelpFile);
+
+  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()) {