diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-09 16:49:55 (GMT) |
| commit | a4a64e7c26a0eb523f5b271c9d90f091e5933ebb (patch) | |
| tree | 6e247c3f46c23a6c85b4740a2ff99abaa25fe9bd /src/Preferences.ui | |
| parent | 51f24b998ba555d15f924ccd4fb5b46219f6537b (diff) | |
| parent | f577f91d25071f5ad1a9fdb6ed7c6dd3aa4c1008 (diff) | |
Merge remote-tracking branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/Preferences.ui')
| -rw-r--r-- | src/Preferences.ui | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/Preferences.ui b/src/Preferences.ui index 556172c..6b80674 100644 --- a/src/Preferences.ui +++ b/src/Preferences.ui @@ -185,6 +185,16 @@ <property name="text"> <string>Show OpenCSG capability warning</string> </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="enableOpenCSGBox"> + <property name="text"> + <string>Enable OpenCSG for OpenGL 1.x</string> + </property> </widget> </item> <item> @@ -239,7 +249,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset> + <iconset resource="../openscad.qrc"> <normaloff>:/icons/prefs3DView.png</normaloff>:/icons/prefs3DView.png</iconset> </property> <property name="text"> @@ -251,7 +261,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset> + <iconset resource="../openscad.qrc"> <normaloff>:/icons/prefsAdvanced.png</normaloff>:/icons/prefsAdvanced.png</iconset> </property> <property name="text"> @@ -263,7 +273,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset> + <iconset resource="../openscad.qrc"> <normaloff>:/icons/prefsEditor.png</normaloff>:/icons/prefsEditor.png</iconset> </property> <property name="text"> @@ -272,7 +282,7 @@ </action> </widget> <resources> - <include location="openscad.qrc"/> + <include location="../openscad.qrc"/> </resources> <connections/> </ui> |