From 70f1e6dd486bdd0ef21ae83d16d886d2e4fd5a68 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Dec 2012 20:56:03 -0600 Subject: [PATCH 1/2] BUG: Remove focus from buttons which caused unintential clicking. --- skimage/viewer/widgets/history.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/skimage/viewer/widgets/history.py b/skimage/viewer/widgets/history.py index 43a940dc..3adac0db 100644 --- a/skimage/viewer/widgets/history.py +++ b/skimage/viewer/widgets/history.py @@ -29,9 +29,11 @@ class OKCancelButtons(BaseWidget): self.ok = QtGui.QPushButton('OK') self.ok.clicked.connect(self.update_original_image) self.ok.setMaximumWidth(button_width) + self.ok.setFocusPolicy(QtCore.Qt.NoFocus) self.cancel = QtGui.QPushButton('Cancel') self.cancel.clicked.connect(self.close_plugin) self.cancel.setMaximumWidth(button_width) + self.cancel.setFocusPolicy(QtCore.Qt.NoFocus) self.layout = QtGui.QHBoxLayout(self) self.layout.addStretch() @@ -61,8 +63,10 @@ class SaveButtons(BaseWidget): self.save_file = QtGui.QPushButton('File') self.save_file.clicked.connect(self.save_to_file) + self.save_file.setFocusPolicy(QtCore.Qt.NoFocus) self.save_stack = QtGui.QPushButton('Stack') self.save_stack.clicked.connect(self.save_to_stack) + self.save_stack.setFocusPolicy(QtCore.Qt.NoFocus) self.layout = QtGui.QHBoxLayout(self) self.layout.addWidget(self.name_label) From 1fd4042ee6e881e3f1eeb81cd3e9b45634afdac5 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Sun, 16 Dec 2012 21:00:57 -0600 Subject: [PATCH 2/2] BUG: Added required QtCore import --- skimage/viewer/widgets/history.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/viewer/widgets/history.py b/skimage/viewer/widgets/history.py index 3adac0db..0d9d39ae 100644 --- a/skimage/viewer/widgets/history.py +++ b/skimage/viewer/widgets/history.py @@ -2,7 +2,7 @@ import os from textwrap import dedent try: - from PyQt4 import QtGui + from PyQt4 import QtGui, QtCore except ImportError: print("Could not import PyQt4 -- skimage.viewer not available.")