Mercurial Repositories > eric / file diff

diff -r 2ca23396c25c -r cd41c844862f eric6/Preferences/ConfigurationPages/EditorGeneralPage.py
--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py	Fri Jan 22 14:14:15 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py	Fri Jan 22 16:48:43 2021 +0100
@@ -19,6 +19,8 @@
     EditorLanguageTabIndentOverrideDialog
 )
 
+from QScintilla.DocstringGenerator import getSupportedDocstringTypes
+
 import Preferences
 import UI.PixmapCache
 
@@ -39,6 +41,11 @@
         self.deleteButton.setIcon(UI.PixmapCache.getIcon("minus"))
         self.editButton.setIcon(UI.PixmapCache.getIcon("edit"))
         
+        for docstringType, docstringStyle in sorted(
+            getSupportedDocstringTypes()
+        ):
+            self.docstringStyleComboBox.addItem(docstringStyle, docstringType)
+        
         # set initial values
         self.tabwidthSlider.setValue(
             Preferences.getEditor("TabWidth"))
@@ -64,6 +71,10 @@
         self.sourceOutlineShowCodingCheckBox.setChecked(
             Preferences.getEditor("SourceOutlineShowCoding"))
         
+        index = self.docstringStyleComboBox.findData(
+            Preferences.getEditor("DocstringType"))
+        self.docstringStyleComboBox.setCurrentIndex(index)
+        
         virtualSpaceOptions = Preferences.getEditor("VirtualSpaceOptions")
         self.vsSelectionCheckBox.setChecked(
             virtualSpaceOptions & QsciScintillaBase.SCVS_RECTANGULARSELECTION)
@@ -111,6 +122,10 @@
             "SourceOutlineShowCoding",
             self.sourceOutlineShowCodingCheckBox.isChecked())
         
+        Preferences.setEditor(
+            "DocstringType",
+            self.docstringStyleComboBox.currentData())
+        
         virtualSpaceOptions = QsciScintillaBase.SCVS_NONE
         if self.vsSelectionCheckBox.isChecked():
             virtualSpaceOptions |= QsciScintillaBase.SCVS_RECTANGULARSELECTION