kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PySide6: Fixes #13533: QSvgWidget is not a child of QtSvg in PySide6 (#13554)

Browse Source 
* Create a compatibility module QtSvgWidgets.py to handle PySide2 & PySide6
* In the Arch and Material modules use the QtSvgWidgets module
* Since Qt6 the method QFont.setWeight() doesn't accept an int any more but requires an enum. Since the call of QFont.setBold(True) sets
  a weight of 75 the extra calls of QFont.setWeight(75) can be safely removed

Co-authored-by: Adrián Insaurralde Avalos <36372335+adrianinsaval@users.noreply.github.com>
This commit is contained in:
wwmayer
2024-04-23 00:35:33 +02:00
committed by GitHub
parent 1f12684f3c
commit dd9da969e9
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Arch/ArchPrecast.py
View File

@@ -777,14 +777,14 @@ class _PrecastTaskPanel:
def __init__(self):
import FreeCADGui
from PySide import QtCore,QtGui,QtSvg
from PySide import QtCore,QtGui,QtSvgWidgets
self.form = QtGui.QWidget()
self.grid = QtGui.QGridLayout(self.form)
self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"]
self.SlabTypes = ["Champagne","Hat"]
# image display
self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg")
self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg")
self.preview.setMaximumWidth(200)
self.preview.setMinimumHeight(120)
self.grid.addWidget(self.preview,0,0,1,2)
@@ -1263,7 +1263,7 @@ class _DentsTaskPanel:
def __init__(self):
import FreeCADGui
from PySide import QtCore,QtGui,QtSvg
from PySide import QtCore,QtGui,QtSvgWidgets
self.form = QtGui.QWidget()
self.grid = QtGui.QGridLayout(self.form)
self.Rotations = ["N","S","E","O"]
@@ -1282,7 +1282,7 @@ class _DentsTaskPanel:
self.grid.addWidget(self.buttonRemove,2,1,1,1)
# image display
self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg")
self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg")
self.preview.setMaximumWidth(200)
self.preview.setMinimumHeight(120)
self.grid.addWidget(self.preview,3,0,1,2)

4
src/Mod/Arch/ArchWindow.py
View File

@@ -34,7 +34,7 @@ from draftutils.messages import _wrn
if FreeCAD.GuiUp:
import FreeCADGui
from PySide import QtCore, QtGui, QtSvg
from PySide import QtCore, QtGui, QtSvgWidgets
from draftutils.translate import translate
from PySide.QtCore import QT_TRANSLATE_NOOP
import draftguitools.gui_trackers as DraftTrackers
@@ -426,7 +426,7 @@ class _CommandWindow:
self.pic.hide()
# SVG display
self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg")
self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg")
self.im.setMaximumWidth(200)
self.im.setMinimumHeight(120)
grid.addWidget(self.im,4,0,1,2)

1
src/Mod/Arch/importIFClegacy.py
View File

@@ -1795,7 +1795,6 @@ def explorer(filename,schema="IFC2X3_TC1.exp"):
tree.headerItem().setText(1, "")
tree.headerItem().setText(2, "Item and Properties")
bold = QtGui.QFont()
bold.setWeight(75)
bold.setBold(True)
#print(ifc.Entities)