From 8272f8013305da9dd2b1e4fadb5aa7327f63d8e3 Mon Sep 17 00:00:00 2001
From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 24 Apr 2014 12:41:22 +0400
Subject: [PATCH] Adaptation to SALOME environment (Issue #31)

---
 CMakeCommon/FindSalome.cmake                  |  43 +++++++++++++-
 CMakeLists.txt                                |   8 +--
 msvc9_env_Salome.bat                          |   5 +-
 salomeRun.bat                                 |  16 ++++++
 src/Config/CMakeLists.txt                     |   4 +-
 src/Config/Config_FeatureMessage.cpp          |   4 +-
 src/Config/Config_FeatureMessage.h            |  10 ++--
 src/Config/Config_FeatureReader.cpp           |   8 +--
 src/Config/Config_PointerMessage.cpp          |   4 +-
 src/Config/Config_PointerMessage.h            |   6 +-
 src/Config/Config_XMLReader.cpp               |   2 +-
 src/Event/CMakeLists.txt                      |  21 -------
 src/Event/Event.h                             |  18 ------
 src/Events/CMakeLists.txt                     |  21 +++++++
 src/Events/Events.h                           |  18 ++++++
 .../Events_Listener.cpp}                      |   4 +-
 .../Events_Listener.h}                        |  18 +++---
 .../Event_Loop.cpp => Events/Events_Loop.cpp} |  40 ++++++-------
 .../Event_Loop.h => Events/Events_Loop.h}     |  28 ++++-----
 .../Events_Message.cpp}                       |   4 +-
 .../Events_Message.h}                         |  36 ++++++------
 src/Model/CMakeLists.txt                      |   4 +-
 src/Model/Model_Document.cpp                  |  14 ++---
 src/Model/Model_Events.cpp                    |  12 ++--
 src/Model/Model_Events.h                      |  10 ++--
 src/Model/Model_PluginManager.cpp             |   8 +--
 src/Model/Model_PluginManager.h               |   6 +-
 src/NewGeom/CMakeLists.txt                    |  54 ++++++++++++++++++
 src/NewGeom/NewGeom.h                         |  21 +++++++
 src/NewGeom/NewGeom_Module.cpp                |  44 ++++++++++++++
 .../NewGeom_Module.h}                         |  11 ++--
 src/NewGeom/resources/LightApp.xml            |  31 ++++++++++
 src/NewGeom/resources/newgeom.png             | Bin 0 -> 1713 bytes
 src/PartSet/CMakeLists.txt                    |   2 +-
 src/PartSet/PartSet_Module.cpp                |   8 +--
 src/SalomeModule/CMakeLists.txt               |  41 -------------
 src/SalomeModule/SalomeModule.h               |  21 -------
 src/SalomeModule/SalomeModule_Module.cpp      |  44 --------------
 src/XGUI/CMakeLists.txt                       |   4 +-
 src/XGUI/XGUI_DocumentDataModel.cpp           |  10 ++--
 src/XGUI/XGUI_DocumentDataModel.h             |   6 +-
 src/XGUI/XGUI_Workshop.cpp                    |  12 ++--
 src/XGUI/XGUI_Workshop.h                      |   8 +--
 43 files changed, 397 insertions(+), 292 deletions(-)
 create mode 100644 salomeRun.bat
 delete mode 100644 src/Event/CMakeLists.txt
 delete mode 100644 src/Event/Event.h
 create mode 100644 src/Events/CMakeLists.txt
 create mode 100644 src/Events/Events.h
 rename src/{Event/Event_Listener.cpp => Events/Events_Listener.cpp} (50%)
 rename src/{Event/Event_Listener.h => Events/Events_Listener.h} (51%)
 rename src/{Event/Event_Loop.cpp => Events/Events_Loop.cpp} (56%)
 rename src/{Event/Event_Loop.h => Events/Events_Loop.h} (67%)
 rename src/{Event/Event_Message.cpp => Events/Events_Message.cpp} (50%)
 rename src/{Event/Event_Message.h => Events/Events_Message.h} (61%)
 create mode 100644 src/NewGeom/CMakeLists.txt
 create mode 100644 src/NewGeom/NewGeom.h
 create mode 100644 src/NewGeom/NewGeom_Module.cpp
 rename src/{SalomeModule/SalomeModule_Module.h => NewGeom/NewGeom_Module.h} (66%)
 create mode 100644 src/NewGeom/resources/LightApp.xml
 create mode 100644 src/NewGeom/resources/newgeom.png
 delete mode 100644 src/SalomeModule/CMakeLists.txt
 delete mode 100644 src/SalomeModule/SalomeModule.h
 delete mode 100644 src/SalomeModule/SalomeModule_Module.cpp

diff --git a/CMakeCommon/FindSalome.cmake b/CMakeCommon/FindSalome.cmake
index bf82cdecc..c2403c270 100644
--- a/CMakeCommon/FindSalome.cmake
+++ b/CMakeCommon/FindSalome.cmake
@@ -1,12 +1,53 @@
 
 
+SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL directory")
 SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI directory")
 IF(EXISTS ${GUI_ROOT_DIR})
 	SET(HAVE_SALOME YES)
   
