Merge lp:~simon-kersey/qbzr/590229-fix into lp:qbzr

[Simon Kersey]

Fix qrun --execute mode.

Changing implementation of 'Retry' button in SubProcessWindowBase broke QBzrRunDialog --execute mode.

Fixed by:

Updating the interface to SubProcessWindowBase to expose the control buttons so that QBzrRunDialog can change their behaviour when running in --execute mode.
Updated QBzrRunDialog to implement --execute mode with the current SubProcessWindowBase interface.

To test:
Run qrun command with -e (or --execute) option.

[Alexander Belchenko (bialix)]

I don't like the idea of exposing buttons as private members (names started with underscore, self._closeButton and so on).

Instead either make them as public (without underscore) or better create (resurrect) methods to control these buttons for various situations.

review: Needs Fixing

[Alexander Belchenko (bialix)]

To clarify my point: if you keep buttons as private variables then please create public methods in SubProcessBase dialog to control these buttons. Otherwise buttons should be exposed as public variables.

[Simon Kersey (simon-kersey)]

> To clarify my point: if you keep buttons as private variables then please
> create public methods in SubProcessBase dialog to control these buttons.
> Otherwise buttons should be exposed as public variables.

I'll probably make them public variables to allow for maximum flexibilty if that is OK.
I was trying for the concept of inherited class variables (not public but available to derived classes).

[lp:~simon-kersey/qbzr/590229-fix]

1312. By Simon Kersey on 2010-08-28

Make subprocess buttons public

[Alexander Belchenko (bialix)]

Simon, thanks for the change. I did not notice your latest change earlier because launchpad did not send any mails about new revisions. So next time when you will update your patch, please write some comment in corresponding merge proposal, so I will know that there is something to look at.

review: Approve

[Alexander Belchenko (bialix)]

Merged into 0.18, 0.19 and trunk (0.20).

Thank you!

=== modified file 'NEWS.txt'
--- NEWS.txt	2010-08-09 17:02:40 +0000
+++ NEWS.txt	2010-08-28 13:13:42 +0000
@@ -1,6 +1,8 @@
 0.20 Beta 1 - In development
 ----------------------------
 
