From: vsv Date: Wed, 3 Sep 2014 08:33:31 +0000 (+0400) Subject: Merge branch 'master' of newgeom:newgeom X-Git-Tag: V_0.4.4~89^2~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=542c9d721fbef80eb2040ef248fdd431cad2e631;p=modules%2Fshaper.git Merge branch 'master' of newgeom:newgeom Conflicts: src/ModuleBase/CMakeLists.txt --- 542c9d721fbef80eb2040ef248fdd431cad2e631 diff --cc src/Config/Config_Keywords.h index d15691700,f1e5e0122..32b1e00b3 --- a/src/Config/Config_Keywords.h +++ b/src/Config/Config_Keywords.h @@@ -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"; diff --cc src/ModuleBase/CMakeLists.txt index 19ba908e8,f65d8c989..16753a2d8 --- a/src/ModuleBase/CMakeLists.txt +++ b/src/ModuleBase/CMakeLists.txt @@@ -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