From 7e0550a7c8e68b3c34881a4e5f1f4648de08eb0a Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Thu, 21 Jul 2022 10:17:03 +0200 Subject: [PATCH] Arch: Housekeeping: import translate from correct file --- src/Mod/Arch/ArchAxis.py | 2 +- src/Mod/Arch/ArchAxisSystem.py | 2 +- src/Mod/Arch/ArchBuilding.py | 2 +- src/Mod/Arch/ArchBuildingPart.py | 2 +- src/Mod/Arch/ArchCurtainWall.py | 2 +- src/Mod/Arch/ArchCutPlane.py | 2 +- src/Mod/Arch/ArchEquipment.py | 2 +- src/Mod/Arch/ArchFloor.py | 2 +- src/Mod/Arch/ArchFrame.py | 2 +- src/Mod/Arch/ArchGrid.py | 2 +- src/Mod/Arch/ArchMaterial.py | 2 +- src/Mod/Arch/ArchPanel.py | 2 +- src/Mod/Arch/ArchPipe.py | 2 +- src/Mod/Arch/ArchPrecast.py | 2 +- src/Mod/Arch/ArchProfile.py | 2 +- src/Mod/Arch/ArchProject.py | 2 +- src/Mod/Arch/ArchRebar.py | 2 +- src/Mod/Arch/ArchReference.py | 2 +- src/Mod/Arch/ArchRoof.py | 2 +- src/Mod/Arch/ArchSchedule.py | 2 +- src/Mod/Arch/ArchSectionPlane.py | 2 +- src/Mod/Arch/ArchSite.py | 2 +- src/Mod/Arch/ArchSpace.py | 2 +- src/Mod/Arch/ArchStairs.py | 2 +- src/Mod/Arch/ArchStructure.py | 2 +- src/Mod/Arch/ArchTruss.py | 2 +- src/Mod/Arch/ArchWall.py | 2 +- src/Mod/Arch/ArchWindow.py | 2 +- src/Mod/Arch/importDAE.py | 2 +- src/Mod/Arch/importGBXML.py | 2 +- src/Mod/Arch/importIFClegacy.py | 2 +- src/Mod/Arch/importJSON.py | 2 +- src/Mod/Arch/importOBJ.py | 2 +- src/Mod/Arch/importWebGL.py | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py index e93c75d0ab..693b731407 100644 --- a/src/Mod/Arch/ArchAxis.py +++ b/src/Mod/Arch/ArchAxis.py @@ -26,7 +26,7 @@ from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui, re from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from pivy import coin from PySide.QtCore import QT_TRANSLATE_NOOP diff --git a/src/Mod/Arch/ArchAxisSystem.py b/src/Mod/Arch/ArchAxisSystem.py index e8bd28ee84..b507c87850 100644 --- a/src/Mod/Arch/ArchAxisSystem.py +++ b/src/Mod/Arch/ArchAxisSystem.py @@ -23,7 +23,7 @@ import FreeCAD, DraftGeomUtils if FreeCAD.GuiUp: import FreeCADGui, Draft from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from pivy import coin from PySide.QtCore import QT_TRANSLATE_NOOP else: diff --git a/src/Mod/Arch/ArchBuilding.py b/src/Mod/Arch/ArchBuilding.py index 6cd647aea6..a574b15017 100644 --- a/src/Mod/Arch/ArchBuilding.py +++ b/src/Mod/Arch/ArchBuilding.py @@ -24,7 +24,7 @@ import FreeCAD,Draft,ArchCommands,ArchFloor if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchBuildingPart.py b/src/Mod/Arch/ArchBuildingPart.py index 4de74ba342..72ae04c2e2 100644 --- a/src/Mod/Arch/ArchBuildingPart.py +++ b/src/Mod/Arch/ArchBuildingPart.py @@ -30,7 +30,7 @@ import tempfile import os if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import draftutils.units as units else: diff --git a/src/Mod/Arch/ArchCurtainWall.py b/src/Mod/Arch/ArchCurtainWall.py index 6f85f31113..a5187486a0 100644 --- a/src/Mod/Arch/ArchCurtainWall.py +++ b/src/Mod/Arch/ArchCurtainWall.py @@ -32,7 +32,7 @@ import DraftVecUtils if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchCutPlane.py b/src/Mod/Arch/ArchCutPlane.py index 4f8c677b5a..11b8ae0116 100644 --- a/src/Mod/Arch/ArchCutPlane.py +++ b/src/Mod/Arch/ArchCutPlane.py @@ -24,7 +24,7 @@ import FreeCAD,ArchCommands if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate else: # \cond def translate(ctxt,txt): diff --git a/src/Mod/Arch/ArchEquipment.py b/src/Mod/Arch/ArchEquipment.py index ae16f0e631..f93811cbe2 100644 --- a/src/Mod/Arch/ArchEquipment.py +++ b/src/Mod/Arch/ArchEquipment.py @@ -28,7 +28,7 @@ import FreeCAD,ArchComponent,DraftVecUtils if FreeCAD.GuiUp: import FreeCADGui from PySide import QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchFloor.py b/src/Mod/Arch/ArchFloor.py index b80dbaf4e4..90c9281f25 100644 --- a/src/Mod/Arch/ArchFloor.py +++ b/src/Mod/Arch/ArchFloor.py @@ -31,7 +31,7 @@ IfcType. import FreeCAD,Draft,ArchCommands, DraftVecUtils, ArchIFC if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchFrame.py b/src/Mod/Arch/ArchFrame.py index 7686efbd13..ef71bd69ed 100644 --- a/src/Mod/Arch/ArchFrame.py +++ b/src/Mod/Arch/ArchFrame.py @@ -22,7 +22,7 @@ import FreeCAD,Draft,ArchComponent,DraftVecUtils if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchGrid.py b/src/Mod/Arch/ArchGrid.py index 28cc17dd28..4e355c98fc 100644 --- a/src/Mod/Arch/ArchGrid.py +++ b/src/Mod/Arch/ArchGrid.py @@ -23,7 +23,7 @@ import FreeCAD, Part, math if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchMaterial.py b/src/Mod/Arch/ArchMaterial.py index 6dbcce39f2..356c674fb5 100644 --- a/src/Mod/Arch/ArchMaterial.py +++ b/src/Mod/Arch/ArchMaterial.py @@ -24,7 +24,7 @@ if FreeCAD.GuiUp: import FreeCADGui, os import Arch_rc # Needed for access to icons # lgtm [py/unused_import] from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py index 33d2e48552..8bceb0f910 100644 --- a/src/Mod/Arch/ArchPanel.py +++ b/src/Mod/Arch/ArchPanel.py @@ -24,7 +24,7 @@ from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import draftguitools.gui_trackers as DraftTrackers else: diff --git a/src/Mod/Arch/ArchPipe.py b/src/Mod/Arch/ArchPipe.py index e0b059ae7b..ab6e2b6843 100644 --- a/src/Mod/Arch/ArchPipe.py +++ b/src/Mod/Arch/ArchPipe.py @@ -23,7 +23,7 @@ import FreeCAD, ArchComponent if FreeCAD.GuiUp: import FreeCADGui, Arch_rc - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py index 78a6b16f88..6ac350e893 100644 --- a/src/Mod/Arch/ArchPrecast.py +++ b/src/Mod/Arch/ArchPrecast.py @@ -29,7 +29,7 @@ Beams, pillars, slabs and panels""" import ArchCommands,ArchComponent,FreeCAD from FreeCAD import Vector if FreeCAD.GuiUp: - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchProfile.py b/src/Mod/Arch/ArchProfile.py index dbfe298154..3b89fc3612 100644 --- a/src/Mod/Arch/ArchProfile.py +++ b/src/Mod/Arch/ArchProfile.py @@ -38,7 +38,7 @@ import csv if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchProject.py b/src/Mod/Arch/ArchProject.py index 503631235c..73f206969b 100644 --- a/src/Mod/Arch/ArchProject.py +++ b/src/Mod/Arch/ArchProject.py @@ -28,7 +28,7 @@ certain IFC relevant values. import FreeCAD,ArchIFC,ArchIFCView if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: def translate(ctxt,txt): diff --git a/src/Mod/Arch/ArchRebar.py b/src/Mod/Arch/ArchRebar.py index bf0bbf45a1..4374daf582 100644 --- a/src/Mod/Arch/ArchRebar.py +++ b/src/Mod/Arch/ArchRebar.py @@ -23,7 +23,7 @@ import FreeCAD,Draft,ArchComponent,DraftVecUtils,ArchCommands if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchReference.py b/src/Mod/Arch/ArchReference.py index 91b1903896..ef8efff692 100644 --- a/src/Mod/Arch/ArchReference.py +++ b/src/Mod/Arch/ArchReference.py @@ -32,7 +32,7 @@ import sys if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchRoof.py b/src/Mod/Arch/ArchRoof.py index 00aa34ac58..f3bcb65a15 100644 --- a/src/Mod/Arch/ArchRoof.py +++ b/src/Mod/Arch/ArchRoof.py @@ -32,7 +32,7 @@ from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchSchedule.py b/src/Mod/Arch/ArchSchedule.py index 13454bf423..156b10e8ea 100644 --- a/src/Mod/Arch/ArchSchedule.py +++ b/src/Mod/Arch/ArchSchedule.py @@ -26,7 +26,7 @@ import FreeCAD if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py index 9e9e1576e3..2ac30b83d5 100644 --- a/src/Mod/Arch/ArchSectionPlane.py +++ b/src/Mod/Arch/ArchSectionPlane.py @@ -34,7 +34,7 @@ from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from pivy import coin from PySide.QtCore import QT_TRANSLATE_NOOP else: diff --git a/src/Mod/Arch/ArchSite.py b/src/Mod/Arch/ArchSite.py index e6ad5f530d..7b7de59f33 100644 --- a/src/Mod/Arch/ArchSite.py +++ b/src/Mod/Arch/ArchSite.py @@ -27,7 +27,7 @@ containers for Arch objects, and also define a terrain surface. import FreeCAD,Draft,ArchCommands,math,re,datetime,ArchIFC if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py index 418eee053d..38714d0a8f 100644 --- a/src/Mod/Arch/ArchSpace.py +++ b/src/Mod/Arch/ArchSpace.py @@ -149,7 +149,7 @@ import FreeCAD,ArchComponent,ArchCommands,Draft,sys if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchStairs.py b/src/Mod/Arch/ArchStairs.py index d247fe9d98..33c2d2063a 100644 --- a/src/Mod/Arch/ArchStairs.py +++ b/src/Mod/Arch/ArchStairs.py @@ -31,7 +31,7 @@ import Part, DraftGeomUtils from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchStructure.py b/src/Mod/Arch/ArchStructure.py index 06b1342d3d..e33c3c53f6 100644 --- a/src/Mod/Arch/ArchStructure.py +++ b/src/Mod/Arch/ArchStructure.py @@ -27,7 +27,7 @@ import ArchProfile if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import ArchPrecast import draftguitools.gui_trackers as DraftTrackers diff --git a/src/Mod/Arch/ArchTruss.py b/src/Mod/Arch/ArchTruss.py index 40fb76076e..088635b888 100644 --- a/src/Mod/Arch/ArchTruss.py +++ b/src/Mod/Arch/ArchTruss.py @@ -30,7 +30,7 @@ import ArchComponent if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP else: # \cond diff --git a/src/Mod/Arch/ArchWall.py b/src/Mod/Arch/ArchWall.py index 4d6a7b1ea9..d9d54bca2d 100644 --- a/src/Mod/Arch/ArchWall.py +++ b/src/Mod/Arch/ArchWall.py @@ -34,7 +34,7 @@ from FreeCAD import Vector if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import draftguitools.gui_trackers as DraftTrackers else: diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py index d7048a2f70..46d3559565 100644 --- a/src/Mod/Arch/ArchWindow.py +++ b/src/Mod/Arch/ArchWindow.py @@ -30,7 +30,7 @@ from draftutils.messages import _wrn if FreeCAD.GuiUp: import FreeCADGui from PySide import QtCore, QtGui, QtSvg - from DraftTools import translate + from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import draftguitools.gui_trackers as DraftTrackers else: diff --git a/src/Mod/Arch/importDAE.py b/src/Mod/Arch/importDAE.py index 35a49e8083..d5c4cf0b31 100644 --- a/src/Mod/Arch/importDAE.py +++ b/src/Mod/Arch/importDAE.py @@ -21,7 +21,7 @@ import FreeCAD, Mesh, os, numpy, MeshPart, Arch, Draft if FreeCAD.GuiUp: - from DraftTools import translate + from draftutils.translate import translate else: # \cond def translate(context,text): diff --git a/src/Mod/Arch/importGBXML.py b/src/Mod/Arch/importGBXML.py index 21416fe404..cefa77f93b 100644 --- a/src/Mod/Arch/importGBXML.py +++ b/src/Mod/Arch/importGBXML.py @@ -26,7 +26,7 @@ __url__ = "https://www.freecadweb.org" import FreeCAD,Draft if FreeCAD.GuiUp: - from DraftTools import translate + from draftutils.translate import translate else: # \cond def translate(ctx,txt): diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py index 1d4cd4a183..04ed52d9e0 100644 --- a/src/Mod/Arch/importIFClegacy.py +++ b/src/Mod/Arch/importIFClegacy.py @@ -27,7 +27,7 @@ import FreeCAD, Arch, Draft, os, sys, time, Part, DraftVecUtils, uuid, math, re -from DraftTools import translate +from draftutils.translate import translate __title__="FreeCAD IFC importer" __author__ = "Yorik van Havre" diff --git a/src/Mod/Arch/importJSON.py b/src/Mod/Arch/importJSON.py index 840d1dbb15..5ad1e800ea 100644 --- a/src/Mod/Arch/importJSON.py +++ b/src/Mod/Arch/importJSON.py @@ -27,7 +27,7 @@ import six if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate else: FreeCADGui = None diff --git a/src/Mod/Arch/importOBJ.py b/src/Mod/Arch/importOBJ.py index 0dd361d186..e622c1d517 100644 --- a/src/Mod/Arch/importOBJ.py +++ b/src/Mod/Arch/importOBJ.py @@ -22,7 +22,7 @@ import FreeCAD, DraftGeomUtils, Part, Draft, Arch, Mesh, MeshPart, os, sys, codecs, ntpath # import numpy as np if FreeCAD.GuiUp: - from DraftTools import translate + from draftutils.translate import translate else: # \cond def translate(context,text): diff --git a/src/Mod/Arch/importWebGL.py b/src/Mod/Arch/importWebGL.py index e2e2302200..54336f7ea7 100644 --- a/src/Mod/Arch/importWebGL.py +++ b/src/Mod/Arch/importWebGL.py @@ -42,7 +42,7 @@ import textwrap if FreeCAD.GuiUp: import FreeCADGui - from DraftTools import translate + from draftutils.translate import translate else: FreeCADGui = None def translate(ctxt, txt): return txt