eric: comparison QScintilla/Editor.py

-:52e8c820d0dd
+:c679fb30c8f3
 menu = QMenu(self.trUtf8("Languages"))
 self.languagesActGrp = QActionGroup(self)
 self.noLanguageAct = menu.addAction(self.trUtf8("No Language"))
 self.noLanguageAct.setCheckable(True)
-self.noLanguageAct.setData(QVariant("None"))
+self.noLanguageAct.setData("None")
 self.languagesActGrp.addAction(self.noLanguageAct)
 menu.addSeparator()
 self.supportedLanguages = {}
 supportedLanguages = Lexers.getSupportedLanguages()
 for language in languages:
 if language != "Guessed":
 self.supportedLanguages[language] = supportedLanguages[language][:]
 act = menu.addAction(self.supportedLanguages[language][0])
 act.setCheckable(True)
-act.setData(QVariant(language))
+act.setData(language)
 self.supportedLanguages[language].append(act)
 self.languagesActGrp.addAction(act)
 menu.addSeparator()
 self.pygmentsAct = menu.addAction(self.trUtf8("Guessed"))
 self.pygmentsAct.setCheckable(True)
-self.pygmentsAct.setData(QVariant("Guessed"))
+self.pygmentsAct.setData("Guessed")
 self.languagesActGrp.addAction(self.pygmentsAct)
 self.pygmentsSelAct = menu.addAction(self.trUtf8("Alternatives"))
-self.pygmentsSelAct.setData(QVariant("Alternatives"))
+self.pygmentsSelAct.setData("Alternatives")
 self.connect(menu, SIGNAL('triggered(QAction *)'), self.__languageMenuTriggered)
 self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuLanguages)
 return menu
 self.encodingsActGrp = QActionGroup(self)
 for encoding in sorted(Utilities.supportedCodecs):
 act = menu.addAction(encoding)
 act.setCheckable(True)
-act.setData(QVariant(encoding))
+act.setData(encoding)
 self.supportedEncodings[encoding] = act
 self.encodingsActGrp.addAction(act)
 self.connect(menu, SIGNAL('triggered(QAction *)'), self.__encodingsMenuTriggered)
 self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuEncodings)
 self.eolActGrp = QActionGroup(self)
 act = menu.addAction(self.trUtf8("Unix"))
 act.setCheckable(True)
-act.setData(QVariant('\n'))
+act.setData('\n')
 self.supportedEols['\n'] = act
 self.eolActGrp.addAction(act)
 act = menu.addAction(self.trUtf8("Windows"))
 act.setCheckable(True)
-act.setData(QVariant('\r\n'))
+act.setData('\r\n')
 self.supportedEols['\r\n'] = act
 self.eolActGrp.addAction(act)
 act = menu.addAction(self.trUtf8("Macintosh"))
 act.setCheckable(True)
-act.setData(QVariant('\r'))
+act.setData('\r')
 self.supportedEols['\r'] = act
 self.eolActGrp.addAction(act)
 self.connect(menu, SIGNAL('triggered(QAction *)'), self.__eolMenuTriggered)
 self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuEol)
 supportedExporters = Exporters.getSupportedFormats()
 exporters = supportedExporters.keys()
 exporters.sort()
 for exporter in exporters:
 act = menu.addAction(supportedExporters[exporter])
-act.setData(QVariant(exporter))
+act.setData(exporter)
 self.connect(menu, SIGNAL('triggered(QAction *)'), self.__exportMenuTriggered)
 return menu
 """
 Private method to handle the selection of an export format.
 @param act reference to the action that was triggered (QAction)
 """
-exporterFormat = act.data().toString()
+exporterFormat = act.data()
 self.exportFile(exporterFormat)
 def exportFile(self, exporterFormat):
 """
 Public method to export the file.
 elif act == self.pygmentsSelAct:
 language = self.__selectPygmentsLexer()
 if language:
 self.setLanguage("dummy.pygments", pyname = language)
 else:
-language = act.data().toString()
+language = act.data()
 if language:
 self.setLanguage(self.supportedLanguages[language][1])
 def languageChanged(self, language, propagate = True):
 """
 """
 Private method to handle the selection of an encoding.
 @param act reference to the action that was triggered (QAction)
 """
-encoding = act.data().toString()
+encoding = act.data()
 self.__encodingChanged("%s-selected" % encoding)
 def __checkEncoding(self):
 """
 Private method to check the selected encoding of the encodings submenu.
 """
 Private method to handle the selection of an eol type.
 @param act reference to the action that was triggered (QAction)
 """
-eol = act.data().toString()
+eol = act.data()
 self.setEolModeByEolString(eol)
 self.convertEols(self.eolMode())
 def __checkEol(self):
 """
 self.setStyleBits(self.lexer_.styleBitsNeeded())
 self.connect(self, SIGNAL("SCN_STYLENEEDED(int)"), self.__styleNeeded)
 # get the font for style 0 and set it as the default font
 key = 'Scintilla/%s/style0/font' % self.lexer_.language()
-fontVariant = Preferences.Prefs.settings.value(key)
+fdesc = Preferences.Prefs.settings.value(key)
-if fontVariant.isValid():
+if fdesc is not None:
-fdesc = fontVariant.toStringList()
 font = QFont(fdesc[0], int(fdesc[1]))
 self.lexer_.setDefaultFont(font)
 self.lexer_.readSettings(Preferences.Prefs.settings, "Scintilla")
 # now set the lexer properties
 """
 Public method to set the spell checking options for files belonging
 to the current project.
 """
 project = e4App().getObject("Project")
-if project.isOpen() and project.isProjectSource(self.fileName):
+if self.fileName and \
+project.isOpen() and \
+project.isProjectSource(self.fileName):
 pwl, pel = project.getProjectDictionaries()
 self.__setSpellingLanguage(project.getProjectSpellLanguage(),
 pwl = pwl, pel = pel)
 def setAutoSpellChecking(self):

Mercurial Repositories > eric / file comparison

comparison: QScintilla/Editor.py

QScintilla/Editor.py