linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Needs Feedback] Add PyQt6. Remove PyQt4

Browse Source 
- fully qualify enum values for Qt6
- add resource file per Qt version
- TabWidget: use QPointF instead of QPoint for constructing mouse event

Change-Id: I07da61c36c4228a60f6b5b9dacbead27c0a2409d
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30585
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
This commit is contained in:
Alexander Zaft
2023-03-06 14:34:02 +01:00
parent f6ee2f8d27
commit e820e1a822
20 changed files with 8852 additions and 6029 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
frappy/gui/qt.py
View File

@@ -19,19 +19,38 @@
# Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
#
# *****************************************************************************
"""Import needed stuff from PyQt4/PyQt5"""
"""Import needed stuff from PyQt5/PyQt6"""
# pylint: disable=unused-import
import sys
# Do not abort on exceptions in signal handlers.
# pylint: disable=unnecessary-lambda
sys.excepthook = lambda *args: sys.__excepthook__(*args)
from xml.sax.saxutils import escape as toHtmlEscaped
try:
# Do not abort on exceptions in signal handlers.
# pylint: disable=unnecessary-lambda
sys.excepthook = lambda *args: sys.__excepthook__(*args)
from PyQt6 import uic
from PyQt6.QtCore import QByteArray, QEvent, QMimeData, QObject, QPoint, \
QPointF, QRectF, QSettings, QSize, Qt, pyqtSignal, pyqtSlot
from PyQt6.QtGui import QAction, QBrush, QColor, QCursor, QDrag, QFont, \
QFontMetrics, QIcon, QKeySequence, QMouseEvent, QPainter, QPalette, \
QPen, QPixmap, QPolygonF, QShortcut, QStandardItem, \
QStandardItemModel, QTextCursor
from PyQt6.QtWidgets import QApplication, QCheckBox, QComboBox, QDialog, \
QDialogButtonBox, QDoubleSpinBox, QFileDialog, QFrame, QGridLayout, \
QGroupBox, QHBoxLayout, QInputDialog, QLabel, QLineEdit, QMainWindow, \
QMenu, QMessageBox, QPlainTextEdit, QPushButton, QRadioButton, \
QScrollArea, QSizePolicy, QSpacerItem, QSpinBox, QStyle, \
QStyleOptionTab, QStylePainter, QTabBar, QTabWidget, QTextEdit, \
QToolButton, QTreeView, QTreeWidget, QTreeWidgetItem, QVBoxLayout, \
QWidget
from xml.sax.saxutils import escape as toHtmlEscaped
import frappy.gui.cfg_editor.icon_rc_qt6
import frappy.gui.resources_qt6
except ImportError as e:
from PyQt5 import uic
from PyQt5.QtCore import QByteArray, QEvent, QMimeData, QObject, QPoint, \
QPointF, QRectF, QSettings, QSize, Qt, pyqtSignal, pyqtSlot
@@ -49,22 +68,4 @@ try:
QTreeWidgetItem, QVBoxLayout, QWidget
import frappy.gui.cfg_editor.icon_rc_qt5
except ImportError:
from PyQt4 import uic
from PyQt4.QtCore import QObject, QPoint, QPointF, QRectF, QSize, Qt, \
pyqtSignal, pyqtSlot
from PyQt4.QtGui import QAbstractItemView, QAction, QApplication, QBrush, \
QCheckBox, QColor, QComboBox, QDialog, QDialogButtonBox, \
QDoubleSpinBox, QFileDialog, QFont, QFontMetrics, QFrame, \
QGridLayout, QGroupBox, QHBoxLayout, QIcon, QInputDialog, QLabel, \
QLineEdit, QMainWindow, QMenu, QMessageBox, QPainter, QPen, \
QPlainTextEdit, QPolygonF, QPushButton, QRadioButton, QScrollArea, \
QSizePolicy, QSpacerItem, QSpinBox, QStandardItem, \
QStandardItemModel, QTabBar, QTextCursor, QTextEdit, QTreeView, \
QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget
import frappy.gui.cfg_editor.icon_rc_qt4
def toHtmlEscaped(s):
return Qt.escape(s)
import frappy.gui.resources_qt5