diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 75d3a9b490..f6bde4e280 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -94,8 +94,10 @@ class ArchWorkbench(Workbench): FreeCADGui.addIconPath(":/icons") FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addPreferencePage(":/ui/archprefs-base.ui","Arch") - FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") - FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") + if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): + FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") + FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") + FreeCADGui.draftToolBar.loadedPreferences = True Log ('Loading Arch module... done\n') def Activated(self): diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index 8f74063b81..ca5d6b8fa4 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -167,17 +167,17 @@ class DraftWorkbench (Workbench): FreeCAD.Console.PrintWarning("Error: PyQt4 not found, Draft workbench will be disabled.\n") else: depsOK = True - - if depsOK: - import Draft_rc + if not depsOK: + return + + try: + import os,macros,DraftTools,DraftGui,Draft_rc FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addIconPath(":/icons") - FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") - FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") - else: - return - try: - import os,macros,DraftTools,DraftGui + if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"): + FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft") + FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft") + FreeCADGui.draftToolBar.loadedPreferences = True self.appendMenu(["&Macro",str(DraftTools.translate("draft","Installed Macros"))],macros.macrosList) Log ('Loading Draft module...done\n') except: