Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Module.cpp
	src/XGUI/CMakeLists.txt

diff --cc src/PartSet/PartSet_Module.cpp
index c76792ca14cfaf19a7f16f3ca04be7afeb0d83d6,1a0e84dd5c0125236e3df181065eb3af7b6bc42f..ebe70c482758d4f38599aef5f1ff5aa8877f18c5
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -79,18 -83,10 +84,18 @@@ void PartSet_Module::launchOperation(co
    std::string aXmlCfg = aWdgReader.featureWidgetCfg(aStdCmdId);
    std::string aDescription = aWdgReader.featureDescription(aStdCmdId);
    ModuleBase_PropPanelOperation* aPartSetOp;
-   if (aCmdId == "Sketch" ) {
-     aPartSetOp = new PartSet_OperationSketch(aCmdId, this);
+   if (theCmdId == "Sketch" ) {
+     aPartSetOp = new PartSet_OperationSketch(theCmdId, this);
 -  } else {
 +  }
 +  else if(aCmdId == "SketchLine") {
 +    ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
 +    boost::shared_ptr<ModelAPI_Feature> aSketchFeature;
 +    if (anOperation)
 +      aSketchFeature = anOperation->feature();
-     aPartSetOp = new PartSet_OperationSketchLine(aCmdId, this, aSketchFeature);
++    aPartSetOp = new PartSet_OperationSketchLine(theCmdId, this, aSketchFeature);
 +  }
 +  else {
-     aPartSetOp = new ModuleBase_PropPanelOperation(aCmdId, this);
+     aPartSetOp = new ModuleBase_PropPanelOperation(theCmdId, this);
    }
    aPartSetOp->setXmlRepresentation(QString::fromStdString(aXmlCfg));
    aPartSetOp->setDescription(QString::fromStdString(aDescription));

diff --cc src/XGUI/CMakeLists.txt
index 106d695b7a40df170281a52fe51ae9d5d89853f2,3741d32e61d01c14d8af28daa646c91484cd926f..460458d1ab561bfc9abc421cca0a489eafa594ad
--- 1/src/XGUI/CMakeLists.txt
--- 2/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -25,6 -26,8 +25,7 @@@ SET(PROJECT_HEADER
        XGUI_OperationMgr.h
      XGUI_DataTreeModel.h
      XGUI_SelectionMgr.h
 -    XGUI_SwitchWidget.h
+     XGUI_SalomeConnector.h
  )
  
  SET(PROJECT_AUTOMOC 

diff --cc src/XGUI/XGUI_Workshop.cpp
index 6518d05e7618e72d3cbc295ac6fba3c4978fe96d,cbd6239cbb6642f88e114af2820c6fe2017cadd6..9af73c3dfdba68cc4703d5f22cbb25327a2eb93c
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -179,17 -200,16 +200,16 @@@ void XGUI_Workshop::onOperationStarted(
    ModuleBase_PropPanelOperation* aOperation =
          (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
  
-   if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
-   } else {
+   if(!aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
      connectWithOperation(aOperation);
-     QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
+     QWidget* aPropWidget = myPropertyPanelDock->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
      qDeleteAll(aPropWidget->children());
  
-     myMainWindow->showPropertyPanel();
+     showPropertyPanel();
  
 -    XGUI_WidgetFactory aFactory = XGUI_WidgetFactory(aOperation);
 +    ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
      aFactory.createWidget(aPropWidget);
-     myMainWindow->setPropertyPannelTitle(aOperation->description());
+     setPropertyPannelTitle(aOperation->description());
    }
  }