suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Draft: bugfix in taskpanel

Browse Source
This commit is contained in:
Yorik van Havre 2012-09-05 17:55:27 -03:00
parent 1de8259968
commit 305c9ad1bc
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Mod/Draft/DraftGui.py
View File

@ -490,7 +490,7 @@ class DraftToolBar:
# Interface modes # Interface modes
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
def taskUi(self,title,extra=None): def taskUi(self,title,extra=None,icon="Draft_Draft"):
if self.taskmode: if self.taskmode:
self.isTaskOn = True self.isTaskOn = True
todo.delay(FreeCADGui.Control.closeDialog,None) todo.delay(FreeCADGui.Control.closeDialog,None)
@ -529,9 +529,9 @@ class DraftToolBar:
def lineUi(self,title=None): def lineUi(self,title=None):
if title: if title:
self.pointUi(title) self.pointUi(title,icon="Draft_Line")
else: else:
self.pointUi(translate("draft", "Line")) self.pointUi(translate("draft", "Line"),icon="Draft_Line")
self.xValue.setEnabled(True) self.xValue.setEnabled(True)
self.yValue.setEnabled(True) self.yValue.setEnabled(True)
self.isRelative.show() self.isRelative.show()
@ -542,7 +542,7 @@ class DraftToolBar:
if title: if title:
self.pointUi(title) self.pointUi(title)
else: else:
self.pointUi(translate("draft", "DWire")) self.pointUi(translate("draft", "DWire"),icon="Draft_Wire")
self.xValue.setEnabled(True) self.xValue.setEnabled(True)
self.yValue.setEnabled(True) self.yValue.setEnabled(True)
self.isRelative.show() self.isRelative.show()
@ -554,20 +554,20 @@ class DraftToolBar:
self.continueCmd.show() self.continueCmd.show()
def circleUi(self): def circleUi(self):
self.pointUi(translate("draft", "Circle")) self.pointUi(translate("draft", "Circle"),icon="Draft_Circle")
self.continueCmd.show() self.continueCmd.show()
self.labelx.setText(translate("draft", "Center X")) self.labelx.setText(translate("draft", "Center X"))
self.hasFill.show() self.hasFill.show()
def arcUi(self): def arcUi(self):
self.pointUi(translate("draft", "Arc")) self.pointUi(translate("draft", "Arc"),icon="Draft_Arc")
self.labelx.setText(translate("draft", "Center X")) self.labelx.setText(translate("draft", "Center X"))
self.continueCmd.show() self.continueCmd.show()
def pointUi(self,title=translate("draft","Point"),cancel=None,extra=None,getcoords=None,rel=False): def pointUi(self,title=translate("draft","Point"),cancel=None,extra=None,getcoords=None,rel=False,icon="Draft_Draft"):
if cancel: self.cancel = cancel if cancel: self.cancel = cancel
if getcoords: self.pointcallback = getcoords if getcoords: self.pointcallback = getcoords
self.taskUi(title,extra) self.taskUi(title,extra,icon)
self.xValue.setEnabled(True) self.xValue.setEnabled(True)
self.yValue.setEnabled(True) self.yValue.setEnabled(True)
self.labelx.setText(translate("draft", "X")) self.labelx.setText(translate("draft", "X"))
@ -691,9 +691,10 @@ class DraftToolBar:
if self.state[5]:self.zValue.show() if self.state[5]:self.zValue.show()
self.state = None self.state = None
def setTitle(self,title): def setTitle(self,title,icon="Draft_Draft"):
if self.taskmode: if self.taskmode:
self.baseWidget.setWindowTitle(title) self.baseWidget.setWindowTitle(title)
self.baseWidget.setWindowIcon(QtGui.QIcon(":/icons/"+icon+".svg"))
else: else:
self.cmdlabel.setText(title) self.cmdlabel.setText(title)