Mercurial Repositories > eric / annotate

src/eric7/Plugins/VcsPlugins/vcsGit/Ui_GitMergeDialog.py@2921faddeaec (annotated)

src/eric7/Plugins/VcsPlugins/vcsGit/Ui_GitMergeDialog.py

Fri, 07 Jun 2024 11:11:57 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 07 Jun 2024 11:11:57 +0200
branch
eric7
changeset 10745
2921faddeaec
parent 10743
5d3a5a05114e
permissions
-rw-r--r--

Regenerated the Ui_*.py files with project relative paths.

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/vcsGit/GitMergeDialog.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_GitMergeDialog(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, GitMergeDialog):
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 GitMergeDialog.setObjectName("GitMergeDialog")
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 GitMergeDialog.resize(451, 491)
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 GitMergeDialog.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.verticalLayout_2 = QtWidgets.QVBoxLayout(GitMergeDialog)
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.verticalLayout_2.setObjectName("verticalLayout_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
19 self.groupBox = QtWidgets.QGroupBox(parent=GitMergeDialog)
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.groupBox.setObjectName("groupBox")
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 = QtWidgets.QGridLayout(self.groupBox)
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.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
23 self.idButton = QtWidgets.QRadioButton(parent=self.groupBox)
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.idButton.setObjectName("idButton")
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.gridLayout.addWidget(self.idButton, 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
26 self.idEdit = QtWidgets.QLineEdit(parent=self.groupBox)
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.idEdit.setEnabled(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
28 self.idEdit.setObjectName("idEdit")
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.idEdit, 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
30 self.tagButton = QtWidgets.QRadioButton(parent=self.groupBox)
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.tagButton.setObjectName("tagButton")
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.gridLayout.addWidget(self.tagButton, 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
33 self.tagCombo = QtWidgets.QComboBox(parent=self.groupBox)
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.tagCombo.setEnabled(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
35 self.tagCombo.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
36 self.tagCombo.setObjectName("tagCombo")
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.gridLayout.addWidget(self.tagCombo, 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
38 self.branchButton = QtWidgets.QRadioButton(parent=self.groupBox)
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.branchButton.setObjectName("branchButton")
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 self.gridLayout.addWidget(self.branchButton, 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
41 self.branchCombo = QtWidgets.QComboBox(parent=self.groupBox)
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 self.branchCombo.setEnabled(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
43 self.branchCombo.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
44 self.branchCombo.setObjectName("branchCombo")
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.gridLayout.addWidget(self.branchCombo, 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
46 self.remoteBranchButton = QtWidgets.QRadioButton(parent=self.groupBox)
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.remoteBranchButton.setObjectName("remoteBranchButton")
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.remoteBranchButton, 3, 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
49 self.remoteBranchCombo = QtWidgets.QComboBox(parent=self.groupBox)
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 self.remoteBranchCombo.setEnabled(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
51 self.remoteBranchCombo.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
52 self.remoteBranchCombo.setObjectName("remoteBranchCombo")
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 self.gridLayout.addWidget(self.remoteBranchCombo, 3, 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
54 self.noneButton = QtWidgets.QRadioButton(parent=self.groupBox)
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.noneButton.setChecked(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.noneButton.setObjectName("noneButton")
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.gridLayout.addWidget(self.noneButton, 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
58 self.verticalLayout_2.addWidget(self.groupBox)
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.commitGroupBox = QtWidgets.QGroupBox(parent=GitMergeDialog)
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.commitGroupBox.setCheckable(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
61 self.commitGroupBox.setObjectName("commitGroupBox")
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 self.verticalLayout = QtWidgets.QVBoxLayout(self.commitGroupBox)
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.verticalLayout.setObjectName("verticalLayout")
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.label = QtWidgets.QLabel(parent=self.commitGroupBox)
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.label.setObjectName("label")
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 self.verticalLayout.addWidget(self.label)
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 self.commitMessageEdit = EricSpellCheckedPlainTextEdit(parent=self.commitGroupBox)
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 self.commitMessageEdit.setTabChangesFocus(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
69 self.commitMessageEdit.setObjectName("commitMessageEdit")
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 self.verticalLayout.addWidget(self.commitMessageEdit)
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 self.addLogCheckBox = QtWidgets.QCheckBox(parent=self.commitGroupBox)
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 self.addLogCheckBox.setObjectName("addLogCheckBox")
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 self.verticalLayout.addWidget(self.addLogCheckBox)
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 self.verticalLayout_2.addWidget(self.commitGroupBox)
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.diffstatCheckBox = QtWidgets.QCheckBox(parent=GitMergeDialog)
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.diffstatCheckBox.setObjectName("diffstatCheckBox")
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.verticalLayout_2.addWidget(self.diffstatCheckBox)
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.buttonBox = QtWidgets.QDialogButtonBox(parent=GitMergeDialog)
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.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
80 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
81 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
82 self.verticalLayout_2.addWidget(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
83
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.retranslateUi(GitMergeDialog)
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.buttonBox.accepted.connect(GitMergeDialog.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
86 self.buttonBox.rejected.connect(GitMergeDialog.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
87 self.idButton.toggled['bool'].connect(self.idEdit.setEnabled) # 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
88 self.tagButton.toggled['bool'].connect(self.tagCombo.setEnabled) # 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
89 self.branchButton.toggled['bool'].connect(self.branchCombo.setEnabled) # 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
90 self.remoteBranchButton.toggled['bool'].connect(self.remoteBranchCombo.setEnabled) # 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
91 QtCore.QMetaObject.connectSlotsByName(GitMergeDialog)
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 GitMergeDialog.setTabOrder(self.idButton, self.idEdit)
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
93 GitMergeDialog.setTabOrder(self.idEdit, self.tagButton)
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
94 GitMergeDialog.setTabOrder(self.tagButton, self.tagCombo)
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
95 GitMergeDialog.setTabOrder(self.tagCombo, self.branchButton)
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
96 GitMergeDialog.setTabOrder(self.branchButton, self.branchCombo)
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
97 GitMergeDialog.setTabOrder(self.branchCombo, self.remoteBranchButton)
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
98 GitMergeDialog.setTabOrder(self.remoteBranchButton, self.remoteBranchCombo)
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
99 GitMergeDialog.setTabOrder(self.remoteBranchCombo, self.noneButton)
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
100 GitMergeDialog.setTabOrder(self.noneButton, self.commitGroupBox)
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
101 GitMergeDialog.setTabOrder(self.commitGroupBox, self.commitMessageEdit)
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
102 GitMergeDialog.setTabOrder(self.commitMessageEdit, self.addLogCheckBox)
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
103 GitMergeDialog.setTabOrder(self.addLogCheckBox, self.diffstatCheckBox)
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
104
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
105 def retranslateUi(self, GitMergeDialog):
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
106 _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
107 GitMergeDialog.setWindowTitle(_translate("GitMergeDialog", "Git 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
108 self.groupBox.setTitle(_translate("GitMergeDialog", "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
109 self.idButton.setToolTip(_translate("GitMergeDialog", "Select to specify a revision by changeset id"))
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
110 self.idButton.setText(_translate("GitMergeDialog", "Commit:"))
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
111 self.idEdit.setToolTip(_translate("GitMergeDialog", "Enter a commit id"))
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
112 self.tagButton.setToolTip(_translate("GitMergeDialog", "Select to specify a revision by a tag"))
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
113 self.tagButton.setText(_translate("GitMergeDialog", "Tag:"))
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
114 self.tagCombo.setToolTip(_translate("GitMergeDialog", "Enter a tag name"))
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
115 self.branchButton.setToolTip(_translate("GitMergeDialog", "Select to specify a revision by a local branch"))
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
116 self.branchButton.setText(_translate("GitMergeDialog", "Local Branch:"))
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
117 self.branchCombo.setToolTip(_translate("GitMergeDialog", "Enter a local branch name"))
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
118 self.remoteBranchButton.setToolTip(_translate("GitMergeDialog", "Select to specify a revision by a remote branch"))
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
119 self.remoteBranchButton.setText(_translate("GitMergeDialog", "Remote Branch:"))
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
120 self.remoteBranchCombo.setToolTip(_translate("GitMergeDialog", "Enter a remote branch name"))
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
121 self.noneButton.setToolTip(_translate("GitMergeDialog", "Select to not specify a specific 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
122 self.noneButton.setText(_translate("GitMergeDialog", "No commit selected"))
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
123 self.commitGroupBox.setToolTip(_translate("GitMergeDialog", "Select to commit the 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
124 self.commitGroupBox.setTitle(_translate("GitMergeDialog", "Commit 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
125 self.label.setText(_translate("GitMergeDialog", "Commit Message:"))
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
126 self.commitMessageEdit.setToolTip(_translate("GitMergeDialog", "Enter a message for the merge commit"))
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
127 self.addLogCheckBox.setToolTip(_translate("GitMergeDialog", "Select to append the log summaries of merged commits"))
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
128 self.addLogCheckBox.setText(_translate("GitMergeDialog", "Add Log Message Summary"))
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
129 self.diffstatCheckBox.setToolTip(_translate("GitMergeDialog", "Select to show diff statistics at the end of the 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
130 self.diffstatCheckBox.setText(_translate("GitMergeDialog", "Show diff statistics"))
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
131 from eric7.EricWidgets.EricSpellCheckedTextEdit import EricSpellCheckedPlainTextEdit

Mercurial Repository: eric

eric ide

mercurial