diff -r 0b936ff1bbb9 -r a2bc06a54d9d src/eric7/Templates/TemplateViewer.py --- a/src/eric7/Templates/TemplateViewer.py Sun Nov 06 11:22:39 2022 +0100 +++ b/src/eric7/Templates/TemplateViewer.py Mon Nov 07 17:19:58 2022 +0100 @@ -19,7 +19,9 @@ from eric7.EricGui import EricPixmapCache from eric7.EricWidgets import EricFileDialog, EricMessageBox from eric7.EricWidgets.EricApplication import ericApp +from eric7.EricXML.TemplatesReader import TemplatesReader +from .TemplatePropertiesDialog import TemplatePropertiesDialog from .TemplatesFile import TemplatesFile @@ -485,8 +487,6 @@ itm.getName() if isinstance(itm, TemplateGroup) else itm.getGroupName() ) - from .TemplatePropertiesDialog import TemplatePropertiesDialog - dlg = TemplatePropertiesDialog(self) dlg.setSelectedGroup(groupName) if dlg.exec() == QDialog.DialogCode.Accepted: @@ -498,8 +498,6 @@ """ Private slot to handle the Add Group context menu action. """ - from .TemplatePropertiesDialog import TemplatePropertiesDialog - dlg = TemplatePropertiesDialog(self, True) if dlg.exec() == QDialog.DialogCode.Accepted: name, language = dlg.getData() @@ -513,8 +511,6 @@ itm = self.currentItem() editGroup = not isinstance(itm, TemplateEntry) - from .TemplatePropertiesDialog import TemplatePropertiesDialog - dlg = TemplatePropertiesDialog(self, editGroup, itm) if dlg.exec() == QDialog.DialogCode.Accepted: if editGroup: @@ -716,6 +712,9 @@ @param itm reference to the template item to apply (TemplateEntry) """ + from .TemplateMultipleVariablesDialog import TemplateMultipleVariablesDialog + from .TemplateSingleVariableDialog import TemplateSingleVariableDialog + editor = self.viewmanager.activeWindow() if editor is None: return @@ -732,17 +731,12 @@ if variables: if Preferences.getTemplates("SingleDialog"): - from .TemplateMultipleVariablesDialog import ( - TemplateMultipleVariablesDialog, - ) dlg = TemplateMultipleVariablesDialog(variables, self) if dlg.exec() == QDialog.DialogCode.Accepted: varValues.update(dlg.getVariables()) ok = True else: - from .TemplateSingleVariableDialog import TemplateSingleVariableDialog - for var in variables: dlg = TemplateSingleVariableDialog(var, self) if dlg.exec() == QDialog.DialogCode.Accepted: @@ -1003,8 +997,6 @@ else: f = QFile(filename) if f.open(QIODevice.OpenModeFlag.ReadOnly): - from eric7.EricXML.TemplatesReader import TemplatesReader - reader = TemplatesReader(f, viewer=self) reader.readXML() f.close()