Merge V9_dev branch into master

diff --cc CMakeLists.txt
Simple merge

diff --cc SalomeGUIConfig.cmake.in
Simple merge

diff --cc src/LightApp/LightApp_Application.cxx
Simple merge

diff --cc src/LightApp/LightApp_Application.h
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_en.ts
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_fr.ts
Simple merge

diff --cc src/LightApp/resources/LightApp_msg_ja.ts
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
Simple merge

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 2bac58d1a078d77594005f1f17bfde2bacf4f492,58634fedd15fc58b4d416b08c434a8163290df77..843e639d8c4cf69ba4bddb50191c0784f1f3a971
--- 1/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
--- 2/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@@ -189,17 -189,12 +189,16 @@@ public
    static void              disableSelector();
    static SALOME_Selection* getSelection();
    static void              setSelection( const QStringList& );
-   static int               getStudyId();
 -  static void              putInfo( const QString&, const int = 0 );
    static const QString     getActiveComponent();
    static PyObject*         getActivePythonModule();
    static bool              activateModule( const QString& );
-   static void              updateObjBrowser( const int = 0, bool = true );
+   static void              updateObjBrowser();
  
 +  static void              putInfo( const QString&, const int = 0 );
 +  static int               showNotification( const QString&, const QString&, const int = -1 );
 +  static void              hideNotification( const QString& );
 +  static void              hideNotification( const int );
 +
    static bool              isModified();
    static void              setModified( bool );
  

diff --cc src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index e7e726ccb8ef32e0e561d72cf9a2cb4a454b204d,6630c7a8a5877638c90432560007a20945db505d..42d7f574b775b715df038804dfe72f2a99c483b3
--- 1/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
--- 2/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@@ -299,18 -299,12 +299,17 @@@ public
    static void              enableSelector() /ReleaseGIL/ ;
    static void              disableSelector() /ReleaseGIL/ ;
    static SALOME_Selection* getSelection() /Factory,ReleaseGIL/ ;
 -  static void              putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ;
 +  static void              setSelection( const QStringList& ) /ReleaseGIL/ ;
-   static int               getStudyId() /ReleaseGIL/ ;
    static const QString     getActiveComponent() /ReleaseGIL/ ;
    static SIP_PYOBJECT      getActivePythonModule() /ReleaseGIL/ ;
    static bool              activateModule( const QString& ) /ReleaseGIL/ ;
-   static void              updateObjBrowser( const int = 0, bool =  true ) /ReleaseGIL/ ;
+   static void              updateObjBrowser() /ReleaseGIL/ ;
 -  
 +
 +  static void              putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ;
 +  static int               showNotification( const QString&, const QString&, const int = -1 ) /ReleaseGIL/ ;
 +  static void              hideNotification( const QString& ) /ReleaseGIL/ ;
 +  static void              hideNotification( const int ) /ReleaseGIL/ ;
 +
    static bool              isModified() /ReleaseGIL/ ;
    static void              setModified( bool ) /ReleaseGIL/ ;
  

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

diff --cc src/STD/STD_Application.cxx
Simple merge

diff --cc src/SalomeApp/SalomeApp_Application.cxx
index 97b4a077ae54d2ae12eb6b82caa8ef3791cc1502,462f1a389ee483d65b36fb32bac035c597eff90e..895e7c7a23e784a43933f2c42ad70145664b16ef
--- 1/src/SalomeApp/SalomeApp_Application.cxx
--- 2/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@@ -596,14 -599,11 +601,14 @@@ void SalomeApp_Application::onCopy(
    if(it.More())
      {
        _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
 -      try {
 -        stdDS->Copy(so);
 -        onSelectionChanged();
 -      }
 -      catch(...) {
 +      if( so )
 +      {
 +        try {
-           studyMgr()->Copy(so);
++          stdDS->Copy(so);
 +          onSelectionChanged();
 +        }
 +        catch(...) {
 +        }
        }
      }
  }
@@@ -634,15 -632,12 +639,15 @@@ void SalomeApp_Application::onPaste(
    if(it.More())
      {
        _PTR(SObject) so = stdDS->FindObjectID(it.Value()->getEntry());
 -      try {
 -        stdDS->Paste(so);
 -        updateObjectBrowser( true );
 -        updateActions(); //SRN: BugID IPAL9377, case 3
 -      }
 -      catch(...) {
 +      if( so )
 +      {
 +        try {
-           studyMgr()->Paste(so);
++          stdDS->Paste(so);
 +          updateObjectBrowser( true );
 +          updateActions(); //SRN: BugID IPAL9377, case 3
 +        }
 +        catch(...) {
 +        }
        }
      }
  }

diff --cc src/Session/Session_ServerThread.cxx
Simple merge

diff --cc src/TOOLSGUI/CMakeLists.txt
index 8bac12d305ca251990d70e39dd4ab1906191debe,91bef71a865df9a02a1871298d96f68e606a24ec..e60dddabfb07080a2e8a61d03854279dbbcb492b
--- 1/src/TOOLSGUI/CMakeLists.txt
--- 2/src/TOOLSGUI/CMakeLists.txt
+++ b/src/TOOLSGUI/CMakeLists.txt
@@@ -41,11 -41,13 +41,13 @@@ ADD_DEFINITIONS
  # libraries to link to
  SET(_link_LIBRARIES
    ${QT_LIBRARIES}
 -  ${CAS_KERNEL}
 +  ${OpenCASCADE_FoundationClasses_LIBRARIES}
    ${KERNEL_SalomeIDLKernel}
    ${KERNEL_SALOMELocalTrace}
+   ${KERNEL_SalomeDSClient}
    ${KERNEL_SalomeNS}
    ${KERNEL_OpUtil}
+   ${KERNEL_SalomeKernelHelpers}
    ${OMNIORB_LIBRARIES}
    qtx suit
  )