diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
| commit | 8e85f09b29ff8c56c26fa69e369080f1d7e09203 (patch) | |
| tree | f1645b2af10067f316039b720033bef141a80ad6 /src/Preferences.ui | |
| parent | bcc6120f9b7ce4187c56e0f83dd021674ccdec80 (diff) | |
| parent | 24d7edd8cab9cf359ccd89bf88bf7a55e2cfc21b (diff) | |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/Preferences.ui')
| -rw-r--r-- | src/Preferences.ui | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Preferences.ui b/src/Preferences.ui index 2ab7646..556172c 100644 --- a/src/Preferences.ui +++ b/src/Preferences.ui @@ -6,7 +6,7 @@ <rect> <x>0</x> <y>0</y> - <width>384</width> + <width>418</width> <height>243</height> </rect> </property> @@ -21,7 +21,7 @@ <item> <widget class="QStackedWidget" name="stackedWidget"> <property name="currentIndex"> - <number>1</number> + <number>2</number> </property> <widget class="QWidget" name="page3DView"> <layout class="QVBoxLayout" name="verticalLayout_4"> @@ -181,9 +181,9 @@ <item> <layout class="QVBoxLayout" name="verticalLayout_6"> <item> - <widget class="QCheckBox" name="OpenGL20WarningCheckbox"> + <widget class="QCheckBox" name="openCSGWarningBox"> <property name="text"> - <string>Show OpenGL 2.0 warning && rendering info</string> + <string>Show OpenCSG capability warning</string> </property> </widget> </item> @@ -239,7 +239,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset resource="openscad.qrc"> + <iconset> <normaloff>:/icons/prefs3DView.png</normaloff>:/icons/prefs3DView.png</iconset> </property> <property name="text"> @@ -251,7 +251,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset resource="openscad.qrc"> + <iconset> <normaloff>:/icons/prefsAdvanced.png</normaloff>:/icons/prefsAdvanced.png</iconset> </property> <property name="text"> @@ -263,7 +263,7 @@ <bool>true</bool> </property> <property name="icon"> - <iconset resource="openscad.qrc"> + <iconset> <normaloff>:/icons/prefsEditor.png</normaloff>:/icons/prefsEditor.png</iconset> </property> <property name="text"> |