Thu, 22 Jul 2010 19:55:52 +0200
Merged remote changes.
--- a/Plugins/PluginEricapi.py Thu Jul 22 19:54:31 2010 +0200 +++ b/Plugins/PluginEricapi.py Thu Jul 22 19:55:52 2010 +0200 @@ -21,6 +21,8 @@ import Utilities +from eric5config import getConfig + # Start-Of-Header name = "Ericapi Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -46,7 +48,7 @@ """ exe = 'eric5-api' if Utilities.isWindowsPlatform(): - exe += '.bat' + exe = os.path.join(getConfig("bindir"), exe +'.bat') data = { "programEntry" : True,
--- a/Plugins/PluginEricdoc.py Thu Jul 22 19:54:31 2010 +0200 +++ b/Plugins/PluginEricdoc.py Thu Jul 22 19:55:52 2010 +0200 @@ -7,6 +7,8 @@ Module implementing the Ericdoc plugin. """ +import os + from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QApplication @@ -19,6 +21,8 @@ import Utilities +from eric5config import getConfig + # Start-Of-Header name = "Ericdoc Plugin" author = "Detlev Offenbach <detlev@die-offenbachs.de>" @@ -45,7 +49,7 @@ """ exe = 'eric5-doc' if Utilities.isWindowsPlatform(): - exe += '.bat' + exe = os.path.join(getConfig("bindir"), exe +'.bat') data = { "programEntry" : True,
--- a/Preferences/ProgramsDialog.py Thu Jul 22 19:54:31 2010 +0200 +++ b/Preferences/ProgramsDialog.py Thu Jul 22 19:55:52 2010 +0200 @@ -21,6 +21,8 @@ import Preferences import Utilities +from eric5config import getConfig + class ProgramsDialog(QDialog, Ui_ProgramsDialog): """ Class implementing the Programs page. @@ -137,11 +139,15 @@ # 5. do the Eric5 programs # 5a. Translation Previewer self.__createProgramEntry(self.trUtf8("Eric5 Translation Previewer"), - Utilities.isWindowsPlatform() and "eric5-trpreviewer.bat" or "eric5-trpreviewer", + Utilities.isWindowsPlatform() and \ + os.path.join(getConfig("bindir"), "eric5-trpreviewer.bat") or \ + "eric5-trpreviewer", '--version', 'Eric5', -3) # 5b. Forms Previewer self.__createProgramEntry(self.trUtf8("Eric5 Forms Previewer"), - Utilities.isWindowsPlatform() and "eric5-uipreviewer.bat" or "eric5-uipreviewer", + Utilities.isWindowsPlatform() and \ + os.path.join(getConfig("bindir"), "eric5-uipreviewer.bat") or \ + "eric5-uipreviewer", '--version', 'Eric5', -3) # 6. do the CORBA programs