Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py	Sat Nov 30 17:47:23 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py	Sun Dec 01 14:55:31 2024 +0100
@@ -1,6 +1,6 @@
 # Form implementation generated from reading ui file 'src/eric7/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui'
 #
-# Created by: PyQt6 UI code generator 6.7.0
+# Created by: PyQt6 UI code generator 6.7.1
 #
 # 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.
@@ -60,6 +60,12 @@
         self.gpgCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
         self.gpgCheckBox.setObjectName("gpgCheckBox")
         self.gridLayout_2.addWidget(self.gpgCheckBox, 0, 1, 1, 1)
+        self.shelveCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
+        self.shelveCheckBox.setObjectName("shelveCheckBox")
+        self.gridLayout_2.addWidget(self.shelveCheckBox, 3, 1, 1, 1)
+        self.rebaseCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
+        self.rebaseCheckBox.setObjectName("rebaseCheckBox")
+        self.gridLayout_2.addWidget(self.rebaseCheckBox, 3, 0, 1, 1)
         self.histeditCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
         self.histeditCheckBox.setObjectName("histeditCheckBox")
         self.gridLayout_2.addWidget(self.histeditCheckBox, 1, 0, 1, 1)
@@ -72,15 +78,6 @@
         self.queuesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
         self.queuesCheckBox.setObjectName("queuesCheckBox")
         self.gridLayout_2.addWidget(self.queuesCheckBox, 2, 1, 1, 1)
-        self.rebaseCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.rebaseCheckBox.setObjectName("rebaseCheckBox")
-        self.gridLayout_2.addWidget(self.rebaseCheckBox, 3, 0, 1, 1)
-        self.shelveCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.shelveCheckBox.setObjectName("shelveCheckBox")
-        self.gridLayout_2.addWidget(self.shelveCheckBox, 3, 1, 1, 1)
-        self.stripCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.stripCheckBox.setObjectName("stripCheckBox")
-        self.gridLayout_2.addWidget(self.stripCheckBox, 4, 0, 1, 1)
         self.verticalLayout_2.addWidget(self.groupBox_2)
         self.largefilesGroup = QtWidgets.QGroupBox(parent=self.tab_2)
         self.largefilesGroup.setEnabled(False)
@@ -288,6 +285,10 @@
         self.closeheadCheckBox.setText(_translate("HgUserConfigDialog", "Close Head"))
         self.gpgCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the GPG extension"))
         self.gpgCheckBox.setText(_translate("HgUserConfigDialog", "GPG"))
+        self.shelveCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the shelve extension"))
+        self.shelveCheckBox.setText(_translate("HgUserConfigDialog", "Shelve"))
+        self.rebaseCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the rebase extension"))
+        self.rebaseCheckBox.setText(_translate("HgUserConfigDialog", "Rebase"))
         self.histeditCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the histedit extension"))
         self.histeditCheckBox.setText(_translate("HgUserConfigDialog", "Histedit"))
         self.largefilesCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the largefiles extension"))
@@ -296,12 +297,6 @@
         self.purgeCheckBox.setText(_translate("HgUserConfigDialog", "Purge"))
         self.queuesCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the queues extension"))
         self.queuesCheckBox.setText(_translate("HgUserConfigDialog", "Queues"))
-        self.rebaseCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the rebase extension"))
-        self.rebaseCheckBox.setText(_translate("HgUserConfigDialog", "Rebase"))
-        self.shelveCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the shelve extension"))
-        self.shelveCheckBox.setText(_translate("HgUserConfigDialog", "Shelve"))
-        self.stripCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the strip extension"))
-        self.stripCheckBox.setText(_translate("HgUserConfigDialog", "Strip"))
         self.largefilesGroup.setTitle(_translate("HgUserConfigDialog", "Large Files"))
         self.label_4.setText(_translate("HgUserConfigDialog", "Minimum file size:"))
         self.lfFileSizeSpinBox.setToolTip(_translate("HgUserConfigDialog", "Enter the minimum file size in MB for files to be treated as Large Files"))