eric: comparison QScintilla/Editor.py

-:0a02c433f52d
+:5883ce99ee12
 self.__unifiedMargins = True
 # define the margins markers
 self.__changeMarkerSaved = self.markerDefine(
 self.__createChangeMarkerPixmap(
 "OnlineChangeTraceMarkerSaved"))
 self.__changeMarkerUnsaved = self.markerDefine(
 self.__createChangeMarkerPixmap(
 "OnlineChangeTraceMarkerUnsaved"))
 self.breakpoint = \
 self.markerDefine(UI.PixmapCache.getPixmap("break.png"))
 self.cbreakpoint = \
 self.markerDefine(UI.PixmapCache.getPixmap("cBreak.png"))
 self.tbreakpoint = \
 res = E5MessageBox.yesNo(
 self,
 self.trUtf8("Open File"),
 self.trUtf8("""<p>The size of the file <b>{0}</b>"""
 """ is <b>{1} KB</b>."""
-""" Do you really want to load it?</p>""")\
+""" Do you really want to load it?</p>""")
-.format(
+.format(self.fileName,
-self.fileName,
+QFileInfo(self.fileName).size() // 1024),
-QFileInfo(self.fileName).size() //
-1024),
 icon=E5MessageBox.Warning)
 if not res:
 raise IOError()
 self.readFile(self.fileName, True)
 bindName = self.__bindName(self.text(0))
 E5MessageBox.critical(
 self,
 self.trUtf8("Export source"),
 self.trUtf8(
 """<p>No exporter available for the """
-"""export format <b>{0}</b>. Aborting...</p>""")\
+"""export format <b>{0}</b>. Aborting...</p>""")
 .format(exporterFormat))
 else:
 E5MessageBox.critical(
 self,
 self.trUtf8("Export source"),
 self.trUtf8("""No export format given. Aborting..."""))
 self.apiLanguage = ""
 self.lexer_ = None
 self.__lexerReset = True
 self.setLexer()
-self.setMonospaced(self.useMonospaced)
 if self.completer is not None:
 self.completer.setEnabled(False)
 self.completer = None
+useMonospaced = self.useMonospaced
 self.__setTextDisplay()
+self.setMonospaced(useMonospaced)
+self.menuActs["MonospacedFont"].setChecked(self.useMonospaced)
 if not self.inLanguageChanged and propagate:
 self.inLanguageChanged = True
 self.languageChanged.emit(self.apiLanguage)
 self.inLanguageChanged = False
 @param initTextDisplay flag indicating an initialization of the text
 display is required as well (boolean)
 @keyparam propagate flag indicating to propagate the change (boolean)
 @keyparam pyname name of the pygments lexer to use (string)
 """
+self.menuActs["MonospacedFont"].setChecked(False)
 self.__lexerReset = False
 self.__bindLexer(filename, pyname=pyname)
 self.__bindCompleter(filename)
 self.recolor()
 self.__checkLanguage()
 if self.filetype == "":
 # 1) Determine by first line
 line0 = self.text(0)
 if line0.startswith("#!") and \
-("python2" in line0 or \
+("python2" in line0 or
 ("python" in line0 and not "python3" in line0)):
 self.filetype = "Python2"
 return True
 if self.fileName is not None:
 ext = os.path.splitext(self.fileName)[1]
 Public slot to extract all tasks.
 """
 from Tasks.Task import Task
 markers = {
 Task.TypeWarning:
 Preferences.getTasks("TasksWarningMarkers").split(),
 Task.TypeNote:
 Preferences.getTasks("TasksNoteMarkers").split(),
 Task.TypeTodo:
 Preferences.getTasks("TasksTodoMarkers").split(),
 Task.TypeFixme:
 Preferences.getTasks("TasksFixmeMarkers").split(),
 }
 txtList = self.text().split(self.getLineSeparator())
 # clear all task markers and tasks
 self.markerDeleteAll(self.taskmarker)
 fn = self.noName
 res = E5MessageBox.okToClearData(
 self,
 self.trUtf8("File Modified"),
 self.trUtf8("<p>The file <b>{0}</b> has unsaved changes.</p>")
 .format(fn),
 self.saveFile)
 if res:
 self.vm.setEditorName(self, self.fileName)
 return res
 fileEol = self.detectEolString(txt)
 modified = False
 if (not Preferences.getEditor("TabForIndentation")) and \
 Preferences.getEditor("ConvertTabsOnLoad") and \
