X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConfig%2FConfig_FeatureReader.cpp;h=6a27228a3d5846190b5ee7238784f0d2808750df;hb=bdbfb368d71ed11cc0391354a7d86c880cd94949;hp=82ea91252b26412e27871c7e79a97e3d580b4dd3;hpb=66d913fb8f4a0b7764fbb79a4139785db4b3b346;p=modules%2Fshaper.git

diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 82ea91252..6a27228a3 100644
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -12,6 +12,7 @@
 #include <Config_FeatureMessage.h>
 #include <Config_AttributeMessage.h>
 #include <Config_FeatureReader.h>
+#include <Config_Translator.h>
 #include <Events_Message.h>
 #include <Events_Loop.h>
 
@@ -51,7 +52,8 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
   Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated);
   if (isNode(theNode, NODE_FEATURE, NULL)) {
     storeAttribute(theNode, _ID);
-    std::shared_ptr<Config_FeatureMessage> aMessage(new Config_FeatureMessage(aMenuItemEvent, this));
+    std::shared_ptr<Config_FeatureMessage>
+      aMessage(new Config_FeatureMessage(aMenuItemEvent, this));
     fillFeature(theNode, aMessage);
     myFeatures.push_back(getProperty(theNode, _ID));
     //If a feature has xml definition for it's widget:
@@ -64,28 +66,47 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
   } else if (myIsProcessWidgets) {
     // widgets, like shape_selector or containers, like toolbox
     if (isAttributeNode(theNode)) {
-      std::shared_ptr<Config_AttributeMessage> aMessage(new Config_AttributeMessage(aMenuItemEvent, this));
+      std::shared_ptr<Config_AttributeMessage>
+        aMessage(new Config_AttributeMessage(aMenuItemEvent, this));
       aMessage->setFeatureId(restoreAttribute(NODE_FEATURE, _ID));
       std::string anAttributeID = getProperty(theNode, _ID);
       if (!anAttributeID.empty()) {
         aMessage->setAttributeId(anAttributeID);
         aMessage->setObligatory(getBooleanAttribute(theNode, ATTR_OBLIGATORY, true));
         aMessage->setConcealment(getBooleanAttribute(theNode, ATTR_CONCEALMENT, false));
-        // nested "paged" widgets are not allowed, this issue may be resolved here:
-        if (hasParentRecursive(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, NULL)) {
-          const char* kWdgCase = hasParentRecursive(theNode, WDG_SWITCH_CASE, NULL)
-                                 ? WDG_SWITCH_CASE
-                                 : WDG_TOOLBOX_BOX;
-          const char* kWdgSwitch = hasParentRecursive(theNode, WDG_SWITCH_CASE, NULL)
-                                   ? WDG_SWITCH
-                                   : WDG_TOOLBOX;
-          aMessage->setCaseId(restoreAttribute(kWdgCase, _ID));
-          aMessage->setSwitchId(restoreAttribute(kWdgSwitch, _ID));
+
+        std::list<std::pair<std::string, std::string> > aCases;
+        xmlNodePtr aCaseNode =
+          hasParentRecursive(theNode, WDG_SWITCH_CASE, WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL);
+        while(aCaseNode) {
+          std::string aCaseNodeID = getProperty(aCaseNode, _ID);
+          std::string aSwitchNodeID = "";
+          const xmlChar* aName = aCaseNode->name;
+          xmlNodePtr aSwitchNode;
+          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);
+          }
+          if (!xmlStrcmp(aName, (const xmlChar *) WDG_OPTIONALBOX)) {
+            /// the box is optional, attribute is in case
+            /// if the optional attribute value is not empty
+            aSwitchNode = aCaseNode;
+          }
+          if (aSwitchNode)
+            aSwitchNodeID = getProperty(aSwitchNode, _ID);
+
+          aCases.push_back(std::make_pair(aSwitchNodeID, aCaseNodeID));
+          aCaseNode = hasParentRecursive(aSwitchNode, WDG_SWITCH_CASE,
+                                         WDG_TOOLBOX_BOX, WDG_OPTIONALBOX, NULL);
         }
+        aMessage->setCases(aCases);
         Events_Loop::loop()->send(aMessage);
       }
     // container pages, like "case" or "box"
-    } else if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+    } else if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE,
+                      WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
       storeAttribute(theNode, _ID); // save case:caseId (or box:boxId)
     }
   }
