Salome HOME
Merge branch 'master' of newgeom:newgeom
authorvsv <vitaly.smetannikov@opencascade.com>
Wed, 3 Sep 2014 08:33:31 +0000 (12:33 +0400)
committervsv <vitaly.smetannikov@opencascade.com>
Wed, 3 Sep 2014 08:33:31 +0000 (12:33 +0400)
Conflicts:
src/ModuleBase/CMakeLists.txt

1  2 
src/Config/Config_Keywords.h
src/ModuleBase/CMakeLists.txt

index d1569170068bf06186a4cbd3db70d9f49a7bc5d4,f1e5e01225c4398f8365020406e4df05412d3940..32b1e00b370660869dc172d2e24922bb746fbabd
@@@ -29,12 -29,10 +29,11 @@@ const static char* WDG_TOOLBOX_BOX = "b
  const static char* WDG_SWITCH = "switch";
  const static char* WDG_SWITCH_CASE = "case";
  const static char* WDG_SELECTOR = "selector";
 +const static char* WDG_CHOICE = "choice";
  
- //Specific widget containers
+ //Specific widgets
  const static char* WDG_POINT_SELECTOR = "point_selector";
  const static char* WDG_POINT2D_DISTANCE = "point2ddistance";
  const static char* WDG_FEATURE_SELECTOR = "feature_selector";
  const static char* WDG_FEATURE_OR_ATTRIBUTE_SELECTOR = "feature_or_attribute_selector";
  const static char* WDG_DOUBLEVALUE_EDITOR = "doublevalue_editor";
index 19ba908e8235fd2b71c20885885321fd2fc69ea9,f65d8c989d17dc212b2846d91d41ac77f274631e..16753a2d8106a04dedfcbed595cac256cb51da74
@@@ -25,7 -25,7 +25,8 @@@ SET(PROJECT_HEADER
        ModuleBase_SelectionValidator.h
        ModuleBase_ISelection.h
        ModuleBase_ViewerPrs.h
 +      ModuleBase_WidgetChoice.h
+       ModuleBase_WidgetFileSelector.h
  )
  
  SET(PROJECT_SOURCES
@@@ -44,8 -44,8 +45,9 @@@
        ModuleBase_WidgetSelector.cpp
        ModuleBase_WidgetPoint2dDistance.cpp
        ModuleBase_WidgetValue.cpp
--      ModuleBase_WidgetValueFeature.cpp
++      ModuleBase_WidgetValueFeature.cpp       
 +      ModuleBase_WidgetChoice.cpp
+       ModuleBase_WidgetFileSelector.cpp
  )
  
  SET(PROJECT_LIBRARIES