diff -r 27f636beebad -r 2c730d5fd177 eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py
--- a/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Tue Mar 02 17:17:09 2021 +0100
@@ -55,8 +55,10 @@
QCoreApplication.applicationDirPath() +
"/qtwebengine_dictionaries"),
QDir.cleanPath(
- QLibraryInfo.location(QLibraryInfo.DataPath) +
- "/qtwebengine_dictionaries"),
+ QLibraryInfo.location(
+ QLibraryInfo.LibraryLocation.DataPath) +
+ "/qtwebengine_dictionaries"
+ ),
}
self.spellCheckDictionaryDirectoriesEdit.setPlainText(
"\n".join(self.__dictionaryDirectories))
@@ -90,27 +92,28 @@
for fileName in fileNames:
lang = fileName[:-5]
langStr = self.__createLanguageString(lang)
- if self.spellCheckLanguagesList.findItems(langStr,
- Qt.MatchExactly):
+ if self.spellCheckLanguagesList.findItems(
+ langStr, Qt.MatchFlag.MatchExactly
+ ):
continue
itm = QListWidgetItem(langStr, self.spellCheckLanguagesList)
- itm.setData(Qt.UserRole, lang)
- itm.setFlags(itm.flags() | Qt.ItemIsUserCheckable)
- itm.setCheckState(Qt.Unchecked)
- self.spellCheckLanguagesList.sortItems(Qt.AscendingOrder)
+ itm.setData(Qt.ItemDataRole.UserRole, lang)
+ itm.setFlags(itm.flags() | Qt.ItemFlag.ItemIsUserCheckable)
+ itm.setCheckState(Qt.CheckState.Unchecked)
+ self.spellCheckLanguagesList.sortItems(Qt.SortOrder.AscendingOrder)
spellCheckLanguages = Preferences.getWebBrowser("SpellCheckLanguages")
topIndex = 0
for lang in spellCheckLanguages:
items = self.spellCheckLanguagesList.findItems(
- self.__createLanguageString(lang), Qt.MatchExactly)
+ self.__createLanguageString(lang), Qt.MatchFlag.MatchExactly)
if items:
itm = items[0]
self.spellCheckLanguagesList.takeItem(
self.spellCheckLanguagesList.row(itm))
self.spellCheckLanguagesList.insertItem(topIndex, itm)
- itm.setCheckState(Qt.Checked)
+ itm.setCheckState(Qt.CheckState.Checked)
topIndex += 1
if self.spellCheckLanguagesList.count():
@@ -129,8 +132,8 @@
languages = []
for row in range(self.spellCheckLanguagesList.count()):
itm = self.spellCheckLanguagesList.item(row)
- if itm.checkState() == Qt.Checked:
- languages.append(itm.data(Qt.UserRole))
+ if itm.checkState() == Qt.CheckState.Checked:
+ languages.append(itm.data(Qt.ItemDataRole.UserRole))
Preferences.setWebBrowser(
"SpellCheckEnabled",
@@ -159,7 +162,7 @@
"""
loc = QLocale(language)
- if loc.language() == QLocale.C:
+ if loc.language() == QLocale.Language.C:
return language
country = QLocale.countryToString(loc.country())
