*** empty log message ***

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index e01efbd3d205ff89f497ff16c90383c66486cb4c..df86577633270daa313e2e9f4eb30a263ce08404 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -25,7 +25,7 @@
 #include "STD_MDIDesktop.h"
 #include "SalomeApp_Application.h"
 #include "SalomeApp_Study.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "OB_Browser.h"
 #include "QtxAction.h"
 
@@ -114,9 +114,9 @@ void SALOME_Selection::onSelMgrDestroyed()
 void SALOME_Selection::Clear()
 {
   class TEvent: public SALOME_Event {
-    SalomeApp_SelectionMgr* mySelMgr;
+    LightApp_SelectionMgr* mySelMgr;
   public:
-    TEvent( SalomeApp_SelectionMgr* selMgr ) 
+    TEvent( LightApp_SelectionMgr* selMgr ) 
       : mySelMgr( selMgr ) {}
     virtual void Execute() {
       if ( mySelMgr )
@@ -142,9 +142,9 @@ void SALOME_Selection::ClearIObjects()
 void SALOME_Selection::ClearFilters()
 {
   class TEvent: public SALOME_Event {
-    SalomeApp_SelectionMgr* mySelMgr;
+    LightApp_SelectionMgr* mySelMgr;
   public:
-    TEvent( SalomeApp_SelectionMgr* selMgr ) 
+    TEvent( LightApp_SelectionMgr* selMgr ) 
       : mySelMgr( selMgr ) {}
     virtual void Execute() {
       if ( mySelMgr )

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index f39dba9bfb2eebb4cdcc726f09f734697455f245..6d9feb87d7578282d7712277ef7ede65339844c5 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -14,7 +14,7 @@
 #include <qobject.h>
 #include <qcolor.h>
 
-class SalomeApp_SelectionMgr;
+class LightApp_SelectionMgr;
 class SalomeApp_Application;
 class QMenuBar;
 class QPopupMenu;
@@ -40,7 +40,7 @@ private slots:
   void onSelMgrDestroyed();
 
 private:
-  SalomeApp_SelectionMgr* mySelMgr;
+  LightApp_SelectionMgr* mySelMgr;
   SALOME_Selection( QObject* );
 };
 

diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
index 088c576ebfc6dee4abf061bb271e34fc2a6345ac..c4c2382c4b875f68734fd31042f3cc9758297edc 100644 (file)
--- a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
+++ b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
@@ -36,7 +36,7 @@
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Module.h"
 #include "SalomeApp_DataObject.h"
-#include "SalomeApp_SelectionMgr.h"
+#include "LightApp_SelectionMgr.h"
 #include "SALOME_Prs.h"
 #include "SOCC_ViewModel.h"
 #include "SVTK_ViewModel.h"
@@ -241,8 +241,8 @@ public:
   TSelectedCountEvent() : myResult( 0 ) {}
   virtual void Execute() {
     if ( SalomeApp_Application* anApp = getApplication() ) {
-      SalomeApp_Study*        aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
-      SalomeApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
+      SalomeApp_Study*       aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
+      LightApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
       if ( aStudy && aSelMgr ) {
        SALOME_ListIO anIOList;
        aSelMgr->selectedObjects( anIOList );
@@ -268,8 +268,8 @@ public:
   TGetSelectedEvent( int theIndex ) : myIndex( theIndex ) {}
   virtual void Execute() {
     if ( SalomeApp_Application* anApp = getApplication() ) {
-      SalomeApp_Study*        aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
-      SalomeApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
+      SalomeApp_Study*       aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
+      LightApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
       if ( aStudy && aSelMgr ) {
        SALOME_ListIO anIOList;
        aSelMgr->selectedObjects( anIOList );
@@ -305,8 +305,8 @@ void SALOMEGUI_Swig::AddIObject( const char* theEntry )
     TEvent( const char* theEntry ) : myEntry( theEntry ) {}
     virtual void Execute() {
       if ( SalomeApp_Application* anApp = getApplication() ) {
-       SalomeApp_Study*        aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
-       SalomeApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
+       SalomeApp_Study*       aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
+       LightApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
        if ( aStudy && aSelMgr ) {
          SALOME_ListIO anIOList;
          anIOList.Append( new SALOME_InteractiveObject( myEntry, "", "" ) );
@@ -329,11 +329,11 @@ void SALOMEGUI_Swig::RemoveIObject( const char* theEntry )
     TEvent( const char* theEntry ) : myEntry( theEntry ) {}
     virtual void Execute() {
       if ( SalomeApp_Application* anApp = getApplication() ) {
-       SalomeApp_Study*        aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
-       SalomeApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
+       SalomeApp_Study*       aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
+       LightApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
        if ( aStudy && aSelMgr ) {
          SALOME_ListIO anIOList;
-         // VSR: temporary solution, until SalomeApp_SelectionMgr::unsetSelectedObjects() method appears
+         // VSR: temporary solution, until LightApp_SelectionMgr::unsetSelectedObjects() method appears
          // Lately this should be replaced by the following:
          // anIOList.Append( new SALOME_InteractiveObject( myEntry, "", "" ) );
          // aSelMgr->unsetSelectedObjects( anIOList );
@@ -364,8 +364,8 @@ void SALOMEGUI_Swig::ClearIObjects()
     TEvent() {}
     virtual void Execute() {
       if ( SalomeApp_Application* anApp = getApplication() ) {
-       SalomeApp_Study*        aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
-       SalomeApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
+       SalomeApp_Study*       aStudy  = dynamic_cast<SalomeApp_Study*>( anApp->activeStudy() ); // for sure!
+       LightApp_SelectionMgr* aSelMgr = anApp->selectionMgr(); 
        if ( aStudy && aSelMgr )
          aSelMgr->clearSelected();
       }

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index 15a0583bc2274c41c469b6b045bfd4cdcdb30ba9..540f9bcc60db212324690899cf6c0fbc4d49b6cf 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/resources/SalomeApp.xml
@@ -16,7 +16,7 @@
     <parameter name="xterm"      value="no"/>
     <parameter name="portkill"   value="no"/>
     <parameter name="killall"    value="no"/>
-    <parameter name="modules"    value="GEOM,SMESH,VISU,SUPERV,MED,COMPONENT"/>
+    <parameter name="modules"    value="GEOM,LIGHT,SMESH,VISU,SUPERV,MED,COMPONENT"/>
     <parameter name="pyModules"  value=""/>
     <parameter name="embedded"   value="SalomeAppEngine,study"/>
     <parameter name="standalone" value="pyContainer,cppContainer,registry,moduleCatalog"/>
@@ -36,7 +36,9 @@
     <parameter name="SalomeApp"    value="${SUITRoot}/resources"/>
     <parameter name="OB"           value="${SUITRoot}/resources"/>
     <parameter name="CAM"          value="${SUITRoot}/resources"/>
+    <parameter name="LightApp"     value="${SUITRoot}/resources"/>
     <parameter name="GEOM"         value="${GEOM_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="LIGHT"        value="${LIGHT_ROOT_DIR}/share/salome/resources"/>
     <parameter name="SMESH"        value="${SMESH_ROOT_DIR}/share/salome/resources"/>
     <parameter name="VISU"         value="${VISU_ROOT_DIR}/share/salome/resources"/>
     <parameter name="SUPERV"       value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
@@ -51,6 +53,10 @@
     <parameter name="name"       value="Geometry"/>
     <parameter name="icon"       value="ModuleGeom.png"/>
   </section>
+  <section name="LIGHT">
+    <parameter name="name"       value="Light"/>
+    <parameter name="icon"       value="LIGHT.png"/>
+  </section>
   <section name="SMESH">
     <parameter name="name"       value="Mesh"/>
     <parameter name="icon"       value="ModuleMesh.png"/>
@@ -74,7 +80,7 @@
     <!-- Here go other common user preferences -->
   </section>
   <section name="ObjectBrowser" >
-    <parameter value="false" name="auto_size" />
+    <parameter value="true" name="auto_size" />
     <parameter value="true" name="visibility_column_0" />
     <parameter value="false" name="visibility_column_1" />
     <parameter value="false" name="visibility_column_2" />

diff --git a/src/SalomeApp/resources/SalomeApp_images.po b/src/SalomeApp/resources/SalomeApp_images.po
index 2a15df4638ca287a81556aa200fdc3e56514f77b..c085ad5122d7120051fed43edc937e57fdc16318 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_images.po
+++ b/src/SalomeApp/resources/SalomeApp_images.po
@@ -11,24 +11,6 @@ msgstr ""
 "Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 
-msgid "ABOUT"
-msgstr "icon_about.png"
-
-msgid "ABOUT_SPLASH"
-msgstr "icon_about.png"
-
-msgid "APP_DEFAULT_ICO"
-msgstr "icon_default.png"
-
-msgid "APP_MODULE_ICO"
-msgstr "icon_module.png"
-
-msgid "APP_MODULE_BIG_ICO"
-msgstr "icon_module_big.png"
-
 msgid "ICON_SELECT"
 msgstr "icon_select.png"
 
-msgid "APP_BASE_LOGO"
-msgstr "icon_applogo.png"
-

diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.po b/src/SalomeApp/resources/SalomeApp_msg_en.po
index ad917a2ce6d4b4aed94f896b467e46f937abd0c7..907f8f73f75818a17f4c7bd8c156c6de7a20a56d 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_msg_en.po
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.po
@@ -47,30 +47,9 @@ msgstr "GNU LGPL"
 
 //=======================================================================================
 
-msgid "SalomeApp_Application::OBJECT_BROWSER"
-msgstr "Object Browser"
-
 msgid "SalomeApp_Application::PYTHON_CONSOLE"
 msgstr "Python Console"
 
-msgid "SalomeApp_Application::LOG_WINDOW"
-msgstr "Message Window"
-
-msgid "SalomeApp_Application::DATA_MODELS"
-msgstr "Data models"
-
-msgid "SalomeApp_Application::NEW_WINDOW_0"
-msgstr "GL view"
-
-msgid "SalomeApp_Application::NEW_WINDOW_1"
-msgstr "Plot2d view"
-
-msgid "SalomeApp_Application::NEW_WINDOW_2"
-msgstr "OCC view"
-
-msgid "SalomeApp_Application::NEW_WINDOW_3"
-msgstr "VTK view"
-
 msgid "SalomeApp_Application::TOT_DESK_FILE_DUMP_STUDY"
 msgstr "Dump study"
 
@@ -92,12 +71,6 @@ msgstr "Loads python script from file"
 msgid "SalomeApp_Application::TOT_FILE_DESK_PREFERENCES"
 msgstr "Preferences"
 
-msgid "SalomeApp_Application::MEN_DESK_PREFERENCES"
-msgstr "Preferences..."
-
-msgid "SalomeApp_Application::PRP_DESK_PREFERENCES"
-msgstr "Allow to change the preferences"
-
 msgid "SalomeApp_Application::MEN_DESK_TOOLS"
 msgstr "Tools"
 
@@ -134,11 +107,14 @@ msgstr "Properties..."
 msgid "SalomeApp_Application::PRP_DESK_PROPERTIES"
 msgstr "Edits study properties"
 
-msgid "SalomeApp_Application::MEN_REFRESH"
-msgstr "Refresh"
+msgid "SalomeApp_Application::PREF_CATEGORY_SALOME"
+msgstr "SALOME"
+
+msgid "SalomeApp_Application::PREF_TAB_OBJBROWSER"
+msgstr "Object browser"
 
 msgid "SalomeApp_Application::MEN_OPENWITH"
-msgstr "Activate Module"
+msgstr "Activate module"
 
 msgid "SalomeApp_Application::MEN_DELETE_REFERENCE"
 msgstr "Delete Reference"
@@ -151,44 +127,8 @@ msgstr "New window"
 msgid "SalomeApp_Application::MEN_VIEW_WNDS"
 msgstr "Windows"
 
-msgid "SalomeApp_Application::PRP_MODULE"
-msgstr "Switch to the module \"%1\""
-
-msgid "SalomeApp_Application::PRP_APP_MODULE"
-msgstr "Switch to SALOME platform neutral point"
-
-msgid "SalomeApp_Application::INF_TOOLBAR_MODULES"
-msgstr "Modules"
-
-msgid "SalomeApp_Application::INF_CANCELLED"
-msgstr "Module activation cancelled"
-
 //=======================================================================================
 
-msgid "SalomeApp_Application::PREFERENCES_NOT_LOADED"
-msgstr "Preferences for module \"<b>%1</b>\" will be available when the module will be loaded"
-
-msgid "SalomeApp_Application::PREF_FONT"
-msgstr "Font"
-
-msgid "SalomeApp_Application::PREF_CATEGORY_SALOME"
-msgstr "SALOME"
-
-msgid "SalomeApp_Application::PREF_TAB_GENERAL"
-msgstr "General"
-
-msgid "SalomeApp_Application::PREF_TAB_OBJBROWSER"
-msgstr "Object browser"
-
-msgid "SalomeApp_Application::PREF_GROUP_EXT_BROWSER"
-msgstr "External browser"
-
-msgid "SalomeApp_Application::PREF_APP"
-msgstr "Application"
-
-msgid "SalomeApp_Application::PREF_PARAM"
-msgstr "Parameters"
-
 msgid "SalomeApp_Application::PREF_GROUP_DEF_COLUMNS"
 msgstr "Default columns"
 
@@ -198,99 +138,6 @@ msgstr "Settings"
 msgid "SalomeApp_Application::PREF_AUTO_SIZE"
 msgstr "Auto size columns"
 
-msgid "SalomeApp_Application::PREF_GROUP_STUDY"
-msgstr "Study properties"
-
-msgid "SalomeApp_Application::PREF_GROUP_PY_CONSOLE"
-msgstr "Python console properties"
-
-msgid "SalomeApp_Application::PREF_TAB_VIEWERS"
-msgstr "Viewers"
-
-msgid "SalomeApp_Application::PREF_GROUP_OCCVIEWER"
-msgstr "OCC Viewer 3d"
-
-msgid "SalomeApp_Application::PREF_MULTI_FILE"
-msgstr "Multi file save"
-
-msgid "SalomeApp_Application::PREF_ASCII_FILE"
-msgstr "ASCII save"
-
-msgid "SalomeApp_Application::PREF_UNDO_LEVEL"
-msgstr "Undo level"
-
-msgid "SalomeApp_Application::PREF_GROUP_VTKVIEWER"
-msgstr "VTK Viewer 3d"
-
-msgid "SalomeApp_Application::PREF_VIEWER_BACKGROUND"
-msgstr "Background color"
-
-msgid "SalomeApp_Application::PREF_TRIHEDRON_SIZE"
-msgstr "Trihedron size"
-
-msgid "SalomeApp_Application::PREF_ISOS_U"
-msgstr "Number of isolines along U"
-
-msgid "SalomeApp_Application::PREF_ISOS_V"
-msgstr "Number of isolines along V"
-
-msgid "SalomeApp_Application::PREF_TRIHEDRON_SHOW"
-msgstr "Show trihedron"
-
-msgid "SalomeApp_Application::PREF_GROUP_PLOT2DVIEWER"
-msgstr "Plot2d Viewer"
-
-msgid "SalomeApp_Application::PREF_SHOW_LEGEND"
-msgstr "Show legend"
-
-msgid "SalomeApp_Application::PREF_LEGEND_POSITION"
-msgstr "Legend position:"
-
-msgid "SalomeApp_Application::PREF_LEFT"
-msgstr "Left"
-
-msgid "SalomeApp_Application::PREF_RIGHT"
-msgstr "Right"
-
-msgid "SalomeApp_Application::PREF_TOP"
-msgstr "Top"
-
-msgid "SalomeApp_Application::PREF_BOTTOM"
-msgstr "Bottom"
-
-msgid "SalomeApp_Application::PREF_CURVE_TYPE"
-msgstr "Curve type:"
-
-msgid "SalomeApp_Application::PREF_POINTS"
-msgstr "Points"
-
-msgid "SalomeApp_Application::PREF_LINES"
-msgstr "Lines"
-
-msgid "SalomeApp_Application::PREF_SPLINE"
-msgstr "Spline"
-
-msgid "SalomeApp_Application::PREF_MARKER_SIZE"
-msgstr "Marker size:"
-
-msgid "SalomeApp_Application::PREF_LINEAR"
-msgstr "Linear"
-
-msgid "SalomeApp_Application::PREF_LOGARITHMIC"
-msgstr "Logarithmic"
-
-msgid "SalomeApp_Application::PREF_HOR_AXIS_SCALE"
-msgstr "Horizontal axis scale:"
-
-msgid "SalomeApp_Application::PREF_VERT_AXIS_SCALE"
-msgstr "Vertical axis scale:"
-
-msgid "SalomeApp_Application::PREF_TAB_DIRECTORIES"
-msgstr "Directories"
-
-msgid "SalomeApp_Application::PREF_GROUP_DIRECTORIES"
-msgstr "Quick directory list"
-
 //=======================================================================================
 
 msgid "SalomeApp_Application::OBJ_BROWSER_NAME"
@@ -319,31 +166,6 @@ msgstr "LOCKED"
 
 //=======================================================================================
 
-msgid "SalomeApp_ModuleDlg::CAPTION"
-msgstr "Activate module"
-
-msgid "SalomeApp_ModuleDlg::NEW"
-msgstr "&New"
-
-msgid "SalomeApp_ModuleDlg::OPEN"
-msgstr "&Open"
-
-msgid "SalomeApp_ModuleDlg::LOAD"
-msgstr "&Load"
-
-msgid "SalomeApp_ModuleDlg::CANCEL"
-msgstr "&Cancel"
-
-msgid "SalomeApp_ModuleDlg::ActivateComponent_DESCRIPTION"
-msgstr "Create, open or load study."
-
-//=======================================================================================
-
-msgid "SalomeApp_PreferencesDlg::CAPTION"
-msgstr "Preferences"
-
-//=======================================================================================
-
 msgid "SalomeApp_StudyPropertiesDlg::PRP_MODE_FROM_SCRATCH"
 msgstr "from scratch"
 
@@ -382,6 +204,3 @@ msgstr "No"
 msgid "SalomeApp_Application::PUBLISH_IN_STUDY"
 msgstr "Publish in study"
 
-msgid "SalomeApp_Application::ACTIVATING_MODULE"
-msgstr "Trying to activate module \"%1\""
-