Sat, 26 Apr 2025 12:34:32 +0200
MicroPython
- Added a configuration option to disable the support for the no longer produced Pimoroni Pico Wireless Pack.
10745
2921faddeaec
Regenerated the Ui_*.py files with project relative paths.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
10743
diff
changeset
|
1 | # Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.ui' |
10743
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | # |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | # Created by: PyQt6 UI code generator 6.7.0 |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | # WARNING: Any manual changes made to this file will be lost when pyuic6 is |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | # run again. Do not edit this file unless you know what you are doing. |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | from PyQt6 import QtCore, QtGui, QtWidgets |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | class Ui_SvnMergeDialog(object): |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | def setupUi(self, SvnMergeDialog): |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | SvnMergeDialog.setObjectName("SvnMergeDialog") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | SvnMergeDialog.resize(456, 152) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | SvnMergeDialog.setSizeGripEnabled(True) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | self.gridlayout = QtWidgets.QGridLayout(SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | self.gridlayout.setObjectName("gridlayout") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | self.forceCheckBox = QtWidgets.QCheckBox(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | self.forceCheckBox.setObjectName("forceCheckBox") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | self.gridlayout.addWidget(self.forceCheckBox, 3, 0, 1, 2) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | self.buttonBox = QtWidgets.QDialogButtonBox(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | self.buttonBox.setOrientation(QtCore.Qt.Orientation.Horizontal) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | self.buttonBox.setStandardButtons(QtWidgets.QDialogButtonBox.StandardButton.Cancel|QtWidgets.QDialogButtonBox.StandardButton.Ok) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | self.buttonBox.setObjectName("buttonBox") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | self.gridlayout.addWidget(self.buttonBox, 4, 0, 1, 2) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | self.textLabel1 = QtWidgets.QLabel(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | self.textLabel1.setObjectName("textLabel1") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | self.gridlayout.addWidget(self.textLabel1, 2, 0, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | self.targetCombo = QtWidgets.QComboBox(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | self.targetCombo.setEditable(True) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | self.targetCombo.setInsertPolicy(QtWidgets.QComboBox.InsertPolicy.InsertAtTop) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | self.targetCombo.setDuplicatesEnabled(False) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | self.targetCombo.setObjectName("targetCombo") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | self.gridlayout.addWidget(self.targetCombo, 2, 1, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | self.TextLabel1 = QtWidgets.QLabel(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | self.TextLabel1.setObjectName("TextLabel1") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | self.gridlayout.addWidget(self.TextLabel1, 0, 0, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | self.tag2Combo = QtWidgets.QComboBox(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | sizePolicy.setHorizontalStretch(0) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | sizePolicy.setVerticalStretch(0) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | sizePolicy.setHeightForWidth(self.tag2Combo.sizePolicy().hasHeightForWidth()) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | self.tag2Combo.setSizePolicy(sizePolicy) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | self.tag2Combo.setEditable(True) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | self.tag2Combo.setDuplicatesEnabled(False) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | self.tag2Combo.setObjectName("tag2Combo") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | self.gridlayout.addWidget(self.tag2Combo, 1, 1, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | self.tag1Combo = QtWidgets.QComboBox(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Fixed) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | sizePolicy.setHorizontalStretch(0) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | sizePolicy.setVerticalStretch(0) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | sizePolicy.setHeightForWidth(self.tag1Combo.sizePolicy().hasHeightForWidth()) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | self.tag1Combo.setSizePolicy(sizePolicy) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | self.tag1Combo.setEditable(True) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | self.tag1Combo.setDuplicatesEnabled(False) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | self.tag1Combo.setObjectName("tag1Combo") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | self.gridlayout.addWidget(self.tag1Combo, 0, 1, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | self.TextLabel1_2 = QtWidgets.QLabel(parent=SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | self.TextLabel1_2.setObjectName("TextLabel1_2") |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | self.gridlayout.addWidget(self.TextLabel1_2, 1, 0, 1, 1) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.retranslateUi(SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.buttonBox.accepted.connect(SvnMergeDialog.accept) # type: ignore |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | self.buttonBox.rejected.connect(SvnMergeDialog.reject) # type: ignore |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | QtCore.QMetaObject.connectSlotsByName(SvnMergeDialog) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | SvnMergeDialog.setTabOrder(self.tag1Combo, self.tag2Combo) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | SvnMergeDialog.setTabOrder(self.tag2Combo, self.targetCombo) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | SvnMergeDialog.setTabOrder(self.targetCombo, self.forceCheckBox) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | SvnMergeDialog.setTabOrder(self.forceCheckBox, self.buttonBox) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | def retranslateUi(self, SvnMergeDialog): |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | _translate = QtCore.QCoreApplication.translate |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | SvnMergeDialog.setWindowTitle(_translate("SvnMergeDialog", "Subversion Merge")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | self.forceCheckBox.setToolTip(_translate("SvnMergeDialog", "Select to force the merge operation")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | self.forceCheckBox.setText(_translate("SvnMergeDialog", "Enforce merge")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | self.textLabel1.setText(_translate("SvnMergeDialog", "Target:")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | self.targetCombo.setToolTip(_translate("SvnMergeDialog", "Enter the target")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | self.targetCombo.setWhatsThis(_translate("SvnMergeDialog", "<b>Target</b>\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | "<p>Enter the target for the merge operation into this field. Leave it empty to\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | "get the target URL from the working copy.</p>\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | "<p><b>Note:</b> This entry is only needed, if you enter revision numbers above.</p>")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | self.TextLabel1.setText(_translate("SvnMergeDialog", "1. URL/Revision:")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | self.tag2Combo.setToolTip(_translate("SvnMergeDialog", "Enter an URL or a revision number")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | self.tag2Combo.setWhatsThis(_translate("SvnMergeDialog", "<b>URL/Revision</b>\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | "<p>Enter an URL or a revision number to be merged into\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | "the working copy.</p>")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | self.tag1Combo.setToolTip(_translate("SvnMergeDialog", "Enter an URL or a revision number")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | self.tag1Combo.setWhatsThis(_translate("SvnMergeDialog", "<b>URL/Revision</b>\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | "<p>Enter an URL or a revision number to be merged into\n" |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | "the working copy.</p>")) |
5d3a5a05114e
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.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | self.TextLabel1_2.setText(_translate("SvnMergeDialog", "2. URL/Revision:")) |