diff --git a/src/Mod/Draft/DraftLayer.py b/src/Mod/Draft/DraftLayer.py index 7bea2f9fb5..2efbf83d1a 100644 --- a/src/Mod/Draft/DraftLayer.py +++ b/src/Mod/Draft/DraftLayer.py @@ -78,7 +78,7 @@ class CommandLayer(): """The Draft_Layer FreeCAD command""" def GetResources(self): - return {'Pixmap' : 'Draft_VisGroup', + return {'Pixmap' : 'Draft_Layer', 'MenuText': QT_TRANSLATE_NOOP("Draft_Layer", "Layer"), 'ToolTip' : QT_TRANSLATE_NOOP("Draft_Layer", "Adds a layer")} @@ -152,7 +152,7 @@ class ViewProviderLayer: if hasattr(self,"icondata"): return self.icondata import Draft_rc - return ":/icons/Draft_VisGroup.svg" + return ":/icons/Draft_Layer.svg" def attach(self,vobj): self.Object = vobj.Object @@ -329,7 +329,7 @@ class ViewProviderLayerContainer: def getIcon(self): import Draft_rc - return ":/icons/Draft_VisGroup.svg" + return ":/icons/Draft_Layer.svg" def attach(self,vobj): @@ -339,7 +339,7 @@ class ViewProviderLayerContainer: import Draft_rc from PySide import QtCore,QtGui - action1 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_VisGroup.svg"),"Merge duplicates",menu) + action1 = QtGui.QAction(QtGui.QIcon(":/icons/Draft_Layer.svg"),"Merge duplicates",menu) action1.triggered.connect(self.mergeByName) menu.addAction(action1) @@ -348,7 +348,7 @@ class ViewProviderLayerContainer: if hasattr(self,"Object") and hasattr(self.Object,"Group"): layers = [o for o in self.Object.Group if (hasattr(o,"Proxy") and isinstance(o.Proxy,Layer))] todelete = [] - for layer in layerss: + for layer in layers: if layer.Label[-1].isdigit() and layer.Label[-2].isdigit() and layer.Label[-3].isdigit(): orig = None for ol in layer: diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 060a562e74..5642e82584 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -21,6 +21,7 @@ icons/Draft_Finish.svg icons/Draft_Fillet.svg icons/Draft_Join.svg + icons/Draft_Layer.svg icons/Draft_Line.svg icons/Draft_Lock.svg icons/Draft_Macro.svg diff --git a/src/Mod/Draft/Resources/icons/Draft_Layer.svg b/src/Mod/Draft/Resources/icons/Draft_Layer.svg new file mode 100644 index 0000000000..dce5071fc2 --- /dev/null +++ b/src/Mod/Draft/Resources/icons/Draft_Layer.svg @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Draft_VisGroup + + Tue Jun 10 10:21:01 2014 -0300 + + + [Yorik van Havre] + + + + + FreeCAD LGPL2+ + + + + + FreeCAD + + + FreeCAD/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + + + [agryson] Alexander Gryson + + + + + page + pages + rectangles + stack + + + Three pages or rectangles stacked on top of each other + + + + diff --git a/src/Mod/Draft/Resources/ui/preferences-dxf.ui b/src/Mod/Draft/Resources/ui/preferences-dxf.ui index 8e6a2189d0..cc08b1acaf 100644 --- a/src/Mod/Draft/Resources/ui/preferences-dxf.ui +++ b/src/Mod/Draft/Resources/ui/preferences-dxf.ui @@ -398,7 +398,7 @@ instead of the size they have in the DXF document - If this is checked, DXF layers will be imported as Draft VisGroups + If this is checked, DXF layers will be imported as Draft Layers Use Layers