Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/ShellPage.py	Sun Jul 09 19:42:44 2017 +0200
+++ b/Preferences/ConfigurationPages/ShellPage.py	Sun Jul 09 19:44:33 2017 +0200
@@ -22,6 +22,8 @@
 except AttributeError:
     MonospacedFontsOption = QFontDialog.FontDialogOptions(0x10)
 
+from QScintilla.Shell import ShellHistoryStyle
+
 
 class ShellPage(ConfigurationPageBase, Ui_ShellPage):
     """
@@ -35,6 +37,13 @@
         self.setupUi(self)
         self.setObjectName("ShellPage")
         
+        self.shellHistoryStyleComboBox.addItem(
+            self.tr("Disabled"), ShellHistoryStyle.Disabled)
+        self.shellHistoryStyleComboBox.addItem(
+            self.tr("Linux Style"), ShellHistoryStyle.LinuxStyle)
+        self.shellHistoryStyleComboBox.addItem(
+            self.tr("Windows Style"), ShellHistoryStyle.WindowsStyle)
+        
         # set initial values
         self.shellLinenoCheckBox.setChecked(
             Preferences.getShell("LinenoMargin"))
@@ -48,6 +57,9 @@
             Preferences.getShell("SyntaxHighlightingEnabled"))
         self.shellHistorySpinBox.setValue(
             Preferences.getShell("MaxHistoryEntries"))
+        index = self.shellHistoryStyleComboBox.findData(
+            Preferences.getShell("HistoryStyle"))
+        self.shellHistoryStyleComboBox.setCurrentIndex(index)
         self.stdOutErrCheckBox.setChecked(
             Preferences.getShell("ShowStdOutErr"))
         
@@ -81,6 +93,9 @@
             "MaxHistoryEntries",
             self.shellHistorySpinBox.value())
         Preferences.setShell(
+            "HistoryStyle",
+            self.shellHistoryStyleComboBox.currentData())
+        Preferences.setShell(
             "ShowStdOutErr",
             self.stdOutErrCheckBox.isChecked())