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

FreeCAD · Jan 10, 2015 · 2bff32d · 2bff32d
2 parents 3254611 + 183a0f0
commit 2bff32d
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
@@ -587,7 +587,7 @@ def retranslateUi(self, widget=None):
         self.finishButton.setText(translate("draft", "&Finish"))
         self.finishButton.setToolTip(translate("draft", "Finishes the current drawing or editing operation (F)"))
         self.continueCmd.setToolTip(translate("draft", "If checked, command will not finish until you press the command button again"))
-        self.continueCmd.setText(translate("draft", "&Continue"))
+        self.continueCmd.setText(translate("draft", "Con&tinue"))
         self.occOffset.setToolTip(translate("draft", "If checked, an OCC-style offset will be performed instead of the classic offset"))
         self.occOffset.setText(translate("draft", "&OCC-style offset"))
         self.addButton.setToolTip(translate("draft", "Add points to the current object"))
@@ -1296,28 +1296,38 @@ def checkSpecialChars(self,txt):
             spec = True
         elif txt.endswith("t"):
             self.toggleContinue()
+            spec = True
         elif txt.endswith("w"):
             self.wipeLine()
+            spec = True
         elif txt.endswith("e"):
             self.selectEdge()
+            spec = True
         elif txt.endswith("s"):
             self.togglesnap()
+            spec = True
         elif txt.endswith("["):
             self.toggleradius(1)
+            spec = True
         elif txt.endswith("]"):
             self.toggleradius(-1)
+            spec = True
         elif txt.endswith("x"):
             self.constrain("x")
             self.displayPoint()
+            spec = True
         elif txt.endswith("y"):
             self.constrain("y")
             self.displayPoint()
+            spec = True
         elif txt.endswith("z"):
             self.constrain("z")
             self.displayPoint()
+            spec = True
         elif txt.endswith("l"):
             self.constrain("angle")
             self.displayPoint()
+            spec = True
         elif txt.endswith("c"):
             if self.closeButton.isVisible():
                 self.closeLine()
@@ -1326,9 +1336,10 @@ def checkSpecialChars(self,txt):
             elif self.continueCmd.isVisible():
                 self.continueCmd.setChecked(not self.continueCmd.isChecked())
             spec = True
-        if spec and (not self.taskmode):
+        if spec:
             for i in [self.xValue,self.yValue,self.zValue]:
-                if (i.text() == txt): i.setText("")
+                if (i.property("text") == txt):
+                    i.setProperty("text",txt[:-1])
 
     def storeCurrentText(self,qstr):
         self.currEditText = self.textValue.text()