@@ -95,7 +116,8 @@ void Config_FeatureReader::processNode(xmlNodePtr theNode)
 
 void Config_FeatureReader::cleanup(xmlNodePtr theNode)
 {
-  if (isNode(theNode, WDG_SWITCH, WDG_SWITCH_CASE, WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
+  if (isNode(theNode, WDG_OPTIONALBOX, WDG_SWITCH, WDG_SWITCH_CASE,
+             WDG_TOOLBOX, WDG_TOOLBOX_BOX, NULL)) {
     // cleanup id of cases when leave case node
     cleanupAttribute(theNode, _ID);
   }
@@ -105,8 +127,8 @@ bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
 {
   bool result = isNode(theNode, NODE_WORKBENCH, NODE_GROUP, NULL);
   if(!result && myIsProcessWidgets) {
-    result = isNode(theNode, NODE_FEATURE, 
-                             WDG_GROUP, WDG_CHECK_GROUP,
+    result = isNode(theNode, NODE_FEATURE,
+                             WDG_GROUP, WDG_OPTIONALBOX,
                              WDG_TOOLBOX, WDG_TOOLBOX_BOX,
                              WDG_SWITCH, WDG_SWITCH_CASE, NULL);
   }
@@ -116,11 +138,15 @@ bool Config_FeatureReader::processChildren(xmlNodePtr theNode)
 void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
   const std::shared_ptr<Config_FeatureMessage>& outFeatureMessage)
 {
-  outFeatureMessage->setId(getProperty(theFeatureNode, _ID));
+  std::string anId = getProperty(theFeatureNode, _ID);
+  outFeatureMessage->setId(anId);
   outFeatureMessage->setPluginLibrary(myLibraryName);
   outFeatureMessage->setNestedFeatures(getProperty(theFeatureNode, FEATURE_NESTED));
-  outFeatureMessage->setActionsWhenNested(getNormalizedProperty(theFeatureNode, FEATURE_WHEN_NESTED));
+  outFeatureMessage->setActionsWhenNested(getNormalizedProperty(theFeatureNode,
+                                          FEATURE_WHEN_NESTED));
   outFeatureMessage->setModal(getBooleanAttribute(theFeatureNode, FEATURE_MODAL, false));
+  bool isAutoPreview = getBooleanAttribute(theFeatureNode, FEATURE_AUTO_PREVIEW, true);
+  outFeatureMessage->setAutoPreview(isAutoPreview);
 
   bool isInternal = getBooleanAttribute(theFeatureNode, ATTR_INTERNAL, false);
   outFeatureMessage->setInternal(isInternal);
@@ -128,9 +154,12 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
     //Internal feature has no visual representation.
     return;
   }
-  
-  outFeatureMessage->setText(getProperty(theFeatureNode, FEATURE_TEXT));
-  outFeatureMessage->setTooltip(getProperty(theFeatureNode, FEATURE_TOOLTIP));
+
+  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));
+  outFeatureMessage->setTooltip(aToolTip);
   outFeatureMessage->setIcon(getProperty(theFeatureNode, FEATURE_ICON));
   outFeatureMessage->setKeysequence(getProperty(theFeatureNode, FEATURE_KEYSEQUENCE));
   outFeatureMessage->setGroupId(restoreAttribute(NODE_GROUP, _ID));
@@ -141,6 +170,4 @@ void Config_FeatureReader::fillFeature(xmlNodePtr theFeatureNode,
     aDocKind = restoreAttribute(NODE_WORKBENCH, WORKBENCH_DOC);
   }
   outFeatureMessage->setDocumentKind(aDocKind);
-  bool isAutoPreview = getBooleanAttribute(theFeatureNode, FEATURE_AUTO_PREVIEW, true);
-  outFeatureMessage->setAutoPreview(isAutoPreview);
 }