Mercurial Repositories > eric / file diff

diff -r b7ebfc2e47d4 -r 59579e8aff98 src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py
--- a/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Mon Feb 19 19:17:04 2024 +0100
+++ b/src/eric7/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py	Wed Feb 21 10:56:24 2024 +0100
@@ -10,7 +10,7 @@
 import enum
 import pathlib
 
-from PyQt6.QtCore import QFile, QIODevice, Qt, pyqtSlot
+from PyQt6.QtCore import Qt, pyqtSlot
 from PyQt6.QtGui import QColor, QFont
 from PyQt6.QtWidgets import (
     QColorDialog,
@@ -23,7 +23,6 @@
 
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
-from eric7.EricXML.HighlightingStylesReader import HighlightingStylesReader
 from eric7.Preferences.HighlightingStylesFile import HighlightingStylesFile
 from eric7.QScintilla import Lexers
 
@@ -657,40 +656,16 @@
             self,
             self.tr("Import Highlighting Styles"),
             stylesDir,
-            self.tr(
-                "Highlighting Styles File (*.ehj);;"
-                "XML Highlighting Styles File (*.e6h *.e4h)"
-            ),
+            self.tr("Highlighting Styles File (*.ehj)"),
         )
 
         if not fn:
             return
 
-        if fn.endswith(".ehj"):
-            # new JSON based file
-            highlightingStylesFile = HighlightingStylesFile()
-            styles = highlightingStylesFile.readFile(fn)
-            if not styles:
-                return
-        else:
-            # old XML based file
-            f = QFile(fn)
-            if f.open(QIODevice.OpenModeFlag.ReadOnly):
-                reader = HighlightingStylesReader(f, self.lexers)
-                styles = reader.readXML()
-                f.close()
-                if not styles:
-                    return
-            else:
-                EricMessageBox.critical(
-                    self,
-                    self.tr("Import Highlighting Styles"),
-                    self.tr(
-                        "<p>The highlighting styles file <b>{0}</b> could not"
-                        " be read.</p><p>Reason: {1}</p>"
-                    ).format(fn, f.errorString()),
-                )
-                return
+        highlightingStylesFile = HighlightingStylesFile()
+        styles = highlightingStylesFile.readFile(fn)
+        if not styles:
+            return
 
         self.__applyStyles(styles, importAll=importAll)
         self.on_lexerLanguageComboBox_activated(