Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add clear button to find comboboxes #5537

Merged
merged 1 commit into from
Oct 25, 2017
Merged

PR: Add clear button to find comboboxes #5537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions spyder/widgets/comboboxes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ class PatternComboBox(BaseComboBox):
def __init__(self, parent, items=None, tip=None,
adjust_to_minimum=True):
BaseComboBox.__init__(self, parent)
if hasattr(self.lineEdit(), 'setClearButtonEnabled'): # only Qt >= 5.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given that this only works for Qt > = 5.2, you need to enclose the lines you added in

if PYQT5:
    ...

where PYQT5 can be imported like this

from qtpy import PYQT5

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The if hasattr() serves exactly that purpose: Only use this feature if available. This should work without explicity checking a Qt version.

Also, I would assume that a simple if PYQT5 would be True for 5.0 <= Qt < 5.2, but they still don't have the clear button.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, you're right, hasattr should be enough.

Besides, we only support Qt 5.2+

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides, we only support Qt 5.2+

In that case, just self.lineEdit().setClearButtonEnabled(True) would be enough.

The if is unneccesary clutter then. Should I remove it for brevity and clarity of the code?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nop, because we also support PyQt4.

self.lineEdit().setClearButtonEnabled(True)
if adjust_to_minimum:
self.setSizeAdjustPolicy(QComboBox.AdjustToMinimumContentsLength)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
Expand Down