Fixed an issue in the Mercurial rebase dialog where some radio buttons could be unchecked resulting in no option selected. 6_1_x

Sat, 29 Oct 2016 09:35:01 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 29 Oct 2016 09:35:01 +0200
branch
6_1_x
changeset 5281
66e9b129897e
parent 5267
ede9faf7388a
child 5306
a8b6884af669

Fixed an issue in the Mercurial rebase dialog where some radio buttons could be unchecked resulting in no option selected.
(grafted from 929f7984ba8b52328ce36be80c5c36ed4b3032aa)

Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py file | annotate | diff | comparison | revisions
--- a/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Mon Oct 24 18:53:40 2016 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.py	Sat Oct 29 09:35:01 2016 +0200
@@ -10,7 +10,7 @@
 from __future__ import unicode_literals
 
 from PyQt5.QtCore import pyqtSlot
-from PyQt5.QtWidgets import QDialog, QDialogButtonBox
+from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QButtonGroup
 
 from .Ui_HgRebaseDialog import Ui_HgRebaseDialog
 
@@ -32,6 +32,11 @@
         super(HgRebaseDialog, self).__init__(parent)
         self.setupUi(self)
         
+        self.__sourceRevisionButtonGroup = QButtonGroup(self)
+        self.__sourceRevisionButtonGroup.addButton(self.parentButton)
+        self.__sourceRevisionButtonGroup.addButton(self.sourceButton)
+        self.__sourceRevisionButtonGroup.addButton(self.baseButton)
+        
         self.tag1Combo.addItems(sorted(tagsList))
         self.tag2Combo.addItems(sorted(tagsList))
         self.branch1Combo.addItems(["default"] + sorted(branchesList))

eric ide

mercurial