--- a/src/eric7/Preferences/ConfigurationPages/InterfacePage.py Wed Jul 13 11:16:20 2022 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/InterfacePage.py Wed Jul 13 14:55:47 2022 +0200 @@ -31,6 +31,7 @@ """ Class implementing the Interface configuration page. """ + def __init__(self): """ Constructor @@ -38,96 +39,94 @@ super().__init__() self.setupUi(self) self.setObjectName("InterfacePage") - + self.styleSheetPicker.setMode(EricPathPickerModes.OPEN_FILE_MODE) - self.styleSheetPicker.setFilters(self.tr( - "Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;" - "All files (*)")) + self.styleSheetPicker.setFilters( + self.tr( + "Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;" + "All files (*)" + ) + ) self.styleSheetPicker.setDefaultDirectory(getConfig("ericStylesDir")) - + styleIconsPath = ericApp().getStyleIconsPath() - self.styleIconsPathPicker.setMode( - EricPathPickerModes.DIRECTORY_SHOW_FILES_MODE) + self.styleIconsPathPicker.setMode(EricPathPickerModes.DIRECTORY_SHOW_FILES_MODE) self.styleIconsPathPicker.setDefaultDirectory(styleIconsPath) - + for iconBarSize in EricIconBar.BarSizes: self.iconSizeComboBox.addItem( - EricIconBar.BarSizes[iconBarSize][2], iconBarSize) - + EricIconBar.BarSizes[iconBarSize][2], iconBarSize + ) + # set initial values self.__populateStyleCombo() self.__populateLanguageCombo() - + self.uiBrowsersListFoldersFirstCheckBox.setChecked( - Preferences.getUI("BrowsersListFoldersFirst")) + Preferences.getUI("BrowsersListFoldersFirst") + ) self.uiBrowsersHideNonPublicCheckBox.setChecked( - Preferences.getUI("BrowsersHideNonPublic")) + Preferences.getUI("BrowsersHideNonPublic") + ) self.uiBrowsersSortByOccurrenceCheckBox.setChecked( - Preferences.getUI("BrowsersListContentsByOccurrence")) + Preferences.getUI("BrowsersListContentsByOccurrence") + ) self.browserShowCodingCheckBox.setChecked( - Preferences.getUI("BrowserShowCoding")) - self.fileFiltersEdit.setText( - Preferences.getUI("BrowsersFileFilters")) - + Preferences.getUI("BrowserShowCoding") + ) + self.fileFiltersEdit.setText(Preferences.getUI("BrowsersFileFilters")) + self.uiCaptionShowsFilenameGroupBox.setChecked( - Preferences.getUI("CaptionShowsFilename")) - self.filenameLengthSpinBox.setValue( - Preferences.getUI("CaptionFilenameLength")) + Preferences.getUI("CaptionShowsFilename") + ) + self.filenameLengthSpinBox.setValue(Preferences.getUI("CaptionFilenameLength")) self.styleSheetPicker.setText(Preferences.getUI("StyleSheet")) self.styleIconsPathPicker.setText(Preferences.getUI("StyleIconsPath")) - + layoutType = Preferences.getUI("LayoutType") if layoutType == "Sidebars": index = 0 elif layoutType == "Toolboxes": index = 1 else: - index = 0 # default for bad values + index = 0 # default for bad values self.layoutComboBox.setCurrentIndex(index) - + # integrated tools activation # left side - self.findReplaceCheckBox.setChecked( - Preferences.getUI("ShowFindFileWidget")) + self.findReplaceCheckBox.setChecked(Preferences.getUI("ShowFindFileWidget")) self.findLocationCheckBox.setChecked( - Preferences.getUI("ShowFindLocationWidget")) - self.templateViewerCheckBox.setChecked( - Preferences.getUI("ShowTemplateViewer")) - self.fileBrowserCheckBox.setChecked( - Preferences.getUI("ShowFileBrowser")) - self.symbolsCheckBox.setChecked( - Preferences.getUI("ShowSymbolsViewer")) + Preferences.getUI("ShowFindLocationWidget") + ) + self.templateViewerCheckBox.setChecked(Preferences.getUI("ShowTemplateViewer")) + self.fileBrowserCheckBox.setChecked(Preferences.getUI("ShowFileBrowser")) + self.symbolsCheckBox.setChecked(Preferences.getUI("ShowSymbolsViewer")) # right side self.codeDocumentationViewerCheckBox.setChecked( - Preferences.getUI("ShowCodeDocumentationViewer")) - self.helpViewerCheckBox.setChecked( - Preferences.getUI("ShowInternalHelpViewer")) - self.condaCheckBox.setChecked( - Preferences.getUI("ShowCondaPackageManager")) - self.pypiCheckBox.setChecked( - Preferences.getUI("ShowPyPIPackageManager")) - self.cooperationCheckBox.setChecked( - Preferences.getUI("ShowCooperation")) - self.ircCheckBox.setChecked( - Preferences.getUI("ShowIrc")) - self.microPythonCheckBox.setChecked( - Preferences.getUI("ShowMicroPython")) + Preferences.getUI("ShowCodeDocumentationViewer") + ) + self.helpViewerCheckBox.setChecked(Preferences.getUI("ShowInternalHelpViewer")) + self.condaCheckBox.setChecked(Preferences.getUI("ShowCondaPackageManager")) + self.pypiCheckBox.setChecked(Preferences.getUI("ShowPyPIPackageManager")) + self.cooperationCheckBox.setChecked(Preferences.getUI("ShowCooperation")) + self.ircCheckBox.setChecked(Preferences.getUI("ShowIrc")) + self.microPythonCheckBox.setChecked(Preferences.getUI("ShowMicroPython")) # bottom side - self.numbersCheckBox.setChecked( - Preferences.getUI("ShowNumbersViewer")) - + self.numbersCheckBox.setChecked(Preferences.getUI("ShowNumbersViewer")) + self.iconSizeComboBox.setCurrentIndex( - self.iconSizeComboBox.findData(Preferences.getUI("IconBarSize"))) + self.iconSizeComboBox.findData(Preferences.getUI("IconBarSize")) + ) self.__iconBarColor = Preferences.getUI("IconBarColor") self.__setIconBarSamples() - + self.combinedLeftRightSidebarCheckBox.setChecked( - Preferences.getUI("CombinedLeftRightSidebar")) - + Preferences.getUI("CombinedLeftRightSidebar") + ) + # connect the icon size combo box after initialization is complete - self.iconSizeComboBox.currentIndexChanged.connect( - self.__setIconBarSamples) - + self.iconSizeComboBox.currentIndexChanged.connect(self.__setIconBarSamples) + def save(self): """ Public slot to save the Interface configuration. @@ -136,134 +135,101 @@ styleIndex = self.styleComboBox.currentIndex() style = self.styleComboBox.itemData(styleIndex) Preferences.setUI("Style", style) - + # save the other UI related settings Preferences.setUI( "BrowsersListFoldersFirst", - self.uiBrowsersListFoldersFirstCheckBox.isChecked()) + self.uiBrowsersListFoldersFirstCheckBox.isChecked(), + ) Preferences.setUI( - "BrowsersHideNonPublic", - self.uiBrowsersHideNonPublicCheckBox.isChecked()) + "BrowsersHideNonPublic", self.uiBrowsersHideNonPublicCheckBox.isChecked() + ) Preferences.setUI( "BrowsersListContentsByOccurrence", - self.uiBrowsersSortByOccurrenceCheckBox.isChecked()) - Preferences.setUI( - "BrowserShowCoding", - self.browserShowCodingCheckBox.isChecked()) - Preferences.setUI( - "BrowsersFileFilters", - self.fileFiltersEdit.text()) - + self.uiBrowsersSortByOccurrenceCheckBox.isChecked(), + ) Preferences.setUI( - "CaptionShowsFilename", - self.uiCaptionShowsFilenameGroupBox.isChecked()) - Preferences.setUI( - "CaptionFilenameLength", - self.filenameLengthSpinBox.value()) + "BrowserShowCoding", self.browserShowCodingCheckBox.isChecked() + ) + Preferences.setUI("BrowsersFileFilters", self.fileFiltersEdit.text()) + Preferences.setUI( - "StyleSheet", - self.styleSheetPicker.text()) - Preferences.setUI( - "StyleIconsPath", - self.styleIconsPathPicker.text()) - + "CaptionShowsFilename", self.uiCaptionShowsFilenameGroupBox.isChecked() + ) + Preferences.setUI("CaptionFilenameLength", self.filenameLengthSpinBox.value()) + Preferences.setUI("StyleSheet", self.styleSheetPicker.text()) + Preferences.setUI("StyleIconsPath", self.styleIconsPathPicker.text()) + # save the language settings uiLanguageIndex = self.languageComboBox.currentIndex() uiLanguage = ( - self.languageComboBox.itemData(uiLanguageIndex) - if uiLanguageIndex else - None + self.languageComboBox.itemData(uiLanguageIndex) if uiLanguageIndex else None ) Preferences.setUILanguage(uiLanguage) - + # save the interface layout settings if self.layoutComboBox.currentIndex() == 0: layoutType = "Sidebars" elif self.layoutComboBox.currentIndex() == 1: layoutType = "Toolboxes" else: - layoutType = "Sidebars" # just in case + layoutType = "Sidebars" # just in case Preferences.setUI("LayoutType", layoutType) - + # save the integrated tools activation # left side - Preferences.setUI( - "ShowFindFileWidget", - self.findReplaceCheckBox.isChecked()) - Preferences.setUI( - "ShowFindLocationWidget", - self.findLocationCheckBox.isChecked()) + Preferences.setUI("ShowFindFileWidget", self.findReplaceCheckBox.isChecked()) Preferences.setUI( - "ShowTemplateViewer", - self.templateViewerCheckBox.isChecked()) - Preferences.setUI( - "ShowFileBrowser", - self.fileBrowserCheckBox.isChecked()) - Preferences.setUI( - "ShowSymbolsViewer", - self.symbolsCheckBox.isChecked()) + "ShowFindLocationWidget", self.findLocationCheckBox.isChecked() + ) + Preferences.setUI("ShowTemplateViewer", self.templateViewerCheckBox.isChecked()) + Preferences.setUI("ShowFileBrowser", self.fileBrowserCheckBox.isChecked()) + Preferences.setUI("ShowSymbolsViewer", self.symbolsCheckBox.isChecked()) # right side Preferences.setUI( "ShowCodeDocumentationViewer", - self.codeDocumentationViewerCheckBox.isChecked()) - Preferences.setUI( - "ShowInternalHelpViewer", - self.helpViewerCheckBox.isChecked()) - Preferences.setUI( - "ShowCondaPackageManager", - self.condaCheckBox.isChecked()) - Preferences.setUI( - "ShowPyPIPackageManager", - self.pypiCheckBox.isChecked()) - Preferences.setUI( - "ShowCooperation", - self.cooperationCheckBox.isChecked()) - Preferences.setUI( - "ShowIrc", - self.ircCheckBox.isChecked()) - Preferences.setUI( - "ShowMicroPython", - self.microPythonCheckBox.isChecked()) + self.codeDocumentationViewerCheckBox.isChecked(), + ) + Preferences.setUI("ShowInternalHelpViewer", self.helpViewerCheckBox.isChecked()) + Preferences.setUI("ShowCondaPackageManager", self.condaCheckBox.isChecked()) + Preferences.setUI("ShowPyPIPackageManager", self.pypiCheckBox.isChecked()) + Preferences.setUI("ShowCooperation", self.cooperationCheckBox.isChecked()) + Preferences.setUI("ShowIrc", self.ircCheckBox.isChecked()) + Preferences.setUI("ShowMicroPython", self.microPythonCheckBox.isChecked()) # bottom side - Preferences.setUI( - "ShowNumbersViewer", - self.numbersCheckBox.isChecked()) - - Preferences.setUI( - "IconBarSize", - self.iconSizeComboBox.currentData()) - Preferences.setUI( - "IconBarColor", - self.__iconBarColor) + Preferences.setUI("ShowNumbersViewer", self.numbersCheckBox.isChecked()) + + Preferences.setUI("IconBarSize", self.iconSizeComboBox.currentData()) + Preferences.setUI("IconBarColor", self.__iconBarColor) Preferences.setUI( "CombinedLeftRightSidebar", - self.combinedLeftRightSidebarCheckBox.isChecked()) - + self.combinedLeftRightSidebarCheckBox.isChecked(), + ) + def __populateStyleCombo(self): """ Private method to populate the style combo box. """ curStyle = Preferences.getUI("Style") styles = sorted(QStyleFactory.keys()) - self.styleComboBox.addItem(self.tr('System'), "System") + self.styleComboBox.addItem(self.tr("System"), "System") for style in styles: self.styleComboBox.addItem(style, style) currentIndex = self.styleComboBox.findData(curStyle) if currentIndex == -1: currentIndex = 0 self.styleComboBox.setCurrentIndex(currentIndex) - + def __populateLanguageCombo(self): """ Private method to initialize the language combo box. """ self.languageComboBox.clear() - + fnlist = ( - glob.glob("eric7_*.qm") + - glob.glob(os.path.join( - getConfig('ericTranslationsDir'), "eric7_*.qm")) + - glob.glob(os.path.join(Utilities.getConfigDir(), "eric7_*.qm")) + glob.glob("eric7_*.qm") + + glob.glob(os.path.join(getConfig("ericTranslationsDir"), "eric7_*.qm")) + + glob.glob(os.path.join(Utilities.getConfigDir(), "eric7_*.qm")) ) locales = {} for fn in fnlist: @@ -271,12 +237,9 @@ if locale not in locales: translator = QTranslator() translator.load(fn) - locales[locale] = ( - translator.translate( - "InterfacePage", "English", - "Translate this with your language") + - " ({0})".format(locale) - ) + locales[locale] = translator.translate( + "InterfacePage", "English", "Translate this with your language" + ) + " ({0})".format(locale) localeList = sorted(locales.keys()) try: uiLanguage = Preferences.getUILanguage() @@ -289,20 +252,20 @@ except ValueError: currentIndex = 0 self.languageComboBox.clear() - + self.languageComboBox.addItem("English (default)", "None") - self.languageComboBox.addItem(self.tr('System'), "System") + self.languageComboBox.addItem(self.tr("System"), "System") for locale in localeList: self.languageComboBox.addItem(locales[locale], locale) self.languageComboBox.setCurrentIndex(currentIndex) - + @pyqtSlot() def on_resetLayoutButton_clicked(self): """ Private method to reset layout to factory defaults. """ Preferences.resetLayout() - + @pyqtSlot() def __setIconBarSamples(self): """ @@ -311,25 +274,25 @@ iconBarSize = self.iconSizeComboBox.currentData() iconSize, borderSize = EricIconBar.BarSizes[iconBarSize][:2] size = iconSize + 2 * borderSize - + self.sampleLabel.setFixedSize(size, size) self.sampleLabel.setStyleSheet( - EricIconBar.LabelStyleSheetTemplate - .format(self.__iconBarColor.name())) + EricIconBar.LabelStyleSheetTemplate.format(self.__iconBarColor.name()) + ) self.sampleLabel.setPixmap( - UI.PixmapCache.getIcon("sbDebugViewer96") - .pixmap(iconSize, iconSize) + UI.PixmapCache.getIcon("sbDebugViewer96").pixmap(iconSize, iconSize) ) - + self.highlightedSampleLabel.setFixedSize(size, size) self.highlightedSampleLabel.setStyleSheet( - EricIconBar.LabelStyleSheetTemplate - .format(self.__iconBarColor.darker().name())) + EricIconBar.LabelStyleSheetTemplate.format( + self.__iconBarColor.darker().name() + ) + ) self.highlightedSampleLabel.setPixmap( - UI.PixmapCache.getIcon("sbDebugViewer96") - .pixmap(iconSize, iconSize) + UI.PixmapCache.getIcon("sbDebugViewer96").pixmap(iconSize, iconSize) ) - + @pyqtSlot() def on_iconBarButton_clicked(self): """ @@ -341,26 +304,24 @@ 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") + self.tr("Combined Left Side") if checked else self.tr("Right Side") ) def create(dlg): """ Module function to create the configuration page. - + @param dlg reference to the configuration dialog @return reference to the instantiated page (ConfigurationPageBase) """