diff options
| author | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2011-12-19 14:41:11 (GMT) |
| commit | 87ce149df2581361e8975bd1a0addf2b6ef61e3d (patch) | |
| tree | c68db815a72cc767b6d51be0a57e9946c5f0a619 /src/Preferences.ui | |
| parent | ba1f0b7489dd5fa9bdc8c44068040f13113b40d0 (diff) | |
| parent | 638743e2201c6869b48857dd2db5ec01df665162 (diff) | |
Merge branch 'master' into boost_filesystem
Conflicts:
boost.pri
tests/CMakeLists.txt
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> |