It make undo for last temporarily integration.

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index b39be0c843da2b5b2fb3b2e66ebe8f3d49b1efc7..35b80fc3943a1123496b56f71fbd27b0cab91e88 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -28,12 +28,6 @@
 #include <SUIT_ViewManager.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <TableViewer_ViewModel.h>
-#include <TableViewer_ViewManager.h>
-
-#include <VTKViewer_ViewModel.h>
-#include <VTKViewer_ViewManager.h>
-
 #include <QtxDockAction.h>
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
@@ -58,8 +52,6 @@ STD_Application::STD_Application()
   myEditEnabled( true )
 {
   setDesktop( new STD_MDIDesktop() );
-  myTableMgr = 0;
-  myVTKMgr = 0;
 }
 
 /*!Destructor.*/
@@ -193,16 +185,6 @@ void STD_Application::createActions()
                 tr( "MEN_DESK_EDIT_PASTE" ), tr( "PRP_DESK_EDIT_PASTE" ),
                 Qt::CTRL+Qt::Key_V, desk, false, this, SLOT( onPaste() ) );
 
-  createAction( TableViewId, tr( "Table view" ),
-                resMgr->loadPixmap( "STD", tr( "ICON_EDIT_COPY" ) ),
-                tr( "Table view" ), tr( "Table view" ),
-                Qt::CTRL+Qt::Key_T, desk, false, this, SLOT( onTableView() ) );
-
-  createAction( VTKViewId, tr( "VTK view" ),
-                resMgr->loadPixmap( "STD", tr( "ICON_EDIT_COPY" ) ),
-                tr( "VTK view" ), tr( "VTK view" ),
-                Qt::CTRL+Qt::Key_V, desk, false, this, SLOT( onVTKView() ) );
-
   QAction* a = createAction( ViewStatusBarId, tr( "TOT_DESK_VIEW_STATUSBAR" ),
                              QIcon(), tr( "MEN_DESK_VIEW_STATUSBAR" ),
                              tr( "PRP_DESK_VIEW_STATUSBAR" ), Qt::SHIFT+Qt::Key_S, desk, true );
@@ -247,8 +229,6 @@ void STD_Application::createActions()
 
   createMenu( EditCopyId,  editMenu );
   createMenu( EditPasteId, editMenu );
-  createMenu( TableViewId, editMenu );
-  createMenu( VTKViewId, editMenu );
   createMenu( separator(), editMenu );
 
   createMenu( ViewToolBarsId,  viewMenu, 0 );
@@ -273,8 +253,6 @@ void STD_Application::createActions()
   createTool( separator(), stdTBar );
   createTool( EditCopyId, stdTBar );
   createTool( EditPasteId, stdTBar );
-  createTool( TableViewId, stdTBar );
-  createTool( VTKViewId, stdTBar );
 }
 
 /*!Opens new application*/
@@ -598,28 +576,6 @@ void STD_Application::onPaste()
 {
 }
 
-void STD_Application::onTableView()
-{
-  if  ( !myTableMgr ) {
-    if ( !activeStudy() )
-      createEmptyStudy();
-    myTableMgr = new TableViewer_ViewManager( activeStudy(), desktop() );
-    TableViewer_Viewer* vm = new TableViewer_Viewer();
-    myTableMgr->setViewModel( vm );
-  }
-  myTableMgr->createView();
-}
-
-void STD_Application::onVTKView()
-{
-  if  ( !myVTKMgr ) {
-    if ( !activeStudy() )
-      createEmptyStudy();
-    myVTKMgr = new VTKViewer_ViewManager( activeStudy(), desktop() );
-  }
-  myVTKMgr->createView();
-}
-
 /*!Sets \a theEnable for menu manager and for tool manager.*/
 void STD_Application::setEditEnabled( bool theEnable )
 {

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 614ffc39f2d4b5d7e026841008866970ba4f9ff9..3ff6d57bc2cce125a937d638601dcf51a6ef5a13 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -37,8 +37,6 @@ class SUIT_ToolWindow;
 class SUIT_Desktop;
 class SUIT_ViewManager;
 class SUIT_PopupClient;
-class TableViewer_ViewManager;
-class VTKViewer_ViewManager;
 
 typedef QList<SUIT_ViewManager*> ViewManagerList;
 
@@ -53,8 +51,7 @@ class STD_EXPORT STD_Application : public SUIT_Application
 public:
   enum { FileNewId, FileOpenId, FileCloseId, FileSaveId, FileSaveAsId, FileExitId,
               ViewWindowsId, ViewToolBarsId, ViewStatusBarId, NewWindowId,
-         EditCutId, EditCopyId, EditPasteId, HelpAboutId,
-         TableViewId, VTKViewId, UserID };
+         EditCutId, EditCopyId, EditPasteId, HelpAboutId, UserID };
 
   enum { CloseSave, CloseDiscard, CloseCancel };
 
