eric: comparison eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py

-:ccbfefe5bc5a
+:a4f1b68c0737
 except AttributeError:
 MonospacedFontsOption = QFontDialog.FontDialogOptions(0x10)
 NoFontsOption = QFontDialog.FontDialogOptions(0)
-# TODO: add capability to export a list of selected highlighter styles
 class EditorHighlightingStylesPage(ConfigurationPageBase,
 Ui_EditorHighlightingStylesPage):
 """
 Class implementing the Editor Highlighting Styles configuration page.
 """
 @param language The lexer language (string)
 """
 self.styleElementList.clear()
 self.styleGroup.setEnabled(False)
 self.lexer = None
-self.exportCurrentButton.setEnabled(language != "")
-self.importCurrentButton.setEnabled(language != "")
 if not language:
 return
 try:
 #######################################################################
 ## Importing and exporting of styles
 #######################################################################
 @pyqtSlot()
-def on_importCurrentButton_clicked(self):
+def on_importButton_clicked(self):
 """
-Private slot to import the styles of the current lexer.
+Private slot to import styles to be selected.
 """
-self.__importStyles({self.lexer.language(): self.lexer})
+self.__importStyles(importAll=False)
 @pyqtSlot()
-def on_exportCurrentButton_clicked(self):
+def on_exportButton_clicked(self):
 """
-Private slot to export the styles of the current lexer.
+Private slot to export styles to be selected.
 """
-self.__exportStyles([self.lexer])
+self.__exportStyles(exportAll=False)
 @pyqtSlot()
 def on_importAllButton_clicked(self):
 """
 Private slot to import the styles of all lexers.
 """
-self.__importStyles(self.lexers)
+self.__importStyles(importAll=True)
 @pyqtSlot()
 def on_exportAllButton_clicked(self):
 """
 Private slot to export the styles of all lexers.
 """
-self.__exportStyles(list(self.lexers.values()))
+self.__exportStyles(exportAll=True)
-def __exportStyles(self, lexers):
+def __exportStyles(self, exportAll=False):
 """
-Private method to export the styles of the given lexers.
+Private method to export the styles of selectable lexers.
-@param lexers list of lexer objects for which to export the styles
+@param exportAll flag indicating to export all styles without asking
-@type list of PreferencesLexer
+(defaults to False)
+@type bool (optional)
 """
 from eric6config import getConfig
 stylesDir = getConfig("ericStylesDir")
+lexerNames = list(self.lexers.keys())
+if not exportAll:
+if self.lexer:
+preselect = [self.lexer.language()]
+else:
+preselect = []
+from .EditorHighlightingStylesSelectionDialog import (
+EditorHighlightingStylesSelectionDialog)
+dlg = EditorHighlightingStylesSelectionDialog(
+lexerNames, forImport=False, preselect=preselect)
+if dlg.exec() == QDialog.Accepted:
+lexerNames = dlg.getLexerNames()
+else:
+# Cancelled by user
+return
+lexers = [self.lexers[name] for name in lexerNames]
 fn, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
 self,
 self.tr("Export Highlighting Styles"),
 stylesDir,
 self.tr("<p>The highlighting styles file <b>{0}</b>"
 " could not be written.</p><p>Reason: {1}</p>")
 .format(fn, f.errorString())
 )
-def __importStyles(self, lexers):
+def __importStyles(self, importAll=False):
 """
-Private method to import the styles of the given lexers.
+Private method to import the styles of lexers to be selected.
-@param lexers dictionary of lexer objects for which to import the
+@param importAll flag indicating to import all styles without asking
-styles
+(defaults to False)
+@type bool (optional)
 """
 from eric6config import getConfig
 stylesDir = getConfig("ericStylesDir")
 fn = E5FileDialog.getOpenFileName(
 # new JSON based file
 from Preferences.HighlightingStylesFile import (
 HighlightingStylesFile
 )
 highlightingStylesFile = HighlightingStylesFile()
-styles = highlightingStylesFile.readFile(fn, lexers)
+styles = highlightingStylesFile.readFile(fn)
 if not styles:
 return
 else:
 # old XML based file
 f = QFile(fn)
 if f.open(QIODevice.ReadOnly):
 from E5XML.HighlightingStylesReader import (
 HighlightingStylesReader
 )
-reader = HighlightingStylesReader(f, lexers)
+reader = HighlightingStylesReader(f, self.lexers)
 styles = reader.readXML()
 f.close()
 if not styles:
 return
 else:
 " be read.</p><p>Reason: {1}</p>"
 ).format(fn, f.errorString())
 )
 return
-self.__applyStyles(styles, lexers)
+self.__applyStyles(styles, importAll=importAll)
 self.on_lexerLanguageComboBox_activated(
 self.lexerLanguageComboBox.currentText())
-def __applyStyles(self, stylesList, lexersList):
+def __applyStyles(self, stylesList, importAll=False):
 """
 Private method to apply the imported styles to this dialog.
 @param stylesList list of imported lexer styles
 @type list of dict
-@param lexersList list of lexers to apply the styles to
+@param importAll flag indicating to import all styles without asking
-@type list of PreferencesLexer
+(defaults to False)
-"""
+@type bool (optional)
+"""
+lexerNames = [d["name"]
+for d in stylesList
+if d["name"] in self.lexers]
+if not importAll:
+from .EditorHighlightingStylesSelectionDialog import (
+EditorHighlightingStylesSelectionDialog)
+dlg = EditorHighlightingStylesSelectionDialog(
+lexerNames, forImport=True)
+if dlg.exec() == QDialog.Accepted:
+lexerNames = dlg.getLexerNames()
+else:
+# Cancelled by user
+return
 for lexerDict in stylesList:
-if lexerDict["name"] in lexersList:
+if lexerDict["name"] in lexerNames:
-lexer = lexersList[lexerDict["name"]]
+lexer = self.lexers[lexerDict["name"]]
 for styleDict in lexerDict["styles"]:
 style = styleDict["style"]
 substyle = styleDict["substyle"]
 lexer.setColor(QColor(styleDict["color"]), style, substyle)
 lexer.setPaper(QColor(styleDict["paper"]), style, substyle)

Mercurial Repositories > eric / file comparison

comparison: eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py

eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py