Fri, 07 Jun 2024 10:05:06 +0200
Changed code structure and install script to include the Ui_*.py files in the code repository and do not compile *.ui files at installation time anymore. This is to cope with a backward incompatible change of Qt 6.7.0.
# Form implementation generated from reading ui file '/home/detlev/Development/Python/Eric/eric7_default/src/eric7/UI/DiffDialog.ui' # # Created by: PyQt6 UI code generator 6.7.0 # # WARNING: Any manual changes made to this file will be lost when pyuic6 is # run again. Do not edit this file unless you know what you are doing. from PyQt6 import QtCore, QtGui, QtWidgets class Ui_DiffDialog(object): def setupUi(self, DiffDialog): DiffDialog.setObjectName("DiffDialog") DiffDialog.resize(750, 800) self.verticalLayout = QtWidgets.QVBoxLayout(DiffDialog) self.verticalLayout.setObjectName("verticalLayout") self.horizontalLayout_2 = QtWidgets.QHBoxLayout() self.horizontalLayout_2.setObjectName("horizontalLayout_2") self.textLabel1 = QtWidgets.QLabel(parent=DiffDialog) self.textLabel1.setObjectName("textLabel1") self.horizontalLayout_2.addWidget(self.textLabel1) self.file1Picker = EricPathPicker(parent=DiffDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file1Picker.sizePolicy().hasHeightForWidth()) self.file1Picker.setSizePolicy(sizePolicy) self.file1Picker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.file1Picker.setObjectName("file1Picker") self.horizontalLayout_2.addWidget(self.file1Picker) self.verticalLayout.addLayout(self.horizontalLayout_2) self.horizontalLayout = QtWidgets.QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") self.textLabel2 = QtWidgets.QLabel(parent=DiffDialog) self.textLabel2.setObjectName("textLabel2") self.horizontalLayout.addWidget(self.textLabel2) self.file2Picker = EricPathPicker(parent=DiffDialog) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.file2Picker.sizePolicy().hasHeightForWidth()) self.file2Picker.setSizePolicy(sizePolicy) self.file2Picker.setFocusPolicy(QtCore.Qt.FocusPolicy.StrongFocus) self.file2Picker.setObjectName("file2Picker") self.horizontalLayout.addWidget(self.file2Picker) self.verticalLayout.addLayout(self.horizontalLayout) self.diffFormatGroup = QtWidgets.QGroupBox(parent=DiffDialog) self.diffFormatGroup.setObjectName("diffFormatGroup") self.hboxlayout = QtWidgets.QHBoxLayout(self.diffFormatGroup) self.hboxlayout.setObjectName("hboxlayout") self.unifiedRadioButton = QtWidgets.QRadioButton(parent=self.diffFormatGroup) self.unifiedRadioButton.setChecked(True) self.unifiedRadioButton.setObjectName("unifiedRadioButton") self.hboxlayout.addWidget(self.unifiedRadioButton) self.contextRadioButton = QtWidgets.QRadioButton(parent=self.diffFormatGroup) self.contextRadioButton.setObjectName("contextRadioButton") self.hboxlayout.addWidget(self.contextRadioButton) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum) self.hboxlayout.addItem(spacerItem) self.verticalLayout.addWidget(self.diffFormatGroup) self.searchWidget = EricTextEditSearchWidget(parent=DiffDialog) self.searchWidget.setFocusPolicy(QtCore.Qt.FocusPolicy.WheelFocus) self.searchWidget.setObjectName("searchWidget") self.verticalLayout.addWidget(self.searchWidget) self.contents = QtWidgets.QPlainTextEdit(parent=DiffDialog) self.contents.setLineWrapMode(QtWidgets.QPlainTextEdit.LineWrapMode.NoWrap) self.contents.setReadOnly(True) self.contents.setTabStopDistance(8.0) self.contents.setObjectName("contents") self.verticalLayout.addWidget(self.contents) self.buttonBox = QtWidgets.QDialogButtonBox(parent=DiffDialog) self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Close) self.buttonBox.setObjectName("buttonBox") self.verticalLayout.addWidget(self.buttonBox) self.textLabel1.setBuddy(self.file1Picker) self.textLabel2.setBuddy(self.file2Picker) self.retranslateUi(DiffDialog) self.buttonBox.rejected.connect(DiffDialog.close) # type: ignore QtCore.QMetaObject.connectSlotsByName(DiffDialog) DiffDialog.setTabOrder(self.file1Picker, self.file2Picker) DiffDialog.setTabOrder(self.file2Picker, self.unifiedRadioButton) DiffDialog.setTabOrder(self.unifiedRadioButton, self.contextRadioButton) DiffDialog.setTabOrder(self.contextRadioButton, self.searchWidget) DiffDialog.setTabOrder(self.searchWidget, self.contents) def retranslateUi(self, DiffDialog): _translate = QtCore.QCoreApplication.translate DiffDialog.setWindowTitle(_translate("DiffDialog", "File Differences")) self.textLabel1.setText(_translate("DiffDialog", "File &1:")) self.file1Picker.setToolTip(_translate("DiffDialog", "Enter the name of the first file")) self.textLabel2.setText(_translate("DiffDialog", "File &2:")) self.file2Picker.setToolTip(_translate("DiffDialog", "Enter the name of the second file")) self.diffFormatGroup.setTitle(_translate("DiffDialog", "Select Diff Kind")) self.unifiedRadioButton.setToolTip(_translate("DiffDialog", "Select to generate a unified diff")) self.unifiedRadioButton.setText(_translate("DiffDialog", "&Unified Diff")) self.unifiedRadioButton.setShortcut(_translate("DiffDialog", "Alt+U")) self.contextRadioButton.setToolTip(_translate("DiffDialog", "Select to generate a context diff")) self.contextRadioButton.setText(_translate("DiffDialog", "Co&ntext Diff")) self.contextRadioButton.setShortcut(_translate("DiffDialog", "Alt+N")) from eric7.EricWidgets.EricPathPicker import EricPathPicker from eric7.EricWidgets.EricTextEditSearchWidget import EricTextEditSearchWidget