--- a/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py Wed Jul 13 14:55:47 2022 +0200 @@ -24,10 +24,11 @@ """ Class implementing a dialog for adding GreaseMonkey scripts.. """ + def __init__(self, manager, script, parent=None): """ Constructor - + @param manager reference to the GreaseMonkey manager (GreaseMonkeyManager) @param script GreaseMonkey script to be added (GreaseMonkeyScript) @@ -35,72 +36,77 @@ """ super().__init__(parent) self.setupUi(self) - - self.iconLabel.setPixmap( - UI.PixmapCache.getPixmap("greaseMonkey48")) - + + self.iconLabel.setPixmap(UI.PixmapCache.getPixmap("greaseMonkey48")) + self.__manager = manager self.__script = script - + runsAt = "" doesNotRunAt = "" - + include = script.include() exclude = script.exclude() - + if include: runsAt = self.tr("<p>runs at:<br/><i>{0}</i></p>").format( - "<br/>".join(include)) - + "<br/>".join(include) + ) + if exclude: - doesNotRunAt = self.tr( - "<p>does not run at:<br/><i>{0}</i></p>").format( - "<br/>".join(exclude)) - + doesNotRunAt = self.tr("<p>does not run at:<br/><i>{0}</i></p>").format( + "<br/>".join(exclude) + ) + scriptInfoTxt = "<p><b>{0}</b> {1}<br/>{2}</p>{3}{4}".format( - script.name(), script.version(), script.description(), runsAt, - doesNotRunAt) + script.name(), script.version(), script.description(), runsAt, doesNotRunAt + ) self.scriptInfo.setHtml(scriptInfoTxt) - + self.accepted.connect(self.__accepted) - + @pyqtSlot() def on_showScriptSourceButton_clicked(self): """ Private slot to show an editor window with the source code. """ from WebBrowser.Tools import WebBrowserTools - + tmpFileName = WebBrowserTools.ensureUniqueFilename( - os.path.join(QDir.tempPath(), "tmp-userscript.js")) + os.path.join(QDir.tempPath(), "tmp-userscript.js") + ) if shutil.copy(self.__script.fileName(), tmpFileName): from QScintilla.MiniEditor import MiniEditor + editor = MiniEditor(tmpFileName, "JavaScript", self) editor.show() - + def __accepted(self): """ Private slot handling the accepted signal. """ if self.__manager.addScript(self.__script): - msg = self.tr( - "<p><b>{0}</b> installed successfully.</p>").format( - self.__script.name()) + msg = self.tr("<p><b>{0}</b> installed successfully.</p>").format( + self.__script.name() + ) success = True else: msg = self.tr("<p>Cannot install script.</p>") success = False - + from WebBrowser.WebBrowserWindow import WebBrowserWindow + if success: WebBrowserWindow.showNotification( UI.PixmapCache.getPixmap("greaseMonkey48"), self.tr("GreaseMonkey Script Installation"), - msg) + msg, + ) else: WebBrowserWindow.showNotification( UI.PixmapCache.getPixmap("greaseMonkey48"), self.tr("GreaseMonkey Script Installation"), msg, kind=NotificationTypes.CRITICAL, - timeout=0) + timeout=0, + )