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

This commit is contained in:
wmayer 2015-03-01 11:39:02 +01:00
commit 1b7c0e2a51

View File

@ -1078,7 +1078,7 @@ class Snapper:
self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg"))
self.masterbutton.setIconSize(QtCore.QSize(isize, isize))
self.masterbutton.setMaximumSize(QtCore.QSize(bsize,bsize))
self.masterbutton.setToolTip("Snap On/Off")
self.masterbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Lock","Toggle On/Off"))
self.masterbutton.setObjectName("SnapButtonMain")
self.masterbutton.setCheckable(True)
self.masterbutton.setChecked(True)
@ -1090,7 +1090,10 @@ class Snapper:
b.setIcon(QtGui.QIcon(i))
b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(bsize,bsize))
b.setToolTip(c)
if c == "passive":
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest"))
else:
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+c.capitalize(),c.capitalize()))
b.setObjectName("SnapButton"+c)
b.setCheckable(True)
b.setChecked(True)
@ -1103,7 +1106,7 @@ class Snapper:
b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg"))
b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(bsize,bsize))
b.setToolTip(n)
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n))
b.setObjectName("SnapButton"+n)
b.setCheckable(True)
b.setChecked(True)