diff -r dac33c7fce07 -r e3642a6a1e71 eric7/Plugins/PluginEricdoc.py --- a/eric7/Plugins/PluginEricdoc.py Sat May 15 19:01:16 2021 +0200 +++ b/eric7/Plugins/PluginEricdoc.py Sat May 15 20:08:03 2021 +0200 @@ -19,7 +19,7 @@ import Utilities import UI.Info -from eric6config import getConfig +from eric7config import getConfig # Start-Of-Header name = "Ericdoc Plugin" @@ -50,8 +50,8 @@ """ dataList = [] - # 1. eric6_doc - exe = 'eric6_doc' + # 1. eric7_doc + exe = 'eric7_doc' if Utilities.isWindowsPlatform(): exe = os.path.join(getConfig("bindir"), exe + '.cmd') if not os.path.exists(exe): @@ -64,7 +64,7 @@ "EricdocPlugin", "eric Documentation Generator"), "exe": exe, "versionCommand": '--version', - "versionStartsWith": 'eric6_', + "versionStartsWith": 'eric7_', "versionPosition": -3, "version": "", "versionCleanup": None, @@ -121,14 +121,14 @@ menu = e5App().getObject("Project").getMenu("Apidoc") if menu: self.__projectAct = E5Action( - self.tr('Generate documentation (eric6_doc)'), - self.tr('Generate &documentation (eric6_doc)'), 0, 0, - self, 'doc_eric6_doc') + self.tr('Generate documentation (eric7_doc)'), + self.tr('Generate &documentation (eric7_doc)'), 0, 0, + self, 'doc_eric7_doc') self.__projectAct.setStatusTip( - self.tr('Generate API documentation using eric6_doc')) + self.tr('Generate API documentation using eric7_doc')) self.__projectAct.setWhatsThis(self.tr( """<b>Generate documentation</b>""" - """<p>Generate API documentation using eric6_doc.</p>""" + """<p>Generate API documentation using eric7_doc.</p>""" )) self.__projectAct.triggered.connect(self.__doEricdoc) e5App().getObject("Project").addE5Actions([self.__projectAct]) @@ -166,7 +166,7 @@ def __doEricdoc(self): """ - Private slot to perform the eric6_doc api documentation generation. + Private slot to perform the eric7_doc api documentation generation. """ from DocumentationPlugins.Ericdoc.EricdocConfigDialog import ( EricdocConfigDialog @@ -199,7 +199,7 @@ outdir = Utilities.toNativeSeparators(parms['outputDirectory']) if outdir == '': - outdir = 'doc' # that is eric6_docs default output dir + outdir = 'doc' # that is eric7_docs default output dir # add it to the project data, if it isn't in already outdir = project.getRelativePath(outdir) @@ -213,7 +213,7 @@ parms['qtHelpOutputDirectory']) if outdir == '': outdir = 'help' - # that is eric6_docs default QtHelp output dir + # that is eric7_docs default QtHelp output dir # add it to the project data, if it isn't in already outdir = project.getRelativePath(outdir)