Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

FreeCAD · Jul 20, 2014 · 81310c9 · 81310c9
2 parents 3fb066c + a0bb761
commit 81310c9
Show file tree

Hide file tree

Showing 18 changed files with 1,860 additions and 28 deletions.
diff --git a/src/Gui/Icons/preferences-import-export.svg b/src/Gui/Icons/preferences-import-export.svg
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
@@ -22,6 +22,7 @@
         <file>macro-stop.svg</file>
         <file>preferences-display.svg</file>
         <file>preferences-general.svg</file>
+        <file>preferences-import-export.svg</file>
         <file>utilities-terminal.svg</file>
         <file>ClassBrowser/const_member.png</file>
         <file>ClassBrowser/member.png</file>

diff --git a/src/Mod/Arch/Arch.py b/src/Mod/Arch/Arch.py
@@ -43,4 +43,5 @@
 from ArchSpace import *
 from ArchStairs import *
 from ArchRebar import *
-from ArchFrame import *
+from ArchFrame import *
+from ArchPanel import *
diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py
@@ -62,6 +62,8 @@ def getDefaultColor(objectType):
         c = p.GetUnsigned("WindowGlassColor",1772731135)
     elif objectType == "Rebar":
         c = p.GetUnsigned("RebarColor",3111475967)
+    elif objectType == "Panel":
+        c = p.GetUnsigned("PanelColor",3416289279)
     else:
         c = p.GetUnsigned("WindowsColor",810781695)
     r = float((c>>24)&0xFF)/255.0

diff --git a/src/Mod/Arch/ArchPanel.py b/src/Mod/Arch/ArchPanel.py
diff --git a/src/Mod/Arch/Arch_rc.py b/src/Mod/Arch/Arch_rc.py
diff --git a/src/Mod/Arch/CMakeLists.txt b/src/Mod/Arch/CMakeLists.txt
@@ -27,6 +27,7 @@ SET(Arch_SRCS
     TestArch.py
     ifcWriter.py
     ArchFrame.py
+    ArchPanel.py
 )
 SOURCE_GROUP("" FILES ${Arch_SRCS})
 

diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py
@@ -73,6 +73,7 @@ def Initialize(self):
                      "Arch_Floor","Arch_Building","Arch_Site",
                      "Arch_Window","Arch_Roof","Arch_Axis",
                      "Arch_SectionPlane","Arch_Space","Arch_Stairs",
+                     "Arch_Panel",
                      "Arch_Frame","Arch_Add","Arch_Remove","Arch_Survey"]
         self.utilities = ["Arch_SplitMesh","Arch_MeshToShape",
                      "Arch_SelectNonSolidMeshes","Arch_RemoveShape",
@@ -113,14 +114,14 @@ def Initialize(self):
         FreeCADGui.addLanguagePath(":/translations")
         FreeCADGui.addPreferencePage(":/ui/archprefs-base.ui","Arch")
         FreeCADGui.addPreferencePage(":/ui/archprefs-defaults.ui","Arch")
-        FreeCADGui.addPreferencePage(":/ui/archprefs-import.ui","Arch")
+        FreeCADGui.addPreferencePage(":/ui/archprefs-import.ui","Import-Export")
         if hasattr(FreeCADGui,"draftToolBar"):
             if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"):
                 FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft")
                 FreeCADGui.addPreferencePage(":/ui/userprefs-snap.ui","Draft")
                 FreeCADGui.addPreferencePage(":/ui/userprefs-visual.ui","Draft")
-                FreeCADGui.addPreferencePage(":/ui/userprefs-import1.ui","Draft")
-                FreeCADGui.addPreferencePage(":/ui/userprefs-import2.ui","Draft")
+                FreeCADGui.addPreferencePage(":/ui/userprefs-import1.ui","Import-Export")
+                FreeCADGui.addPreferencePage(":/ui/userprefs-import2.ui","Import-Export")
                 FreeCADGui.draftToolBar.loadedPreferences = True
         Log ('Loading Arch module... done\n')
 

diff --git a/src/Mod/Arch/Resources/Arch.qrc b/src/Mod/Arch/Resources/Arch.qrc
@@ -40,6 +40,8 @@
         <file>icons/Arch_Rebar_Tree.svg</file>
         <file>icons/Arch_Frame.svg</file>
         <file>icons/Arch_Frame_Tree.svg</file>
+        <file>icons/Arch_Panel.svg</file>
+        <file>icons/Arch_Panel_Tree.svg</file>
         <file>icons/Arch_Survey.svg</file>
         <file>icons/IFC.svg</file>
         <file>icons/Arch_StructuralSystem.svg</file>

diff --git a/src/Mod/Arch/Resources/icons/Arch_Panel.svg b/src/Mod/Arch/Resources/icons/Arch_Panel.svg