From 15a4976c972b3a99be1aa055d76ea266ceb66ec8 Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Sat, 30 Jan 2016 15:07:29 -0200
Subject: [PATCH] Draft: implemented OK button in task dialogs - fixes #2423

---
 src/Mod/Draft/Draft.py    |  6 ++++--
 src/Mod/Draft/DraftGui.py | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py
index bbbbce734..77752c9f9 100644
--- a/src/Mod/Draft/Draft.py
+++ b/src/Mod/Draft/Draft.py
@@ -244,7 +244,9 @@ def dimSymbol(symbol=None,invert=False):
     if symbol == None:
         symbol = getParam("dimsymbol",0)
     from pivy import coin
-    if symbol == 1: 
+    if symbol == 0:
+        return coin.SoSphere()
+    elif symbol == 1: 
         marker = coin.SoMarkerSet()
         marker.markerIndex = coin.SoMarkerSet.CIRCLE_LINE_9_9
         return marker
@@ -272,7 +274,7 @@ def dimSymbol(symbol=None,invert=False):
         return marker
     else:
         print("Draft.dimsymbol: Not implemented")
-    return coin.SoSphere()
+        return coin.SoSphere()
 
 def shapify(obj):
     '''shapify(object): transforms a parametric shape object into
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
index 9185b18ed..c597a7df9 100644
--- a/src/Mod/Draft/DraftGui.py
+++ b/src/Mod/Draft/DraftGui.py
@@ -201,10 +201,14 @@ class DraftTaskPanel:
         else:
             self.form = widget
     def getStandardButtons(self):
-        return int(QtGui.QDialogButtonBox.Close)
+        return int(QtGui.QDialogButtonBox.Ok) | int(QtGui.QDialogButtonBox.Close)
     def accept(self):
-        FreeCADGui.ActiveDocument.resetEdit()
-        return True
+        if hasattr(FreeCADGui,"draftToolBar"):
+            print "validating"
+            FreeCADGui.draftToolBar.validatePoint()
+        else:
+            FreeCADGui.ActiveDocument.resetEdit()
+            return True
     def reject(self):
         FreeCADGui.draftToolBar.isTaskOn = False
         FreeCADGui.draftToolBar.escape()