Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py	Sun Dec 01 14:55:31 2024 +0100
+++ b/src/eric7/Plugins/VcsPlugins/vcsMercurial/Ui_HgUserConfigDialog.py	Sun Dec 01 18:17:51 2024 +0100
@@ -60,24 +60,18 @@
         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)
         self.largefilesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
         self.largefilesCheckBox.setObjectName("largefilesCheckBox")
         self.gridLayout_2.addWidget(self.largefilesCheckBox, 1, 1, 1, 1)
-        self.purgeCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
-        self.purgeCheckBox.setObjectName("purgeCheckBox")
-        self.gridLayout_2.addWidget(self.purgeCheckBox, 2, 0, 1, 1)
         self.queuesCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
         self.queuesCheckBox.setObjectName("queuesCheckBox")
-        self.gridLayout_2.addWidget(self.queuesCheckBox, 2, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.queuesCheckBox, 2, 0, 1, 1)
+        self.rebaseCheckBox = QtWidgets.QCheckBox(parent=self.groupBox_2)
+        self.rebaseCheckBox.setObjectName("rebaseCheckBox")
+        self.gridLayout_2.addWidget(self.rebaseCheckBox, 2, 1, 1, 1)
         self.verticalLayout_2.addWidget(self.groupBox_2)
         self.largefilesGroup = QtWidgets.QGroupBox(parent=self.tab_2)
         self.largefilesGroup.setEnabled(False)
@@ -250,7 +244,12 @@
         HgUserConfigDialog.setTabOrder(self.tabWidget, self.userNameEdit)
         HgUserConfigDialog.setTabOrder(self.userNameEdit, self.emailEdit)
         HgUserConfigDialog.setTabOrder(self.emailEdit, self.closeheadCheckBox)
-        HgUserConfigDialog.setTabOrder(self.closeheadCheckBox, self.lfFileSizeSpinBox)
+        HgUserConfigDialog.setTabOrder(self.closeheadCheckBox, self.gpgCheckBox)
+        HgUserConfigDialog.setTabOrder(self.gpgCheckBox, self.histeditCheckBox)
+        HgUserConfigDialog.setTabOrder(self.histeditCheckBox, self.largefilesCheckBox)
+        HgUserConfigDialog.setTabOrder(self.largefilesCheckBox, self.queuesCheckBox)
+        HgUserConfigDialog.setTabOrder(self.queuesCheckBox, self.rebaseCheckBox)
+        HgUserConfigDialog.setTabOrder(self.rebaseCheckBox, self.lfFileSizeSpinBox)
         HgUserConfigDialog.setTabOrder(self.lfFileSizeSpinBox, self.lfFilePatternsEdit)
         HgUserConfigDialog.setTabOrder(self.lfFilePatternsEdit, self.lfUserCachePicker)
         HgUserConfigDialog.setTabOrder(self.lfUserCachePicker, self.proxyHostEdit)
@@ -285,18 +284,14 @@
         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"))
         self.largefilesCheckBox.setText(_translate("HgUserConfigDialog", "Large Files"))
-        self.purgeCheckBox.setToolTip(_translate("HgUserConfigDialog", "Select to activate the Purge extension"))
-        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.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"))