Mercurial Repositories > eric / file diff

diff -r eb15faf0e3e2 -r 8087ef6df2e4 eric6/Preferences/ConfigurationPages/EditorTypingPage.py
--- a/eric6/Preferences/ConfigurationPages/EditorTypingPage.py	Sat Sep 28 19:03:56 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorTypingPage.py	Sun Sep 29 17:03:39 2019 +0200
@@ -29,10 +29,12 @@
         self.setObjectName("EditorTypingPage")
         
         # set initial values
-        self.pageIds = {}
-        self.pageIds[' '] = self.stackedWidget.indexOf(self.emptyPage)
-        self.pageIds['Python'] = self.stackedWidget.indexOf(self.pythonPage)
-        self.pageIds['Ruby'] = self.stackedWidget.indexOf(self.rubyPage)
+        self.pageIds = {
+            ' ': self.stackedWidget.indexOf(self.emptyPage),
+            'Python': self.stackedWidget.indexOf(self.pythonPage),
+            'Ruby': self.stackedWidget.indexOf(self.rubyPage),
+            'YAML': self.stackedWidget.indexOf(self.yamlPage),
+        }
         languages = sorted(list(self.pageIds.keys()))
         for language in languages:
             self.languageCombo.addItem(language, self.pageIds[language])
@@ -83,10 +85,30 @@
         self.rubyInsertInlineDocCheckBox.setChecked(
             Preferences.getEditorTyping("Ruby/InsertInlineDoc"))
         
-        # TODO: add page for Yaml settings
+        # YAML
+        self.yamlGroup.setChecked(
+            Preferences.getEditorTyping("Yaml/EnabledTypingAids"))
+        self.yamlInsertClosingBraceCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertClosingBrace"))
+        self.yamlSkipBraceCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/SkipBrace"))
+        self.yamlInsertQuoteCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertQuote"))
+        self.yamlAutoIndentationCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/AutoIndentation"))
+        self.yamlColonDetectionCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/ColonDetection"))
+        self.yamlInsertBlankDashCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankDash"))
+        self.yamlInsertBlankColonCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankColon"))
+        self.yamlInsertBlankQuestionCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankQuestion"))
+        self.yamlInsertBlankCommaCheckBox.setChecked(
+            Preferences.getEditorTyping("Yaml/InsertBlankComma"))
         
         self.on_languageCombo_activated(' ')
-        
+    
     def save(self):
         """
         Public slot to save the Editor Typing configuration.
@@ -158,6 +180,38 @@
             "Ruby/InsertInlineDoc",
             self.rubyInsertInlineDocCheckBox.isChecked())
         
+        # YAML
+        Preferences.setEditorTyping(
+            "Yaml/EnabledTypingAids",
+            self.yamlGroup.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertClosingBrace",
+            self.yamlInsertClosingBraceCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/SkipBrace",
+            self.yamlSkipBraceCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertQuote",
+            self.yamlInsertQuoteCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/AutoIndentation",
+            self.yamlAutoIndentationCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/ColonDetection",
+            self.yamlColonDetectionCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankDash",
+            self.yamlInsertBlankDashCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankColon",
+            self.yamlInsertBlankColonCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankQuestion",
+            self.yamlInsertBlankQuestionCheckBox.isChecked())
+        Preferences.setEditorTyping(
+            "Yaml/InsertBlankComma",
+            self.yamlInsertBlankCommaCheckBox.isChecked())
+    
     @pyqtSlot(str)
     def on_languageCombo_activated(self, language):
         """