Skip to content

Commit

Permalink
Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Aug 15, 2014
2 parents 4ba56b5 + 7665e34 commit 4dc1274
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
6 changes: 3 additions & 3 deletions src/Mod/Draft/Draft_rc.py
View file

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions src/Mod/Draft/Resources/ui/userprefs-visual.ui
View file
Expand Up @@ -457,16 +457,16 @@ such as &quot;Arial:Bold&quot;</string>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_14">
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Dimensions arrows</string>
<string>Dimensions</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -479,54 +479,55 @@ such as &quot;Arial:Bold&quot;</string>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_17">
<widget class="QLabel" name="label_21">
<property name="text">
<string>style</string>
<string>display mode</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox">
<widget class="Gui::PrefComboBox" name="gui::prefcombobox_4">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<property name="prefEntry" stdset="0">
<cstring>dimsymbol</cstring>
<cstring>dimstyle</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
<item>
<property name="text">
<string>Dot</string>
<string>text above (2D)</string>
</property>
</item>
<item>
<property name="text">
<string>Circle</string>
</property>
</item>
<item>
<property name="text">
<string>Arrow</string>
<string> text inside (3D)</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_9">
<widget class="QLabel" name="label_18">
<property name="text">
<string>size</string>
<string>extension lines size</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefDoubleSpinBox" name="gui::prefdoublespinbox">
<widget class="Gui::PrefDoubleSpinBox" name="gui::prefdoublespinbox_4">
<property name="toolTip">
<string>The default size of arrows</string>
<string>The default size of dimensions extension lines</string>
</property>
<property name="value">
<double>0.100000000000000</double>
<double>0.300000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>arrowsize</cstring>
<cstring>extlines</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
Expand All @@ -536,16 +537,16 @@ such as &quot;Arial:Bold&quot;</string>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<layout class="QHBoxLayout" name="horizontalLayout_14">
<item>
<widget class="QLabel" name="label_10">
<widget class="QLabel" name="label">
<property name="text">
<string>Dimensions lines</string>
<string>Dimensions arrows</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_13">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -558,55 +559,54 @@ such as &quot;Arial:Bold&quot;</string>
</spacer>
</item>
<item>
<widget class="QLabel" name="label_21">
<widget class="QLabel" name="label_17">
<property name="text">
<string>style</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox_4">
<property name="minimumSize">
<size>
<width>120</width>
<height>0</height>
</size>
</property>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox">
<property name="prefEntry" stdset="0">
<cstring>dimstyle</cstring>
<cstring>dimsymbol</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
<item>
<property name="text">
<string>text above (3D)</string>
<string>Dot</string>
</property>
</item>
<item>
<property name="text">
<string> text inside (2D)</string>
<string>Circle</string>
</property>
</item>
<item>
<property name="text">
<string>Arrow</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QLabel" name="label_18">
<widget class="QLabel" name="label_9">
<property name="text">
<string>size</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::PrefDoubleSpinBox" name="gui::prefdoublespinbox_4">
<widget class="Gui::PrefDoubleSpinBox" name="gui::prefdoublespinbox">
<property name="toolTip">
<string>The default size of dimensions extension lines</string>
<string>The default size of arrows</string>
</property>
<property name="value">
<double>0.300000000000000</double>
<double>0.100000000000000</double>
</property>
<property name="prefEntry" stdset="0">
<cstring>extlines</cstring>
<cstring>arrowsize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
Expand Down

0 comments on commit 4dc1274

Please sign in to comment.