Skip to content

Commit

Permalink
Merge pull request FreeCAD#13580 from Roy-043/Draft-Move-MouseDelay-p…
Browse files Browse the repository at this point in the history
…ref-to-General-group-and-set-max-value

Draft: Move MouseDelay pref to General group and set max value
  • Loading branch information
Roy-043 authored Apr 21, 2024
2 parents 700868f + e972755 commit 1f9be3f
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 111 deletions.
65 changes: 49 additions & 16 deletions src/Mod/Draft/Resources/ui/preferences-draft.ui
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,53 @@ Only for the splitFaces and makeShell options.</string>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_MouseDelay">
<property name="text">
<string>Mouse delay</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::PrefSpinBox" name="spinBox_MouseDelay">
<property name="toolTip">
<string>This is a delay during which the mouse is inactive, after entering numbers
manually in any of the coordinate fields. Setting this to 0 disables the delay.
If a delay of 1 is set, after entering a numeric value, the mouse will not
update the field anymore during one second, to avoid moving the mouse
accidentally and modifying the entered value.</string>
</property>
<property name="suffix">
<string> seconds</string>
</property>
<property name="maximum">
<number>10000</number>
</property>
<property name="value">
<number>1</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>MouseDelay</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
<item row="6" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_DraftEditMaxObjects">
<property name="text">
<string>Max. number of editable objects</string>
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="Gui::PrefSpinBox" name="spinBox_DraftEditMaxObjects">
<property name="toolTip">
<string>The maximum number of objects Draft Edit is allowed to process at the same time</string>
Expand All @@ -282,21 +322,14 @@ Only for the splitFaces and makeShell options.</string>
</property>
</widget>
</item>
<item row="6" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</spacer>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="label_DraftEditPickRadius">
<property name="text">
<string>Edit node pick radius</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="Gui::PrefSpinBox" name="spinBox_DraftEditPickRadius">
<property name="toolTip">
<string>The pick radius of edit nodes</string>
Expand All @@ -318,14 +351,14 @@ Only for the splitFaces and makeShell options.</string>
</property>
</widget>
</item>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QLabel" name="label_ClonePrefix">
<property name="text">
<string>Label prefix for clones</string>
</property>
</widget>
</item>
<item row="8" column="1">
<item row="9" column="1">
<widget class="Gui::PrefLineEdit" name="lineEdit_ClonePrefix">
<property name="maximumSize">
<size>
Expand All @@ -347,14 +380,14 @@ Only for the splitFaces and makeShell options.</string>
</property>
</widget>
</item>
<item row="9" column="0">
<item row="10" column="0">
<widget class="QLabel" name="label_constructiongroupname">
<property name="text">
<string>Construction group label</string>
</property>
</widget>
</item>
<item row="9" column="1">
<item row="10" column="1">
<widget class="Gui::PrefLineEdit" name="lineEdit_constructiongroupname">
<property name="maximumSize">
<size>
Expand All @@ -376,14 +409,14 @@ Only for the splitFaces and makeShell options.</string>
</property>
</widget>
</item>
<item row="10" column="0">
<item row="11" column="0">
<widget class="QLabel" name="label_constructioncolor">
<property name="text">
<string>Construction geometry color</string>
</property>
</widget>
</item>
<item row="10" column="1">
<item row="11" column="1">
<widget class="Gui::PrefColorButton" name="colorButton_constructioncolor">
<property name="toolTip">
<string>The default color for Draft objects in construction mode</string>
Expand Down
158 changes: 63 additions & 95 deletions src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
Original file line number Diff line number Diff line change
Expand Up @@ -293,52 +293,32 @@ These lines are thicker than normal grid lines.</string>
<string>Snapping and modifier keys</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="0" colspan="3">
<widget class="Gui::PrefCheckBox" name="checkBox_alwaysSnap">
<property name="toolTip">
<string>If checked, snapping is activated without the need to press the Snap modifier key</string>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_snapStyle">
<property name="text">
<string>Always snap</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>alwaysSnap</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
<string>Snap symbol style</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_modalt">
<item row="0" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_snapStyle">
<property name="toolTip">
<string>The Alt modifier key. The function of this key depends on the command.</string>
</property>
<property name="currentIndex">
<number>2</number>
<string>The style for snap symbols</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>modalt</cstring>
<cstring>snapStyle</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
<item>
<property name="text">
<string>Shift</string>
</property>
</item>
<item>
<property name="text">
<string>Ctrl</string>
<string>Draft classic style</string>
</property>
</item>
<item>
<property name="text">
<string>Alt</string>
<string>Bitsnpieces style</string>
</property>
</item>
</widget>
Expand All @@ -356,6 +336,13 @@ These lines are thicker than normal grid lines.</string>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_snapcolor">
<property name="text">
<string>Snap symbol color</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::PrefColorButton" name="colorButton_snapcolor">
<property name="toolTip">
Expand All @@ -376,68 +363,36 @@ These lines are thicker than normal grid lines.</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_modsnap">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Snap modifier</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_modconstrain">
<property name="text">
<string>Constrain modifier</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_modalt">
<property name="text">
<string>Alt modifier</string>
<item row="2" column="0" colspan="3">
<widget class="Gui::PrefCheckBox" name="checkBox_alwaysSnap">
<property name="toolTip">
<string>If checked, snapping is activated without the need to press the Snap modifier key</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_snapcolor">
<property name="text">
<string>Snap symbol color</string>
<string>Always snap</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_snapStyle">
<property name="toolTip">
<string>The style for snap symbols</string>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>snapStyle</cstring>
<cstring>alwaysSnap</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
<item>
<property name="text">
<string>Draft classic style</string>
</property>
</item>
<item>
<property name="text">
<string>Bitsnpieces style</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_snapStyle">
<item row="3" column="0">
<widget class="QLabel" name="label_modsnap">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Snap symbol style</string>
<string>Snap modifier</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="3" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_modsnap">
<property name="enabled">
<bool>false</bool>
Expand Down Expand Up @@ -477,7 +432,14 @@ These lines are thicker than normal grid lines.</string>
</item>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="0">
<widget class="QLabel" name="label_modconstrain">
<property name="text">
<string>Constrain modifier</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_modconstrain">
<property name="toolTip">
<string>The Constrain modifier key</string>
Expand Down Expand Up @@ -505,36 +467,42 @@ These lines are thicker than normal grid lines.</string>
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<item row="5" column="0">
<widget class="QLabel" name="label_modalt">
<property name="text">
<string>Mouse delay</string>
<string>Alt modifier</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::PrefSpinBox" name="spinBox">
<item row="5" column="1">
<widget class="Gui::PrefComboBox" name="comboBox_modalt">
<property name="toolTip">
<string>This is a delay during which the mouse is inactive, after entering
numbers manually in any of the coordinate fields. Setting this
to 0 disables the delay. If a delay of 1 is set, after entering a numeric
value, the mouse will not update the field anymore during one
second, to avoid moving the mouse accidentally and modifying the
entered value. If you use a very large value, e.g. 3600, the mouse
movement will be disabled until the command finishes.</string>
</property>
<property name="suffix">
<string> seconds</string>
<string>The Alt modifier key. The function of this key depends on the command.</string>
</property>
<property name="value">
<number>1</number>
<property name="currentIndex">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>MouseDelay</cstring>
<cstring>modalt</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
<item>
<property name="text">
<string>Shift</string>
</property>
</item>
<item>
<property name="text">
<string>Ctrl</string>
</property>
</item>
<item>
<property name="text">
<string>Alt</string>
</property>
</item>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 1f9be3f

Please sign in to comment.