diff -r 12c25acee031 -r e2f8a0fbf738 eric7/Preferences/ConfigurationPages/InterfacePage.py --- a/eric7/Preferences/ConfigurationPages/InterfacePage.py Tue Oct 26 18:03:56 2021 +0200 +++ b/eric7/Preferences/ConfigurationPages/InterfacePage.py Wed Oct 27 19:15:50 2021 +0200 @@ -51,7 +51,6 @@ # set initial values self.__populateStyleCombo() self.__populateLanguageCombo() - self.__populateShellPositionCombo() self.uiBrowsersListFoldersFirstCheckBox.setChecked( Preferences.getUI("BrowsersListFoldersFirst")) @@ -111,6 +110,9 @@ self.__iconBarColor = Preferences.getUI("IconBarColor") self.__setIconBarSamples() + self.combinedLeftRightSidebarCheckBox.setChecked( + Preferences.getUI("CombinedLeftRightSidebar")) + # connect the icon size combo box after initialization is complete self.iconSizeComboBox.currentIndexChanged.connect( self.__setIconBarSamples) @@ -169,11 +171,6 @@ layoutType = "Sidebars" # just in case Preferences.setUI("LayoutType", layoutType) - # save the shell position setting - shellPositionIndex = self.shellPositionComboBox.currentIndex() - shellPosition = self.shellPositionComboBox.itemData(shellPositionIndex) - Preferences.setUI("ShellPosition", shellPosition) - # save the integrated tools activation # left side Preferences.setUI( @@ -218,6 +215,9 @@ Preferences.setUI( "IconBarColor", self.__iconBarColor) + Preferences.setUI( + "CombinedLeftRightSidebar", + self.combinedLeftRightSidebarCheckBox.isChecked()) def __populateStyleCombo(self): """ @@ -276,20 +276,6 @@ self.languageComboBox.addItem(locales[locale], locale) self.languageComboBox.setCurrentIndex(currentIndex) - def __populateShellPositionCombo(self): - """ - Private method to initialize the shell position combo box. - """ - self.shellPositionComboBox.addItem(self.tr("Left Side"), "left") - self.shellPositionComboBox.addItem(self.tr("Right Side"), "right") - self.shellPositionComboBox.addItem(self.tr("Bottom Side"), "bottom") - - shellPosition = Preferences.getUI("ShellPosition") - if shellPosition not in ("left", "right", "bottom"): - shellPosition = "bottom" - index = self.shellPositionComboBox.findData(shellPosition) - self.shellPositionComboBox.setCurrentIndex(index) - @pyqtSlot() def on_resetLayoutButton_clicked(self): """ @@ -335,6 +321,20 @@ if colDlg.exec() == QDialog.DialogCode.Accepted: self.__iconBarColor = colDlg.selectedColor() self.__setIconBarSamples() + + @pyqtSlot(bool) + def on_combinedLeftRightSidebarCheckBox_toggled(self, checked): + """ + Private slot handling a change of the combined sidebars checkbox. + + @param checked state of the checkbox + @type bool + """ + self.leftRightGroupBox.setTitle( + self.tr("Combined Left Side") + if checked else + self.tr("Right Side") + ) def create(dlg):