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.

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: Migrate to qtpy #3098

Merged
merged 86 commits into from
Apr 10, 2016
Merged
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
6f01d29
Migrate arraybuilder.py to qtpy
goanpeca Apr 9, 2016
5b8105f
Migrate browser.py to qtpy
goanpeca Apr 9, 2016
2ab41b7
Migrate calltip.py to qtpy
goanpeca Apr 9, 2016
effa0e6
Migrate colors.py to qtpy
goanpeca Apr 9, 2016
39ad973
Migrate comboboxes.py to qtpy
goanpeca Apr 9, 2016
ff164b3
Change QtWebKit to QtWebEngineWidgets
goanpeca Apr 9, 2016
3242601
Migrate dependencies.py to qtpy
goanpeca Apr 9, 2016
0dc9090
Migrate editor.py to qtpy
goanpeca Apr 9, 2016
66746d7
Migrate editortools.py to qtpy
goanpeca Apr 9, 2016
7273578
Migrate explorer.py to qtpy
goanpeca Apr 9, 2016
6209da2
Migrate fileswitcher.py to qtpy
goanpeca Apr 9, 2016
3c8d13a
Migrate findinfiles.py to qtpy
goanpeca Apr 9, 2016
af3e150
Migrate findreplace.py to qtpy
goanpeca Apr 9, 2016
f21b6ef
Migrate formlayout.py to qtpy
goanpeca Apr 9, 2016
c659d67
Migrate helperwidgets.py to qtpy
goanpeca Apr 9, 2016
7b1f1f4
Migrate internalshell.py to qtpy
goanpeca Apr 9, 2016
2b5b809
Migrate ipython.py to qtpy
goanpeca Apr 9, 2016
912ffb3
Migrate mixins.py to qtpy
goanpeca Apr 9, 2016
6b4af40
Migrate onecolumntree.py to qtpy
goanpeca Apr 9, 2016
3414fbd
Migrate pathmanager.py to qtpy
goanpeca Apr 9, 2016
7a51ceb
Migrate projectexplorer.py to qtpy
goanpeca Apr 9, 2016
7e88bf7
Migrate pydocgui.py to qtpy
goanpeca Apr 9, 2016
992bd79
Remove project file
goanpeca Apr 9, 2016
9457a80
Migrate shell.py to qtpy
goanpeca Apr 10, 2016
f5c67da
Migrate status.py to qtpy
goanpeca Apr 10, 2016
8788f18
Migrate tabs.py to qtpy
goanpeca Apr 10, 2016
84d6cd2
Migrate baseshell.py to qtpy
goanpeca Apr 10, 2016
77d1019
Migrate introspection.py to qtpy
goanpeca Apr 10, 2016
79e1b57
Migrate pythonshell.py to qtpy
goanpeca Apr 10, 2016
e6b810a
Migrate systemshell.py to qtpy
goanpeca Apr 10, 2016
b9eec13
Migrate base.py to qtpy
goanpeca Apr 10, 2016
fd3448d
Migrate codeeditor.py to qtpy
goanpeca Apr 10, 2016
1b990b5
Migrate kill_ring.py to qtpy
goanpeca Apr 10, 2016
be268a8
Migrate arrayeditor.py to qtpy
goanpeca Apr 10, 2016
6284e95
Migrate collectionseditor.py to qtpy
goanpeca Apr 10, 2016
01c7c93
Fix test error
goanpeca Apr 10, 2016
2b58ca9
Migrate dataframeeditor.py to qtpy
goanpeca Apr 10, 2016
1da7a90
Migrate importwizard.py to qtpy
goanpeca Apr 10, 2016
8cacb75
Migrate namespacebrowser.py to qtpy
goanpeca Apr 10, 2016
5ce92b3
Migrate objecteditor.py to qtpy
goanpeca Apr 10, 2016
ad25498
Migrate texteditor.py to qtpy
goanpeca Apr 10, 2016
8ac606e
Migrate utils.py to qtpy
goanpeca Apr 10, 2016
45c7d32
Migrate gui.py to qtpy
goanpeca Apr 10, 2016
5c7eab1
Migrate updates.py to qtpy
goanpeca Apr 10, 2016
a010769
Migrate plugins/__init__.py to qtpy
goanpeca Apr 10, 2016
a8f7c2d
Migrate configdialog.py to qtpy
goanpeca Apr 10, 2016
d0b03f1
Migrate console.py to qtpy
goanpeca Apr 10, 2016
ed13f7a
Migrate editor.py to qtpy
goanpeca Apr 10, 2016
09f8834
Migrate explorer.py to qtpy
goanpeca Apr 10, 2016
3c4b70d
Migrate externalconsole.py to qtpy
goanpeca Apr 10, 2016
cc3a2cf
Migrate findinfiles.py to qtpy
goanpeca Apr 10, 2016
971ed0e
Migrate help.py to qtpy
goanpeca Apr 10, 2016
d67e807
Migrate history.py to qtpy
goanpeca Apr 10, 2016
0b269b2
Migrate ipythonconsole.py to qtpy
goanpeca Apr 10, 2016
1044377
Migrate layoutdialog.py to qtpy
goanpeca Apr 10, 2016
fbf9033
Migrate onlinehelp.py to qtpy
goanpeca Apr 10, 2016
aa7d2ee
Migrate onlinehelp.py to qtpy fix
goanpeca Apr 10, 2016
d09b3d8
Migrate outlineexplorer.py to qtpy fix
goanpeca Apr 10, 2016
88ce2c9
Migrate projectexplorer.py to qtpy fix
goanpeca Apr 10, 2016
60978e2
Migrate runconfig.py to qtpy fix
goanpeca Apr 10, 2016
74f8df4
Migrate shortcuts.py to qtpy fix
goanpeca Apr 10, 2016
a25e3cf
Migrate variableexplorer.py to qtpy fix
goanpeca Apr 10, 2016
cff0de1
Migrate workingdirectory.py to qtpy fix
goanpeca Apr 10, 2016
7258401
Migrate environ.py to qtpy
goanpeca Apr 10, 2016
9fe2165
Migrate icon_manager.py to qtpy
goanpeca Apr 10, 2016
14d261f
Migrate qthelpers.py to qtpy
goanpeca Apr 10, 2016
e7540a6
Migrate syntaxhighlighters.py to qtpy
goanpeca Apr 10, 2016
f5c0743
Migrate manager.py to qtpy
goanpeca Apr 10, 2016
9fdc0b7
Migrate plugin_client.py to qtpy
goanpeca Apr 10, 2016
7deb620
Migrate restart.py to qtpy
goanpeca Apr 10, 2016
1a18635
Migrate spyder.py to qtpy
goanpeca Apr 10, 2016
ab62e84
Migrate tour.py to qtpy
goanpeca Apr 10, 2016
9fdd69c
Migrate spyderlib/__init__.py to qtpy
goanpeca Apr 10, 2016
f9a5bec
Migrate programs.py to qtpy
goanpeca Apr 10, 2016
ea2b8f0
Migrate editor.py to qtpy, missing import
goanpeca Apr 10, 2016
f59a987
Migrate findreplace.py to qtpy, missing import
goanpeca Apr 10, 2016
0985fb4
Migrate status.py to qtpy, missing import
goanpeca Apr 10, 2016
ef9cbaa
Migrate configdialog.py to qtpy, fix comment
goanpeca Apr 10, 2016
78339dd
Migrate example.pyw to qtpy
goanpeca Apr 10, 2016
9403678
Migrate breakpointsgui.pyw to qtpy
goanpeca Apr 10, 2016
4a897b6
Migrate profiler.pyw to qtpy
goanpeca Apr 10, 2016
d2ea099
Migrate profilergui.py to qtpy
goanpeca Apr 10, 2016
654da2c
Fix pylint imports
goanpeca Apr 10, 2016
6dccce4
Migrate requirements.py to qtpy
goanpeca Apr 10, 2016
127bb78
Add qtpy as dependency
goanpeca Apr 10, 2016
765f9d5
Update code to latest qtpy (QIntValidator bug)
goanpeca Apr 10, 2016
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
Prev Previous commit
Next Next commit
Migrate comboboxes.py to qtpy
  • Loading branch information
goanpeca committed Apr 9, 2016
commit 39ad9733972754b534d9497a3ed5b989fa62a482
6 changes: 3 additions & 3 deletions spyderlib/widgets/comboboxes.py
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@
import os.path as osp

# Third party imports
from spyderlib.qt.QtCore import QEvent, Qt, QTimer, QUrl, Signal
from spyderlib.qt.QtGui import (QComboBox, QCompleter, QFont,
QSizePolicy, QToolTip)
from qtpy.QtCore import QEvent, Qt, QTimer, QUrl, Signal
from qtpy.QtGui import QFont
from qtpy.QtWidgets import QComboBox, QCompleter, QSizePolicy, QToolTip

# Local imports
from spyderlib.config.base import _