projects
/
lilass.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fixes
[lilass.git]
/
qt_frontend.py
diff --git
a/qt_frontend.py
b/qt_frontend.py
index 62e3b842054ce3760668ed8c263314e0d04835cd..6e41d551be0352f2741188a4431e976bd6b5391c 100644
(file)
--- a/
qt_frontend.py
+++ b/
qt_frontend.py
@@
-19,9
+19,9
@@
from screen import RelativeScreenPosition, ScreenSetup
try:
# Be fine with PyQt4 not being installed
try:
# Be fine with PyQt4 not being installed
- from PyQt
4 import QtCore, QtGui
, uic
+ from PyQt
5 import QtCore, QtWidgets
, uic
- class PositionSelection(Qt
Gui
.QDialog):
+ class PositionSelection(Qt
Widgets
.QDialog):
def __init__(self, situation):
# set up main window
super(PositionSelection, self).__init__()
def __init__(self, situation):
# set up main window
super(PositionSelection, self).__init__()
@@
-95,7
+95,7
@@
try:
self.posLabel2.setEnabled(bothEnabled)
self.relPos.setEnabled(bothEnabled)
# avoid having no screen
self.posLabel2.setEnabled(bothEnabled)
self.relPos.setEnabled(bothEnabled)
# avoid having no screen
- self.buttonBox.button(Qt
Gui
.QDialogButtonBox.Ok).setEnabled(intEnabled or extEnabled)
+ self.buttonBox.button(Qt
Widgets
.QDialogButtonBox.Ok).setEnabled(intEnabled or extEnabled)
def run(self):
self.exec_()
def run(self):
self.exec_()
@@
-109,13
+109,13
@@
except ImportError:
# Qt frontend
class QtFrontend:
def __init__(self):
# Qt frontend
class QtFrontend:
def __init__(self):
- from PyQt
4 import QtGui
- self.app = Qt
Gui
.QApplication(sys.argv)
+ from PyQt
5 import QtWidgets
+ self.app = Qt
Widgets
.QApplication(sys.argv)
print("Qt loaded")
def error(self, message):
print("Qt loaded")
def error(self, message):
- from PyQt
4 import QtGui
- Qt
Gui
.QMessageBox.critical(None, 'Fatal error', message)
+ from PyQt
5 import QtWidgets
+ Qt
Widgets
.QMessageBox.critical(None, 'Fatal error', message)
def setup(self, situation):
return PositionSelection(situation).run()
def setup(self, situation):
return PositionSelection(situation).run()
@@
-123,7
+123,7
@@
class QtFrontend:
@staticmethod
def isAvailable():
try:
@staticmethod
def isAvailable():
try:
- import PyQt
4
+ import PyQt
5
return True
except ImportError:
return False
return True
except ImportError:
return False