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 icon to MessageCheckBox while avoiding unclickable issue #4749

Merged
merged 7 commits into from
Jul 26, 2017
Merged

PR: Add icon to MessageCheckBox while avoiding unclickable issue #4749

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
85a5b3d
Add icon to messagecheckbox
jnsebgosselin Jul 14, 2017
5ca9777
Sitecustomize: Don't set pandas.core.common.in_qtconsole anymore
ccordoba12 Jul 14, 2017
016adc5
moved the import to the top of the file
jnsebgosselin Jul 15, 2017
76cb133
Merge pull request #4750 from ccordoba12/remove-in_qtconsole
ccordoba12 Jul 15, 2017
eb1f23a
Add icon to messagecheckbox
jnsebgosselin Jul 14, 2017
ee4a5f2
moved the import to the top of the file
jnsebgosselin Jul 15, 2017
5603b9a
Merge branch '3.1.x-messagecheckbox' of https://github.com/jnsebgosse…
jnsebgosselin Jul 18, 2017
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
6 changes: 2 additions & 4 deletions spyder/app/mainwindow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2753,14 +2753,12 @@ def _check_updates_ready(self):
url_i = 'http://pythonhosted.org/spyder/installation.html'

# Define the custom QMessageBox
box = MessageCheckBox()
box = MessageCheckBox(icon=QMessageBox.Information,
parent=self)
box.setWindowTitle(_("Spyder updates"))
box.set_checkbox_text(_("Check for updates on startup"))
box.setStandardButtons(QMessageBox.Ok)
box.setDefaultButton(QMessageBox.Ok)
# The next line is commented because it freezes the dialog.
# For now there is then no info icon. This solves issue #3609.
# box.setIcon(QMessageBox.Information)

# Adjust the checkbox depending on the stored configuration
section, option = 'main', 'check_updates_on_startup'
Expand Down
6 changes: 5 additions & 1 deletion spyder/widgets/helperwidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,12 @@ def __init__(self, *args, **kwargs):
check_layout.addItem(QSpacerItem(size, size))

# Access the Layout of the MessageBox to add the Checkbox
from qtpy import PYQT5
Copy link
Member

Choose a reason for hiding this comment

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

Please move this import to the top of the fie. There's no need to put it here.

layout = self.layout()
layout.addLayout(check_layout, 1, 1)
if PYQT5:
layout.addLayout(check_layout, 1, 2)
else:
layout.addLayout(check_layout, 1, 1)

# --- Public API
# Methods to access the checkbox
Expand Down