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 Mar 14, 2014
2 parents bea4c44 + 476b701 commit f0b54d3
Show file tree
Hide file tree
Showing 10 changed files with 991 additions and 805 deletions.
4 changes: 3 additions & 1 deletion src/Mod/Arch/InitGui.py
View file
Expand Up @@ -116,8 +116,10 @@ def Initialize(self):
if hasattr(FreeCADGui,"draftToolBar"):
if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"):
FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-snap.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-visual.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import1.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import2.ui","Draft")
FreeCADGui.draftToolBar.loadedPreferences = True
Log ('Loading Arch module... done\n')

Expand Down
8 changes: 4 additions & 4 deletions src/Mod/Draft/Draft_rc.py
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/Mod/Draft/InitGui.py
View file
Expand Up @@ -134,8 +134,10 @@ def QT_TRANSLATE_NOOP(scope, text):
if hasattr(FreeCADGui,"draftToolBar"):
if not hasattr(FreeCADGui.draftToolBar,"loadedPreferences"):
FreeCADGui.addPreferencePage(":/ui/userprefs-base.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-snap.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-visual.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import1.ui","Draft")
FreeCADGui.addPreferencePage(":/ui/userprefs-import2.ui","Draft")
FreeCADGui.draftToolBar.loadedPreferences = True
Log ('Loading Draft module...done\n')

Expand Down
4 changes: 3 additions & 1 deletion src/Mod/Draft/Resources/Draft.qrc
View file
Expand Up @@ -94,7 +94,9 @@
<file>translations/Draft_ro.qm</file>
<file>translations/Draft_pt-PT.qm</file>
<file>ui/userprefs-base.ui</file>
<file>ui/userprefs-import.ui</file>
<file>ui/userprefs-snap.ui</file>
<file>ui/userprefs-import1.ui</file>
<file>ui/userprefs-import2.ui</file>
<file>ui/userprefs-visual.ui</file>
</qresource>
</RCC>
260 changes: 3 additions & 257 deletions src/Mod/Draft/Resources/ui/userprefs-base.ui
View file
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>718</width>
<height>808</height>
<width>487</width>
<height>455</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -358,243 +358,6 @@ Values with differences below this value will be treated as same.</string>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Snapping</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox">
<property name="toolTip">
<string>If this is checked, snapping is activated without the need to press the snap mod key</string>
</property>
<property name="text">
<string>Always snap (disable snap mod)</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>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_20">
<property name="text">
<string>Constrain mod</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox_5">
<property name="toolTip">
<string>The Constraining modifier key</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>modconstrain</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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_21">
<property name="text">
<string>Snap mod</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox_6">
<property name="toolTip">
<string>The snap modifier key</string>
</property>
<property name="currentIndex">
<number>1</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>modsnap</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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_22">
<property name="text">
<string>Alt mod</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="Gui::PrefComboBox" name="gui::prefcombobox_7">
<property name="toolTip">
<string>The alt modifier key</string>
</property>
<property name="currentIndex">
<number>2</number>
</property>
<property name="prefEntry" stdset="0">
<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>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_7">
<property name="toolTip">
<string>If checked, the Snap toolbar will be shown whenever you use snapping</string>
</property>
<property name="text">
<string>Show Draft Snap toolbar</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>showSnapBar</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="Gui::PrefCheckBox" name="gui::prefcheckbox_9">
<property name="text">
<string>Hide Draft snap toolbar after use</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>hideSnapBar</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Mod/Draft</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<zorder></zorder>
<zorder></zorder>
<zorder></zorder>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
Expand Down Expand Up @@ -730,22 +493,5 @@ Values with differences below this value will be treated as same.</string>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>gui::prefcheckbox_7</sender>
<signal>clicked(bool)</signal>
<receiver>gui::prefcheckbox_9</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>158</x>
<y>290</y>
</hint>
<hint type="destinationlabel">
<x>400</x>
<y>293</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

0 comments on commit f0b54d3

Please sign in to comment.