From: Sergey Belash <sergey.belash@opencascade.com>
Date: Mon, 31 Mar 2014 13:12:25 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.1~43^2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=263d0f7bef75e1979c33f0d5a3d3fbc3b71d76a1;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

263d0f7bef75e1979c33f0d5a3d3fbc3b71d76a1
diff --cc src/Config/Config_FeatureMessage.h
index 8f5fc3354,64f2881e6..ba0c64c7b
--- a/src/Config/Config_FeatureMessage.h
+++ b/src/Config/Config_FeatureMessage.h
@@@ -3,25 -3,20 +3,25 @@@
  
  #include "Config.h"
  
- #include <Event_Message.hxx>
+ #include <Event_Message.h>
  #include <string>
  
 +/*
 + * Class to pass a feature entry extracted from xml file.
 + * Example of the feature entry:
 + * <feature id="new_part" text="Part" tooltip="Creates a new part" icon=":pictures/part_ico.png"/>
 + */
  class CONFIG_EXPORT Config_FeatureMessage: public Event_Message
  {
 +  std::string myId;  //Feature unique id
 +  std::string myText; //Represents action's text
 +  std::string myTooltip;  //Represents action's tooltip
 +  std::string myIcon; //Represents action's icon
 +  std::string myKeysequence;  //Represents action's key sequence
  
 -  std::string myId;
 -  std::string myText;
 -  std::string myTooltip;
 -  std::string myIcon;
 -  std::string myKeysequence;
 -
 -  std::string myGroupId;
 -  std::string myWorkbenchId;
 +  std::string myGroupId;  //Id of feature's group
 +  std::string myWorkbenchId;  //Id of feature's workbench
 +  std::string myPluginLibrary;  //Name of feature's library
  
  public:
    //const Event_ID theID, const void* theSender = 0
@@@ -46,7 -40,6 +46,7 @@@
  
    void setGroupId(const std::string& groupId);
    void setWorkbenchId(const std::string& workbenchId);
 +  void setPluginLibrary(const std::string& thePluginLibrary);
  };
  
- #endif // CONFIG_MESSAGE_H
 -#endif // CONFIG_MESSAGE_H
++#endif // CONFIG_MESSAGE_H