diff --git a/src/Mod/Arch/ArchSectionPlane.py b/src/Mod/Arch/ArchSectionPlane.py
index 9aa8818b2e..afa607c1dc 100644
--- a/src/Mod/Arch/ArchSectionPlane.py
+++ b/src/Mod/Arch/ArchSectionPlane.py
@@ -320,7 +320,7 @@ def getSVG(source,
lineColor=(0.0, 0.0, 0.0),
fontsize=1,
showFill=False,
- fillColor=(1.0, 1.0, 1.0),
+ fillColor=(0.8, 0.8, 0.8),
techdraw=False,
fillSpaces=False,
cutlinewidth=0,
@@ -400,10 +400,10 @@ def getSVG(source,
svgSymbolLineWidth = str(linewidth * yt)
hiddenPattern = archUserParameters.GetString("archHiddenPattern","30,10")
svgHiddenPattern = hiddenPattern.replace(" ","")
- #fillpattern = ''
- #fillpattern += ''
- #fillpattern += ''
+ fillpattern = ''
+ fillpattern += ''
+ fillpattern += ''
svgLineColor = Draft.getrgb(lineColor)
svg = ''
# reading cached version
@@ -444,16 +444,11 @@ def getSVG(source,
render.cut(cutplane,showHidden)
else:
render.cut(cutplane)
- g = '\n'
- if hasattr(source.ViewObject,"RotateSolidRender"):
- if (source.ViewObject.RotateSolidRender.Value != 0):
- g = '\n'
- svgcache += g
+ svgcache += '\n'
svgcache += render.getViewSVG(linewidth="SVGLINEWIDTH")
- #svgcache += fillpattern
- svgcache += render.getSectionSVG(linewidth="SVGCUTLINEWIDTH",fillpattern="#ffffff")
+ svgcache += fillpattern
+ svgcache += render.getSectionSVG(linewidth="SVGCUTLINEWIDTH",
+ fillpattern="sectionfill")
if showHidden:
svgcache += render.getHiddenSVG(linewidth="SVGLINEWIDTH")
svgcache += '\n'
diff --git a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
index 0f26a64de1..2df87d5e94 100644
--- a/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
+++ b/src/Mod/Draft/Resources/ui/dialog_AnnotationStyleEditor.ui
@@ -6,8 +6,8 @@
0
0
- 266
- 691
+ 453
+ 424
@@ -22,18 +22,6 @@
-
-
-
- 0
- 0
-
-
-
-
- 60
- 0
-
-
The name of your style. Existing style names can be edited.
@@ -58,17 +46,11 @@
false
-
+
0
0
-
-
- 60
- 0
-
-
110
@@ -89,17 +71,11 @@
false
-
+
0
0
-
-
- 60
- 0
-
-
110
@@ -132,9 +108,9 @@
0
- -58
- 233
- 624
+ -290
+ 420
+ 589
@@ -176,18 +152,6 @@
-
-
-
- 0
- 0
-
-
-
-
- 60
- 0
-
-
The font to use for texts and dimensions
@@ -436,18 +400,6 @@
-
-
-
- 0
- 0
-
-
-
-
- 60
- 0
-
-
The type of arrows or markers to use at the end of dimension lines
@@ -521,30 +473,6 @@
- -
-
-
-
-
-
- Import styles from json file
-
-
- Import...
-
-
-
- -
-
-
- Export styles to json file
-
-
- Export...
-
-
-
-
-
diff --git a/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py b/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py
index 5057e0c30d..ffeaca51b4 100644
--- a/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py
+++ b/src/Mod/Draft/draftguitools/gui_annotationstyleeditor.py
@@ -111,8 +111,6 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest):
self.form.pushButtonRename.setIcon(QtGui.QIcon(":/icons/accessories-text-editor.svg"))
self.form.pushButtonDelete.resize(self.form.pushButtonDelete.sizeHint())
self.form.pushButtonRename.resize(self.form.pushButtonRename.sizeHint())
- self.form.pushButtonImport.setIcon(QtGui.QIcon(":/icons/Std_Import.svg"))
- self.form.pushButtonExport.setIcon(QtGui.QIcon(":/icons/Std_Export.svg"))
# fill the styles combo
self.styles = self.read_meta()
@@ -123,8 +121,6 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest):
self.form.comboBoxStyles.currentIndexChanged.connect(self.on_style_changed)
self.form.pushButtonDelete.clicked.connect(self.on_delete)
self.form.pushButtonRename.clicked.connect(self.on_rename)
- self.form.pushButtonImport.clicked.connect(self.on_import)
- self.form.pushButtonExport.clicked.connect(self.on_export)
for attr in DEFAULT.keys():
control = getattr(self.form, attr)
for signal in ("clicked", "textChanged",
@@ -284,36 +280,6 @@ class AnnotationStyleEditor(gui_base.GuiCommandSimplest):
self.styles[newname] = value
self.renamed[style] = newname
-
- def on_import(self):
- """imports styles from a json file"""
- filename = QtGui.QFileDialog.getOpenFileName(
- QtGui.QApplication.activeWindow(),
- _tr("Draft","Open styles file"),
- None,
- _tr("Draft","JSON file (*.json)"))
- if filename:
- nstyles = json.load(filename[1])
- if nstyles:
- self.styles.update(nstyles)
- self.form.comboBoxStyles.clear()
- for style in self.styles.keys():
- self.form.comboBoxStyles.addItem(style)
- print("Styles updated from "+filename[0])
-
-
- def on_export(self):
- """exports styles to a json file"""
- filename = QtGui.QFileDialog.getSaveFileName(
- QtGui.QApplication.activeWindow(),
- _tr("Draft","Save styles file"),
- None,
- _tr("Draft","JSON file (*.json)"))
- if filename:
- json.dump(self.styles,filename[1])
- print("Styles saved to "+filename[0])
-
-
def fill_editor(self, style):
"""Fill the editor fields with the contents of a style."""
if style is None: