kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Draft: Allow to turn off Draft verbose output in preferences

Browse Source
This commit is contained in:
Yorik van Havre
2018-08-03 19:07:59 -03:00
parent 27c6ebc347
commit 02868667dc
3 changed files with 115 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1198,23 +1198,24 @@ class DraftToolBar:
self.delButton.setChecked(not(addmode))
def showCommandOptions(self,name):
cmdstr = "\n"+name+" "+translate("draft","options")+" : "
first = True
for k,v in inCommandShortcuts.items():
if v[2]:
if getattr(self,v[2]).isVisible():
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetBool("Verbose",True):
cmdstr = "\n"+name+" "+translate("draft","options")+" : "
first = True
for k,v in inCommandShortcuts.items():
if v[2]:
if getattr(self,v[2]).isVisible():
if first:
first = False
else:
cmdstr += ", "
cmdstr += v[0] + ":" + v[1]
else:
if first:
first = False
else:
cmdstr += ", "
cmdstr += v[0] + ":" + v[1]
else:
if first:
first = False
else:
cmdstr += ", "
cmdstr += v[0] + ":" + v[1]
FreeCAD.Console.PrintMessage(cmdstr+"\n\n")
FreeCAD.Console.PrintMessage(cmdstr+"\n\n")
def checkLocal(self):
"checks if x,y,z coords must be displayed as local or global"

16
src/Mod/Draft/DraftTools.py
View File

@@ -75,14 +75,16 @@ MODALT = MODS[Draft.getParam("modalt",2)]
def msg(text=None,mode=None):
"prints the given message on the FreeCAD status bar"
if not text: FreeCAD.Console.PrintMessage("")
else:
if mode == 'warning':
FreeCAD.Console.PrintWarning(text)
elif mode == 'error':
FreeCAD.Console.PrintError(text)
if FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft").GetBool("Verbose",True):
if not text:
FreeCAD.Console.PrintMessage("")
else:
FreeCAD.Console.PrintMessage(text)
if mode == 'warning':
FreeCAD.Console.PrintWarning(text)
elif mode == 'error':
FreeCAD.Console.PrintError(text)
else:
FreeCAD.Console.PrintMessage(text)
def formatUnit(exp,unit="mm"):
'''returns a formatting string to set a number to the correct unit'''

187
src/Mod/Draft/Resources/ui/preferences-draft.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>487</width>
<height>489</height>
<height>491</height>
</rect>
</property>
<property name="windowTitle">
@@ -80,47 +80,58 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_5">
<property name="toolTip">
<string>If this is checked, copy mode will be kept across command, otherwise commands will always start in no-copy mode</string>
</property>
<property name="text">
<string>Global copy mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>copymode</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
<widget class="Gui::PrefCheckBox" name="checkBox_2">
<property name="toolTip">
<string>If this is checked, step-by-step instructions will be displayed in the Output Window when running Draft commands</string>
</property>
<property name="text">
<string>Verbose command line mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>Verbose</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_3">
<property name="toolTip">
<string>Normally, after copying objects, the copies get selected. If this option is checked, the base objects will be selected instead.</string>
</property>
<property name="text">
<string>Select base objects after copying</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>selectBaseObjects</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_5">
<property name="toolTip">
<string>If this is checked, copy mode will be kept across command, otherwise commands will always start in no-copy mode</string>
</property>
<property name="text">
<string>Global copy mode</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>copymode</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_3">
<property name="toolTip">
<string>Normally, after copying objects, the copies get selected. If this option is checked, the base objects will be selected instead.</string>
</property>
<property name="text">
<string>Select base objects after copying</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>selectBaseObjects</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -276,64 +287,52 @@ Values with differences below this value will be treated as same.</string>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_22">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_13">
<property name="toolTip">
<string>When this is checked, the Draft tools will create Part primitives instead of Draft objects, when available.</string>
</property>
<property name="text">
<string>Use Part Primitives when available</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>UsePartPrimitives</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_13">
<property name="toolTip">
<string>When this is checked, the Draft tools will create Part primitives instead of Draft objects, when available.</string>
</property>
<property name="text">
<string>Use Part Primitives when available</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>UsePartPrimitives</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_6">
<property name="toolTip">
<string>If this is checked, objects will appear as filled by default. Otherwise, they will appear as wireframe</string>
</property>
<property name="text">
<string>Fill objects with faces whenever possible</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>fillmode</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_6">
<property name="toolTip">
<string>If this is checked, objects will appear as filled by default. Otherwise, they will appear as wireframe</string>
</property>
<property name="text">
<string>Fill objects with faces whenever possible</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>fillmode</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="Gui::PrefCheckBox" name="checkBox">
<property name="text">
<string>When drawing lines, set focus on Length instead of X coordinate</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>focusOnLength</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
<widget class="Gui::PrefCheckBox" name="checkBox">
<property name="text">
<string>When drawing lines, set focus on Length instead of X coordinate</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>focusOnLength</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">