Merge remote-tracking branch 'remotes/origin/master'

diff --combined src/XGUI/XGUI_Workshop.cpp
index ec7da2e25e629aef667d9df4ca2785edef7b3b87,462359e0976930a15071f07b66ef740c351b3a27..d2935f1eba3fb82fcd3c7a77066b8664c8a2261d
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -508,7 -508,7 +508,7 @@@ void XGUI_Workshop::onAcceptActionClick
                                                      (anOperationMgr->currentOperation());
      if (aFOperation) {
        //if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
 -      myOperationMgr->commitOperation();
 +      myOperationMgr->onCommitOperation();
      }
    }
  }
@@@ -776,12 -776,6 +776,12 @@@ void XGUI_Workshop::saveDocument(const 
    QApplication::restoreOverrideCursor();
  }
  
 +//******************************************************
 +bool XGUI_Workshop::abortAllOperations()
 +{
 +  return myOperationMgr->abortAllOperations();
 +}
 +
  //******************************************************
  void XGUI_Workshop::operationStarted(ModuleBase_Operation* theOperation)
  {
@@@ -797,7 -791,7 +797,7 @@@
  //******************************************************
  void XGUI_Workshop::onOpen()
  {
 -  if(!myOperationMgr->abortAllOperations())
 +  if(!abortAllOperations())
      return;
    //save current file before close if modified
    SessionPtr aSession = ModelAPI_Session::get();
@@@ -927,7 -921,7 +927,7 @@@ void XGUI_Workshop::onTrihedronVisibili
  //******************************************************
  bool XGUI_Workshop::onSave()
  {
 -  if(!myOperationMgr->abortAllOperations(XGUI_OperationMgr::XGUI_InformationMessage))
 +  if(!abortAllOperations())
      return false;
    if (myCurrentDir.isEmpty()) {
      return onSaveAs();
@@@ -944,7 -938,7 +944,7 @@@
  //******************************************************
  bool XGUI_Workshop::onSaveAs()
  {
 -  if(!myOperationMgr->abortAllOperations(XGUI_OperationMgr::XGUI_InformationMessage))
 +  if(!abortAllOperations())
      return false;
    QFileDialog dialog(desktop());
    dialog.setWindowTitle(tr("Select directory to save files..."));
@@@ -1424,14 -1418,14 +1424,14 @@@ void XGUI_Workshop::onContextMenuComman
          #endif
          aParameters.Append(MyVCallBack);
  
-         MyTCommunicator->registerPlugin("SMBrowser"); // custom plugin to view ModelAPI
+         MyTCommunicator->RegisterPlugin("SMBrowser"); // custom plugin to view ModelAPI
  
-         MyTCommunicator->init(aParameters);
+         MyTCommunicator->Init(aParameters);
          MyTCommunicator->Activate("SMBrowser"); // to have button in TInspector
          MyTCommunicator->Activate("TKVInspector"); // to have filled callback by model
          MyTCommunicator->Activate("TKDFBrowser");
        }
-       MyTCommunicator->setVisible(true);
+       MyTCommunicator->SetVisible(true);
      }
    }
  #endif
@@@ -1472,7 -1466,7 +1472,7 @@@ void XGUI_Workshop::deleteObjects(
    }
  
    QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
 -  if (!myOperationMgr->abortAllOperations())
 +  if (!abortAllOperations())
      return;
  
    bool hasResult = false;
@@@ -1539,7 -1533,7 +1539,7 @@@ void addRefsToFeature(const FeaturePtr
  //**************************************************************
  void XGUI_Workshop::cleanHistory()
  {
 -  if (!myOperationMgr->abortAllOperations())
 +  if (!abortAllOperations())
      return;
  
    QObjectPtrList anObjects = mySelector->selection()->selectedObjects();
@@@ -1665,7 -1659,7 +1665,7 @@@
  //**************************************************************
  void XGUI_Workshop::moveObjects()
  {
 -  if (!myOperationMgr->abortAllOperations())
 +  if (!abortAllOperations())
      return;
  
    SessionPtr aMgr = ModelAPI_Session::get();
@@@ -1906,7 -1900,7 +1906,7 @@@ void XGUI_Workshop::changeColor(const Q
    if (aColor.size() != 3)
      return;
  
 -  if (!myOperationMgr->abortAllOperations())
 +  if (!abortAllOperations())
    return;
    // 2. show the dialog to change the value
    XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop());
@@@ -1996,7 -1990,7 +1996,7 @@@ void XGUI_Workshop::changeDeflection(co
    if (aDeflection < 0)
      return;
  
 -  if (!myOperationMgr->abortAllOperations())
 +  if (!abortAllOperations())
    return;
    // 2. show the dialog to change the value
    XGUI_DeflectionDialog* aDlg = new XGUI_DeflectionDialog(desktop());