+ * qrun:
+   * Fixed '--execute' mode. (Bug #590229, Simon Kersey) 
 
 0.19.1 - In development
 -----------------------

=== modified file 'lib/run.py'
--- lib/run.py	2010-06-06 08:40:13 +0000
+++ lib/run.py	2010-08-28 13:13:42 +0000
@@ -116,25 +116,31 @@
             self.ui.help_browser.hide()
             
             # create edit button
-            self._editButton = QtGui.QPushButton(gettext('&Edit'))
-            QtCore.QObject.connect(self._editButton,
+            self.editButton = QtGui.QPushButton(gettext('&Edit'))
+            QtCore.QObject.connect(self.editButton,
                 QtCore.SIGNAL("clicked()"),
                 self.enable_command_edit)
 
             # cause edit button to be shown if command fails
             QtCore.QObject.connect(self,
                                    QtCore.SIGNAL("subprocessFailed(bool)"),
-                                   self._editButton,
+                                   self.editButton,
                                    QtCore.SLOT("setHidden(bool)"))
-            
-            # add edit button to dialog buttons     
-            self.buttonbox.addButton(self._editButton,
+
+            # add edit button to dialog buttons
+            self.buttonbox.addButton(self.editButton,
                 QtGui.QDialogButtonBox.ResetRole)
             
             # setup initial dialog button status
-            self.init_button_status()
-            self._okButton.setHidden(True)
-            self._editButton.setHidden(True)
+            self.closeButton.setHidden(True)
+            self.okButton.setHidden(True)
+            self.editButton.setHidden(True)
+            
+            # cancel button gets hidden when finished.
+            QtCore.QObject.connect(self,
+                               QtCore.SIGNAL("subprocessFinished(bool)"),
+                               self.cancelButton,
+                               QtCore.SLOT("setHidden(bool)"))
             
             # run command
             self.do_start()
@@ -146,13 +152,14 @@
 
     def enable_command_edit(self):
         """Hide Edit button and make user edit fields visible"""
-        self._editButton.setHidden(True)
+        self.editButton.setHidden(True)
         QtCore.QObject.disconnect(self,
                                   QtCore.SIGNAL("subprocessFailed(bool)"),
-                                  self._editButton,
+                                  self.editButton,
                                   QtCore.SLOT("setHidden(bool)"))
-        self.ui.frame.show()
+        self.ui.run_container.show()
         self.ui.help_browser.show()
+        self.okButton.setShown(True)
 
     def set_default_help(self):
         """Set default text in help widget."""

=== modified file 'lib/subprocess.py'
--- lib/subprocess.py	2010-06-25 11:36:02 +0000
+++ lib/subprocess.py	2010-08-28 13:13:42 +0000
@@ -110,55 +110,56 @@
             QtCore.SIGNAL("error()"),
             self.on_error)
 
-        closeButton = StandardButton(BTN_CLOSE)
-        okButton = StandardButton(BTN_OK)
-        cancelButton = StandardButton(BTN_CANCEL)
-
+        self.closeButton = StandardButton(BTN_CLOSE)
+        self.okButton = StandardButton(BTN_OK)
+        self.cancelButton = StandardButton(BTN_CANCEL)
+        
         # ok button gets disabled when we start.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessStarted(bool)"),
-                               okButton,
+                               self.okButton,
                                QtCore.SLOT("setDisabled(bool)"))
 
         # ok button gets hidden when we finish.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessFinished(bool)"),
-                               okButton,
+                               self.okButton,
                                QtCore.SLOT("setHidden(bool)"))
 
         # close button gets shown when we finish.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessFinished(bool)"),
-                               closeButton,
+                               self.closeButton,
                                QtCore.SLOT("setShown(bool)"))
 
         # cancel button gets disabled when finished.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessFinished(bool)"),
-                               cancelButton,
+                               self.cancelButton,
                                QtCore.SLOT("setDisabled(bool)"))
 
         # ok button gets enabled when we fail.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessFailed(bool)"),
-                               okButton,
+                               self.okButton,
                                QtCore.SLOT("setDisabled(bool)"))
 
         # Change the ok button to 'retry' if we fail.
         QtCore.QObject.connect(self,
                                QtCore.SIGNAL("subprocessFailed(bool)"),
-                               lambda failed: okButton.setText(gettext('&Retry')))
+                               lambda failed: self.okButton.setText(
+                                              gettext('&Retry')))
 
         self.buttonbox = QtGui.QDialogButtonBox(self)
-        self.buttonbox.addButton(okButton,
-            QtGui.QDialogButtonBox.AcceptRole)
-        self.buttonbox.addButton(closeButton,
-            QtGui.QDialogButtonBox.AcceptRole)
-        self.buttonbox.addButton(cancelButton,
+        self.buttonbox.addButton(self.okButton,
+            QtGui.QDialogButtonBox.AcceptRole)
+        self.buttonbox.addButton(self.closeButton,
+            QtGui.QDialogButtonBox.AcceptRole)
+        self.buttonbox.addButton(self.cancelButton,
             QtGui.QDialogButtonBox.RejectRole)
         self.connect(self.buttonbox, QtCore.SIGNAL("accepted()"), self.do_accept)
         self.connect(self.buttonbox, QtCore.SIGNAL("rejected()"), self.do_reject)
-        closeButton.setHidden(True) # but 'close' starts as hidden.
+        self.closeButton.setHidden(True) # but 'close' starts as hidden.
         
         self.uncommitted_info = InfoWidget(self)
         uncommitted_info_layout = QtGui.QHBoxLayout(self.uncommitted_info)