--- a/QScintilla/Editor.py Fri Oct 18 23:00:41 2013 +0200 +++ b/QScintilla/Editor.py Fri Nov 01 15:48:48 2013 +0100 @@ -319,7 +319,8 @@ if self.fileName is not None: if (QFileInfo(self.fileName).size() // 1024) > \ Preferences.getEditor("WarnFilesize"): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Open File"), self.trUtf8("""<p>The size of the file <b>{0}</b>""" """ is <b>{1} KB</b>.""" @@ -624,89 +625,89 @@ self.encodingsMenu = self.__initContextMenuEncodings() self.__menus["Encodings"] = self.encodingsMenu - self.menuActs["Undo"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("editUndo.png"), + self.menuActs["Undo"] = self.menu.addAction( + UI.PixmapCache.getIcon("editUndo.png"), self.trUtf8('Undo'), self.undo) - self.menuActs["Redo"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("editRedo.png"), + self.menuActs["Redo"] = self.menu.addAction( + UI.PixmapCache.getIcon("editRedo.png"), self.trUtf8('Redo'), self.redo) - self.menuActs["Revert"] = \ - self.menu.addAction(self.trUtf8("Revert to last saved state"), - self.revertToUnmodified) + self.menuActs["Revert"] = self.menu.addAction( + self.trUtf8("Revert to last saved state"), + self.revertToUnmodified) self.menu.addSeparator() - self.menuActs["Cut"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("editCut.png"), + self.menuActs["Cut"] = self.menu.addAction( + UI.PixmapCache.getIcon("editCut.png"), self.trUtf8('Cut'), self.cut) - self.menuActs["Copy"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("editCopy.png"), + self.menuActs["Copy"] = self.menu.addAction( + UI.PixmapCache.getIcon("editCopy.png"), self.trUtf8('Copy'), self.copy) - self.menu.addAction(UI.PixmapCache.getIcon("editPaste.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("editPaste.png"), self.trUtf8('Paste'), self.paste) if not self.miniMenu: self.menu.addSeparator() - self.menu.addAction(UI.PixmapCache.getIcon("editIndent.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("editIndent.png"), self.trUtf8('Indent'), self.indentLineOrSelection) - self.menu.addAction(UI.PixmapCache.getIcon("editUnindent.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("editUnindent.png"), self.trUtf8('Unindent'), self.unindentLineOrSelection) - self.menuActs["Comment"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("editComment.png"), - self.trUtf8('Comment'), self.commentLineOrSelection) - self.menuActs["Uncomment"] = \ - self.menu.addAction( - UI.PixmapCache.getIcon("editUncomment.png"), - self.trUtf8('Uncomment'), self.uncommentLineOrSelection) - self.menuActs["StreamComment"] = \ - self.menu.addAction(self.trUtf8('Stream Comment'), - self.streamCommentLineOrSelection) - self.menuActs["BoxComment"] = \ - self.menu.addAction(self.trUtf8('Box Comment'), - self.boxCommentLineOrSelection) + self.menuActs["Comment"] = self.menu.addAction( + UI.PixmapCache.getIcon("editComment.png"), + self.trUtf8('Comment'), self.commentLineOrSelection) + self.menuActs["Uncomment"] = self.menu.addAction( + UI.PixmapCache.getIcon("editUncomment.png"), + self.trUtf8('Uncomment'), self.uncommentLineOrSelection) + self.menuActs["StreamComment"] = self.menu.addAction( + self.trUtf8('Stream Comment'), + self.streamCommentLineOrSelection) + self.menuActs["BoxComment"] = self.menu.addAction( + self.trUtf8('Box Comment'), + self.boxCommentLineOrSelection) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Select to brace'), - self.selectToMatchingBrace) + self.menu.addAction( + self.trUtf8('Select to brace'), self.selectToMatchingBrace) self.menu.addAction(self.trUtf8('Select all'), self.__selectAll) self.menu.addAction( self.trUtf8('Deselect all'), self.__deselectAll) self.menu.addSeparator() - self.menuActs["SpellCheck"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), - self.trUtf8('Check spelling...'), self.checkSpelling) - self.menuActs["SpellCheckSelection"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("spellchecking.png"), - self.trUtf8('Check spelling of selection...'), - self.__checkSpellingSelection) - self.menuActs["SpellCheckRemove"] = \ - self.menu.addAction(self.trUtf8("Remove from dictionary"), - self.__removeFromSpellingDictionary) + self.menuActs["SpellCheck"] = self.menu.addAction( + UI.PixmapCache.getIcon("spellchecking.png"), + self.trUtf8('Check spelling...'), self.checkSpelling) + self.menuActs["SpellCheckSelection"] = self.menu.addAction( + UI.PixmapCache.getIcon("spellchecking.png"), + self.trUtf8('Check spelling of selection...'), + self.__checkSpellingSelection) + self.menuActs["SpellCheckRemove"] = self.menu.addAction( + self.trUtf8("Remove from dictionary"), + self.__removeFromSpellingDictionary) self.menu.addSeparator() - self.menu.addAction(self.trUtf8('Shorten empty lines'), - self.shortenEmptyLines) + self.menu.addAction( + self.trUtf8('Shorten empty lines'), self.shortenEmptyLines) self.menu.addSeparator() self.menuActs["Languages"] = self.menu.addMenu(self.languagesMenu) self.menuActs["Encodings"] = self.menu.addMenu(self.encodingsMenu) self.menuActs["Eol"] = self.menu.addMenu(self.eolMenu) self.menu.addSeparator() - self.menuActs["MonospacedFont"] = \ - self.menu.addAction(self.trUtf8("Use Monospaced Font"), - self.handleMonospacedEnable) + self.menuActs["MonospacedFont"] = self.menu.addAction( + self.trUtf8("Use Monospaced Font"), + self.handleMonospacedEnable) self.menuActs["MonospacedFont"].setCheckable(True) self.menuActs["MonospacedFont"].setChecked(self.useMonospaced) - self.menuActs["AutosaveEnable"] = \ - self.menu.addAction(self.trUtf8("Autosave enabled"), - self.__autosaveEnable) + self.menuActs["AutosaveEnable"] = self.menu.addAction( + self.trUtf8("Autosave enabled"), self.__autosaveEnable) self.menuActs["AutosaveEnable"].setCheckable(True) self.menuActs["AutosaveEnable"].setChecked(self.autosaveEnabled) - self.menuActs["TypingAidsEnabled"] = \ - self.menu.addAction(self.trUtf8("Typing aids enabled"), - self.__toggleTypingAids) + self.menuActs["TypingAidsEnabled"] = self.menu.addAction( + self.trUtf8("Typing aids enabled"), self.__toggleTypingAids) self.menuActs["TypingAidsEnabled"].setCheckable(True) self.menuActs["TypingAidsEnabled"].setEnabled( self.completer is not None) self.menuActs["TypingAidsEnabled"].setChecked( self.completer is not None and self.completer.isEnabled()) - self.menuActs["AutoCompletionEnable"] = \ - self.menu.addAction(self.trUtf8("Autocompletion enabled"), - self.__toggleAutoCompletionEnable) + self.menuActs["AutoCompletionEnable"] = self.menu.addAction( + self.trUtf8("Autocompletion enabled"), + self.__toggleAutoCompletionEnable) self.menuActs["AutoCompletionEnable"].setCheckable(True) self.menuActs["AutoCompletionEnable"].setChecked( self.autoCompletionThreshold() != -1) @@ -723,28 +724,32 @@ self.menuActs["Diagrams"] = self.menu.addMenu(self.graphicsMenu) self.menu.addSeparator() self.menu.addAction(self.trUtf8('New view'), self.__newView) - act = self.menu.addAction(self.trUtf8('New view (with new split)'), - self.__newViewNewSplit) + act = self.menu.addAction( + self.trUtf8('New view (with new split)'), self.__newViewNewSplit) if not self.vm.canSplit(): act.setEnabled(False) - self.menu.addAction(UI.PixmapCache.getIcon("close.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("close.png"), self.trUtf8('Close'), self.__contextClose) self.menu.addSeparator() - self.menuActs["Save"] = \ - self.menu.addAction(UI.PixmapCache.getIcon("fileSave.png"), + self.menuActs["Save"] = self.menu.addAction( + UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8('Save'), self.__contextSave) - self.menu.addAction(UI.PixmapCache.getIcon("fileSaveAs.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("fileSaveAs.png"), self.trUtf8('Save As...'), self.__contextSaveAs) if not self.miniMenu: self.menu.addMenu(self.exportersMenu) self.menu.addSeparator() - self.menuActs["OpenRejections"] = \ - self.menu.addAction(self.trUtf8("Open 'rejection' file"), - self.__contextOpenRejections) + self.menuActs["OpenRejections"] = self.menu.addAction( + self.trUtf8("Open 'rejection' file"), + self.__contextOpenRejections) self.menu.addSeparator() - self.menu.addAction(UI.PixmapCache.getIcon("printPreview.png"), - self.trUtf8("Print Preview"), self.printPreviewFile) - self.menu.addAction(UI.PixmapCache.getIcon("print.png"), + self.menu.addAction( + UI.PixmapCache.getIcon("printPreview.png"), + self.trUtf8("Print Preview"), self.printPreviewFile) + self.menu.addAction( + UI.PixmapCache.getIcon("print.png"), self.trUtf8('Print'), self.printFile) else: self.menuActs["OpenRejections"] = None @@ -766,21 +771,18 @@ """ menu = QMenu(self.trUtf8('Autocomplete')) - self.menuActs["acDynamic"] = \ - menu.addAction(self.trUtf8('dynamic'), - self.autoComplete) + self.menuActs["acDynamic"] = menu.addAction( + self.trUtf8('dynamic'), self.autoComplete) menu.addSeparator() - menu.addAction(self.trUtf8('from Document'), - self.autoCompleteFromDocument) - self.menuActs["acAPI"] = \ - menu.addAction(self.trUtf8('from APIs'), - self.autoCompleteFromAPIs) - self.menuActs["acAPIDocument"] = \ - menu.addAction(self.trUtf8('from Document and APIs'), - self.autoCompleteFromAll) + menu.addAction( + self.trUtf8('from Document'), self.autoCompleteFromDocument) + self.menuActs["acAPI"] = menu.addAction( + self.trUtf8('from APIs'), self.autoCompleteFromAPIs) + self.menuActs["acAPIDocument"] = menu.addAction( + self.trUtf8('from Document and APIs'), self.autoCompleteFromAll) menu.addSeparator() - self.menuActs["calltip"] = \ - menu.addAction(self.trUtf8('Calltip'), self.callTip) + self.menuActs["calltip"] = menu.addAction( + self.trUtf8('Calltip'), self.callTip) menu.aboutToShow.connect(self.__showContextMenuAutocompletion) @@ -828,17 +830,18 @@ """ menu = QMenu(self.trUtf8('Diagrams')) - menu.addAction(self.trUtf8('Class Diagram...'), - self.__showClassDiagram) - menu.addAction(self.trUtf8('Package Diagram...'), - self.__showPackageDiagram) - menu.addAction(self.trUtf8('Imports Diagram...'), - self.__showImportsDiagram) - self.applicationDiagramMenuAct = \ - menu.addAction(self.trUtf8('Application Diagram...'), - self.__showApplicationDiagram) + menu.addAction( + self.trUtf8('Class Diagram...'), self.__showClassDiagram) + menu.addAction( + self.trUtf8('Package Diagram...'), self.__showPackageDiagram) + menu.addAction( + self.trUtf8('Imports Diagram...'), self.__showImportsDiagram) + self.applicationDiagramMenuAct = menu.addAction( + self.trUtf8('Application Diagram...'), + self.__showApplicationDiagram) menu.addSeparator() - menu.addAction(UI.PixmapCache.getIcon("open.png"), + menu.addAction( + UI.PixmapCache.getIcon("open.png"), self.trUtf8("Load Diagram..."), self.__loadDiagram) menu.aboutToShow.connect(self.__showContextMenuGraphics) @@ -989,45 +992,38 @@ # bookmark margin self.bmMarginMenu = QMenu() - self.bmMarginMenu.addAction(self.trUtf8('Toggle bookmark'), - self.menuToggleBookmark) - self.marginMenuActs["NextBookmark"] = \ - self.bmMarginMenu.addAction(self.trUtf8('Next bookmark'), - self.nextBookmark) - self.marginMenuActs["PreviousBookmark"] = \ - self.bmMarginMenu.addAction(self.trUtf8('Previous bookmark'), - self.previousBookmark) - self.marginMenuActs["ClearBookmark"] = \ - self.bmMarginMenu.addAction(self.trUtf8('Clear all bookmarks'), - self.clearBookmarks) + self.bmMarginMenu.addAction( + self.trUtf8('Toggle bookmark'), self.menuToggleBookmark) + self.marginMenuActs["NextBookmark"] = self.bmMarginMenu.addAction( + self.trUtf8('Next bookmark'), self.nextBookmark) + self.marginMenuActs["PreviousBookmark"] = self.bmMarginMenu.addAction( + self.trUtf8('Previous bookmark'), self.previousBookmark) + self.marginMenuActs["ClearBookmark"] = self.bmMarginMenu.addAction( + self.trUtf8('Clear all bookmarks'), self.clearBookmarks) self.bmMarginMenu.aboutToShow.connect(self.__showContextMenuMargin) # breakpoint margin self.bpMarginMenu = QMenu() - self.marginMenuActs["Breakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Toggle breakpoint'), - self.menuToggleBreakpoint) - self.marginMenuActs["TempBreakpoint"] = \ + self.marginMenuActs["Breakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Toggle breakpoint'), self.menuToggleBreakpoint) + self.marginMenuActs["TempBreakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Toggle temporary breakpoint'), + self.__menuToggleTemporaryBreakpoint) + self.marginMenuActs["EditBreakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Edit breakpoint...'), self.menuEditBreakpoint) + self.marginMenuActs["EnableBreakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Enable breakpoint'), + self.__menuToggleBreakpointEnabled) + self.marginMenuActs["NextBreakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Next breakpoint'), self.menuNextBreakpoint) + self.marginMenuActs["PreviousBreakpoint"] = \ self.bpMarginMenu.addAction( - self.trUtf8('Toggle temporary breakpoint'), - self.__menuToggleTemporaryBreakpoint) - self.marginMenuActs["EditBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Edit breakpoint...'), - self.menuEditBreakpoint) - self.marginMenuActs["EnableBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Enable breakpoint'), - self.__menuToggleBreakpointEnabled) - self.marginMenuActs["NextBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Next breakpoint'), - self.menuNextBreakpoint) - self.marginMenuActs["PreviousBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Previous breakpoint'), + self.trUtf8('Previous breakpoint'), self.menuPreviousBreakpoint) - self.marginMenuActs["ClearBreakpoint"] = \ - self.bpMarginMenu.addAction(self.trUtf8('Clear all breakpoints'), - self.__menuClearBreakpoints) + self.marginMenuActs["ClearBreakpoint"] = self.bpMarginMenu.addAction( + self.trUtf8('Clear all breakpoints'), self.__menuClearBreakpoints) self.bpMarginMenu.aboutToShow.connect(self.__showContextMenuMargin) @@ -1035,50 +1031,49 @@ self.indicMarginMenu = QMenu() self.marginMenuActs["GotoSyntaxError"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Goto syntax error'), - self.gotoSyntaxError) + self.indicMarginMenu.addAction( + self.trUtf8('Goto syntax error'), self.gotoSyntaxError) self.marginMenuActs["ShowSyntaxError"] = \ self.indicMarginMenu.addAction( self.trUtf8('Show syntax error message'), self.__showSyntaxError) self.marginMenuActs["ClearSyntaxError"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Clear syntax error'), - self.clearSyntaxError) + self.indicMarginMenu.addAction( + self.trUtf8('Clear syntax error'), self.clearSyntaxError) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextWarningMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8("Next warning"), - self.nextFlakesWarning) + self.indicMarginMenu.addAction( + self.trUtf8("Next warning"), self.nextFlakesWarning) self.marginMenuActs["PreviousWarningMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8("Previous warning"), - self.previousFlakesWarning) + self.indicMarginMenu.addAction( + self.trUtf8("Previous warning"), self.previousFlakesWarning) self.marginMenuActs["ShowWarning"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Show warning message'), - self.__showFlakesWarning) + self.indicMarginMenu.addAction( + self.trUtf8('Show warning message'), self.__showFlakesWarning) self.marginMenuActs["ClearWarnings"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Clear warnings'), - self.clearFlakesWarnings) + self.indicMarginMenu.addAction( + self.trUtf8('Clear warnings'), self.clearFlakesWarnings) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextCoverageMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Next uncovered line'), - self.nextUncovered) + self.indicMarginMenu.addAction( + self.trUtf8('Next uncovered line'), self.nextUncovered) self.marginMenuActs["PreviousCoverageMarker"] = \ self.indicMarginMenu.addAction( - self.trUtf8('Previous uncovered line'), - self.previousUncovered) + self.trUtf8('Previous uncovered line'), self.previousUncovered) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextTaskMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Next task'), - self.nextTask) + self.indicMarginMenu.addAction( + self.trUtf8('Next task'), self.nextTask) self.marginMenuActs["PreviousTaskMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Previous task'), - self.previousTask) + self.indicMarginMenu.addAction( + self.trUtf8('Previous task'), self.previousTask) self.indicMarginMenu.addSeparator() self.marginMenuActs["NextChangeMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Next change'), - self.nextChange) + self.indicMarginMenu.addAction( + self.trUtf8('Next change'), self.nextChange) self.marginMenuActs["PreviousChangeMarker"] = \ - self.indicMarginMenu.addAction(self.trUtf8('Previous change'), - self.previousChange) + self.indicMarginMenu.addAction( + self.trUtf8('Previous change'), self.previousChange) self.indicMarginMenu.aboutToShow.connect(self.__showContextMenuMargin) @@ -1088,93 +1083,72 @@ """ self.marginMenu = QMenu() - self.marginMenu.addAction(self.trUtf8('Toggle bookmark'), - self.menuToggleBookmark) - self.marginMenuActs["NextBookmark"] = \ - self.marginMenu.addAction(self.trUtf8('Next bookmark'), - self.nextBookmark) - self.marginMenuActs["PreviousBookmark"] = \ - self.marginMenu.addAction(self.trUtf8('Previous bookmark'), - self.previousBookmark) - self.marginMenuActs["ClearBookmark"] = \ - self.marginMenu.addAction(self.trUtf8('Clear all bookmarks'), - self.clearBookmarks) + self.marginMenu.addAction( + self.trUtf8('Toggle bookmark'), self.menuToggleBookmark) + self.marginMenuActs["NextBookmark"] = self.marginMenu.addAction( + self.trUtf8('Next bookmark'), self.nextBookmark) + self.marginMenuActs["PreviousBookmark"] = self.marginMenu.addAction( + self.trUtf8('Previous bookmark'), self.previousBookmark) + self.marginMenuActs["ClearBookmark"] = self.marginMenu.addAction( + self.trUtf8('Clear all bookmarks'), self.clearBookmarks) self.marginMenu.addSeparator() - self.marginMenuActs["GotoSyntaxError"] = \ - self.marginMenu.addAction(self.trUtf8('Goto syntax error'), - self.gotoSyntaxError) - self.marginMenuActs["ShowSyntaxError"] = \ - self.marginMenu.addAction(self.trUtf8('Show syntax error message'), - self.__showSyntaxError) - self.marginMenuActs["ClearSyntaxError"] = \ - self.marginMenu.addAction(self.trUtf8('Clear syntax error'), - self.clearSyntaxError) + self.marginMenuActs["GotoSyntaxError"] = self.marginMenu.addAction( + self.trUtf8('Goto syntax error'), self.gotoSyntaxError) + self.marginMenuActs["ShowSyntaxError"] = self.marginMenu.addAction( + self.trUtf8('Show syntax error message'), self.__showSyntaxError) + self.marginMenuActs["ClearSyntaxError"] = self.marginMenu.addAction( + self.trUtf8('Clear syntax error'), self.clearSyntaxError) self.marginMenu.addSeparator() - self.marginMenuActs["NextWarningMarker"] = \ - self.marginMenu.addAction(self.trUtf8("Next warning"), - self.nextFlakesWarning) + self.marginMenuActs["NextWarningMarker"] = self.marginMenu.addAction( + self.trUtf8("Next warning"), self.nextFlakesWarning) self.marginMenuActs["PreviousWarningMarker"] = \ - self.marginMenu.addAction(self.trUtf8("Previous warning"), - self.previousFlakesWarning) - self.marginMenuActs["ShowWarning"] = \ - self.marginMenu.addAction(self.trUtf8('Show warning message'), - self.__showFlakesWarning) - self.marginMenuActs["ClearWarnings"] = \ - self.marginMenu.addAction(self.trUtf8('Clear warnings'), - self.clearFlakesWarnings) - self.marginMenu.addSeparator() - self.marginMenuActs["Breakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Toggle breakpoint'), - self.menuToggleBreakpoint) - self.marginMenuActs["TempBreakpoint"] = \ self.marginMenu.addAction( - self.trUtf8('Toggle temporary breakpoint'), - self.__menuToggleTemporaryBreakpoint) - self.marginMenuActs["EditBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Edit breakpoint...'), - self.menuEditBreakpoint) - self.marginMenuActs["EnableBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Enable breakpoint'), - self.__menuToggleBreakpointEnabled) - self.marginMenuActs["NextBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Next breakpoint'), - self.menuNextBreakpoint) - self.marginMenuActs["PreviousBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Previous breakpoint'), - self.menuPreviousBreakpoint) - self.marginMenuActs["ClearBreakpoint"] = \ - self.marginMenu.addAction(self.trUtf8('Clear all breakpoints'), - self.__menuClearBreakpoints) + self.trUtf8("Previous warning"), self.previousFlakesWarning) + self.marginMenuActs["ShowWarning"] = self.marginMenu.addAction( + self.trUtf8('Show warning message'), self.__showFlakesWarning) + self.marginMenuActs["ClearWarnings"] = self.marginMenu.addAction( + self.trUtf8('Clear warnings'), self.clearFlakesWarnings) self.marginMenu.addSeparator() - self.marginMenuActs["NextCoverageMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Next uncovered line'), - self.nextUncovered) - self.marginMenuActs["PreviousCoverageMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Previous uncovered line'), - self.previousUncovered) + self.marginMenuActs["Breakpoint"] = self.marginMenu.addAction( + self.trUtf8('Toggle breakpoint'), self.menuToggleBreakpoint) + self.marginMenuActs["TempBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Toggle temporary breakpoint'), + self.__menuToggleTemporaryBreakpoint) + self.marginMenuActs["EditBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Edit breakpoint...'), self.menuEditBreakpoint) + self.marginMenuActs["EnableBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Enable breakpoint'), + self.__menuToggleBreakpointEnabled) + self.marginMenuActs["NextBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Next breakpoint'), self.menuNextBreakpoint) + self.marginMenuActs["PreviousBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Previous breakpoint'), self.menuPreviousBreakpoint) + self.marginMenuActs["ClearBreakpoint"] = self.marginMenu.addAction( + self.trUtf8('Clear all breakpoints'), self.__menuClearBreakpoints) self.marginMenu.addSeparator() - self.marginMenuActs["NextTaskMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Next task'), - self.nextTask) - self.marginMenuActs["PreviousTaskMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Previous task'), - self.previousTask) + self.marginMenuActs["NextCoverageMarker"] = self.marginMenu.addAction( + self.trUtf8('Next uncovered line'), self.nextUncovered) + self.marginMenuActs["PreviousCoverageMarker"] = \ + self.marginMenu.addAction( + self.trUtf8('Previous uncovered line'), self.previousUncovered) self.marginMenu.addSeparator() - self.marginMenuActs["NextChangeMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Next change'), - self.nextChange) + self.marginMenuActs["NextTaskMarker"] = self.marginMenu.addAction( + self.trUtf8('Next task'), self.nextTask) + self.marginMenuActs["PreviousTaskMarker"] = self.marginMenu.addAction( + self.trUtf8('Previous task'), self.previousTask) + self.marginMenu.addSeparator() + self.marginMenuActs["NextChangeMarker"] = self.marginMenu.addAction( + self.trUtf8('Next change'), self.nextChange) self.marginMenuActs["PreviousChangeMarker"] = \ - self.marginMenu.addAction(self.trUtf8('Previous change'), - self.previousChange) + self.marginMenu.addAction( + self.trUtf8('Previous change'), self.previousChange) self.marginMenu.addSeparator() - self.marginMenuActs["LMBbookmarks"] = \ - self.marginMenu.addAction(self.trUtf8('LMB toggles bookmarks'), - self.__lmBbookmarks) + self.marginMenuActs["LMBbookmarks"] = self.marginMenu.addAction( + self.trUtf8('LMB toggles bookmarks'), self.__lmBbookmarks) self.marginMenuActs["LMBbookmarks"].setCheckable(True) self.marginMenuActs["LMBbookmarks"].setChecked(False) - self.marginMenuActs["LMBbreakpoints"] = \ - self.marginMenu.addAction(self.trUtf8('LMB toggles breakpoints'), - self.__lmBbreakpoints) + self.marginMenuActs["LMBbreakpoints"] = self.marginMenu.addAction( + self.trUtf8('LMB toggles breakpoints'), self.__lmBbreakpoints) self.marginMenuActs["LMBbreakpoints"].setCheckable(True) self.marginMenuActs["LMBbreakpoints"].setChecked(True) @@ -1201,14 +1175,16 @@ if exporter: exporter.exportSource() else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export source"), self.trUtf8( """<p>No exporter available for the """ """export format <b>{0}</b>. Aborting...</p>""")\ .format(exporterFormat)) else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Export source"), self.trUtf8("""No export format given. Aborting...""")) @@ -1671,7 +1647,8 @@ """ Private slot to handle the modificationAttempted signal. """ - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Modification of Read Only file"), self.trUtf8("""You are attempting to change a read only file. """ """Please save to a different file first.""")) @@ -1783,8 +1760,8 @@ return isProjectPy2 else: # 3) determine by compiling the sources - syntaxError = Utilities.compile(self.fileName, - self.text(), True)[0] + syntaxError = Utilities.compile( + self.fileName, self.text(), True)[0] if not syntaxError: self.filetype = "Python2" return True @@ -1826,8 +1803,8 @@ return isProjectPy3 else: # 3) determine by compiling the sources - syntaxError = Utilities.compile(self.fileName, - self.text(), False)[0] + syntaxError = Utilities.compile( + self.fileName, self.text(), False)[0] if not syntaxError: self.filetype = "Python3" return True @@ -2090,8 +2067,8 @@ """ if self.fileName and \ (self.isPy3File() or self.isPy2File() or self.isRubyFile()): - self.breakpointModel.addBreakPoint(self.fileName, line, - ('', temporary, True, 0)) + self.breakpointModel.addBreakPoint( + self.fileName, line, ('', temporary, True, 0)) self.breakpointToggled.emit(self) def __toggleBreakpointEnabled(self, line): @@ -2184,13 +2161,15 @@ return from Debugger.EditBreakpointDialog import EditBreakpointDialog - dlg = EditBreakpointDialog((self.fileName, ln), + dlg = EditBreakpointDialog( + (self.fileName, ln), (cond, temp, enabled, ignorecount), self.condHistory, self, modal=True) if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, ignorecount = dlg.getData() - self.breakpointModel.setBreakPointByIndex(index, - self.fileName, ln, (cond, temp, enabled, ignorecount)) + self.breakpointModel.setBreakPointByIndex( + index, self.fileName, ln, + (cond, temp, enabled, ignorecount)) self.line = -1 @@ -2707,7 +2686,8 @@ fn = self.fileName if fn is None: fn = self.noName - res = E5MessageBox.okToClearData(self, + res = E5MessageBox.okToClearData( + self, self.trUtf8("File Modified"), self.trUtf8("<p>The file <b>{0}</b> has unsaved changes.</p>") .format(fn), @@ -2755,7 +2735,9 @@ txt, self.encoding = Utilities.readEncodedFile(fn) except (UnicodeDecodeError, IOError) as why: QApplication.restoreOverrideCursor() - E5MessageBox.critical(self.vm, self.trUtf8('Open File'), + E5MessageBox.critical( + self.vm, + self.trUtf8('Open File'), self.trUtf8('<p>The file <b>{0}</b> could not be opened.</p>' '<p>Reason: {1}</p>') .format(fn, str(why))) @@ -2856,7 +2838,9 @@ os.chmod(fn, permissions) return True except (IOError, Utilities.CodingError, UnicodeError) as why: - E5MessageBox.critical(self, self.trUtf8('Save File'), + E5MessageBox.critical( + self, + self.trUtf8('Save File'), self.trUtf8('<p>The file <b>{0}</b> could not be saved.<br/>' 'Reason: {1}</p>') .format(fn, str(why))) @@ -2921,7 +2905,8 @@ if ex: fn += ex if QFileInfo(fn).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save File"), self.trUtf8("<p>The file <b>{0}</b> already exists." " Overwrite it?</p>").format(fn), @@ -4094,7 +4079,8 @@ self.zoomTo(Preferences.getEditor("ZoomFactor")) self.searchIndicator = QsciScintilla.INDIC_CONTAINER - self.indicatorDefine(self.searchIndicator, QsciScintilla.INDIC_BOX, + self.indicatorDefine( + self.searchIndicator, QsciScintilla.INDIC_BOX, Preferences.getEditorColour("SearchMarkers")) if not Preferences.getEditor("SearchMarkersEnabled") and \ not Preferences.getEditor("QuickSearchMarkersEnabled") and \ @@ -4222,9 +4208,11 @@ elif acs == QsciScintilla.AcsAll: self.autoCompleteFromAll() else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Autocompletion"), - self.trUtf8("""Autocompletion is not available because""" + self.trUtf8( + """Autocompletion is not available because""" """ there is no autocompletion source set.""")) def setAutoCompletionEnabled(self, enable): @@ -4321,7 +4309,8 @@ """ if self.__acHookFunction is not None: # there is another provider registered already - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Activating Auto-Completion Provider"), self.trUtf8("""Auto-completion provider cannot be connected""" """ because there is already another one active.""" @@ -4489,7 +4478,8 @@ """ ct = pos if ctshift: - ctmin = self.SendScintilla(QsciScintilla.SCI_POSITIONFROMLINE, + ctmin = self.SendScintilla( + QsciScintilla.SCI_POSITIONFROMLINE, self.SendScintilla(QsciScintilla.SCI_LINEFROMPOSITION, ct)) if ct - ctshift < ctmin: ct = ctmin @@ -4509,7 +4499,8 @@ """ if self.__ctHookFunction is not None: # there is another provider registered already - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Activating Calltip Provider"), self.trUtf8("""Calltip provider cannot be connected""" """ because there is already another one active.""" @@ -4668,7 +4659,8 @@ prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) - coEnable = (coEnable or \ + coEnable = ( + coEnable or \ os.path.isfile("{0}.coverage".format(basename)) or \ os.path.isfile("{0}.coverage".format(tbasename))) and \ self.project.isPy3Project() @@ -4682,7 +4674,8 @@ prEnable = prEnable or \ os.path.isfile("{0}.profile".format(basename)) or \ os.path.isfile("{0}.profile".format(tbasename)) - coEnable = (coEnable or \ + coEnable = ( + coEnable or \ os.path.isfile("{0}.coverage".format(basename)) or \ os.path.isfile("{0}.coverage".format(tbasename))) and \ self.isPy3File() @@ -5099,13 +5092,15 @@ self.coverageMarkersShown.emit(True) else: if not silent: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Show Code Coverage Annotations"), self.trUtf8("""All lines have been covered.""")) self.showingNotcoveredMarkers = True else: if not silent: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Show Code Coverage Annotations"), self.trUtf8("""There is no coverage file available.""")) @@ -5336,12 +5331,14 @@ for handle in list(self.syntaxerrors.keys()): if self.markerLine(handle) == line: errors = [e[0] for e in self.syntaxerrors[handle]] - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Syntax Error"), "\n".join(errors)) break else: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Syntax Error"), self.trUtf8("No syntax error message available.")) @@ -5466,12 +5463,14 @@ for handle in list(self.warnings.keys()): if self.markerLine(handle) == line: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Warning"), '\n'.join([w[0] for w in self.warnings[handle]])) break else: - E5MessageBox.warning(self, + E5MessageBox.warning( + self, self.trUtf8("Warning"), self.trUtf8("No warning messages available.")) @@ -5549,20 +5548,20 @@ annotationStyleTxt = "\n".join(styleAnnotations) if warningAnnotations or errorAnnotations: annotationStyleTxt += "\n" - annotations.append(QsciStyledText(annotationStyleTxt, - self.annotationStyleStyle)) + annotations.append(QsciStyledText( + annotationStyleTxt, self.annotationStyleStyle)) if warningAnnotations: annotationWarningTxt = "\n".join(warningAnnotations) if errorAnnotations: annotationWarningTxt += "\n" - annotations.append(QsciStyledText(annotationWarningTxt, - self.annotationWarningStyle)) + annotations.append(QsciStyledText( + annotationWarningTxt, self.annotationWarningStyle)) if errorAnnotations: annotationErrorTxt = "\n".join(errorAnnotations) - annotations.append(QsciStyledText(annotationErrorTxt, - self.annotationErrorStyle)) + annotations.append(QsciStyledText( + annotationErrorTxt, self.annotationErrorStyle)) if annotations: self.annotate(line, annotations) @@ -5637,7 +5636,8 @@ lines = f.readlines() f.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error loading macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be read.</p>") @@ -5645,7 +5645,8 @@ return if len(lines) != 2: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error loading macro"), self.trUtf8("<p>The macro file <b>{0}</b> is corrupt.</p>") .format(fname)) @@ -5681,7 +5682,8 @@ if ex: fname += ex if QFileInfo(fname).exists(): - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Save macro"), self.trUtf8("<p>The macro file <b>{0}</b> already exists." " Overwrite it?</p>").format(fname), @@ -5696,7 +5698,8 @@ f.write(self.macros[name].save()) f.close() except IOError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Error saving macro"), self.trUtf8( "<p>The macro file <b>{0}</b> could not be written.</p>") @@ -5708,7 +5711,8 @@ Public method to start macro recording. """ if self.recording: - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Start Macro Recording"), self.trUtf8("Macro recording is already active. Start new?"), icon=E5MessageBox.Warning, @@ -5865,7 +5869,8 @@ """<br><b>Warning:</b> You will lose""" """ your changes upon reopening it.""") yesDefault = False - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("File changed"), msg, icon=E5MessageBox.Warning, yesDefault=yesDefault) @@ -6125,7 +6130,8 @@ if not QFileInfo(fname).isDir(): self.vm.openSourceFile(fname) else: - E5MessageBox.information(self, + E5MessageBox.information( + self, self.trUtf8("Drop Error"), self.trUtf8("""<p><b>{0}</b> is not a file.</p>""") .format(fname)) @@ -6147,17 +6153,19 @@ """ menu = QMenu(self.trUtf8('Resources')) - menu.addAction(self.trUtf8('Add file...'), - self.__addFileResource) - menu.addAction(self.trUtf8('Add files...'), - self.__addFileResources) - menu.addAction(self.trUtf8('Add aliased file...'), + menu.addAction( + self.trUtf8('Add file...'), self.__addFileResource) + menu.addAction( + self.trUtf8('Add files...'), self.__addFileResources) + menu.addAction( + self.trUtf8('Add aliased file...'), self.__addFileAliasResource) - menu.addAction(self.trUtf8('Add localized resource...'), + menu.addAction( + self.trUtf8('Add localized resource...'), self.__addLocalizedResource) menu.addSeparator() - menu.addAction(self.trUtf8('Add resource frame'), - self.__addResourceFrame) + menu.addAction( + self.trUtf8('Add resource frame'), self.__addResourceFrame) menu.aboutToShow.connect(self.__showContextMenuResources) @@ -6282,7 +6290,8 @@ package = os.path.isdir(self.fileName) and \ self.fileName or os.path.dirname(self.fileName) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Package Diagram"), self.trUtf8("""Include class attributes?"""), yesDefault=True) @@ -6301,7 +6310,8 @@ package = os.path.isdir(self.fileName) and self.fileName \ or os.path.dirname(self.fileName) - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Imports Diagram"), self.trUtf8("""Include imports from external modules?""")) self.importsDiagram = UMLDialog( @@ -6314,7 +6324,8 @@ Private method to handle the Imports Diagram context menu action. """ from Graphics.UMLDialog import UMLDialog - res = E5MessageBox.yesNo(self, + res = E5MessageBox.yesNo( + self, self.trUtf8("Application Diagram"), self.trUtf8("""Include module names?"""), yesDefault=True) @@ -6375,7 +6386,8 @@ self.getLanguage()) return elif len(templateNames) > 1: - self.showUserList(TemplateCompletionListID, + self.showUserList( + TemplateCompletionListID, ["{0}?{1:d}".format(t, self.TemplateImageID) \ for t in templateNames]) return @@ -6603,10 +6615,10 @@ self.spellingMenu.addAction( UI.PixmapCache.getIcon("spellchecking.png"), self.trUtf8("Check spelling..."), self.__checkSpellingWord) - self.spellingMenu.addAction(self.trUtf8("Add to dictionary"), - self.__addToSpellingDictionary) - self.spellingMenu.addAction(self.trUtf8("Ignore All"), - self.__ignoreSpellingAlways) + self.spellingMenu.addAction( + self.trUtf8("Add to dictionary"), self.__addToSpellingDictionary) + self.spellingMenu.addAction( + self.trUtf8("Ignore All"), self.__ignoreSpellingAlways) self.showMenu.emit("Spelling", self.spellingMenu, self) @@ -7011,7 +7023,8 @@ try: txt = float(txt) except ValueError: - E5MessageBox.critical(self, + E5MessageBox.critical( + self, self.trUtf8("Sort Lines"), self.trUtf8( """The selection contains illegal data for a"""