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

Merge pull request #12111 from 3x380V/draft_wb_qt6

Browse Source 
Draft: Qt6 fixes
This commit is contained in:
Roy-043
2024-01-31 11:31:38 +01:00
committed by GitHub
parent 739b4a7c04 839fb17649
commit 47f6c756e3
16 changed files with 177 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Mod/Draft/draftutils/init_draft_statusbar.py
View File

@@ -33,6 +33,7 @@ and is populated by various widgets, buttons and menus.
# @{
import PySide.QtCore as QtCore
import PySide.QtGui as QtGui
import PySide.QtWidgets as QtWidgets
import FreeCAD as App
import FreeCADGui as Gui
@@ -145,13 +146,13 @@ def _set_scale(action):
mw = Gui.getMainWindow()
sb = mw.statusBar()
scale_widget = sb.findChild(QtGui.QToolBar,"draft_scale_widget")
scale_widget = sb.findChild(QtWidgets.QToolBar,"draft_scale_widget")
if action.text() == translate("draft", "Custom"):
title_text = translate("draft", "Set custom scale")
dialog_text = translate("draft",
"Set custom annotation scale in format x:x, x=x")
custom_scale = QtGui.QInputDialog.getText(None, title_text, dialog_text)
custom_scale = QtWidgets.QInputDialog.getText(None, title_text, dialog_text)
if custom_scale[1]:
print(custom_scale[0])
scale = label_to_scale(custom_scale[0])
@@ -179,7 +180,7 @@ def init_draft_statusbar_scale():
mw = Gui.getMainWindow()
sb = mw.statusBar()
scale_widget = QtGui.QToolBar()
scale_widget = QtWidgets.QToolBar()
scale_widget.setObjectName("draft_scale_widget")
# get scales list according to system units
@@ -191,10 +192,10 @@ def init_draft_statusbar_scale():
# initializes scale widget
scale_widget.draft_scales = draft_scales
scaleLabel = QtGui.QPushButton("Scale")
scaleLabel = QtWidgets.QPushButton("Scale")
scaleLabel.setObjectName("ScaleLabel")
scaleLabel.setFlat(True)
menu = QtGui.QMenu(scaleLabel)
menu = QtWidgets.QMenu(scaleLabel)
gUnits = QtGui.QActionGroup(menu)
for u in draft_scales:
a = QtGui.QAction(gUnits)
@@ -223,7 +224,7 @@ def init_draft_statusbar_snap():
"""
empty label instead of snap_widget.addSeparator()
"""
label = QtGui.QLabel()
label = QtWidgets.QLabel()
label.setFixedWidth(2)
return label
@@ -232,11 +233,11 @@ def init_draft_statusbar_snap():
# check if the toolbar is available, without it the required actions
# may be missing:
if mw.findChild(QtGui.QToolBar, "Draft snap") is None:
if mw.findChild(QtWidgets.QToolBar, "Draft snap") is None:
return
# snap widget:
snap_widget = QtGui.QToolBar()
snap_widget = QtWidgets.QToolBar()
snap_widget.setObjectName("draft_snap_widget")
snap_widget.setOrientation(QtCore.Qt.Orientation.Horizontal)
snap_widget.setIconSize(QtCore.QSize(16, 16))
@@ -286,11 +287,11 @@ def show_draft_statusbar():
sb = mw.statusBar()
if params.get_param("DisplayStatusbarScaleWidget"):
scale_widget = sb.findChild(QtGui.QToolBar, "draft_scale_widget")
scale_widget = sb.findChild(QtWidgets.QToolBar, "draft_scale_widget")
if scale_widget:
scale_widget.show()
else:
scale_widget = mw.findChild(QtGui.QToolBar, "draft_scale_widget")
scale_widget = mw.findChild(QtWidgets.QToolBar, "draft_scale_widget")
if scale_widget:
sb.insertPermanentWidget(3, scale_widget)
scale_widget.show()
@@ -299,12 +300,12 @@ def show_draft_statusbar():
t.singleShot(500, init_draft_statusbar_scale)
if params.get_param("DisplayStatusbarSnapWidget"):
snap_widget = sb.findChild(QtGui.QToolBar, "draft_snap_widget")
snap_widget = sb.findChild(QtWidgets.QToolBar, "draft_snap_widget")
if snap_widget:
snap_widget.setOrientation(QtCore.Qt.Orientation.Horizontal)
snap_widget.show()
else:
snap_widget = mw.findChild(QtGui.QToolBar, "draft_snap_widget")
snap_widget = mw.findChild(QtWidgets.QToolBar, "draft_snap_widget")
if snap_widget:
sb.insertPermanentWidget(2, snap_widget)
snap_widget.setOrientation(QtCore.Qt.Orientation.Horizontal)
@@ -322,11 +323,11 @@ def hide_draft_statusbar():
sb = mw.statusBar()
# hide scale widget
scale_widget = sb.findChild(QtGui.QToolBar, "draft_scale_widget")
scale_widget = sb.findChild(QtWidgets.QToolBar, "draft_scale_widget")
if scale_widget is None:
# when switching workbenches, the toolbar sometimes "jumps"
# out of the status bar to any other dock area...
scale_widget = mw.findChild(QtGui.QToolBar, "draft_scale_widget")
scale_widget = mw.findChild(QtWidgets.QToolBar, "draft_scale_widget")
if scale_widget:
scale_widget.hide()
# prevent the widget from showing up as a blank item in the toolbar
@@ -334,11 +335,11 @@ def hide_draft_statusbar():
scale_widget.toggleViewAction().setVisible(False)
# hide snap widget
snap_widget = sb.findChild(QtGui.QToolBar,"draft_snap_widget")
snap_widget = sb.findChild(QtWidgets.QToolBar,"draft_snap_widget")
if snap_widget is None:
# when switching workbenches, the toolbar sometimes "jumps"
# out of the status bar to any other dock area...
snap_widget = mw.findChild(QtGui.QToolBar,"draft_snap_widget")
snap_widget = mw.findChild(QtWidgets.QToolBar,"draft_snap_widget")
if snap_widget:
snap_widget.hide()
# prevent the widget from showing up as a blank item in the toolbar

