diff options
author | Thomas Karl Pietrowski <thopiekar@googlemail.com> | 2016-04-03 09:35:40 +0200 |
---|---|---|
committer | Thomas Karl Pietrowski <thopiekar@googlemail.com> | 2016-04-03 09:35:40 +0200 |
commit | cfc0276dcb1988a4001fa7deece028d63f5d5bc7 (patch) | |
tree | d30a3f9b167a7f0eea6b1cb1e6a01757b2450e97 | |
parent | 7d3823d1cae8fd893d284a72dd603fdeed54eff6 (diff) | |
parent | 42fe80bc55413bbf109ea76a7d511be7a7eeb23a (diff) |
Merge pull request #3 from ddinu/master
Migrate pysideuic to Qt5.
-rw-r--r-- | pysideuic/Compiler/compiler.py | 4 | ||||
-rw-r--r-- | pysideuic/Compiler/qobjectcreator.py | 14 | ||||
-rw-r--r-- | pysideuic/Compiler/qtproxies.py | 48 | ||||
-rw-r--r-- | pysideuic/__init__.py.in | 8 | ||||
-rw-r--r-- | pysideuic/driver.py | 3 | ||||
-rw-r--r-- | pysideuic/objcreator.py | 2 | ||||
-rw-r--r-- | pysideuic/properties.py | 24 | ||||
-rw-r--r-- | pysideuic/uiparser.py | 92 |
8 files changed, 101 insertions, 94 deletions
diff --git a/pysideuic/Compiler/compiler.py b/pysideuic/Compiler/compiler.py index b25406a..7d8ef3b 100644 --- a/pysideuic/Compiler/compiler.py +++ b/pysideuic/Compiler/compiler.py @@ -33,7 +33,7 @@ from pysideuic.Compiler.misc import write_import class UICompiler(UIParser): def __init__(self): - UIParser.__init__(self, qtproxies.QtCore, qtproxies.QtGui, + UIParser.__init__(self, qtproxies.QtCore, qtproxies.QtGui, qtproxies.QtWidgets, CompilerCreatorPolicy()) def reset(self): @@ -47,7 +47,7 @@ class UICompiler(UIParser): indenter = getIndenter() indenter.level = 0 - indenter.write("from PySide2 import QtCore, QtGui") + indenter.write("from PySide2 import QtCore, QtGui, QtWidgets") indenter.write("") indenter.write("class Ui_%s(object):" % self.uiname) diff --git a/pysideuic/Compiler/qobjectcreator.py b/pysideuic/Compiler/qobjectcreator.py index d46acc0..3842f16 100644 --- a/pysideuic/Compiler/qobjectcreator.py +++ b/pysideuic/Compiler/qobjectcreator.py @@ -29,17 +29,17 @@ except NameError: from sets import Set as set from pysideuic.Compiler.indenter import write_code -from pysideuic.Compiler.qtproxies import QtGui, Literal, strict_getattr +from pysideuic.Compiler.qtproxies import QtWidgets, Literal, strict_getattr logger = logging.getLogger(__name__) DEBUG = logger.debug -class _QtGuiWrapper(object): +class _QtWidgetsWrapper(object): def search(clsname): try: - return strict_getattr(QtGui, clsname) + return strict_getattr(QtWidgets, clsname) except AttributeError: return None @@ -62,7 +62,7 @@ class _ModuleWrapper(object): def search(self, cls): if cls in self._classes: self._used = True - return type(cls, (QtGui.QWidget,), {"module": self._module}) + return type(cls, (QtWidgets.QWidget,), {"module": self._module}) else: return None @@ -87,7 +87,7 @@ class _CustomWidgetLoader(object): def _resolveBaseclass(self, baseClass): try: for x in range(0, 10): - try: return strict_getattr(QtGui, baseClass) + try: return strict_getattr(QtWidgets, baseClass) except AttributeError: pass baseClass = self._widgets[baseClass][0] @@ -124,8 +124,8 @@ class CompilerCreatorPolicy(object): def __init__(self): self._modules = [] - def createQtGuiWrapper(self): - return _QtGuiWrapper + def createQtWidgetsWrapper(self): + return _QtWidgetsWrapper def createModuleWrapper(self, name, classes): mw = _ModuleWrapper(name, classes) diff --git a/pysideuic/Compiler/qtproxies.py b/pysideuic/Compiler/qtproxies.py index c34b852..88d515e 100644 --- a/pysideuic/Compiler/qtproxies.py +++ b/pysideuic/Compiler/qtproxies.py @@ -71,7 +71,7 @@ class i18n_string(object): else: disambig = as_string(self.disambig, encode=False) - return 'QtGui.QApplication.translate("%s", %s, %s, QtGui.QApplication.UnicodeUTF8)' % (i18n_context, as_string(self.string, encode=False), disambig) + return 'QtWidgets.QApplication.translate("%s", %s, %s, -1)' % (i18n_context, as_string(self.string, encode=False), disambig) # Classes with this flag will be handled as literal values. If functions are @@ -209,17 +209,7 @@ class QtCore(ProxyNamespace): ProxyClassMember(cls, "connect", 0)(*args) connect = classmethod(connect) -# These sub-class QWidget but aren't themselves sub-classed. -_qwidgets = ("QCalendarWidget", "QDialogButtonBox", "QDockWidget", "QGroupBox", - "QLineEdit", "QMainWindow", "QMenuBar", "QProgressBar", "QStatusBar", - "QToolBar", "QWizardPage") - class QtGui(ProxyNamespace): - class QApplication(QtCore.QObject): - def translate(uiname, text, disambig, encoding): - return i18n_string(text or "", disambig) - translate = staticmethod(translate) - class QIcon(ProxyClass): pass class QConicalGradient(ProxyClass): pass class QLinearGradient(ProxyClass): pass @@ -228,11 +218,23 @@ class QtGui(ProxyNamespace): class QPainter(ProxyClass): pass class QPalette(ProxyClass): pass class QFont(ProxyClass): pass + +# These sub-class QWidget but aren't themselves sub-classed. +_qwidgets = ("QCalendarWidget", "QDialogButtonBox", "QDockWidget", "QGroupBox", + "QLineEdit", "QMainWindow", "QMenuBar", "QProgressBar", "QStatusBar", + "QToolBar", "QWizardPage") + +class QtWidgets(ProxyNamespace): + class QApplication(QtCore.QObject): + def translate(uiname, text, disambig, encoding): + return i18n_string(text or "", disambig) + translate = staticmethod(translate) + class QSpacerItem(ProxyClass): pass class QSizePolicy(ProxyClass): pass ## QActions inherit from QObject for the metaobject stuff ## and the hierarchy has to be correct since we have a - ## isinstance(x, QtGui.QLayout) call in the ui parser + ## isinstance(x, QtWidgets.QLayout) call in the ui parser class QAction(QtCore.QObject): pass class QActionGroup(QtCore.QObject): pass class QButtonGroup(QtCore.QObject): pass @@ -316,7 +318,7 @@ class QtGui(ProxyNamespace): return Literal("%s.indexOf(%s)" % (self, page)) def layout(self): - return QtGui.QLayout("%s.layout()" % self, + return QtWidgets.QLayout("%s.layout()" % self, False, (), noInstantiation=True) class QAbstractScrollArea(QFrame): pass @@ -335,16 +337,16 @@ class QtGui(ProxyNamespace): class QTableView(QAbstractItemView): def horizontalHeader(self): - return QtGui.QHeaderView("%s.horizontalHeader()" % self, + return QtWidgets.QHeaderView("%s.horizontalHeader()" % self, False, (), noInstantiation=True) def verticalHeader(self): - return QtGui.QHeaderView("%s.verticalHeader()" % self, + return QtWidgets.QHeaderView("%s.verticalHeader()" % self, False, (), noInstantiation=True) class QTreeView(QAbstractItemView): def header(self): - return QtGui.QHeaderView("%s.header()" % self, + return QtWidgets.QHeaderView("%s.header()" % self, False, (), noInstantiation=True) class QListWidgetItem(ProxyClass): pass @@ -354,7 +356,7 @@ class QtGui(ProxyNamespace): setSortingEnabled = i18n_void_func("setSortingEnabled") def item(self, row): - return QtGui.QListWidgetItem("%s.item(%i)" % (self, row), False, + return QtWidgets.QListWidgetItem("%s.item(%i)" % (self, row), False, (), noInstantiation=True) class QTableWidgetItem(ProxyClass): pass @@ -364,20 +366,20 @@ class QtGui(ProxyNamespace): setSortingEnabled = i18n_void_func("setSortingEnabled") def item(self, row, col): - return QtGui.QTableWidgetItem("%s.item(%i, %i)" % (self, row, col), + return QtWidgets.QTableWidgetItem("%s.item(%i, %i)" % (self, row, col), False, (), noInstantiation=True) def horizontalHeaderItem(self, col): - return QtGui.QTableWidgetItem("%s.horizontalHeaderItem(%i)" % (self, col), + return QtWidgets.QTableWidgetItem("%s.horizontalHeaderItem(%i)" % (self, col), False, (), noInstantiation=True) def verticalHeaderItem(self, row): - return QtGui.QTableWidgetItem("%s.verticalHeaderItem(%i)" % (self, row), + return QtWidgets.QTableWidgetItem("%s.verticalHeaderItem(%i)" % (self, row), False, (), noInstantiation=True) class QTreeWidgetItem(ProxyClass): def child(self, index): - return QtGui.QTreeWidgetItem("%s.child(%i)" % (self, index), + return QtWidgets.QTreeWidgetItem("%s.child(%i)" % (self, index), False, (), noInstantiation=True) class QTreeWidget(QTreeView): @@ -385,11 +387,11 @@ class QtGui(ProxyNamespace): setSortingEnabled = i18n_void_func("setSortingEnabled") def headerItem(self): - return QtGui.QWidget("%s.headerItem()" % self, False, (), + return QtWidgets.QWidget("%s.headerItem()" % self, False, (), noInstantiation=True) def topLevelItem(self, index): - return QtGui.QTreeWidgetItem("%s.topLevelItem(%i)" % (self, index), + return QtWidgets.QTreeWidgetItem("%s.topLevelItem(%i)" % (self, index), False, (), noInstantiation=True) class QAbstractButton(QWidget): pass diff --git a/pysideuic/__init__.py.in b/pysideuic/__init__.py.in index 18f52af..c6eba75 100644 --- a/pysideuic/__init__.py.in +++ b/pysideuic/__init__.py.in @@ -40,8 +40,8 @@ _header = """# -*- coding: utf-8 -*- _display_code = """ if __name__ == "__main__": \timport sys -\tapp = QtGui.QApplication(sys.argv) -\t%(widgetname)s = QtGui.%(baseclass)s() +\tapp = QtWidgets.QApplication(sys.argv) +\t%(widgetname)s = QtWidgets.%(baseclass)s() \tui = %(uiclass)s() \tui.setupUi(%(widgetname)s) \t%(widgetname)s.show() @@ -127,7 +127,7 @@ def compileUi(uifile, pyfile, execute=False, indent=4, from_imports=False): """ from time import ctime - import PySide + import PySide2 try: uifname = uifile.name @@ -137,7 +137,7 @@ def compileUi(uifile, pyfile, execute=False, indent=4, from_imports=False): indenter.indentwidth = indent global PySideToolsVersion - pyfile.write(_header % (uifname, ctime(), __version__, PySide.__version__)) + pyfile.write(_header % (uifname, ctime(), __version__, PySide2.__version__)) winfo = compiler.UICompiler().compileUi(uifile, pyfile, from_imports) diff --git a/pysideuic/driver.py b/pysideuic/driver.py index 129c330..abadd87 100644 --- a/pysideuic/driver.py +++ b/pysideuic/driver.py @@ -68,8 +68,9 @@ class Driver(object): from PySide2 import QtUiTools from PySide2 import QtGui + from PySide2 import QtWidgets - app = QtGui.QApplication([self._ui_file]) + app = QtWidgets.QApplication([self._ui_file]) widget = QtUiTools.QUiLoader().load(self._ui_file) widget.show() diff --git a/pysideuic/objcreator.py b/pysideuic/objcreator.py index aa74023..06f3092 100644 --- a/pysideuic/objcreator.py +++ b/pysideuic/objcreator.py @@ -47,7 +47,7 @@ class QObjectCreator(object): self._cpolicy = creatorPolicy self._cwFilters = [] - self._modules = [self._cpolicy.createQtGuiWrapper()] + self._modules = [self._cpolicy.createQtWidgetsWrapper()] # Get the optional plugins. for plugindir in widgetPluginPath: diff --git a/pysideuic/properties.py b/pysideuic/properties.py index 9ef656e..27387fc 100644 --- a/pysideuic/properties.py +++ b/pysideuic/properties.py @@ -37,6 +37,7 @@ DEBUG = logger.debug QtCore = None QtGui = None +QtWidgets = None def int_list(prop): @@ -53,8 +54,9 @@ def needsWidget(func): class Properties(object): - def __init__(self, factory, QtCore_mod, QtGui_mod): - global QtGui, QtCore + def __init__(self, factory, QtCore_mod, QtGui_mod, QtWidgets_mod): + global QtGui, QtCore, QtWidgets + QtWidgets = QtWidgets_mod QtGui = QtGui_mod QtCore = QtCore_mod self.factory = factory @@ -125,8 +127,8 @@ class Properties(object): if prop.get('notr', notr) == 'true': return text - return QtGui.QApplication.translate(self.uiname, text, - prop.get('comment'), QtGui.QApplication.UnicodeUTF8) + return QtWidgets.QApplication.translate(self.uiname, text, + prop.get('comment'), -1) _char = _string @@ -297,12 +299,12 @@ class Properties(object): if len(values) == 2: # Qt v4.3.0 and later. horstretch, verstretch = values - hsizetype = getattr(QtGui.QSizePolicy, prop.get('hsizetype')) - vsizetype = getattr(QtGui.QSizePolicy, prop.get('vsizetype')) + hsizetype = getattr(QtWidgets.QSizePolicy, prop.get('hsizetype')) + vsizetype = getattr(QtWidgets.QSizePolicy, prop.get('vsizetype')) else: hsizetype, vsizetype, horstretch, verstretch = values - hsizetype = QtGui.QSizePolicy.Policy(hsizetype) - vsizetype = QtGui.QSizePolicy.Policy(vsizetype) + hsizetype = QtWidgets.QSizePolicy.Policy(hsizetype) + vsizetype = QtWidgets.QSizePolicy.Policy(vsizetype) sizePolicy = self.factory.createQObject("QSizePolicy", "sizePolicy", (hsizetype, vsizetype), is_attribute=False) @@ -452,13 +454,13 @@ class Properties(object): # If the class is a QFrame, it's a line. if widget.metaObject().className() == "QFrame": widget.setFrameShape( - {"Qt::Horizontal": QtGui.QFrame.HLine, - "Qt::Vertical" : QtGui.QFrame.VLine}[prop[0].text]) + {"Qt::Horizontal": QtWidgets.QFrame.HLine, + "Qt::Vertical" : QtWidgets.QFrame.VLine}[prop[0].text]) # In Qt Designer, lines appear to be sunken, QFormBuilder loads # them as such, uic generates plain lines. We stick to the look in # Qt Designer. - widget.setFrameShadow(QtGui.QFrame.Sunken) + widget.setFrameShadow(QtWidgets.QFrame.Sunken) else: widget.setOrientation(self._enum(prop[0])) diff --git a/pysideuic/uiparser.py b/pysideuic/uiparser.py index 9f86972..15421c1 100644 --- a/pysideuic/uiparser.py +++ b/pysideuic/uiparser.py @@ -46,6 +46,7 @@ if sys.version_info < (2,4,0): QtCore = None QtGui = None +QtWidgets = None def gridPosition(elem): @@ -69,7 +70,7 @@ class WidgetStack(list): DEBUG("push %s %s" % (item.metaObject().className(), item.objectName())) self.append(item) - if isinstance(item, QtGui.QWidget): + if isinstance(item, QtWidgets.QWidget): self.topwidget = item def popLayout(self): @@ -83,7 +84,7 @@ class WidgetStack(list): DEBUG("pop widget %s %s" % (widget.metaObject().className(), widget.objectName())) for item in reversed(self): - if isinstance(item, QtGui.QWidget): + if isinstance(item, QtWidgets.QWidget): self.topwidget = item break else: @@ -95,17 +96,18 @@ class WidgetStack(list): return self[-1] def topIsLayout(self): - return isinstance(self[-1], QtGui.QLayout) + return isinstance(self[-1], QtWidgets.QLayout) class UIParser(object): - def __init__(self, QtCoreModule, QtGuiModule, creatorPolicy): + def __init__(self, QtCoreModule, QtGuiModule, QtWidgetsModule, creatorPolicy): self.factory = QObjectCreator(creatorPolicy) - self.wprops = Properties(self.factory, QtCoreModule, QtGuiModule) + self.wprops = Properties(self.factory, QtCoreModule, QtGuiModule, QtWidgetsModule) - global QtCore, QtGui + global QtCore, QtGui, QtWidgets QtCore = QtCoreModule QtGui = QtGuiModule + QtWidgets = QtWidgetsModule self.reset() @@ -113,7 +115,7 @@ class UIParser(object): """UIParser.uniqueName(string) -> string Create a unique name from a string. - >>> p = UIParser(QtCore, QtGui) + >>> p = UIParser(QtCore, QtGui, QtWidgets) >>> p.uniqueName("foo") 'foo' >>> p.uniqueName("foo") @@ -173,22 +175,22 @@ class UIParser(object): # if is a Menubar on MacOS macMenu = (sys.platform == 'darwin') and (widget_class == 'QMenuBar') - if isinstance(parent, (QtGui.QDockWidget, QtGui.QMdiArea, - QtGui.QScrollArea, QtGui.QStackedWidget, - QtGui.QToolBox, QtGui.QTabWidget, - QtGui.QWizard)) or macMenu: + if isinstance(parent, (QtWidgets.QDockWidget, QtWidgets.QMdiArea, + QtWidgets.QScrollArea, QtWidgets.QStackedWidget, + QtWidgets.QToolBox, QtWidgets.QTabWidget, + QtWidgets.QWizard)) or macMenu: parent = None # See if this is a layout widget. if widget_class == 'QWidget': if parent is not None: - if not isinstance(parent, QtGui.QMainWindow): + if not isinstance(parent, QtWidgets.QMainWindow): self.layout_widget = True self.stack.push(self.setupObject(widget_class, parent, elem)) - if isinstance(self.stack.topwidget, QtGui.QTableWidget): + if isinstance(self.stack.topwidget, QtWidgets.QTableWidget): self.stack.topwidget.setColumnCount(len(elem.findall("column"))) self.stack.topwidget.setRowCount(len(elem.findall("row"))) @@ -197,16 +199,16 @@ class UIParser(object): self.layout_widget = False - if isinstance(widget, QtGui.QTreeView): + if isinstance(widget, QtWidgets.QTreeView): self.handleHeaderView(elem, "header", widget.header()) - elif isinstance(widget, QtGui.QTableView): + elif isinstance(widget, QtWidgets.QTableView): self.handleHeaderView(elem, "horizontalHeader", widget.horizontalHeader()) self.handleHeaderView(elem, "verticalHeader", widget.verticalHeader()) - elif isinstance(widget, QtGui.QAbstractButton): + elif isinstance(widget, QtWidgets.QAbstractButton): bg_i18n = self.wprops.getAttribute(elem, "buttonGroup") if bg_i18n is not None: bg_name = bg_i18n.string @@ -230,14 +232,14 @@ class UIParser(object): lay = self.stack.peek() gp = elem.attrib["grid-position"] - if isinstance(lay, QtGui.QFormLayout): + if isinstance(lay, QtWidgets.QFormLayout): lay.setWidget(gp[0], self._form_layout_role(gp), widget) else: lay.addWidget(widget, *gp) topwidget = self.stack.topwidget - if isinstance(topwidget, QtGui.QToolBox): + if isinstance(topwidget, QtWidgets.QToolBox): icon = self.wprops.getAttribute(elem, "icon") if icon is not None: topwidget.addItem(widget, icon, self.wprops.getAttribute(elem, "label")) @@ -248,7 +250,7 @@ class UIParser(object): if tooltip is not None: topwidget.setItemToolTip(topwidget.indexOf(widget), tooltip) - elif isinstance(topwidget, QtGui.QTabWidget): + elif isinstance(topwidget, QtWidgets.QTabWidget): icon = self.wprops.getAttribute(elem, "icon") if icon is not None: topwidget.addTab(widget, icon, self.wprops.getAttribute(elem, "title")) @@ -259,19 +261,19 @@ class UIParser(object): if tooltip is not None: topwidget.setTabToolTip(topwidget.indexOf(widget), tooltip) - elif isinstance(topwidget, QtGui.QWizard): + elif isinstance(topwidget, QtWidgets.QWizard): topwidget.addPage(widget) - elif isinstance(topwidget, QtGui.QStackedWidget): + elif isinstance(topwidget, QtWidgets.QStackedWidget): topwidget.addWidget(widget) - elif isinstance(topwidget, (QtGui.QDockWidget, QtGui.QScrollArea)): + elif isinstance(topwidget, (QtWidgets.QDockWidget, QtWidgets.QScrollArea)): topwidget.setWidget(widget) - elif isinstance(topwidget, QtGui.QMainWindow): - if type(widget) == QtGui.QWidget: + elif isinstance(topwidget, QtWidgets.QMainWindow): + if type(widget) == QtWidgets.QWidget: topwidget.setCentralWidget(widget) - elif isinstance(widget, QtGui.QToolBar): + elif isinstance(widget, QtWidgets.QToolBar): tbArea = self.wprops.getAttribute(elem, "toolBarArea") if tbArea is None: @@ -284,11 +286,11 @@ class UIParser(object): if tbBreak: topwidget.insertToolBarBreak(widget) - elif isinstance(widget, QtGui.QMenuBar): + elif isinstance(widget, QtWidgets.QMenuBar): topwidget.setMenuBar(widget) - elif isinstance(widget, QtGui.QStatusBar): + elif isinstance(widget, QtWidgets.QStatusBar): topwidget.setStatusBar(widget) - elif isinstance(widget, QtGui.QDockWidget): + elif isinstance(widget, QtWidgets.QDockWidget): dwArea = self.wprops.getAttribute(elem, "dockWidgetArea") topwidget.addDockWidget(QtCore.Qt.DockWidgetArea(dwArea), widget) @@ -332,9 +334,9 @@ class UIParser(object): size_args = (int(width), int(height)) sizeType = self.wprops.getProperty(elem, "sizeType", - QtGui.QSizePolicy.Expanding) + QtWidgets.QSizePolicy.Expanding) - policy = (QtGui.QSizePolicy.Minimum, sizeType) + policy = (QtWidgets.QSizePolicy.Minimum, sizeType) if self.wprops.getProperty(elem, "orientation") == QtCore.Qt.Horizontal: policy = policy[1], policy[0] @@ -347,7 +349,7 @@ class UIParser(object): lay = self.stack.peek() gp = elem.attrib["grid-position"] - if isinstance(lay, QtGui.QFormLayout): + if isinstance(lay, QtWidgets.QFormLayout): lay.setItem(gp[0], self._form_layout_role(gp), spacer) else: lay.addItem(spacer, *gp) @@ -429,13 +431,13 @@ class UIParser(object): top_layout = self.stack.peek() gp = elem.attrib["grid-position"] - if isinstance(top_layout, QtGui.QFormLayout): + if isinstance(top_layout, QtWidgets.QFormLayout): top_layout.setLayout(gp[0], self._form_layout_role(gp), layout) else: top_layout.addLayout(layout, *gp) def configureLayout(self, elem, layout): - if isinstance(layout, QtGui.QGridLayout): + if isinstance(layout, QtWidgets.QGridLayout): self.setArray(elem, 'columnminimumwidth', layout.setColumnMinimumWidth) self.setArray(elem, 'rowminimumheight', @@ -443,7 +445,7 @@ class UIParser(object): self.setArray(elem, 'columnstretch', layout.setColumnStretch) self.setArray(elem, 'rowstretch', layout.setRowStretch) - elif isinstance(layout, QtGui.QBoxLayout): + elif isinstance(layout, QtWidgets.QBoxLayout): self.setArray(elem, 'stretch', layout.setStretch) def setArray(self, elem, name, setter): @@ -461,7 +463,7 @@ class UIParser(object): else: w = self.stack.topwidget - if isinstance(w, QtGui.QComboBox): + if isinstance(w, QtWidgets.QComboBox): text = self.wprops.getProperty(elem, "text") icon = self.wprops.getProperty(elem, "icon") @@ -472,7 +474,7 @@ class UIParser(object): w.setItemText(self.item_nr, text) - elif isinstance(w, QtGui.QListWidget): + elif isinstance(w, QtWidgets.QListWidget): text = self.wprops.getProperty(elem, "text") icon = self.wprops.getProperty(elem, "icon") flags = self.wprops.getProperty(elem, "flags") @@ -510,7 +512,7 @@ class UIParser(object): if foreground: item.setForeground(foreground) - elif isinstance(w, QtGui.QTreeWidget): + elif isinstance(w, QtWidgets.QTreeWidget): if self.itemstack: parent, _ = self.itemstack[-1] _, nr_in_root = self.itemstack[0] @@ -557,7 +559,7 @@ class UIParser(object): self.traverseWidgetTree(elem) _, self.item_nr = self.itemstack.pop() - elif isinstance(w, QtGui.QTableWidget): + elif isinstance(w, QtWidgets.QTableWidget): text = self.wprops.getProperty(elem, "text") icon = self.wprops.getProperty(elem, "icon") flags = self.wprops.getProperty(elem, "flags") @@ -606,7 +608,7 @@ class UIParser(object): def addHeader(self, elem): w = self.stack.topwidget - if isinstance(w, QtGui.QTreeWidget): + if isinstance(w, QtWidgets.QTreeWidget): text = self.wprops.getProperty(elem, "text") icon = self.wprops.getProperty(elem, "icon") @@ -618,7 +620,7 @@ class UIParser(object): self.column_counter += 1 - elif isinstance(w, QtGui.QTableWidget): + elif isinstance(w, QtWidgets.QTableWidget): if len(elem) == 0: return @@ -720,9 +722,9 @@ class UIParser(object): else: DEBUG("add action %s to %s", action_name, widget.objectName()) action_obj = getattr(self.toplevelWidget, action_name) - if isinstance(action_obj, QtGui.QMenu): + if isinstance(action_obj, QtWidgets.QMenu): widget.addAction(action_obj.menuAction()) - elif not isinstance(action_obj, QtGui.QActionGroup): + elif not isinstance(action_obj, QtWidgets.QActionGroup): widget.addAction(action_obj) def setDelayedProps(self): @@ -873,10 +875,10 @@ class UIParser(object): @staticmethod def _form_layout_role(grid_position): if grid_position[3] > 1: - role = QtGui.QFormLayout.SpanningRole + role = QtWidgets.QFormLayout.SpanningRole elif grid_position[1] == 1: - role = QtGui.QFormLayout.FieldRole + role = QtWidgets.QFormLayout.FieldRole else: - role = QtGui.QFormLayout.LabelRole + role = QtWidgets.QFormLayout.LabelRole return role |