Merge remote-tracking branch 'origin/EDF_2019'

# Conflicts:
#	src/FeaturesPlugin/Test/TestBooleanFuse_MultiLevelCompound_v20190506_2.py
#	src/PartSet/PartSet_WidgetSketchLabel.h
#	src/XGUI/XGUI_Workshop.cpp

diff --cc src/Config/Config_Keywords.h
Simple merge

diff --cc src/ExchangePlugin/CMakeLists.txt
Simple merge

diff --cc src/Model/Model_AttributeSelection.cpp
Simple merge

diff --cc src/ModuleBase/CMakeLists.txt
Simple merge

diff --cc src/ModuleBase/ModuleBase_IModule.h
Simple merge

diff --cc src/ModuleBase/ModuleBase_ModelWidget.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_ModelWidget.h
Simple merge

diff --cc src/ModuleBase/ModuleBase_Tools.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
Simple merge

diff --cc src/PartSet/PartSet_MenuMgr.cpp
Simple merge

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge

diff --cc src/PartSet/PartSet_Module.h
Simple merge

diff --cc src/PartSet/PartSet_SketcherMgr.cpp
Simple merge

diff --cc src/PartSet/PartSet_SketcherMgr.h
Simple merge

diff --cc src/PartSet/PartSet_WidgetSketchLabel.cpp
Simple merge

diff --cc src/PartSet/PartSet_WidgetSketchLabel.h
index 0e19d74701a9568cb0e3fc2ff938b9a76b34a2eb,9144f9ef4216cd6a57498df95cf57e6d95898209..51ad42abaaac1c9da4f8fdbee92a65bf155f8936
--- 1/src/PartSet/PartSet_WidgetSketchLabel.h
--- 2/src/PartSet/PartSet_WidgetSketchLabel.h
+++ b/src/PartSet/PartSet_WidgetSketchLabel.h
@@@ -41,7 -42,7 +42,8 @@@ class XGUI_Workshop
  class QCheckBox;
  class QStackedWidget;
  class QLineEdit;
 +class QPushButton;
+ class QDialog;
  
  /**
  * \ingroup Modules

diff --cc src/SHAPERGUI/SHAPERGUI.cpp
Simple merge

diff --cc src/SketchPlugin/CMakeLists.txt
Simple merge

diff --cc src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp
Simple merge

diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge

diff --cc src/XGUI/CMakeLists.txt
Simple merge

diff --cc src/XGUI/XGUI_Displayer.cpp
index c96dd3e7c5da6069654347f5919aa02fd7961f97,b9ff21eefa4bbcc88479a762e9d66a510cdca11b..68549f2b2674fabf33d7421c29081dc9fd89e618
--- 1/src/XGUI/XGUI_Displayer.cpp
--- 2/src/XGUI/XGUI_Displayer.cpp
+++ b/src/XGUI/XGUI_Displayer.cpp
@@@ -121,8 -123,9 +121,8 @@@ QString qIntListInfo(const QIntList& th
  //**************************************************************
  XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop)
  : myWorkshop(theWorkshop), myNeedUpdate(false),
-   myViewerBlockedRecursiveCount(0), myIsFirstAISContextUse(true)
+   myViewerBlockedRecursiveCount(0), myContextId(0)
  {
 -  myCustomPrs = std::shared_ptr<GeomAPI_ICustomPrs>(new XGUI_CustomPrs(theWorkshop));
  }
  
  //**************************************************************

diff --cc src/XGUI/XGUI_Displayer.h
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
index 28b7699ec29957bd6f281521c2e315fbff1d1cb3,b00a040be13b82bdd46039eb58c7e472e29b7d38..2dd70bb5ab53d4c85dbedab16b6abb5881c3eeaf
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -273,6 -279,25 +278,9 @@@ XGUI_Workshop::XGUI_Workshop(XGUI_Salom
    connect(myEventsListener, SIGNAL(errorOccurred(std::shared_ptr<Events_InfoMessage>)),
            myErrorDlg, SLOT(addError(std::shared_ptr<Events_InfoMessage>)));
  
 -  //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color",
 -  //                                 Config_Prop::Color, "225,225,225");
 -
 -  Config_PropManager::registerProp("Visualization", "result_body_color", "Result color",
 -                                   Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR());
 -  Config_PropManager::registerProp("Visualization", "result_group_color", "Group color",
 -                                   Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR());
 -  Config_PropManager::registerProp("Visualization", "result_construction_color",
 -                                   "Construction color",
 -                                   Config_Prop::Color,
 -                                   ModelAPI_ResultConstruction::DEFAULT_COLOR());
 -  Config_PropManager::registerProp("Visualization", "result_part_color", "Part color",
 -                                   Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR());
 -  Config_PropManager::registerProp("Visualization", "result_field_color", "Field color",
 -                                   Config_Prop::Color, ModelAPI_ResultField::DEFAULT_COLOR());
 -
+   Config_PropManager::registerProp("Visualization", "selection_color", "Selection color",
+     Config_Prop::Color, "255,255,255");
+ 
    if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "face-selection", true))
      myViewerSelMode.append(TopAbs_FACE);
    if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "edge-selection", true))

diff --cc src/XGUI/XGUI_Workshop.h
Simple merge