Corrections for

1) the server connection saving,
2) adding the native paraview user documentation in the Help menu.

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 0a558e42b785ed81f6981762b7c32d80a078fd78..ddec75c91a8203e7e8a08a314cff6b7471a21da8 100644 (file)
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -373,11 +373,12 @@ bool PVGUI_Module::pvInit()
 }
  
 /*!
-  \brief Static method, cleans up ParaView session at application exit. Not yet implemented.
+  \brief Static method, cleans up ParaView session at application exit.
 */
 void PVGUI_Module::pvShutdown()
 {
-  // TODO...
+  if ( pqImplementation::myPVHelper )
+    pqImplementation::myPVHelper->finalize();
 }  
 
 /*!
@@ -549,6 +550,14 @@ void PVGUI_Module::onHelpAbout()
   dialog->show();
 }
 
+/*!
+  \brief Slot to show native ParaView user documentation.
+*/
+void PVGUI_Module::onParaViewHelp()
+{
+  showHelpForProxy("index");
+}
+
 /*!
   \brief Slot to show help for proxy.
 */
@@ -810,6 +819,21 @@ bool PVGUI_Module::deactivateModule( SUIT_Study* study )
   return LightApp_Module::deactivateModule( study );
 }
 
+/*!
+  \brief Called when application is closed.
+
+  Process finalize application functionality from ParaView in order to save server settings
+  and nullify application pointer if the application is being closed.
+
+  \param theApp application
+*/
+void PVGUI_Module::onApplicationClosed( SUIT_Application* theApp )
+{
+  pvShutdown();
+  
+  CAM_Module::onApplicationClosed(theApp);
+}
+
 /*!
   \brief Compares the contents of the window with the given reference image,
   returns true if they "match" within some tolerance.

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index f680268409d65844f068d28dd9d11c07734e4776..0945423721b0cb8fc78c3b6f91e64d089507632c 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -218,6 +218,8 @@ private slots:
   
   void onHelpAbout();
 
+  void onParaViewHelp();
+
   void showHelpForProxy( const QString& proxy );
   void makeAssistant();
   void assistantError( const QString& err );
@@ -229,6 +231,7 @@ private slots:
 public slots:
   virtual bool           activateModule( SUIT_Study* );
   virtual bool           deactivateModule( SUIT_Study* );
+  virtual void           onApplicationClosed( SUIT_Application* );
 
 private:
   class pqImplementation;

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index c2469df2a8084af780c402d8598771111d68c002..38d55b4ffac375bde83c40deaf72d735f6113966 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -525,8 +525,11 @@ void PVGUI_Module::pvCreateActions()
                tr( "MEN_ABOUT" ), tr( "STB_ABOUT" ),
                0, desk, false, this, SLOT( onHelpAbout() ) );
 
-  // ParaView Help
-  // TODO...
+  // Native ParaView user documentation
+  aPixmap = resMgr->loadPixmap( "ParaView", tr("ICON_PARAVIEW_HELP"), false );
+  createAction( ParaViewHelpId, tr( "TOP_PARAVIEW_HELP" ), QIcon(aPixmap),
+               tr( "MEN_PARAVIEW_HELP" ), tr( "STB_PARAVIEW_HELP" ),
+               0, desk, false, this, SLOT( onParaViewHelp() ) );
 
   // Enable Tooltips
   aQtxAction = new QtxAction( tr("TOP_ENABLE_TOOLTIPS"), QIcon(), 
@@ -690,11 +693,9 @@ void PVGUI_Module::pvCreateMenus()
   int aHelpMnu = createMenu( tr( "MEN_DESK_HELP" ), -1, -1 );
 
   createMenu( AboutParaViewId, aHelpMnu );
-  // ParaView Help
-  // It's needed to install module docs into <module>_ROOT_DIR/share/doc/salome/gui/<module>
-  // createMenu( ParaViewHelpId, aHelpMnu );
-  createMenu( EnableTooltipsId, aHelpMnu );
+  createMenu( ParaViewHelpId, aHelpMnu );
   createMenu( separator(), aHelpMnu );
+  createMenu( EnableTooltipsId, aHelpMnu );
 
 }
 
@@ -719,8 +720,8 @@ void PVGUI_Module::pvCreateToolBars()
   createTool( separator(), aToolId );
   createTool( ConnectId, aToolId );
   createTool( DisconnectId, aToolId );
-  //createTool( separator(), aToolId );
-  //createTool( ParaViewHelpId, aToolId );
+  createTool( separator(), aToolId );
+  createTool( ParaViewHelpId, aToolId );
 
   // --- Toolbar "Selection Controls"
 

diff --git a/src/PVGUI/PVGUI_ProcessModuleHelper.cxx b/src/PVGUI/PVGUI_ProcessModuleHelper.cxx
index 642c46acfed130222723bbf5ae53dfa062a65872..deb210cf29efff70087b5eadf84a269f822bb568 100644 (file)
--- a/src/PVGUI/PVGUI_ProcessModuleHelper.cxx
+++ b/src/PVGUI/PVGUI_ProcessModuleHelper.cxx
@@ -89,6 +89,15 @@ void PVGUI_ProcessModuleHelper::hideWindow()
 {
 }
 
+//-----------------------------------------------------------------------------
+/*! 
+  \brief Finalize application in order to save server settings.
+*/
+void PVGUI_ProcessModuleHelper::finalize()
+{
+  this->FinalizeApplication();
+}
+
 //-----------------------------------------------------------------------------
 /*! 
   \brief Calls the base implementation and redirects ParaView output to PVGUI_OutputWindowAdapter instance.

diff --git a/src/PVGUI/PVGUI_ProcessModuleHelper.h b/src/PVGUI/PVGUI_ProcessModuleHelper.h
index 87bc3aca49e352550f969e7d03ad77a5564b0b71..b59089a24fd89a43ba721f054dbed842dbd11709 100644 (file)
--- a/src/PVGUI/PVGUI_ProcessModuleHelper.h
+++ b/src/PVGUI/PVGUI_ProcessModuleHelper.h
@@ -50,6 +50,8 @@ public:
   virtual void showWindow();
   virtual void hideWindow();
 
+  void finalize();
+
 protected:
   virtual int InitializeApplication(int argc, char** argv);
 

diff --git a/src/PVGUI/resources/PARAVIS_images.ts b/src/PVGUI/resources/PARAVIS_images.ts
index 5609995b86695a2034900d6f00406157fb5019ea..ad8b3c3f35168f25ea68ba1d98c51f3fe1d1bdcf 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_images.ts
+++ b/src/PVGUI/resources/PARAVIS_images.ts
@@ -149,6 +149,10 @@
         <source>ICON_LOOP</source>
         <translation>pqVcrLoop24.png</translation>
     </message>
+    <message>
+        <source>ICON_PARAVIEW_HELP</source>
+        <translation>pqHelp24.png</translation>
+    </message>
     
 </context>
 </TS>

diff --git a/src/PVGUI/resources/PARAVIS_msg_en.ts b/src/PVGUI/resources/PARAVIS_msg_en.ts
index 530fa16c123ba08098a26aeeb810e51e29bde679..7b2559f5921df91fcdd21dd3ad7ac307286f9a86 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_en.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_en.ts
@@ -1013,15 +1013,15 @@
     </message>
     <message>
         <source>TOP_PARAVIEW_HELP</source>
-        <translation>ParaView Help</translation>
+        <translation>ParaView User Documentation</translation>
     </message>
     <message>
         <source>MEN_PARAVIEW_HELP</source>
-        <translation>ParaView Help</translation>
+        <translation>ParaView User Documentation</translation>
     </message>
     <message>
         <source>STB_PARAVIEW_HELP</source>
-        <translation>ParaView Help</translation>
+        <translation>ParaView User Documentation reference</translation>
     </message>
     <message>
         <source>TOP_ENABLE_TOOLTIPS</source>