From d8029588603b00049d6f81f6e85ab58fc33339d0 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Mon, 7 Jul 2014 12:07:53 -0300 Subject: [PATCH] Draft: Fixed escape() bug in Draft GUI --- src/Mod/Draft/DraftGui.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index 5cb68d467..df9fe7e49 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -453,7 +453,7 @@ class DraftToolBar: QtCore.QObject.connect(self.radiusValue,QtCore.SIGNAL("returnPressed()"),self.validatePoint) QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("textChanged(QString)"),self.storeCurrentText) QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("returnPressed()"),self.sendText) - QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("down()"),self.sendText) QtCore.QObject.connect(self.textValue,QtCore.SIGNAL("up()"),self.lineUp) QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("returnPressed()"),self.xValue.setFocus) @@ -477,26 +477,29 @@ class DraftToolBar: QtCore.QObject.connect(self.hasFill,QtCore.SIGNAL("stateChanged(int)"),self.setFill) QtCore.QObject.connect(self.currentViewButton,QtCore.SIGNAL("clicked()"),self.selectCurrentView) QtCore.QObject.connect(self.resetPlaneButton,QtCore.SIGNAL("clicked()"),self.selectResetPlane) - QtCore.QObject.connect(self.xValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.xValue,QtCore.SIGNAL("undo()"),self.undoSegment) - QtCore.QObject.connect(self.yValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.yValue,QtCore.SIGNAL("undo()"),self.undoSegment) - QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("undo()"),self.undoSegment) - QtCore.QObject.connect(self.radiusValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.baseWidget,QtCore.SIGNAL("resized()"),self.relocate) QtCore.QObject.connect(self.baseWidget,QtCore.SIGNAL("retranslate()"),self.retranslateUi) QtCore.QObject.connect(self.SSizeValue,QtCore.SIGNAL("valueChanged(double)"),self.changeSSizeValue) QtCore.QObject.connect(self.SSizeValue,QtCore.SIGNAL("returnPressed()"),self.validateSNumeric) - QtCore.QObject.connect(self.SSizeValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.STrackValue,QtCore.SIGNAL("valueChanged(double)"),self.changeSTrackValue) QtCore.QObject.connect(self.STrackValue,QtCore.SIGNAL("returnPressed()"),self.validateSNumeric) - QtCore.QObject.connect(self.STrackValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.SStringValue,QtCore.SIGNAL("returnPressed()"),self.validateSString) - QtCore.QObject.connect(self.SStringValue,QtCore.SIGNAL("escaped()"),self.escape) QtCore.QObject.connect(self.chooserButton,QtCore.SIGNAL("pressed()"),self.pickFile) QtCore.QObject.connect(self.FFileValue,QtCore.SIGNAL("returnPressed()"),self.validateFile) - QtCore.QObject.connect(self.FFileValue,QtCore.SIGNAL("escaped()"),self.escape) + + # following lines can cause a crash and are not needed anymore when using the task panel + # http://forum.freecadweb.org/viewtopic.php?f=3&t=6952 + #QtCore.QObject.connect(self.FFileValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.xValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.yValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.zValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.radiusValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.SSizeValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.STrackValue,QtCore.SIGNAL("escaped()"),self.escape) + #QtCore.QObject.connect(self.SStringValue,QtCore.SIGNAL("escaped()"),self.escape) # if Ui changed to have Size & Track visible at same time, use this # QtCore.QObject.connect(self.SSizeValue,QtCore.SIGNAL("returnPressed()"),self.checkSSize)