12
src/Mod/Draft/draftutils/params.py
View File

@@ -35,7 +35,7 @@ from draftutils.translate import translate
if App.GuiUp:
import FreeCADGui as Gui
from PySide import QtGui
from PySide import QtWidgets
class ParamObserverDraft:
@@ -93,7 +93,7 @@ def _param_observer_callback_scalemultiplier(value):
return
mw = Gui.getMainWindow()
sb = mw.statusBar()
scale_widget = sb.findChild(QtGui.QToolBar,"draft_scale_widget")
scale_widget = sb.findChild(QtWidgets.QToolBar,"draft_scale_widget")
if scale_widget is not None:
scale_label = init_draft_statusbar.scale_to_label(1 / value)
scale_widget.scaleLabel.setText(scale_label)
@@ -179,10 +179,10 @@ def _param_observer_callback_svg_pattern():
msg = translate("draft",
"""Do you want to update the SVG pattern options
of existing objects in all opened documents?""")
res = QtGui.QMessageBox.question(None, "Update SVG patterns", msg,
QtGui.QMessageBox.Yes | QtGui.QMessageBox.No,
QtGui.QMessageBox.No)
if res == QtGui.QMessageBox.No:
res = QtWidgets.QMessageBox.question(None, "Update SVG patterns", msg,
QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No,
QtWidgets.QMessageBox.No)
if res == QtWidgets.QMessageBox.No:
return
for doc, vobjs in data:

12
src/Mod/Draft/draftutils/translate.py
View File

@@ -33,12 +33,12 @@ using the QtCore module.
## \addtogroup draftutils
# @{
import PySide.QtCore as QtCore
import PySide.QtGui as QtGui
import PySide.QtWidgets as QtWidgets
Qtranslate = QtCore.QCoreApplication.translate
try:
_encoding = QtGui.QApplication.UnicodeUTF8
_encoding = QtWidgets.QApplication.UnicodeUTF8
except AttributeError:
_encoding = None
@@ -46,7 +46,7 @@ except AttributeError:
def translate(context, text, comment=None):
r"""Translate the text using the Qt translate function.
It wraps around `QtGui.QApplication.translate`,
It wraps around `QtWidgets.QApplication.translate`,
which is the same as `QtCore.QCoreApplication.translate`.
Parameters
@@ -68,7 +68,7 @@ def translate(context, text, comment=None):
Returns
-------
str
A unicode string returned by `QtGui.QApplication.translate`.
A unicode string returned by `QtWidgets.QApplication.translate`.
Unicode strings
---------------
@@ -77,7 +77,7 @@ def translate(context, text, comment=None):
In Qt5 the strings are always assumed unicode
>>> QtCore.QCoreApplication.translate(context, text, None)
>>> QtGui.QApplication.translate(context, text, None)
>>> QtWidgets.QApplication.translate(context, text, None)
"""
return Qtranslate(context, text, comment)
@@ -90,7 +90,7 @@ def translate(context, text, comment=None):
#
# =============================================================================
# try:
# _encoding = QtGui.QApplication.UnicodeUTF8 if six.PY2 else None
# _encoding = QtWidgets.QApplication.UnicodeUTF8 if six.PY2 else None
# def translate(context, text, utf8_decode=True):
# """convenience function for Qt translator
# context: str