@@ -124,8 +121,6 @@ public slots:
 
   virtual void          onCopy();
   virtual void          onPaste();
-  virtual void          onTableView();
-  virtual void          onVTKView();
 
   virtual void          onViewStatusBar( bool );
 
@@ -173,8 +168,6 @@ private:
 private:
   bool                  myExitConfirm;
   bool                  myEditEnabled;
-  TableViewer_ViewManager* myTableMgr;
-  VTKViewer_ViewManager*   myVTKMgr;
 };
 
 #if defined WIN32

diff --git a/src/STD/resources/STD.xml b/src/STD/resources/STD.xml
index 9674f0247f96c2799c3eada36b336f976e69f968..098792222a2c1dcb1615a61fa8ba5622b7e1c916 100644 (file)
--- a/src/STD/resources/STD.xml
+++ b/src/STD/resources/STD.xml
@@ -15,7 +15,7 @@
   </section>
   <section name="splash" >
     <!-- Splash screen settings -->
-    <parameter name="image"             value="${GUI_ROOT_DIR}/share/salome/resources/gui/icon_about.png" />
+    <parameter name="image"             value="" />
     <parameter name="constant_info"     value="%A [ %V ]" />
     <parameter name="text_colors"       value="#5A81BF|#20408F" />
     <parameter name="hide_on_click"     value="no" />
@@ -30,12 +30,12 @@
   </section>
   <section name="resources">
     <!-- Resource directories (resource manager)-->
-    <parameter name="SUIT"         value="${GUI_ROOT_DIR}/resources"/>
-    <parameter name="STD"          value="${GUI_ROOT_DIR}/resources"/>
-    <parameter name="Plot2d"       value="${GUI_ROOT_DIR}/resources"/>
-    <parameter name="TableViewer"  value="${GUI_ROOT_DIR}/resources"/>
-    <parameter name="VTKViewer"    value="${GUI_ROOT_DIR}/resources"/>
-    <parameter name="OB"           value="${GUI_ROOT_DIR}/resources"/>
+    <parameter name="SUIT"         value="${SUIT_DIR}/resources"/>
+    <parameter name="STD"          value="${SUIT_DIR}/resources"/>
+    <parameter name="Plot2d"       value="${SUIT_DIR}/resources"/>
+    <parameter name="TableViewer"  value="${SUIT_DIR}/resources"/>
+    <parameter name="VTKViewer"    value="${SUIT_DIR}/resources"/>
+    <parameter name="OB"           value="${SUIT_DIR}/resources"/>
   </section>
   <section name="desktop" >
     <!-- Default GUI desktop state, position, size -->

diff --git a/src/STD/resources/STD_msg_en.ts b/src/STD/resources/STD_msg_en.ts
index 83316ceae5bd530b2f19ff24bce4f0485ab9cee0..a1de799cd737a062c6321a32a13a6b8cffdbb895 100644 (file)
--- a/src/STD/resources/STD_msg_en.ts
+++ b/src/STD/resources/STD_msg_en.ts
@@ -160,6 +160,10 @@ Directory with this name exist on disc. Try to use another name</translation>
         <source>TOT_DESK_EDIT_PASTE</source>
         <translation>Paste</translation>
     </message>
+    <message>
+        <source>MEN_DOCKWINDOWS</source>
+        <translation>W&amp;indows</translation>
+    </message>
     <message>
         <source>BUT_YES</source>
         <translation>&amp;Yes</translation>
@@ -238,7 +242,7 @@ Do you want to reload it ?</translation>
         <translation>About...</translation>
     </message>
     <message>
-        <source>MEN_DESK_VIEW_TOOLBARS</source>
+        <source>MEN_TOOLBARS</source>
         <translation>T&amp;oolbars</translation>
     </message>
     <message>