summaryrefslogtreecommitdiff
path: root/src/Preferences.ui
diff options
context:
space:
mode:
authorMarius Kintel <marius@kintel.net>2014-01-03 18:58:13 (GMT)
committerMarius Kintel <marius@kintel.net>2014-01-03 18:58:13 (GMT)
commit064247ae5e3975c3e9f529f4a4c4a0546892d96f (patch)
treeb2a11e24e73a26fc4f6551982a1677d261dea9e5 /src/Preferences.ui
parent8dca991045a9f0563e6b654b1b946e5d778e8fd2 (diff)
parentc4a1d855f11d076d30e98f799315446da021514a (diff)
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/Preferences.ui')
-rw-r--r--src/Preferences.ui92
1 files changed, 90 insertions, 2 deletions
diff --git a/src/Preferences.ui b/src/Preferences.ui
index ea039f2..100bcb1 100644
--- a/src/Preferences.ui
+++ b/src/Preferences.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>473</width>
- <height>320</height>
+ <width>823</width>
+ <height>433</height>
</rect>
</property>
<property name="sizePolicy">
@@ -378,6 +378,78 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="pageFeatures">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_9">
+ <item>
+ <widget class="QLabel" name="label_9">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Features</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>803</width>
+ <height>311</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_10">
+ <item>
+ <layout class="QGridLayout" name="gridLayoutExperimentalFeatures" rowminimumheight="0">
+ <property name="spacing">
+ <number>8</number>
+ </property>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>282</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
<widget class="QWidget" name="pageAdvanced">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
@@ -520,6 +592,7 @@
<addaction name="prefsAction3DView"/>
<addaction name="prefsActionEditor"/>
<addaction name="prefsActionUpdate"/>
+ <addaction name="prefsActionFeatures"/>
<addaction name="prefsActionAdvanced"/>
</widget>
<action name="prefsAction3DView">
@@ -570,6 +643,21 @@
<string>Update</string>
</property>
</action>
+ <action name="prefsActionFeatures">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="icon">
+ <iconset resource="../openscad.qrc">
+ <normaloff>:/icons/prefsFeatures.png</normaloff>:/icons/prefsFeatures.png</iconset>
+ </property>
+ <property name="text">
+ <string>Features</string>
+ </property>
+ <property name="toolTip">
+ <string>Enable/Disable experimental features</string>
+ </property>
+ </action>
</widget>
<resources>
<include location="../openscad.qrc"/>
contact: Jan Huwald // Impressum