-not (self.lexer_ and \
+not (self.lexer_ and
 self.lexer_.alwaysKeepTabs()):
 txtExpanded = txt.expandtabs(Preferences.getEditor("TabWidth"))
 if txtExpanded != txt:
 modified = True
 txt = txtExpanded
 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)))
 return False
 def saveFile(self, saveas=False, path=None):
 """
 Public slot to save the text to a file.
 self.commentLineOrSelection()
 else:
 # determine the start of the comment block
 begline = line
 while begline > 0 and \
 self.__isCommentedLine(self.text(begline - 1), commentStr):
 begline -= 1
 # determine the end of the comment block
 endline = line
 lines = self.lines()
 while endline < lines and \
 self.__isCommentedLine(self.text(endline + 1), commentStr):
 endline += 1
 self.setSelection(begline, 0, endline, self.lineLength(endline))
 self.uncommentLineOrSelection()
 tbasename = os.path.splitext(tfn)[0]
 prEnable = prEnable or \
 os.path.isfile("{0}.profile".format(basename)) or \
 os.path.isfile("{0}.profile".format(tbasename))
 coEnable = (
-coEnable or \
+coEnable or
-os.path.isfile("{0}.coverage".format(basename)) or \
+os.path.isfile("{0}.coverage".format(basename)) or
 os.path.isfile("{0}.coverage".format(tbasename))) and \
 self.project.isPy3Project()
 # now check ourself
 fn = self.getFileName()
 tbasename = os.path.splitext(tfn)[0]
 prEnable = prEnable or \
 os.path.isfile("{0}.profile".format(basename)) or \
 os.path.isfile("{0}.profile".format(tbasename))
 coEnable = (
-coEnable or \
+coEnable or
-os.path.isfile("{0}.coverage".format(basename)) or \
+os.path.isfile("{0}.coverage".format(basename)) or
 os.path.isfile("{0}.coverage".format(tbasename))) and \
 self.isPy3File()
 # now check for syntax errors
 if self.hasSyntaxErrors():
 Public slot to check the autosave flags.
 @return flag indicating this editor should be saved (boolean)
 """
 return self.fileName is not None and \
 not self.autosaveManuallyDisabled and \
 not self.isReadOnly()
 def __autoSyntaxCheck(self):
 """
 Private method to perform an automatic syntax check of the file.
 E5MessageBox.critical(
 self,
 self.trUtf8("Error loading macro"),
 self.trUtf8(
 "<p>The macro file <b>{0}</b> could not be read.</p>")
 .format(fname))
 return
 if len(lines) != 2:
 E5MessageBox.critical(
 self,
 self.trUtf8("Error loading macro"),
 self.trUtf8("<p>The macro file <b>{0}</b> is corrupt.</p>")
 .format(fname))
 return
 macro = QsciMacro(lines[1], self)
 self.macros[lines[0].strip()] = macro
 E5MessageBox.critical(
 self,
 self.trUtf8("Error saving macro"),
 self.trUtf8(
 "<p>The macro file <b>{0}</b> could not be written.</p>")
 .format(fname))
 return
 def macroRecordingStart(self):
 """
 Public method to start macro recording.
 else:
 E5MessageBox.information(
 self,
 self.trUtf8("Drop Error"),
 self.trUtf8("""<p><b>{0}</b> is not a file.</p>""")
 .format(fname))
 event.acceptProposedAction()
 else:
 super(Editor, self).dropEvent(event)
 self.inDragDrop = False
 self.trUtf8("Alias for file <b>{0}</b>:").format(relFile),
 QLineEdit.Normal,
 relFile)
 if ok and alias:
 line, index = self.getCursorPosition()
-self.insert('  <file alias="{1}">{0}</file>\n'\
+self.insert('  <file alias="{1}">{0}</file>\n'
 .format(relFile, alias))
 self.setCursorPosition(line + 1, index)
 def __addLocalizedResource(self):
 """
 self.getLanguage())
 return
 elif len(templateNames) > 1:
 self.showUserList(
 TemplateCompletionListID,
-["{0}?{1:d}".format(t, self.TemplateImageID) \
+["{0}?{1:d}".format(t, self.TemplateImageID)
 for t in templateNames])
 return
 super(Editor, self).editorCommand(cmd)
 """
 if self.__spellCheckStringsOnly:
 style = self.styleAt(pos)
 if self.lexer_ is not None:
 return self.lexer_.isCommentStyle(style) or \
 self.lexer_.isStringStyle(style)
 return True
 @pyqtSlot(int)
 def __spellCharAdded(self, charNumber):
 """
 status, if it is inside a locally initiated shared edit session
 and if it is inside a remotely initiated shared edit session
 (boolean, boolean, boolean, boolean)
 """
 return self.fileName is not None and \
 self.project.isOpen() and \
 self.project.isProjectFile(self.fileName), \
 self.__isShared, self.__inSharedEdit, self.__inRemoteSharedEdit
 def shareConnected(self, connected):
 """
 Public slot to handle a change of the connected state.

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Editor.py

QScintilla/Editor.py