From 39967262e43093b9cc83f3afabc8e063308152bd Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Wed, 18 May 2016 16:01:38 -0300 Subject: [PATCH] Draft/Arch: cleanup of startup scripts --- src/Mod/Arch/Init.py | 8 ++++++++ src/Mod/Arch/InitGui.py | 17 ++++------------- src/Mod/Draft/Init.py | 11 +++++++++++ src/Mod/Draft/InitGui.py | 20 ++++++-------------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/Mod/Arch/Init.py b/src/Mod/Arch/Init.py index 93d95a7070c4..a1a994dc6411 100644 --- a/src/Mod/Arch/Init.py +++ b/src/Mod/Arch/Init.py @@ -20,3 +20,11 @@ #* USA * #* * #*************************************************************************** + +# add import/export types +FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC") +FreeCAD.addExportType("Industry Foundation Classes (*.ifc)","importIFC") +FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ") +FreeCAD.addExportType("WebGL file (*.html)","importWebGL") +FreeCAD.addImportType("Collada (*.dae)","importDAE") +FreeCAD.addExportType("Collada (*.dae)","importDAE") diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 08cf42668147..f6b955fbff82 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -82,18 +82,12 @@ def QT_TRANSLATE_NOOP(scope, text): return text FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addPreferencePage(":/ui/preferences-arch.ui","Arch") FreeCADGui.addPreferencePage(":/ui/preferences-archdefaults.ui","Arch") - FreeCADGui.addPreferencePage(":/ui/preferences-ifc.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-dae.ui","Import-Export") if hasattr(FreeCADGui,"draftToolBar"): if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): FreeCADGui.addPreferencePage(":/ui/preferences-draft.ui","Draft") FreeCADGui.addPreferencePage(":/ui/preferences-draftsnap.ui","Draft") FreeCADGui.addPreferencePage(":/ui/preferences-draftvisual.ui","Draft") FreeCADGui.addPreferencePage(":/ui/preferences-drafttexts.ui","Draft") - FreeCADGui.addPreferencePage(":/ui/preferences-dxf.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-dwg.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-svg.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-oca.ui","Import-Export") FreeCADGui.draftToolBar.loadedPreferences = True Log ('Loading Arch module... done\n') @@ -119,12 +113,9 @@ def GetClassName(self): FreeCADGui.addWorkbench(ArchWorkbench) -# add import/export types -FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC") -FreeCAD.addExportType("Industry Foundation Classes (*.ifc)","importIFC") -FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ") -FreeCAD.addExportType("WebGL file (*.html)","importWebGL") -FreeCAD.addImportType("Collada (*.dae)","importDAE") -FreeCAD.addExportType("Collada (*.dae)","importDAE") +# File format pref pages are independent and can be loaded at startup +import Arch_rc +FreeCADGui.addPreferencePage(":/ui/preferences-ifc.ui","Import-Export") +FreeCADGui.addPreferencePage(":/ui/preferences-dae.ui","Import-Export") diff --git a/src/Mod/Draft/Init.py b/src/Mod/Draft/Init.py index dac92ee6a239..47188de86510 100644 --- a/src/Mod/Draft/Init.py +++ b/src/Mod/Draft/Init.py @@ -19,3 +19,14 @@ #* USA * #* * #*************************************************************************** + +# add Import/Export types +App.addImportType("Autodesk DXF (*.dxf)","importDXF") +App.addImportType("SVG as geometry (*.svg)","importSVG") +App.addImportType("Open CAD Format (*.oca *.gcad)","importOCA") +App.addImportType("Common airfoil data (*.dat)","importAirfoilDAT") +App.addExportType("Autodesk DXF (*.dxf)","importDXF") +App.addExportType("Flattened SVG (*.svg)","importSVG") +App.addExportType("Open CAD Format (*.oca)","importOCA") +App.addImportType("Autodesk DWG (*.dwg)","importDWG") +App.addExportType("Autodesk DWG (*.dwg)","importDWG") diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 52c6f53307f1..626efdffd289 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -100,10 +100,6 @@ def QT_TRANSLATE_NOOP(scope, text): FreeCADGui.addPreferencePage(":/ui/preferences-draftsnap.ui","Draft") FreeCADGui.addPreferencePage(":/ui/preferences-draftvisual.ui","Draft") FreeCADGui.addPreferencePage(":/ui/preferences-drafttexts.ui","Draft") - FreeCADGui.addPreferencePage(":/ui/preferences-dxf.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-dwg.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-svg.ui","Import-Export") - FreeCADGui.addPreferencePage(":/ui/preferences-oca.ui","Import-Export") FreeCADGui.draftToolBar.loadedPreferences = True Log ('Loading Draft module...done\n') @@ -141,13 +137,9 @@ def GetClassName(self): FreeCADGui.addWorkbench(DraftWorkbench) -# add Import/Export types -App.addImportType("Autodesk DXF (*.dxf)","importDXF") -App.addImportType("SVG as geometry (*.svg)","importSVG") -App.addImportType("Open CAD Format (*.oca *.gcad)","importOCA") -App.addImportType("Common airfoil data (*.dat)","importAirfoilDAT") -App.addExportType("Autodesk DXF (*.dxf)","importDXF") -App.addExportType("Flattened SVG (*.svg)","importSVG") -App.addExportType("Open CAD Format (*.oca)","importOCA") -App.addImportType("Autodesk DWG (*.dwg)","importDWG") -App.addExportType("Autodesk DWG (*.dwg)","importDWG") +# File format pref pages are independent and can be loaded at startup +import Draft_rc +FreeCADGui.addPreferencePage(":/ui/preferences-dxf.ui","Import-Export") +FreeCADGui.addPreferencePage(":/ui/preferences-dwg.ui","Import-Export") +FreeCADGui.addPreferencePage(":/ui/preferences-svg.ui","Import-Export") +FreeCADGui.addPreferencePage(":/ui/preferences-oca.ui","Import-Export")