Merge branch 'master' into abn/qtesting

diff --cc CMakeLists.txt
Simple merge

diff --cc idl/MEDEventListener.idl
index 77fcc8fa3e114c33e2e6e2dfc475f35a7bb8147e,73d8b9be7f9de15d61b565ef6a9de6472ace50c3..97a84d6f1e178ec826efd2711d3e1836eb99dd89
--- 1/idl/MEDEventListener.idl
--- 2/idl/MEDEventListener.idl
+++ b/idl/MEDEventListener.idl
@@@ -34,8 -34,7 +34,9 @@@ module MEDCAL
      EVENT_CLEAN_WORKSPACE,
      EVENT_ADD_DATASOURCE,
      EVENT_ADD_PRESENTATION,
+     EVENT_REMOVE_PRESENTATION,
 +    EVENT_PLAY_TEST,
 +    EVENT_QUIT_SALOME,
      EVENT_UNKNOWN
    };
  

diff --cc src/MEDCalc/gui/DatasourceController.cxx
Simple merge

diff --cc src/MEDCalc/gui/MEDModule.cxx
index 7b8ffb2e1f495267b9b9312023165e56067c8627,448cc7f04d203f9a8be3d670dba364359d9214ce..cb0c4703e4e218374b03a02a1ccca5feb4aef7eb
--- 1/src/MEDCalc/gui/MEDModule.cxx
--- 2/src/MEDCalc/gui/MEDModule.cxx
+++ b/src/MEDCalc/gui/MEDModule.cxx
@@@ -381,17 -348,9 +381,22 @@@ MEDModule::onDblClick(const QModelIndex
    STDLOG("    - Field id:          " + oss.str());
    STDLOG("    - Presentation name: " + name);
  
+   // :TODO:
+   // get edited values from a popup widget
+   // get presentation
+   // call presentation edit function
+ 
  }
 +
 +void
 +MEDModule::requestSALOMETermination() const
 +{
 +  STDLOG("Requesting SALOME termination!!");
 +  SUIT_Session::session()->closeSession( SUIT_Session::DONT_SAVE, 1 );  // killServers = True
 +}
 +
 +
 +//bool MEDModule::hasMainEventLoopStarted() const
 +//{
 +//  return _eventLoopStarted;
 +//}

diff --cc src/MEDCalc/gui/MED_msg_fr.ts
Simple merge

diff --cc src/MEDCalc/gui/WorkspaceController.cxx
index 223eb7815cdd525aee6819d6888d244ce77fea4f,b85ea1f9d5a564dd2a6e1bad5c05d91b9953414c..b5c3d008d5ba8cf95ce2da43e0b2c83983791886
--- 1/src/MEDCalc/gui/WorkspaceController.cxx
--- 2/src/MEDCalc/gui/WorkspaceController.cxx
+++ b/src/MEDCalc/gui/WorkspaceController.cxx
@@@ -308,14 -306,12 +308,17 @@@ void WorkspaceController::processMedEve
      emit workspaceSignal(event); // forward to DatasourceController
    }
    else if ( event->type == MEDCALC::EVENT_ADD_PRESENTATION ) {
-     emit workspaceSignal(event); // forward to DatasourceController
+     emit workspaceSignal(event); // forward to PresentationController
+   }
+   else if ( event->type == MEDCALC::EVENT_REMOVE_PRESENTATION ) {
+     emit workspaceSignal(event); // forward to PresentationController
    }
 -
 +  else if ( event->type == MEDCALC::EVENT_PLAY_TEST ) {
 +    emit workspaceSignal(event); // forward to TestController
 +  }
 +  else if ( event->type == MEDCALC::EVENT_QUIT_SALOME ) {
 +    emit workspaceSignal(event); // forward to TestController
 +  }
  }
  
  /*!

diff --cc src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx
Simple merge

diff --cc src/MEDCalc/tui/__init__.py
Simple merge

diff --cc src/MEDCalc/tui/medevents.py
index 6c3c28d711802337e8fae9466598fe60fab78736,3db24ca009fb85fbf2fbe90ff14dab61790ba8bf..2c819f6b3a38a86524c9cc4fb800394825b5b543
--- 1/src/MEDCalc/tui/medevents.py
--- 2/src/MEDCalc/tui/medevents.py
+++ b/src/MEDCalc/tui/medevents.py
@@@ -115,9 -115,6 +115,11 @@@ def notifyGui_addDatasource(handlerId, 
  def notifyGui_addPresentation(fieldId, presId):
    __notifyGui(MEDCALC.EVENT_ADD_PRESENTATION, dataId=fieldId, presentationId=presId)
  #
- 
+ def notifyGui_removePresentation(presId):
+   __notifyGui(MEDCALC.EVENT_REMOVE_PRESENTATION, presentationId=presId)
+ #
 +def notifyGui_playQtTestingScenario(filename):
 +  __notifyGui(MEDCALC.EVENT_PLAY_TEST, filename=filename)
 +#
 +def notifyGui_termination():
 +  __notifyGui(MEDCALC.EVENT_QUIT_SALOME)