+  	FIND_LIBRARY(caf caf ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(CAM CAM ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(CASCatch CASCatch ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(DDS DDS ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(Event Event ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(GLViewer GLViewer ${GUI_ROOT_DIR}/lib/salome)
 	FIND_LIBRARY(LightApp LightApp ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(LogWindow LogWindow ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(ObjBrowser ObjBrowser ${GUI_ROOT_DIR}/lib/salome)
 	FIND_LIBRARY(OCCViewer OCCViewer ${GUI_ROOT_DIR}/lib/salome)
-  
+	FIND_LIBRARY(OpenGLUtils OpenGLUtils ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(Plot2d Plot2d ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(PyConsole PyConsole ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(PyInterp PyInterp ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(QDS QDS ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(qtx qtx ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(QxScene QxScene ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeApp SalomeApp ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeIDLGUI SalomeIDLGUI ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeObject SalomeObject ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomePrs SalomePrs ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomePyQtGUILight SalomePyQtGUILight ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomePyQtGUI SalomePyQtGUI ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomePyQt SalomePyQt ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomePy SalomePy ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeSession SalomeSession ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeStyle SalomeStyle ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SOCC SOCC ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SPlot2d SPlot2d ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(std std ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SUITApp SUITApp ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(suit suit ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SVTK SVTK ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(ToolsGUI ToolsGUI ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(ViewerTools ViewerTools ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(ViewerData ViewerData ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(VTKViewer VTKViewer ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(vtkEDFOverloads vtkEDFOverloads ${GUI_ROOT_DIR}/lib/paraview)
+	FIND_LIBRARY(vtkTools vtkTools ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeGuiHelpers SalomeGuiHelpers ${GUI_ROOT_DIR}/lib/salome)
+	FIND_LIBRARY(SalomeTreeData SalomeTreeData ${GUI_ROOT_DIR}/lib/salome)
+
 	SET(SALOME_GUI_INCLUDE ${GUI_ROOT_DIR}/include/salome)
+	SET(SALOME_KERNEL_INCLUDE ${KERNEL_ROOT_DIR}/include/salome)
 	ADD_DEFINITIONS( -DHAVE_SALOME )
 ENDIF(EXISTS ${GUI_ROOT_DIR})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f7435c67..f29f9a8ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ ENDIF(UNIX)
 
 
 ADD_SUBDIRECTORY (src/Config)
-ADD_SUBDIRECTORY (src/Event)
+ADD_SUBDIRECTORY (src/Events)
 ADD_SUBDIRECTORY (src/Model)
 ADD_SUBDIRECTORY (src/ModelAPI)
 ADD_SUBDIRECTORY (src/GeomAPI)
@@ -37,6 +37,6 @@ ADD_SUBDIRECTORY (src/PyInterp)
 ADD_SUBDIRECTORY (src/XGUI)
 ADD_SUBDIRECTORY (src/GeomApp)
 
-#IF(${HAVE_SALOME})
-#	ADD_SUBDIRECTORY (src/SalomeModule)
-#ENDIF(${HAVE_SALOME})
+IF(${HAVE_SALOME})
+	ADD_SUBDIRECTORY (src/NewGeom)
+ENDIF(${HAVE_SALOME})
diff --git a/msvc9_env_Salome.bat b/msvc9_env_Salome.bat
index 043e2c951..15317ad20 100644
--- a/msvc9_env_Salome.bat
+++ b/msvc9_env_Salome.bat
@@ -57,6 +57,7 @@ call "%PDIR%\env_compile.bat"
 @SET PATH=%PDIR%\ftgl-2.1.3\bin;%PATH%
 @SET PATH=%PDIR%\freetype-2.4.11\bin;%PATH%
 @SET PATH=%PDIR%\gl2ps-1.3.8\bin;%PATH%
+@SET PATH=%PDIR%\qwt-5.2.1\lib;%PATH%
 @REM -------------------------
 
 IF "%ARCH%" == "Win64" (
@@ -71,4 +72,6 @@ IF "%ARCH%" == "Win64" (
 )
 
 @SET NEW_GEOM_CONFIG_FILE=%ROOT_DIR%\install\plugins
-@SET PATH=%ROOT_DIR%\install\plugins;%PATH%
+@SET PATH=%ROOT_DIR%\install\bin;%ROOT_DIR%\install\plugins;%PATH%
+
+@SET LightAppConfig=%ROOT_DIR%\install\share\salome\resources\newgeom;%GUI_ROOT_DIR%\share\salome\resources\gui
diff --git a/salomeRun.bat b/salomeRun.bat
new file mode 100644
index 000000000..3738b2f17
--- /dev/null
+++ b/salomeRun.bat
@@ -0,0 +1,16 @@
+@ECHO OFF
+
+REM Find absolute path to ROOT_DIR 
+@SET PARENT_DIR=%~dp0..
+@SET ROOT_DIR=
+pushd %PARENT_DIR%
+@SET ROOT_DIR=%CD%
+popd
+
+@SET SRC_DIR=%ROOT_DIR%\sources
+@SET OCC_LIB_PREFIX=d
+
+call %SRC_DIR%\msvc9_env_Salome.bat
+
+
+SuitApp.exe LightApp -style salome --modules=NewGeom --uselicense --noexcepthandling
diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt
index 92aee7ca6..a501bcfa7 100644
--- a/src/Config/CMakeLists.txt
+++ b/src/Config/CMakeLists.txt
@@ -1,7 +1,7 @@
 INCLUDE(Common)
 INCLUDE(XMLProcessing)
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event) 
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events) 
 
 SET(PROJECT_HEADERS
   Config.h
@@ -30,7 +30,7 @@ SET(XML_RESOURCES
 )
 
 SET(PROJECT_LIBRARIES
-    Event
+    Events
     ${LIBXML2_LIBRARIES}
 )
 
diff --git a/src/Config/Config_FeatureMessage.cpp b/src/Config/Config_FeatureMessage.cpp
index 209bb7aa2..2da657417 100644
--- a/src/Config/Config_FeatureMessage.cpp
+++ b/src/Config/Config_FeatureMessage.cpp
@@ -3,8 +3,8 @@
  */
 #include "Config_FeatureMessage.h"
 
-Config_FeatureMessage::Config_FeatureMessage(const Event_ID theId, const void* theParent)
-    : Event_Message(theId, theParent)
+Config_FeatureMessage::Config_FeatureMessage(const Events_ID theId, const void* theParent)
+    : Events_Message(theId, theParent)
 {
   myId = "";
   myText = "";
diff --git a/src/Config/Config_FeatureMessage.h b/src/Config/Config_FeatureMessage.h
index 900d547d3..a7928800a 100644
--- a/src/Config/Config_FeatureMessage.h
+++ b/src/Config/Config_FeatureMessage.h
@@ -2,7 +2,7 @@
 #define CONFIG_MESSAGE_H
 
 #include <Config.h>
-#include <Event_Message.h>
+#include <Events_Message.h>
 
 #include <string>
 
@@ -11,7 +11,7 @@
  * Example of the feature entry:
  * <feature id="Part" text="New part" tooltip="Creates a new part" icon=":pictures/part_ico.png"/>
  */
-class Config_FeatureMessage: public Event_Message
+class Config_FeatureMessage: public Events_Message
 {
   std::string myId;  //Feature unique id
   std::string myText; //Represents action's text
@@ -26,8 +26,8 @@ class Config_FeatureMessage: public Event_Message
   bool myUseInput; //Action is being checked until user commit the operation
 
 public:
-  //const Event_ID theID, const void* theSender = 0
-  CONFIG_EXPORT Config_FeatureMessage(const Event_ID theId, const void* theParent = 0);
+  //const Events_ID theID, const void* theSender = 0
+  CONFIG_EXPORT Config_FeatureMessage(const Events_ID theId, const void* theParent = 0);
 
   //TODO(sbh): Implement static method to extract event id [SEID]
   //static const char* eventId() { return ""; }
@@ -56,4 +56,4 @@ public:
   CONFIG_EXPORT void setUseInput(bool isUseInput);
 };
 
-#endif // CONFIG_MESSAGE_H
+#endif // CONFIG_MESSAGE_H
diff --git a/src/Config/Config_FeatureReader.cpp b/src/Config/Config_FeatureReader.cpp
index 50d72e992..229c4cec9 100644
--- a/src/Config/Config_FeatureReader.cpp
+++ b/src/Config/Config_FeatureReader.cpp
@@ -9,8 +9,8 @@
 #include <Config_Common.h>
 #include <Config_FeatureMessage.h>
 #include <Config_FeatureReader.h>
-#include <Event_Message.h>
-#include <Event_Loop.h>
+#include <Events_Message.h>
+#include <Events_Loop.h>
 
 #include <libxml/parser.h>
 #include <libxml/tree.h>
@@ -38,9 +38,9 @@ Config_FeatureReader::~Config_FeatureReader()
 
 void Config_FeatureReader::processNode(xmlNodePtr theNode)
 {
-  Event_ID aMenuItemEvent = Event_Loop::eventByName(myEventGenerated);
+  Events_ID aMenuItemEvent = Events_Loop::eventByName(myEventGenerated);
   if (isNode(theNode, NODE_FEATURE, NULL)) {
-    Event_Loop* aEvLoop = Event_Loop::loop();
+    Events_Loop* aEvLoop = Events_Loop::loop();
     Config_FeatureMessage aMessage(aMenuItemEvent, this);
     fillFeature(theNode, aMessage);
     //If a feature has xml definition for it's widget:
diff --git a/src/Config/Config_PointerMessage.cpp b/src/Config/Config_PointerMessage.cpp
index cc4b353d5..91e9d10f3 100644
--- a/src/Config/Config_PointerMessage.cpp
+++ b/src/Config/Config_PointerMessage.cpp
@@ -7,8 +7,8 @@
 
 #include <Config_PointerMessage.h>
 
-Config_PointerMessage::Config_PointerMessage(const Event_ID theId, const void* theParent)
-    : Event_Message(theId, theParent), myPointer(0)
+Config_PointerMessage::Config_PointerMessage(const Events_ID theId, const void* theParent)
+    : Events_Message(theId, theParent), myPointer(0)
 {
 
 }
diff --git a/src/Config/Config_PointerMessage.h b/src/Config/Config_PointerMessage.h
index e0ac3e440..f108d3ede 100644
--- a/src/Config/Config_PointerMessage.h
+++ b/src/Config/Config_PointerMessage.h
@@ -9,15 +9,15 @@
 #define PARTSET_MESSAGE_H_
 
 #include <Config.h>
-#include <Event_Message.h>
+#include <Events_Message.h>
 
 /*
  * A general class to pass pointers over the event loop.
  */
-class CONFIG_EXPORT Config_PointerMessage: public Event_Message
+class CONFIG_EXPORT Config_PointerMessage: public Events_Message
 {
 public:
-  Config_PointerMessage(const Event_ID theId, const void* theParent = 0);
+  Config_PointerMessage(const Events_ID theId, const void* theParent = 0);
   virtual ~Config_PointerMessage();
 
   void* pointer() const;
diff --git a/src/Config/Config_XMLReader.cpp b/src/Config/Config_XMLReader.cpp
index 002c9df49..f804cd501 100644
--- a/src/Config/Config_XMLReader.cpp
+++ b/src/Config/Config_XMLReader.cpp
@@ -7,7 +7,7 @@
 
 #include <Config_XMLReader.h>
 
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
diff --git a/src/Event/CMakeLists.txt b/src/Event/CMakeLists.txt
deleted file mode 100644
index 63191667e..000000000
--- a/src/Event/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-INCLUDE(Common)
-
-SET(PROJECT_HEADERS
-    Event.h
-    Event_Message.h
-    Event_Listener.h
-    Event_Loop.h
-)
-
-SET(PROJECT_SOURCES
-    Event_Message.cpp
-    Event_Listener.cpp
-    Event_Loop.cpp
-)
-
-ADD_DEFINITIONS(-DEVENT_EXPORTS)
-ADD_LIBRARY(Event SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-
-TARGET_LINK_LIBRARIES(Event ${PROJECT_LIBRARIES})
-
-INSTALL(TARGETS Event DESTINATION bin)
diff --git a/src/Event/Event.h b/src/Event/Event.h
deleted file mode 100644
index d99cd0046..000000000
--- a/src/Event/Event.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef EVENT_H
-#define EVENT_H
-
-#if defined EVENT_EXPORTS
-#if defined WIN32
-#define EVENT_EXPORT              __declspec( dllexport )
-#else
-#define EVENT_EXPORT
-#endif
-#else
-#if defined WIN32
-#define EVENT_EXPORT              __declspec( dllimport )
-#else
-#define EVENT_EXPORT
-#endif
-#endif
-
-#endif
diff --git a/src/Events/CMakeLists.txt b/src/Events/CMakeLists.txt
new file mode 100644
index 000000000..08c3903c2
--- /dev/null
+++ b/src/Events/CMakeLists.txt
@@ -0,0 +1,21 @@
+INCLUDE(Common)
+
+SET(PROJECT_HEADERS
+    Events.h
+    Events_Message.h
+    Events_Listener.h
+    Events_Loop.h
+)
+
+SET(PROJECT_SOURCES
+    Events_Message.cpp
+    Events_Listener.cpp
+    Events_Loop.cpp
+)
+
+ADD_DEFINITIONS(-DEVENTS_EXPORTS)
+ADD_LIBRARY(Events SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
+
+TARGET_LINK_LIBRARIES(Events ${PROJECT_LIBRARIES})
+
+INSTALL(TARGETS Events DESTINATION bin)
diff --git a/src/Events/Events.h b/src/Events/Events.h
new file mode 100644
index 000000000..928056c8e
--- /dev/null
+++ b/src/Events/Events.h
@@ -0,0 +1,18 @@
+#ifndef EVENTS_H
+#define EVENTS_H
+
+#if defined EVENTS_EXPORTS
+#if defined WIN32
+#define EVENTS_EXPORT              __declspec( dllexport )
+#else
+#define EVENTS_EXPORT
+#endif
+#else
+#if defined WIN32
+#define EVENTS_EXPORT              __declspec( dllimport )
+#else
+#define EVENTS_EXPORT
+#endif
+#endif
+
+#endif
diff --git a/src/Event/Event_Listener.cpp b/src/Events/Events_Listener.cpp
similarity index 50%
rename from src/Event/Event_Listener.cpp
rename to src/Events/Events_Listener.cpp
index ffb56c7b6..8a7720c72 100644
--- a/src/Event/Event_Listener.cpp
+++ b/src/Events/Events_Listener.cpp
@@ -1,5 +1,5 @@
-// File:	Event_Listener.cxx
+// File:	Events_Listener.cxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#include <Event_Listener.h>
+#include <Events_Listener.h>
diff --git a/src/Event/Event_Listener.h b/src/Events/Events_Listener.h
similarity index 51%
rename from src/Event/Event_Listener.h
rename to src/Events/Events_Listener.h
index c47d28dbf..2fdcb097f 100644
--- a/src/Event/Event_Listener.h
+++ b/src/Events/Events_Listener.h
@@ -1,25 +1,25 @@
-// File:	Event_Listener.hxx
+// File:	Events_Listener.hxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Event_Listener_HeaderFile
-#define Event_Listener_HeaderFile
+#ifndef Events_Listener_HeaderFile
+#define Events_Listener_HeaderFile
 
-#include <Event.h>
-class Event_Message;
+#include <Events.h>
+class Events_Message;
 
-/**\class Event_Listener
- * \ingroup EventLoop
+/**\class Events_Listener
+ * \ingroup EventsLoop
  * \brief Base interface for any event listener.
  *
  * If some object wants to listen some events it must inherit
  * this class and register in the Loop.
  */
-class EVENT_EXPORT Event_Listener {
+class EVENTS_EXPORT Events_Listener {
 
 public:
   //! This method is called by loop when the event is started to process.
-  virtual void processEvent(const Event_Message* theMessage) = 0;
+  virtual void processEvent(const Events_Message* theMessage) = 0;
 };
 
 #endif
diff --git a/src/Event/Event_Loop.cpp b/src/Events/Events_Loop.cpp
similarity index 56%
rename from src/Event/Event_Loop.cpp
rename to src/Events/Events_Loop.cpp
index c938dbe95..6c8bb4760 100644
--- a/src/Event/Event_Loop.cpp
+++ b/src/Events/Events_Loop.cpp
@@ -1,22 +1,22 @@
-// File:	Event_Loop.hxx
+// File:	Events_Loop.hxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 
 #include <string>
 #include <cstring>
 
 using namespace std;
 
-Event_Loop* Event_Loop::loop()
+Events_Loop* Events_Loop::loop()
 {
   // initialized on initialization of the application
-  static Event_Loop MAIN_LOOP;
+  static Events_Loop MAIN_LOOP;
   return &MAIN_LOOP;
 }
 
-Event_ID Event_Loop::eventByName(const char* theName)
+Events_ID Events_Loop::eventByName(const char* theName)
 {
   ///! All events created in this session, uniquely identified by the text and char pointer
   static map<string, char*> CREATED_EVENTS;
@@ -29,52 +29,52 @@ Event_ID Event_Loop::eventByName(const char* theName)
   } else
     aResult = aFound->second;
 
-  return Event_ID(aResult);
+  return Events_ID(aResult);
 }
 
-void Event_Loop::send(Event_Message& theMessage)
+void Events_Loop::send(Events_Message& theMessage)
 {
   // TO DO: make it in thread and wit husage of semaphores
 
-  map<char*, map<void*, list<Event_Listener*> > >::iterator aFindID = myListeners.find(
+  map<char*, map<void*, list<Events_Listener*> > >::iterator aFindID = myListeners.find(
       theMessage.eventID().eventText());
   if (aFindID != myListeners.end()) {
-    map<void*, list<Event_Listener*> >::iterator aFindSender = aFindID->second.find(
+    map<void*, list<Events_Listener*> >::iterator aFindSender = aFindID->second.find(
         theMessage.sender());
     if (aFindSender != aFindID->second.end()) {
-      list<Event_Listener*>& aListeners = aFindSender->second;
-      for(list<Event_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+      list<Events_Listener*>& aListeners = aFindSender->second;
+      for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
         (*aL)->processEvent(&theMessage);
     }
     if (theMessage.sender()) { // also call for NULL senders registered
       aFindSender = aFindID->second.find(NULL);
       if (aFindSender != aFindID->second.end()) {
-        list<Event_Listener*>& aListeners = aFindSender->second;
-        for(list<Event_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+        list<Events_Listener*>& aListeners = aFindSender->second;
+        for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
           (*aL)->processEvent(&theMessage);
       }
     }
   }
 }
 
-void Event_Loop::registerListener(Event_Listener* theListener, const Event_ID theID,
+void Events_Loop::registerListener(Events_Listener* theListener, const Events_ID theID,
                                   void* theSender)
 {
-  map<char*, map<void*, list<Event_Listener*> > >::iterator aFindID = myListeners.find(
+  map<char*, map<void*, list<Events_Listener*> > >::iterator aFindID = myListeners.find(
       theID.eventText());
   if (aFindID == myListeners.end()) { // create container associated with ID
-    myListeners[theID.eventText()] = map<void*, list<Event_Listener*> >();
+    myListeners[theID.eventText()] = map<void*, list<Events_Listener*> >();
     aFindID = myListeners.find(theID.eventText());
   }
 
-  map<void*, list<Event_Listener*> >::iterator aFindSender = aFindID->second.find(theSender);
+  map<void*, list<Events_Listener*> >::iterator aFindSender = aFindID->second.find(theSender);
   if (aFindSender == aFindID->second.end()) { // create container associated with sender
-    aFindID->second[theSender] = list<Event_Listener*>();
+    aFindID->second[theSender] = list<Events_Listener*>();
     aFindSender = aFindID->second.find(theSender);
   }
   // check that listener was not registered wit hsuch parameters before
-  list<Event_Listener*>& aListeners = aFindSender->second;
-  for(list<Event_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+  list<Events_Listener*>& aListeners = aFindSender->second;
+  for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
     if (*aL == theListener)
       return; // avoid duplicates
 
diff --git a/src/Event/Event_Loop.h b/src/Events/Events_Loop.h
similarity index 67%
rename from src/Event/Event_Loop.h
rename to src/Events/Events_Loop.h
index 60ddacd73..893ecb199 100644
--- a/src/Event/Event_Loop.h
+++ b/src/Events/Events_Loop.h
@@ -1,18 +1,18 @@
-// File:	Event_Loop.hxx
+// File:	Events_Loop.hxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Event_Loop_HeaderFile
-#define Event_Loop_HeaderFile
+#ifndef Events_Loop_HeaderFile
+#define Events_Loop_HeaderFile
 
-#include <Event_Message.h>
-#include <Event_Listener.h>
+#include <Events_Message.h>
+#include <Events_Listener.h>
 
 #include <map>
 #include <list>
 
-/**\class Event_Lopp
- * \ingroup EventLoop
+/**\class Events_Lopp
+ * \ingroup EventsLoop
  * \brief Base class that manages the receiving and sending of all
  * not Qt-events in the application.
  *
@@ -21,25 +21,25 @@
  * Performing of events is processed in separated thread, so, sender takes 
  * control back immideately.
  */
-class Event_Loop {
-  std::map<char*, std::map<void*, std::list<Event_Listener*> > >
+class Events_Loop {
+  std::map<char*, std::map<void*, std::list<Events_Listener*> > >
     myListeners; ///< map from event ID to sender pointer to listeners that must be called for this
 
   //! The empty constructor, will be called at startup of the application, only once
-  Event_Loop() {};
+  Events_Loop() {};
 public:
   ///! Returns the main object of the loop, one per application.
-  EVENT_EXPORT static Event_Loop* loop();
+  EVENTS_EXPORT static Events_Loop* loop();
   //! Returns the unique event by the given name. Call this method only on initialization of object
   //! to speedup the events processing without parsing of the string.
-  EVENT_EXPORT static Event_ID eventByName(const char* theName);
+  EVENTS_EXPORT static Events_ID eventByName(const char* theName);
 
   //! Allows to send an event
-  EVENT_EXPORT void send(Event_Message& theMessage);
+  EVENTS_EXPORT void send(Events_Message& theMessage);
 
   //! Registers (or adds if such listener is already registered) a listener 
   //! that will be called on the event and from the defined sender
-  EVENT_EXPORT void registerListener(Event_Listener* theListener, const Event_ID theID, 
+  EVENTS_EXPORT void registerListener(Events_Listener* theListener, const Events_ID theID, 
     void* theSender = 0);
 };
 
diff --git a/src/Event/Event_Message.cpp b/src/Events/Events_Message.cpp
similarity index 50%
rename from src/Event/Event_Message.cpp
rename to src/Events/Events_Message.cpp
index 764ed826f..6de383912 100644
--- a/src/Event/Event_Message.cpp
+++ b/src/Events/Events_Message.cpp
@@ -1,5 +1,5 @@
-// File:	Event_Message.cxx
+// File:	Events_Message.cxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#include <Event_Message.h>
+#include <Events_Message.h>
diff --git a/src/Event/Event_Message.h b/src/Events/Events_Message.h
similarity index 61%
rename from src/Event/Event_Message.h
rename to src/Events/Events_Message.h
index 0c2702072..1d5a57d41 100644
--- a/src/Event/Event_Message.h
+++ b/src/Events/Events_Message.h
@@ -1,14 +1,14 @@
-// File:	Event_Message.hxx
+// File:	Events_Message.hxx
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Event_Message_HeaderFile
-#define Event_Message_HeaderFile
+#ifndef Events_Message_HeaderFile
+#define Events_Message_HeaderFile
 
-#include <Event.h>
+#include <Events.h>
 
-/**\class Event_ID
- * \ingroup EventLoop
+/**\class Events_ID
+ * \ingroup EventsLoop
  * \brief Identifier of the event kind.
  *
  * Each event ID is created in main Envent_Loop class
@@ -17,38 +17,38 @@
  * used as an identifier (this is usefull for debugging of the events
  * with log files and in debugger).
  */
-class EVENT_EXPORT Event_ID {
+class EVENTS_EXPORT Events_ID {
   char* myID; ///< pointer to the text-identifier of the event, unique pointer for all events of such type
 
-  Event_ID(char* theID) {myID = theID;}
+  Events_ID(char* theID) {myID = theID;}
 
-  friend class Event_Loop;
+  friend class Events_Loop;
 public:
   /// Returns the text-identifier of the event (for debugging reasons)
   char* eventText() const {return myID;}
   /// Allows to compare identifiers
-  bool operator==(const Event_ID& theID) const {return myID == theID.myID;}
+  bool operator==(const Events_ID& theID) const {return myID == theID.myID;}
 };
 
-/**\class Event_Message
- * \ingroup EventLoop
+/**\class Events_Message
+ * \ingroup EventsLoop
  * \brief Message for communication between sender and listener of event.
  * Normally it is inherited by the higher-level 
  */
-class EVENT_EXPORT Event_Message {
-  Event_ID myEventId; ///< identifier of the event
+class EVENTS_EXPORT Events_Message {
+  Events_ID myEventsId; ///< identifier of the event
   void* mySender; ///< the sender object
 
 public:
 
   //! Creates the message
-  Event_Message(const Event_ID theID, const void* theSender = 0)
-    : myEventId(theID), mySender((void*) theSender) {}
+  Events_Message(const Events_ID theID, const void* theSender = 0)
+    : myEventsId(theID), mySender((void*) theSender) {}
   //! do nothing in the destructor yet
-  virtual ~Event_Message() {}
+  virtual ~Events_Message() {}
 
   //! Returns identifier of the message
-  const Event_ID& eventID() const {return myEventId;}
+  const Events_ID& eventID() const {return myEventsId;}
 
   //! Returns sender of the message or NULL if it is anonymous message
   void* sender() const {return mySender;}
diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 310c9f8a3..24bee85be 100644
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -26,11 +26,11 @@ SET(PROJECT_SOURCES
 
 ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
 ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES} ${CAS_OCAF} ModelAPI Event Config)
+TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES} ${CAS_OCAF} ModelAPI Events Config)
 
 INCLUDE_DIRECTORIES(
   ../ModelAPI
-  ../Event
+  ../Events
   ../Config
   ${CAS_INCLUDE_DIRS}
 )
diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index c022362e8..d33caaae8 100644
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -9,7 +9,7 @@
 #include <Model_PluginManager.h>
 #include <Model_Iterator.h>
 #include <Model_Events.h>
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_Comment.hxx>
@@ -236,9 +236,9 @@ void Model_Document::addFeature(const boost::shared_ptr<ModelAPI_Feature> theFea
   myFeatures[aGroup].push_back(theFeature);
 
   // event: feature is added
-  static Event_ID anEvent = Event_Loop::eventByName(EVENT_FEATURE_CREATED);
+  static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_CREATED);
   ModelAPI_FeatureUpdatedMessage aMsg(aThis, theFeature, anEvent);
-  Event_Loop::loop()->send(aMsg);
+  Events_Loop::loop()->send(aMsg);
 }
 
 boost::shared_ptr<ModelAPI_Feature> Model_Document::feature(TDF_Label& theLabel)
@@ -371,7 +371,7 @@ void Model_Document::synchronizeFeatures()
     aGroupNamesIter = myGroupsNames.erase(aGroupNamesIter);
     // say that features were deleted from group
     ModelAPI_FeatureDeletedMessage aMsg(aThis, aGroupName);
-    Event_Loop::loop()->send(aMsg);
+    Events_Loop::loop()->send(aMsg);
   }
   // create new groups basing on the following data model update
   for(; aGroupsIter.More(); aGroupsIter.Next()) {
@@ -408,7 +408,7 @@ void Model_Document::synchronizeFeatures()
         aFIter = aFeatures.erase(aFIter);
         // event: model is updated
         ModelAPI_FeatureDeletedMessage aMsg(aThis, aGroupName);
-        Event_Loop::loop()->send(aMsg);
+        Events_Loop::loop()->send(aMsg);
       } else if (aDSTag < aFeatureTag) { // a new feature is inserted
         // create a feature
         boost::shared_ptr<ModelAPI_Feature> aFeature = ModelAPI_PluginManager::get()->createFeature(
@@ -422,9 +422,9 @@ void Model_Document::synchronizeFeatures()
         aFeature->setData(aData);
         aFeature->initAttributes();
         // event: model is updated
-        static Event_ID anEvent = Event_Loop::eventByName(EVENT_FEATURE_CREATED);
+        static Events_ID anEvent = Events_Loop::eventByName(EVENT_FEATURE_CREATED);
         ModelAPI_FeatureUpdatedMessage aMsg(aThis, aFeature, anEvent);
-        Event_Loop::loop()->send(aMsg);
+        Events_Loop::loop()->send(aMsg);
 
         if (aFIter == aFeatures.end()) {
           aFeatures.push_back(aFeature);
diff --git a/src/Model/Model_Events.cpp b/src/Model/Model_Events.cpp
index a83e9cabd..b71ecff50 100644
--- a/src/Model/Model_Events.cpp
+++ b/src/Model/Model_Events.cpp
@@ -3,23 +3,23 @@
 // Author:      Mikhail PONIKAROV
 
 #include <Model_Events.h>
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 
 ModelAPI_FeatureUpdatedMessage::ModelAPI_FeatureUpdatedMessage(
   const boost::shared_ptr<ModelAPI_Document>& theDoc,
-  const boost::shared_ptr<ModelAPI_Feature>& theFeature, const Event_ID& theEvent)
-  : Event_Message(theEvent, 0), myFeature(theFeature), myDoc(theDoc)
+  const boost::shared_ptr<ModelAPI_Feature>& theFeature, const Events_ID& theEvent)
+  : Events_Message(theEvent, 0), myFeature(theFeature), myDoc(theDoc)
 {}
 
 ModelAPI_FeatureDeletedMessage::ModelAPI_FeatureDeletedMessage(
   const boost::shared_ptr<ModelAPI_Document>& theDoc, const std::string& theGroup)
-  : Event_Message(messageId(), 0), myDoc(theDoc), myGroup(theGroup)
+  : Events_Message(messageId(), 0), myDoc(theDoc), myGroup(theGroup)
 
 {
 }
 
-const Event_ID ModelAPI_FeatureDeletedMessage::messageId()
+const Events_ID ModelAPI_FeatureDeletedMessage::messageId()
 {
-  static Event_ID MY_ID = Event_Loop::eventByName(EVENT_FEATURE_DELETED);
+  static Events_ID MY_ID = Events_Loop::eventByName(EVENT_FEATURE_DELETED);
   return MY_ID;
 }
diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index 81828bf30..feda6ab02 100644
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -6,7 +6,7 @@
 #define Model_Events_HeaderFile
 
 #include <Model.h>
-#include <Event_Message.h>
+#include <Events_Message.h>
 #include <boost/shared_ptr.hpp>
 #include <string>
 
@@ -21,7 +21,7 @@ static const char * EVENT_FEATURE_UPDATED = "FeatureUpdated";
 static const char * EVENT_FEATURE_DELETED = "FeatureDeleted";
 
 /// Message that feature was changed (used for Object Browser update)
-class ModelAPI_FeatureUpdatedMessage : public Event_Message {
+class ModelAPI_FeatureUpdatedMessage : public Events_Message {
   boost::shared_ptr<ModelAPI_Document> myDoc; ///< document owner of the feature
   boost::shared_ptr<ModelAPI_Feature> myFeature; ///< which feature is changed
 public:
@@ -29,7 +29,7 @@ public:
   ModelAPI_FeatureUpdatedMessage(
     const boost::shared_ptr<ModelAPI_Document>& theDoc,
     const boost::shared_ptr<ModelAPI_Feature>& theFeature,
-    const Event_ID& theEvent);
+    const Events_ID& theEvent);
 
   /// Returns the feature that has been updated
   boost::shared_ptr<ModelAPI_Feature> feature() const {return myFeature;}
@@ -38,7 +38,7 @@ public:
 };
 
 /// Message that feature was deleted (used for Object Browser update)
-class ModelAPI_FeatureDeletedMessage : public Event_Message {
+class ModelAPI_FeatureDeletedMessage : public Events_Message {
   boost::shared_ptr<ModelAPI_Document> myDoc; ///< document owner of the feature
   std::string myGroup; ///< group identifier that contained the deleted feature
 public:
@@ -47,7 +47,7 @@ public:
     const std::string& theGroup);
 
   /// Returns the ID of this message (EVENT_FEATURE_DELETED)
-  static const Event_ID messageId();
+  static const Events_ID messageId();
 
   /// Returns the feature that has been updated
   boost::shared_ptr<ModelAPI_Document> document() const {return myDoc;}
diff --git a/src/Model/Model_PluginManager.cpp b/src/Model/Model_PluginManager.cpp
index e816fdd4a..2750614e7 100644
--- a/src/Model/Model_PluginManager.cpp
+++ b/src/Model/Model_PluginManager.cpp
@@ -8,7 +8,7 @@
 #include <Model_Data.h>
 #include <Model_Document.h>
 #include <Model_Application.h>
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 #include <Config_FeatureMessage.h>
 #include <Config_ModuleReader.h>
 
@@ -64,15 +64,15 @@ Model_PluginManager::Model_PluginManager()
 {
   myPluginsInfoLoaded = false;
   //TODO(sbh): Implement static method to extract event id [SEID]
-  static Event_ID aFeatureEvent = Event_Loop::eventByName("FeatureRegisterEvent");
+  static Events_ID aFeatureEvent = Events_Loop::eventByName("FeatureRegisterEvent");
 
   ModelAPI_PluginManager::SetPluginManager(boost::shared_ptr<ModelAPI_PluginManager>(this));
   // register the configuration reading listener
-  Event_Loop* aLoop = Event_Loop::loop();
+  Events_Loop* aLoop = Events_Loop::loop();
   aLoop->registerListener(this, aFeatureEvent);
 }
 
-void Model_PluginManager::processEvent(const Event_Message* theMessage)
+void Model_PluginManager::processEvent(const Events_Message* theMessage)
 {
   const Config_FeatureMessage* aMsg =
     dynamic_cast<const Config_FeatureMessage*>(theMessage);
diff --git a/src/Model/Model_PluginManager.h b/src/Model/Model_PluginManager.h
index 018f705b1..7f405573f 100644
--- a/src/Model/Model_PluginManager.h
+++ b/src/Model/Model_PluginManager.h
@@ -7,7 +7,7 @@
 
 #include "Model.h"
 #include <ModelAPI_PluginManager.h>
-#include <Event_Listener.h>
+#include <Events_Listener.h>
 #include <map>
 
 class Model_Document;
@@ -18,7 +18,7 @@ class Model_Document;
  * plugin contains which feature, loads and stores reference to loaded plugins by
  * the feature functionality request.
  */
-class Model_PluginManager : public ModelAPI_PluginManager, public Event_Listener
+class Model_PluginManager : public ModelAPI_PluginManager, public Events_Listener
 {
   bool myPluginsInfoLoaded; ///< it true if plugins information is loaded
   /// map of feature IDs to plugin name
@@ -45,7 +45,7 @@ public:
   MODEL_EXPORT virtual void registerPlugin(ModelAPI_Plugin* thePlugin);
 
   /// Processes the configuration file reading
-  MODEL_EXPORT virtual void processEvent(const Event_Message* theMessage);
+  MODEL_EXPORT virtual void processEvent(const Events_Message* theMessage);
 
   /// Is called only once, on startup of the application
   Model_PluginManager();
diff --git a/src/NewGeom/CMakeLists.txt b/src/NewGeom/CMakeLists.txt
new file mode 100644
index 000000000..4d908a259
--- /dev/null
+++ b/src/NewGeom/CMakeLists.txt
@@ -0,0 +1,54 @@
+
+INCLUDE(FindCAS)
+
+SET(CMAKE_AUTOMOC ON)
+
+SET(PROJECT_HEADERS
+	NewGeom.h
+	NewGeom_Module.h
+)
+
+SET(PROJECT_AUTOMOC 
+    ${CMAKE_CURRENT_BINARY_DIR}/XGUI_automoc.cpp
+)
+
+SET(PROJECT_SOURCES
+	NewGeom_Module.cpp
+)
+
+SET(PROJECT_RESOURCES
+	resources/LightApp.xml
+	resources/newgeom.png
+)
+
+SET(PROJECT_LIBRARIES
+    Events
+    Config
+	XGUI
+	${QT_LIBRARIES}
+	${LightApp}
+	${CAM}
+	${OCCViewer}
+)
+
+ADD_DEFINITIONS( -DNewGeom_EXPORTS ${CAS_DEFINITIONS} )
+
+INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
+					${PROJECT_SOURCE_DIR}/src/Events
+					${SALOME_GUI_INCLUDE}
+					${SALOME_KERNEL_INCLUDE}
+                    ${CAS_INCLUDE_DIRS}
+)
+
+ADD_LIBRARY(NewGeom SHARED 
+	${PROJECT_SOURCES} 
+	${PROJECT_HEADERS} 
+)
+
+ADD_DEPENDENCIES(NewGeom XGUI)
+
+# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
+TARGET_LINK_LIBRARIES(NewGeom ${PROJECT_LIBRARIES})
+
+INSTALL(TARGETS NewGeom DESTINATION bin)
+INSTALL(FILES ${PROJECT_RESOURCES} DESTINATION share/salome/resources/newgeom )
\ No newline at end of file
diff --git a/src/NewGeom/NewGeom.h b/src/NewGeom/NewGeom.h
new file mode 100644
index 000000000..78f0f9930
--- /dev/null
+++ b/src/NewGeom/NewGeom.h
@@ -0,0 +1,21 @@
+#ifndef NewGeom_H
+#define NewGeom_H
+
+#if defined NewGeom_EXPORTS
+#if defined WIN32
+#define NewGeom_EXPORT     __declspec( dllexport )
+#else
+#define NewGeom_EXPORT
+#endif
+#else
+#if defined WIN32
+#define NewGeom_EXPORT     __declspec( dllimport )
+#else
+#define NewGeom_EXPORT
+#endif
+#endif
+
+#endif
+
+
+
diff --git a/src/NewGeom/NewGeom_Module.cpp b/src/NewGeom/NewGeom_Module.cpp
new file mode 100644
index 000000000..4fe5e15a7
--- /dev/null
+++ b/src/NewGeom/NewGeom_Module.cpp
@@ -0,0 +1,44 @@
+
+
+#include "NewGeom_Module.h"
+
+#include <LightApp_Application.h>
+#include <OCCViewer_ViewModel.h>
+
+
+
+NewGeom_Module::NewGeom_Module()
+: LightApp_Module( "NewGeom" )
+{
+}
+
+
+NewGeom_Module::~NewGeom_Module()
+{
+}
+
+void NewGeom_Module::initialize(CAM_Application* theApp)
+{
+}
+
+void NewGeom_Module::windows(QMap<int, int>& theWndMap) const
+{
+  theWndMap.insert( LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
+}
+
+void NewGeom_Module::viewManagers(QStringList& theList) const
+{
+  theList.append( OCCViewer_Viewer::Type() );
+}
+
+bool NewGeom_Module::activateModule(SUIT_Study* theStudy)
+{
+  return LightApp_Module::activateModule(theStudy);
+}
+
+bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy)
+{
+  return LightApp_Module::deactivateModule(theStudy);
+}
+
+
diff --git a/src/SalomeModule/SalomeModule_Module.h b/src/NewGeom/NewGeom_Module.h
similarity index 66%
rename from src/SalomeModule/SalomeModule_Module.h
rename to src/NewGeom/NewGeom_Module.h
index d4acd2708..bd6886e0f 100644
--- a/src/SalomeModule/SalomeModule_Module.h
+++ b/src/NewGeom/NewGeom_Module.h
@@ -1,16 +1,17 @@
 
 
-#ifndef SalomeModule_Module_H
-#define SalomeModule_Module_H
+#ifndef NewGeom_Module_H
+#define NewGeom_Module_H
 
+#include "NewGeom.h"
 #include <LightApp_Module.h>
 
-class SalomeModule_Module: public LightApp_Module
+class NewGeom_EXPORT NewGeom_Module: public LightApp_Module
 {
   Q_OBJECT
 public:
-  SalomeModule_Module();
-  virtual ~SalomeModule_Module();
+  NewGeom_Module();
+  virtual ~NewGeom_Module();
 
   virtual void initialize( CAM_Application* theApp);
   virtual void windows( QMap<int, int>& theWndMap) const;
diff --git a/src/NewGeom/resources/LightApp.xml b/src/NewGeom/resources/LightApp.xml
new file mode 100644
index 000000000..db530bde7
--- /dev/null
+++ b/src/NewGeom/resources/LightApp.xml
@@ -0,0 +1,31 @@
+<!--
+  Copyright (C) 2005-2013  OPEN CASCADE
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+
+-->
+<document>
+  <section name="NewGeom">
+    <!-- Major module parameters -->
+    <parameter name="name" value="NewGeom"/>
+    <parameter name="icon" value="newgeom.png"/>
+  </section>
+  <section name="resources">
+    <!-- Module resources -->
+    <parameter name="NewGeom" value="${NEWGEOM_ROOT_DIR}/share/salome/resources/newgeom"/>
+  </section>
+</document>
diff --git a/src/NewGeom/resources/newgeom.png b/src/NewGeom/resources/newgeom.png
new file mode 100644
index 0000000000000000000000000000000000000000..d4827e272dcd437ef6b677af77edad75c8ae0b22
GIT binary patch
literal 1713
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
Hu0mjfnNT5;

literal 0
HcmV?d00001

diff --git a/src/PartSet/CMakeLists.txt b/src/PartSet/CMakeLists.txt
index 1554472a2..260da21aa 100644
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@ -44,7 +44,7 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/XGUI 
                     ${CMAKE_SOURCE_DIR}/src/Config
-                    ${CMAKE_SOURCE_DIR}/src/Event
+                    ${CMAKE_SOURCE_DIR}/src/Events
                     ${CMAKE_SOURCE_DIR}/src/ModuleBase
                     ${CMAKE_SOURCE_DIR}/src/ModelAPI
                     ${CMAKE_SOURCE_DIR}/src/SketchPlugin
diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index f82eee4b2..a4e64417b 100644
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -12,8 +12,8 @@
 #include <Config_PointerMessage.h>
 #include <Config_ModuleReader.h>
 #include <Config_WidgetReader.h>
-#include <Event_Loop.h>
-#include <Event_Message.h>
+#include <Events_Loop.h>
+#include <Events_Message.h>
 
 #include <QObject>
 #include <QString>
@@ -84,10 +84,10 @@ void PartSet_Module::onFeatureTriggered()
   aPartSetOp->setDescription(QString::fromStdString(aDescription));
 
   //TODO(sbh): Implement static method to extract event id [SEID]
-  static Event_ID aModuleEvent = Event_Loop::eventByName("PartSetModuleEvent");
+  static Events_ID aModuleEvent = Events_Loop::eventByName("PartSetModuleEvent");
   Config_PointerMessage aMessage(aModuleEvent, this);
   aMessage.setPointer(aPartSetOp);
-  Event_Loop::loop()->send(aMessage);
+  Events_Loop::loop()->send(aMessage);
 }
 
 /**
diff --git a/src/SalomeModule/CMakeLists.txt b/src/SalomeModule/CMakeLists.txt
deleted file mode 100644
index 2749ccfc9..000000000
--- a/src/SalomeModule/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-SET(CMAKE_AUTOMOC ON)
-
-SET(PROJECT_HEADERS
-	SalomeModule.h
-	SalomeModule_Module.h
-)
-
-SET(PROJECT_AUTOMOC 
-    ${CMAKE_CURRENT_BINARY_DIR}/XGUI_automoc.cpp
-)
-
-SET(PROJECT_SOURCES
-	SalomeModule_Module.cpp
-)
-
-
-SET(PROJECT_LIBRARIES
-    Event
-    Config
-	${QT_LIBRARIES}
-	XGUI
-)
-
-ADD_DEFINITIONS( -DSalomeModule_EXPORTS ${CAS_DEFINITIONS} )
-
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/XGUI
-					${SALOME_GUI_INCLUDE}
-                    ${CAS_INCLUDE_DIRS}
-)
-
-ADD_LIBRARY(SalomeModule SHARED 
-	${PROJECT_SOURCES} 
-	${PROJECT_HEADERS} 
-)
-
-ADD_DEPENDENCIES(SalomeModule XGUI)
-
-# The Qt5Widgets_LIBRARIES variable also includes QtGui and QtCore
-TARGET_LINK_LIBRARIES(SalomeModule ${PROJECT_LIBRARIES})
-
-INSTALL(TARGETS SalomeModule DESTINATION bin)
diff --git a/src/SalomeModule/SalomeModule.h b/src/SalomeModule/SalomeModule.h
deleted file mode 100644
index e8977e5a8..000000000
--- a/src/SalomeModule/SalomeModule.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SalomeModule_H
-#define SalomeModule_H
-
-#if defined SalomeModule_EXPORTS
-#if defined WIN32
-#define SalomeModule_EXPORT     __declspec( dllexport )
-#else
-#define SalomeModule_EXPORT
-#endif
-#else
-#if defined WIN32
-#define SalomeModule_EXPORT     __declspec( dllimport )
-#else
-#define SalomeModule_EXPORT
-#endif
-#endif
-
-#endif
-
-
-
diff --git a/src/SalomeModule/SalomeModule_Module.cpp b/src/SalomeModule/SalomeModule_Module.cpp
deleted file mode 100644
index 1190e77e9..000000000
--- a/src/SalomeModule/SalomeModule_Module.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-#include "SalomeModule_Module.h"
-
-#include <LightApp_Application.h>
-#include <OCCViewer_ViewModel.h>
-
-
-
-SalomeModule_Module::SalomeModule_Module()
-: LightApp_Module( "NewGeom" )
-{
-}
-
-
-SalomeModule_Module::~SalomeModule_Module()
-{
-}
-
-void SalomeModule_Module::initialize(CAM_Application* theApp)
-{
-}
-
-void SalomeModule_Module::windows(QMap<int, int>& theWndMap) const
-{
-  theWndMap.insert( LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
-}
-
-void SalomeModule_Module::viewManagers(QStringList& theList) const
-{
-  theList.append( OCCViewer_Viewer::Type() );
-}
-
-bool SalomeModule_Module::activateModule(SUIT_Study* theStudy)
-{
-  return LightApp_Module::activateModule(theStudy);
-}
-
-bool SalomeModule_Module::deactivateModule(SUIT_Study* theStudy)
-{
-  return LightApp_Module::deactivateModule(theStudy);
-}
-
-
diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt
index becc47ee3..a246e4060 100644
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@ -65,7 +65,7 @@ SET(PROJECT_RESOURCES
 #)
 
 SET(PROJECT_LIBRARIES
-    Event
+    Events
     Config
 	${QT_LIBRARIES}
 	${CAS_VIEWER}
@@ -92,7 +92,7 @@ SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES})
 
 ADD_DEFINITIONS( -DXGUI_EXPORTS ${CAS_DEFINITIONS} )
 
-INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Event
+INCLUDE_DIRECTORIES (${PROJECT_SOURCE_DIR}/src/Events
 					 ${PROJECT_SOURCE_DIR}/src/Config
 					 ${PROJECT_SOURCE_DIR}/src/PyInterp
 					 ${PROJECT_SOURCE_DIR}/src/PyConsole
diff --git a/src/XGUI/XGUI_DocumentDataModel.cpp b/src/XGUI/XGUI_DocumentDataModel.cpp
index 7fae4b2bd..50ea7c707 100644
--- a/src/XGUI/XGUI_DocumentDataModel.cpp
+++ b/src/XGUI/XGUI_DocumentDataModel.cpp
@@ -8,7 +8,7 @@
 #include <ModelAPI_Data.h>
 #include <Model_Events.h>
 
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 
 
 #include <QIcon>
@@ -23,9 +23,9 @@ XGUI_DocumentDataModel::XGUI_DocumentDataModel(QObject* theParent)
   myDocument = aMgr->currentDocument();
 
   // Register in event loop
-  Event_Loop::loop()->registerListener(this, Event_Loop::eventByName(EVENT_FEATURE_CREATED));
-  Event_Loop::loop()->registerListener(this, Event_Loop::eventByName(EVENT_FEATURE_UPDATED));
-  Event_Loop::loop()->registerListener(this, Event_Loop::eventByName(EVENT_FEATURE_DELETED));
+  Events_Loop::loop()->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_CREATED));
+  Events_Loop::loop()->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_UPDATED));
+  Events_Loop::loop()->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_DELETED));
 
   // Create a top part of data tree model
   myModel = new XGUI_TopDataModel(myDocument, this);
@@ -38,7 +38,7 @@ XGUI_DocumentDataModel::~XGUI_DocumentDataModel()
 }
 
 
-void XGUI_DocumentDataModel::processEvent(const Event_Message* theMessage)
+void XGUI_DocumentDataModel::processEvent(const Events_Message* theMessage)
 {
   // Created object event *******************
   if (QString(theMessage->eventID().eventText()) == EVENT_FEATURE_CREATED) {
diff --git a/src/XGUI/XGUI_DocumentDataModel.h b/src/XGUI/XGUI_DocumentDataModel.h
index 592308ae8..80d69f3b6 100644
--- a/src/XGUI/XGUI_DocumentDataModel.h
+++ b/src/XGUI/XGUI_DocumentDataModel.h
@@ -6,7 +6,7 @@
 #include "XGUI_Constants.h"
 
 #include <QAbstractItemModel>
-#include <Event_Listener.h>
+#include <Events_Listener.h>
 
 #include <QList>
 
@@ -19,7 +19,7 @@ class XGUI_TopDataModel;
  * \brief This is a proxy data model for Object Browser (QTreeView).
  * It contains several sub-models for generation of each sub-part of data tree.
  */
-class XGUI_EXPORT XGUI_DocumentDataModel : public QAbstractItemModel, public Event_Listener
+class XGUI_EXPORT XGUI_DocumentDataModel : public QAbstractItemModel, public Events_Listener
 {
   Q_OBJECT
 public:
@@ -29,7 +29,7 @@ public:
   virtual ~XGUI_DocumentDataModel();
 
   // Event Listener method
-  virtual void processEvent(const Event_Message* theMessage);
+  virtual void processEvent(const Events_Message* theMessage);
 
 
   virtual QVariant data(const QModelIndex& theIndex, int theRole) const;
diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index f606615a7..eb4552d96 100644
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -19,7 +19,7 @@
 #include <ModelAPI_Data.h>
 #include <ModelAPI_AttributeDocRef.h>
 
-#include <Event_Loop.h>
+#include <Events_Loop.h>
 #include <ModuleBase_PropPanelOperation.h>
 #include <ModuleBase_Operation.h>
 #include <Config_FeatureMessage.h>
@@ -64,11 +64,11 @@ void XGUI_Workshop::startApplication()
 {
   initMenu();
   //Initialize event listening
-  Event_Loop* aLoop = Event_Loop::loop();
+  Events_Loop* aLoop = Events_Loop::loop();
   //TODO(sbh): Implement static method to extract event id [SEID]
-  Event_ID aFeatureId = aLoop->eventByName("FeatureEvent");
+  Events_ID aFeatureId = aLoop->eventByName("FeatureEvent");
   aLoop->registerListener(this, aFeatureId);
-  Event_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
+  Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
   aLoop->registerListener(this, aPartSetId);
   activateModule();
   myMainWindow->show();
@@ -141,9 +141,9 @@ XGUI_Workbench* XGUI_Workshop::addWorkbench(const QString& theName)
 }
 
 //******************************************************
-void XGUI_Workshop::processEvent(const Event_Message* theMessage)
+void XGUI_Workshop::processEvent(const Events_Message* theMessage)
 {
-  static Event_ID aFeatureId = Event_Loop::loop()->eventByName("FeatureEvent");
+  static Events_ID aFeatureId = Events_Loop::loop()->eventByName("FeatureEvent");
   if (theMessage->eventID() == aFeatureId) {
     const Config_FeatureMessage* aFeatureMsg =
         dynamic_cast<const Config_FeatureMessage*>(theMessage);
diff --git a/src/XGUI/XGUI_Workshop.h b/src/XGUI/XGUI_Workshop.h
index a1c79c0b3..f61f6e1b1 100644
--- a/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@ -2,7 +2,7 @@
 #define XGUI_WORKSHOP_H
 
 #include "XGUI.h"
-#include <Event_Listener.h>
+#include <Events_Listener.h>
 
 #include <QObject>
 #include <QMap>
@@ -26,7 +26,7 @@ class Config_PointerMessage;
  * \ingroup GUI
  * \brief Class which defines a configuration of the application (Workshop) and launches it.
  */
-class XGUI_EXPORT XGUI_Workshop: public QObject, public Event_Listener
+class XGUI_EXPORT XGUI_Workshop: public QObject, public Events_Listener
 {
 Q_OBJECT
 public:
@@ -55,8 +55,8 @@ public:
   //! Creates and adds a new workbench (menu group) with the given name and returns it
   XGUI_Workbench* addWorkbench(const QString& theName);
 
-  //! Redefinition of Event_Listener method
-  virtual void processEvent(const Event_Message* theMessage);
+  //! Redefinition of Events_Listener method
+  virtual void processEvent(const Events_Message* theMessage);
 
 public slots:
   void updateCommandStatus();
-- 
2.39.2