--- a/src/eric7/Preferences/ConfigurationPages/Ui_EditorGeneralPage.py Sat Jul 06 19:48:50 2024 +0200 +++ b/src/eric7/Preferences/ConfigurationPages/Ui_EditorGeneralPage.py Sun Jul 07 12:57:21 2024 +0200 @@ -12,18 +12,18 @@ class Ui_EditorGeneralPage(object): def setupUi(self, EditorGeneralPage): EditorGeneralPage.setObjectName("EditorGeneralPage") - EditorGeneralPage.resize(550, 1119) - self.verticalLayout_6 = QtWidgets.QVBoxLayout(EditorGeneralPage) - self.verticalLayout_6.setObjectName("verticalLayout_6") + EditorGeneralPage.resize(550, 1130) + self.verticalLayout_7 = QtWidgets.QVBoxLayout(EditorGeneralPage) + self.verticalLayout_7.setObjectName("verticalLayout_7") self.headerLabel = QtWidgets.QLabel(parent=EditorGeneralPage) self.headerLabel.setObjectName("headerLabel") - self.verticalLayout_6.addWidget(self.headerLabel) + self.verticalLayout_7.addWidget(self.headerLabel) self.line2 = QtWidgets.QFrame(parent=EditorGeneralPage) self.line2.setFrameShape(QtWidgets.QFrame.Shape.HLine) self.line2.setFrameShadow(QtWidgets.QFrame.Shadow.Sunken) self.line2.setFrameShape(QtWidgets.QFrame.Shape.HLine) self.line2.setObjectName("line2") - self.verticalLayout_6.addWidget(self.line2) + self.verticalLayout_7.addWidget(self.line2) self.groupBox_5 = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.groupBox_5.setObjectName("groupBox_5") self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.groupBox_5) @@ -106,44 +106,50 @@ self.verticalLayout_2.addItem(spacerItem1) self.horizontalLayout_2.addLayout(self.verticalLayout_2) self.verticalLayout_4.addLayout(self.horizontalLayout_2) - self.verticalLayout_6.addWidget(self.groupBox_5) + self.verticalLayout_7.addWidget(self.groupBox_5) self.sourceNavigationGroupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.sourceNavigationGroupBox.setCheckable(True) self.sourceNavigationGroupBox.setObjectName("sourceNavigationGroupBox") - self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.sourceNavigationGroupBox) - self.verticalLayout_3.setObjectName("verticalLayout_3") + self.verticalLayout_6 = QtWidgets.QVBoxLayout(self.sourceNavigationGroupBox) + self.verticalLayout_6.setObjectName("verticalLayout_6") self.sourceOutlineGroupBox = QtWidgets.QGroupBox(parent=self.sourceNavigationGroupBox) self.sourceOutlineGroupBox.setCheckable(True) self.sourceOutlineGroupBox.setObjectName("sourceOutlineGroupBox") - self.gridLayout_3 = QtWidgets.QGridLayout(self.sourceOutlineGroupBox) - self.gridLayout_3.setObjectName("gridLayout_3") + self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.sourceOutlineGroupBox) + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.horizontalLayout_4 = QtWidgets.QHBoxLayout() + self.horizontalLayout_4.setObjectName("horizontalLayout_4") self.label_2 = QtWidgets.QLabel(parent=self.sourceOutlineGroupBox) self.label_2.setObjectName("label_2") - self.gridLayout_3.addWidget(self.label_2, 0, 0, 1, 1) + self.horizontalLayout_4.addWidget(self.label_2) self.sourceOutlineWidthSpinBox = QtWidgets.QSpinBox(parent=self.sourceOutlineGroupBox) self.sourceOutlineWidthSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.sourceOutlineWidthSpinBox.setMinimum(50) self.sourceOutlineWidthSpinBox.setMaximum(498) self.sourceOutlineWidthSpinBox.setSingleStep(50) self.sourceOutlineWidthSpinBox.setObjectName("sourceOutlineWidthSpinBox") - self.gridLayout_3.addWidget(self.sourceOutlineWidthSpinBox, 0, 1, 1, 1) + self.horizontalLayout_4.addWidget(self.sourceOutlineWidthSpinBox) self.label_3 = QtWidgets.QLabel(parent=self.sourceOutlineGroupBox) self.label_3.setObjectName("label_3") - self.gridLayout_3.addWidget(self.label_3, 0, 2, 1, 1) + self.horizontalLayout_4.addWidget(self.label_3) self.sourceOutlineWidthStepSpinBox = QtWidgets.QSpinBox(parent=self.sourceOutlineGroupBox) self.sourceOutlineWidthStepSpinBox.setAlignment(QtCore.Qt.AlignmentFlag.AlignRight|QtCore.Qt.AlignmentFlag.AlignTrailing|QtCore.Qt.AlignmentFlag.AlignVCenter) self.sourceOutlineWidthStepSpinBox.setMinimum(10) self.sourceOutlineWidthStepSpinBox.setMaximum(100) self.sourceOutlineWidthStepSpinBox.setSingleStep(10) self.sourceOutlineWidthStepSpinBox.setObjectName("sourceOutlineWidthStepSpinBox") - self.gridLayout_3.addWidget(self.sourceOutlineWidthStepSpinBox, 0, 3, 1, 1) + self.horizontalLayout_4.addWidget(self.sourceOutlineWidthStepSpinBox) spacerItem2 = QtWidgets.QSpacerItem(345, 17, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) - self.gridLayout_3.addItem(spacerItem2, 0, 4, 1, 1) + self.horizontalLayout_4.addItem(spacerItem2) + self.verticalLayout_3.addLayout(self.horizontalLayout_4) + self.sourceOutlineSortByOccurrenceCheckBox = QtWidgets.QCheckBox(parent=self.sourceOutlineGroupBox) + self.sourceOutlineSortByOccurrenceCheckBox.setObjectName("sourceOutlineSortByOccurrenceCheckBox") + self.verticalLayout_3.addWidget(self.sourceOutlineSortByOccurrenceCheckBox) self.sourceOutlineShowCodingCheckBox = QtWidgets.QCheckBox(parent=self.sourceOutlineGroupBox) self.sourceOutlineShowCodingCheckBox.setObjectName("sourceOutlineShowCodingCheckBox") - self.gridLayout_3.addWidget(self.sourceOutlineShowCodingCheckBox, 1, 0, 1, 5) - self.verticalLayout_3.addWidget(self.sourceOutlineGroupBox) - self.verticalLayout_6.addWidget(self.sourceNavigationGroupBox) + self.verticalLayout_3.addWidget(self.sourceOutlineShowCodingCheckBox) + self.verticalLayout_6.addWidget(self.sourceOutlineGroupBox) + self.verticalLayout_7.addWidget(self.sourceNavigationGroupBox) self.commentsGroupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.commentsGroupBox.setObjectName("commentsGroupBox") self.gridLayout = QtWidgets.QGridLayout(self.commentsGroupBox) @@ -151,7 +157,7 @@ self.comment0CheckBox = QtWidgets.QCheckBox(parent=self.commentsGroupBox) self.comment0CheckBox.setObjectName("comment0CheckBox") self.gridLayout.addWidget(self.comment0CheckBox, 0, 0, 1, 1) - self.verticalLayout_6.addWidget(self.commentsGroupBox) + self.verticalLayout_7.addWidget(self.commentsGroupBox) self.docstringGroupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.docstringGroupBox.setObjectName("docstringGroupBox") self.gridLayout_6 = QtWidgets.QGridLayout(self.docstringGroupBox) @@ -170,7 +176,7 @@ self.docstringCompletionCheckBox = QtWidgets.QCheckBox(parent=self.docstringGroupBox) self.docstringCompletionCheckBox.setObjectName("docstringCompletionCheckBox") self.gridLayout_6.addWidget(self.docstringCompletionCheckBox, 1, 0, 1, 2) - self.verticalLayout_6.addWidget(self.docstringGroupBox) + self.verticalLayout_7.addWidget(self.docstringGroupBox) self.mouseHoverHelpGroupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.mouseHoverHelpGroupBox.setCheckable(True) self.mouseHoverHelpGroupBox.setObjectName("mouseHoverHelpGroupBox") @@ -189,7 +195,7 @@ self.horizontalLayout.addWidget(self.mouseDwellTimeSpinBox) spacerItem3 = QtWidgets.QSpacerItem(347, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.horizontalLayout.addItem(spacerItem3) - self.verticalLayout_6.addWidget(self.mouseHoverHelpGroupBox) + self.verticalLayout_7.addWidget(self.mouseHoverHelpGroupBox) self.groupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.groupBox.setObjectName("groupBox") self.verticalLayout_5 = QtWidgets.QVBoxLayout(self.groupBox) @@ -210,7 +216,7 @@ self.rectangularSelectionMetaButton.setObjectName("rectangularSelectionMetaButton") self.horizontalLayout_3.addWidget(self.rectangularSelectionMetaButton) self.verticalLayout_5.addLayout(self.horizontalLayout_3) - self.verticalLayout_6.addWidget(self.groupBox) + self.verticalLayout_7.addWidget(self.groupBox) self.virtualSpaceGroupBox = QtWidgets.QGroupBox(parent=EditorGeneralPage) self.virtualSpaceGroupBox.setObjectName("virtualSpaceGroupBox") self.verticalLayout = QtWidgets.QVBoxLayout(self.virtualSpaceGroupBox) @@ -225,9 +231,9 @@ self.vsUserCheckBox = QtWidgets.QCheckBox(parent=self.virtualSpaceGroupBox) self.vsUserCheckBox.setObjectName("vsUserCheckBox") self.verticalLayout.addWidget(self.vsUserCheckBox) - self.verticalLayout_6.addWidget(self.virtualSpaceGroupBox) + self.verticalLayout_7.addWidget(self.virtualSpaceGroupBox) spacerItem4 = QtWidgets.QSpacerItem(20, 13, QtWidgets.QSizePolicy.Policy.Minimum, QtWidgets.QSizePolicy.Policy.Expanding) - self.verticalLayout_6.addItem(spacerItem4) + self.verticalLayout_7.addItem(spacerItem4) self.TextLabel13_3.setBuddy(self.tabwidthSlider) self.TextLabel13_2_3.setBuddy(self.indentwidthSlider) @@ -248,7 +254,8 @@ EditorGeneralPage.setTabOrder(self.sourceNavigationGroupBox, self.sourceOutlineGroupBox) EditorGeneralPage.setTabOrder(self.sourceOutlineGroupBox, self.sourceOutlineWidthSpinBox) EditorGeneralPage.setTabOrder(self.sourceOutlineWidthSpinBox, self.sourceOutlineWidthStepSpinBox) - EditorGeneralPage.setTabOrder(self.sourceOutlineWidthStepSpinBox, self.sourceOutlineShowCodingCheckBox) + EditorGeneralPage.setTabOrder(self.sourceOutlineWidthStepSpinBox, self.sourceOutlineSortByOccurrenceCheckBox) + EditorGeneralPage.setTabOrder(self.sourceOutlineSortByOccurrenceCheckBox, self.sourceOutlineShowCodingCheckBox) EditorGeneralPage.setTabOrder(self.sourceOutlineShowCodingCheckBox, self.comment0CheckBox) EditorGeneralPage.setTabOrder(self.comment0CheckBox, self.docstringStyleComboBox) EditorGeneralPage.setTabOrder(self.docstringStyleComboBox, self.docstringCompletionCheckBox) @@ -294,6 +301,8 @@ self.sourceOutlineWidthSpinBox.setToolTip(_translate("EditorGeneralPage", "Enter the default width of the source code outline view")) self.label_3.setText(_translate("EditorGeneralPage", "Width Step Size:")) self.sourceOutlineWidthStepSpinBox.setToolTip(_translate("EditorGeneralPage", "Enter the amount of pixels the width of the outline should be increased or decreased")) + self.sourceOutlineSortByOccurrenceCheckBox.setToolTip(_translate("EditorGeneralPage", "Select to sort file contents by occurrence")) + self.sourceOutlineSortByOccurrenceCheckBox.setText(_translate("EditorGeneralPage", "Sort contents by occurrence")) self.sourceOutlineShowCodingCheckBox.setToolTip(_translate("EditorGeneralPage", "Select to show the source code encoding")) self.sourceOutlineShowCodingCheckBox.setText(_translate("EditorGeneralPage", "Show source file encoding")) self.commentsGroupBox.setTitle(_translate("EditorGeneralPage", "Comments"))