BUG: MGCleaner / MGSurfOpt : Fixed a problem with the doc displayed in a non-standard way when clickin on help button.

A pdf file included in the general plugin documentation was opened through xdg-open instead of showing the general documentation in the browser specified in the preferences. This latest behaviour has been implemented
This commit is contained in:
rnc 2013-12-03 16:40:54 +00:00
parent de12df7b90
commit f543238c60
2 changed files with 19 additions and 7 deletions

View File

@ -129,14 +129,20 @@ class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):
self.connect(self.CB_ComputedOverlapDistance,SIGNAL("stateChanged(int)"),self.SP_OverlapDistance.setDisabled)
def PBHelpPressed(self):
import SalomePyQt
sgPyQt = SalomePyQt.SalomePyQt()
try:
mydir=os.environ["SMESH_ROOT_DIR"]
except Exception:
QMessageBox.warning( self, "Help", "Help unavailable $SMESH_ROOT_DIR not found")
return
maDoc=mydir+"/share/doc/salome/gui/SMESH/MGCleaner/_downloads/mg-cleaner_user_manual.pdf"
command="xdg-open "+maDoc+";"
subprocess.call(command, shell=True)
maDoc=mydir+"/share/doc/salome/gui/SMESH/MGCleaner/index.html"
sgPyQt.helpContext(maDoc,"")
#maDoc=mydir+"/share/doc/salome/gui/SMESH/MGCleaner/_downloads/mg-cleaner_user_manual.pdf"
#command="xdg-open "+maDoc+";"
#subprocess.call(command, shell=True)
def PBOKPressed(self):
if not(self.PrepareLigneCommande()):

View File

@ -102,14 +102,20 @@ class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
self.connect(self.LE_ParamsFile,SIGNAL("returnPressed()"),self.paramsFileNameChanged)
def PBHelpPressed(self):
import SalomePyQt
sgPyQt = SalomePyQt.SalomePyQt()
try :
mydir=os.environ["SMESH_ROOT_DIR"]
except Exception:
QMessageBox.warning(self, "Help", "Help unavailable $SMESH_ROOT_DIR not found")
return
maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/_downloads/mg-surfopt_user_manual.pdf"
command="xdg-open "+maDoc+";"
subprocess.call(command, shell=True)
maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/index.html"
sgPyQt.helpContext(maDoc,"")
#maDoc=mydir+"/share/doc/salome/gui/SMESH/yams/_downloads/mg-surfopt_user_manual.pdf"
#command="xdg-open "+maDoc+";"
#subprocess.call(command, shell=True)
def PBOKPressed(self):
if not(self.PrepareLigneCommande()):
@ -518,7 +524,7 @@ __dialog=None
def getDialog():
"""
This function returns a singleton instance of the plugin dialog.
It is mandatory in order to call show witout a parent ...
It is mandatory in order to call show without a parent ...
"""
global __dialog
if __dialog is None: