Gui: PR4556 Step 3: sort QGridLayout by row-col

This commit is contained in:
Chris Hennes
2022-03-28 10:09:09 -05:00
parent 5533f41241
commit 20a0003cfb
28 changed files with 1664 additions and 1664 deletions

View File

@@ -17,36 +17,6 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<layout class="QHBoxLayout" name="boxOK">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>160</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
@@ -145,8 +115,43 @@
<property name="spacing">
<number>6</number>
</property>
<item row="6" column="1">
<widget class="Gui::UrlLabel" name="labelBuildHash">
<item row="0" column="0">
<widget class="QLabel" name="labelVersion">
<property name="text">
<string>Version</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelBuildVersion">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelRevision">
<property name="text">
<string>Revision number</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelBuildRevision">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelDate">
<property name="text">
<string>Release date</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelBuildDate">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
@@ -159,6 +164,13 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelBuildOS">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelPlatform">
<property name="text">
@@ -173,55 +185,6 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelDate">
<property name="text">
<string>Release date</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelBuildOS">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelBuildRevision">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelBuildDate">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelRevision">
<property name="text">
<string>Revision number</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelBuildVersion">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelVersion">
<property name="text">
<string>Version</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="labelBranch">
<property name="text">
@@ -243,7 +206,14 @@
</property>
</widget>
</item>
</layout>
<item row="6" column="1">
<widget class="Gui::UrlLabel" name="labelBuildHash">
<property name="text">
<string notr="true">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-family: MS Shell Dlg 2; font-weight:600;"&gt;Unknown&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
@@ -388,7 +358,37 @@ p, li { white-space: pre-wrap; }
</widget>
</widget>
</item>
</layout>
<item row="1" column="0">
<layout class="QHBoxLayout" name="boxOK">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>160</width>
<height>31</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>OK</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>

View File

@@ -26,16 +26,16 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipX"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="flipClipX">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Flip</string>
<string>Offset</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipX"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_2">
<property name="orientation">
@@ -49,14 +49,14 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<item row="0" column="3">
<widget class="QPushButton" name="flipClipX">
<property name="text">
<string>Offset</string>
<string>Flip</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="0">
@@ -71,16 +71,16 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipY"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="flipClipY">
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Flip</string>
<string>Offset</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipY"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_3">
<property name="orientation">
@@ -94,14 +94,14 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<item row="0" column="3">
<widget class="QPushButton" name="flipClipY">
<property name="text">
<string>Offset</string>
<string>Flip</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="2" column="0">
@@ -116,16 +116,16 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipZ"/>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="flipClipZ">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Flip</string>
<string>Offset</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="clipZ"/>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer_4">
<property name="orientation">
@@ -139,14 +139,14 @@
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<item row="0" column="3">
<widget class="QPushButton" name="flipClipZ">
<property name="text">
<string>Offset</string>
<string>Flip</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="3" column="0">
@@ -161,7 +161,17 @@
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="3">
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Offset</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QDoubleSpinBox" name="clipView"/>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -206,17 +216,7 @@
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Offset</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QDoubleSpinBox" name="clipView"/>
</item>
</layout>
</layout>
</widget>
</item>
<item row="4" column="0">

View File

@@ -32,6 +32,48 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Angle</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>-90°</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="angleSlider">
<property name="minimum">
<number>-90</number>
</property>
<property name="maximum">
<number>90</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>90°</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
@@ -44,7 +86,14 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Minimum</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSlider" name="speedSlider">
<property name="minimum">
<number>1</number>
@@ -67,17 +116,23 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Minimum</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
@@ -117,62 +172,7 @@
</item>
</layout>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Angle</string>
</property>
<layout class="QGridLayout">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QSlider" name="angleSlider">
<property name="minimum">
<number>-90</number>
</property>
<property name="maximum">
<number>90</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="label_4">
<property name="text">
<string>90°</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>-90°</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="0">

View File

@@ -55,21 +55,74 @@
</property>
</widget>
</item>
<item row="6" column="4" colspan="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<item row="0" column="2" colspan="4">
<widget class="QComboBox" name="actionMacros"/>
</item>
<item row="1" column="1">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Menu text:</string>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</widget>
</item>
<item row="1" column="2" colspan="4">
<widget class="QLineEdit" name="actionMenu"/>
</item>
<item row="2" column="1">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Tool tip:</string>
</property>
<property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</widget>
</item>
<item row="2" column="2" colspan="4">
<widget class="QLineEdit" name="actionToolTip">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</spacer>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
<string>Status text:</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="4">
<widget class="QLineEdit" name="actionStatus"/>
</item>
<item row="4" column="1">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>What's this:</string>
</property>
</widget>
</item>
<item row="4" column="2" colspan="4">
<widget class="QLineEdit" name="actionWhatsThis"/>
</item>
<item row="5" column="1">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>Accelerator:</string>
</property>
</widget>
</item>
<item row="5" column="2" colspan="4">
<widget class="Gui::AccelLineEdit" name="actionAccel"/>
</item>
<item row="6" column="1">
<widget class="QLabel" name="TextLabel5_2">
<property name="text">
<string>Pixmap</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QToolButton" name="buttonChoosePixmap">
@@ -98,75 +151,6 @@
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLabel" name="TextLabel5_2">
<property name="text">
<string>Pixmap</string>
</property>
</widget>
</item>
<item row="5" column="2" colspan="4">
<widget class="Gui::AccelLineEdit" name="actionAccel"/>
</item>
<item row="5" column="1">
<widget class="QLabel" name="TextLabel1">
<property name="text">
<string>Accelerator:</string>
</property>
</widget>
</item>
<item row="4" column="2" colspan="4">
<widget class="QLineEdit" name="actionWhatsThis"/>
</item>
<item row="4" column="1">
<widget class="QLabel" name="TextLabel2">
<property name="text">
<string>What's this:</string>
</property>
</widget>
</item>
<item row="3" column="2" colspan="4">
<widget class="QLineEdit" name="actionStatus"/>
</item>
<item row="3" column="1">
<widget class="QLabel" name="TextLabel3_2">
<property name="text">
<string>Status text:</string>
</property>
</widget>
</item>
<item row="2" column="2" colspan="4">
<widget class="QLineEdit" name="actionToolTip">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="TextLabel2_2">
<property name="text">
<string>Tool tip:</string>
</property>
</widget>
</item>
<item row="1" column="2" colspan="4">
<widget class="QLineEdit" name="actionMenu"/>
</item>
<item row="1" column="1">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Menu text:</string>
</property>
</widget>
</item>
<item row="0" column="2" colspan="4">
<widget class="QComboBox" name="actionMacros"/>
</item>
<item row="6" column="3">
<widget class="QLabel" name="pixmapLabel">
<property name="minimumSize">
@@ -186,10 +170,10 @@
</property>
</widget>
</item>
<item row="7" column="1">
<item row="6" column="4" colspan="2">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
@@ -202,17 +186,17 @@
</property>
</spacer>
</item>
<item row="8" column="5">
<item row="7" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>41</width>
<width>20</width>
<height>20</height>
</size>
</property>
@@ -239,7 +223,23 @@
</property>
</widget>
</item>
</layout>
<item row="8" column="5">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>

View File

@@ -17,7 +17,30 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Site:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="siteDescription">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>%1 at %2</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Username:</string>
@@ -64,30 +87,7 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Site:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="siteDescription">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>%1 at %2</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>

View File

@@ -23,7 +23,28 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<item row="0" column="0">
<widget class="QTreeWidget" name="categoryTreeWidget">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>4</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QTreeWidget" name="commandTreeWidget">
<property name="rootIsDecorated">
<bool>false</bool>
@@ -52,28 +73,7 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QTreeWidget" name="categoryTreeWidget">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>4</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<tabstops>

View File

@@ -168,50 +168,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Line transparency:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
<string>Transparency:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QSlider" name="sliderLineTransparency">
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinLineTransparency">
<property name="maximum">
<number>100</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
@@ -304,6 +260,13 @@
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
<string>Transparency:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
@@ -340,7 +303,44 @@
</item>
</layout>
</item>
</layout>
<item row="4" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Line transparency:</string>
</property>
</widget>
</item>
<item row="5" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QSlider" name="sliderLineTransparency">
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="spinLineTransparency">
<property name="maximum">
<number>100</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">

View File

@@ -29,143 +29,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="GroupBox5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Display items</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="3" column="1">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Preview:</string>
</property>
</widget>
</item>
<item row="4" column="1" rowspan="3" colspan="2">
<widget class="QTextEdit" name="textEdit1">
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="fontFamily">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font family to be used for selected code type</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="TextLabel4">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Color:</string>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="7">
<widget class="QTreeWidget" name="displayItems">
<property name="toolTip">
<string>Color and font settings will be applied to selected type</string>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="1" column="2">
<widget class="Gui::PrefSpinBox" name="fontSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font size to be used for selected code type</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>FontSize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Editor</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Family:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::ColorButton" name="colorButton">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox2">
<property name="title">
@@ -287,22 +150,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="3" column="0" colspan="2">
<widget class="Gui::PrefRadioButton" name="radioSpaces">
<property name="toolTip">
<string>Pressing &lt;Tab&gt; will insert amount of defined indent size</string>
</property>
<property name="text">
<string>Insert spaces</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Spaces</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Editor</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
@@ -368,10 +215,163 @@
</property>
</widget>
</item>
</layout>
<item row="3" column="0" colspan="2">
<widget class="Gui::PrefRadioButton" name="radioSpaces">
<property name="toolTip">
<string>Pressing &lt;Tab&gt; will insert amount of defined indent size</string>
</property>
<property name="text">
<string>Insert spaces</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Spaces</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Editor</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="GroupBox5">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Display items</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0" rowspan="7">
<widget class="QTreeWidget" name="displayItems">
<property name="toolTip">
<string>Color and font settings will be applied to selected type</string>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="TextLabel3">
<property name="text">
<string>Family:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QComboBox" name="fontFamily">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font family to be used for selected code type</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="TextLabel4">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="Gui::PrefSpinBox" name="fontSize">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Font size to be used for selected code type</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="prefEntry" stdset="0">
<cstring>FontSize</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Editor</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Color:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="Gui::ColorButton" name="colorButton">
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Preview:</string>
</property>
</widget>
</item>
<item row="4" column="1" rowspan="3" colspan="2">
<widget class="QTextEdit" name="textEdit1">
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

View File

@@ -89,22 +89,6 @@
</item>
</layout>
</item>
<item row="1" column="1">
<widget class="Gui::PrefCheckBox" name="SubstituteDecimal">
<property name="toolTip">
<string>If enabled, numerical keypad decimal separator will be substituted with locale separator</string>
</property>
<property name="text">
<string>Substitute decimal separator (needs restart)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>SubstituteDecimalSeparator</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>General</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::PrefComboBox" name="UseLocaleFormatting">
<property name="prefEntry" stdset="0">
@@ -130,7 +114,23 @@
</item>
</widget>
</item>
</layout>
<item row="1" column="1">
<widget class="Gui::PrefCheckBox" name="SubstituteDecimal">
<property name="toolTip">
<string>If enabled, numerical keypad decimal separator will be substituted with locale separator</string>
</property>
<property name="text">
<string>Substitute decimal separator (needs restart)</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>SubstituteDecimalSeparator</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>General</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@@ -534,27 +534,6 @@ this according to your screen size or personal taste</string>
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<widget class="Gui::PrefCheckBox" name="SplashScreen">
<property name="toolTip">
<string>A Splash screen is a small loading window that is shown
when FreeCAD is launching. If this option is checked, FreeCAD will
display the splash screen</string>
</property>
<property name="text">
<string>Enable splash screen at start up</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>ShowSplasher</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>General</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
@@ -589,7 +568,28 @@ after FreeCAD launches</string>
</item>
</layout>
</item>
</layout>
<item row="2" column="0">
<widget class="Gui::PrefCheckBox" name="SplashScreen">
<property name="toolTip">
<string>A Splash screen is a small loading window that is shown
when FreeCAD is launching. If this option is checked, FreeCAD will
display the splash screen</string>
</property>
<property name="text">
<string>Enable splash screen at start up</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>ShowSplasher</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>General</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>

View File

@@ -20,46 +20,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0" colspan="4">
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabelDescriptionHeader">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="textLabelDescription">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout">
<property name="spacing">
@@ -176,6 +136,22 @@
</item>
</layout>
</item>
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<layout class="QVBoxLayout">
<property name="spacing">
@@ -239,7 +215,31 @@
</item>
</layout>
</item>
</layout>
<item row="1" column="0" colspan="4">
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="textLabelDescriptionHeader">
<property name="text">
<string>Description:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="textLabelDescription">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

View File

@@ -70,7 +70,14 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLineEdit" name="LineEditMacroName">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTabWidget" name="tabMacroWidget">
<property name="tabPosition">
<enum>QTabWidget::North</enum>
@@ -130,48 +137,7 @@
</widget>
</widget>
</item>
<item row="0" column="0">
<widget class="QLineEdit" name="LineEditMacroName">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="DestinationGroup">
<property name="title">
<string>User macros location:</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::FileChooser" name="fileChooser">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="0" column="1">
@@ -309,7 +275,41 @@
</item>
</layout>
</item>
</layout>
<item row="1" column="0">
<widget class="QGroupBox" name="DestinationGroup">
<property name="title">
<string>User macros location:</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::FileChooser" name="fileChooser">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

View File

@@ -32,20 +32,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Emissive color:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Specular color:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel2">
<property name="text">
@@ -53,13 +39,34 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="0" column="1">
<widget class="Gui::ColorButton" name="ambientColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
<string>Diffuse color:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::ColorButton" name="diffuseColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Emissive color:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::ColorButton" name="emissiveColor">
<property name="text">
@@ -67,6 +74,13 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="textLabel3">
<property name="text">
<string>Specular color:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::ColorButton" name="specularColor">
<property name="text">
@@ -114,21 +128,7 @@
</item>
</layout>
</item>
<item row="1" column="1">
<widget class="Gui::ColorButton" name="diffuseColor">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::ColorButton" name="ambientColor">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="0">

View File

@@ -20,22 +20,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>373</width>
<height>291</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBoxOther">
<property name="title">
@@ -68,7 +52,23 @@
</layout>
</widget>
</item>
</layout>
<item row="1" column="0">
<spacer>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>373</width>
<height>291</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

View File

@@ -29,6 +29,16 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QComboBox" name="parameterSet"/>
</item>
<item row="1" column="0">
<widget class="QSplitter" name="splitter3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout">
<property name="margin">
@@ -127,17 +137,7 @@
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QSplitter" name="splitter3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="parameterSet"/>
</item>
</layout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>

View File

@@ -35,7 +35,31 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<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="QPushButton" name="pushButtonOpenAddonManager">
<property name="text">
<string>Open Addon Manager...</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
@@ -73,31 +97,7 @@
</column>
</widget>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<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="QPushButton" name="pushButtonOpenAddonManager">
<property name="text">
<string>Open Addon Manager...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>

View File

@@ -14,52 +14,6 @@
<string>Link</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::ExpressionLineEdit" name="searchBox">
<property name="toolTip">
<string>A search pattern to filter the results above</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QTreeWidget" name="typeTree">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="10" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidget">
<property name="editTriggers">
@@ -105,7 +59,53 @@
</item>
</layout>
</item>
</layout>
<item row="5" column="0">
<widget class="QTreeWidget" name="typeTree">
<property name="selectionMode">
<enum>QAbstractItemView::ExtendedSelection</enum>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<attribute name="headerVisible">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
</item>
<item row="6" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="Gui::ExpressionLineEdit" name="searchBox">
<property name="toolTip">
<string>A search pattern to filter the results above</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="10" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>

View File

@@ -225,22 +225,6 @@ on-screen while displaying the log message</string>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
@@ -492,7 +476,23 @@ on-screen while displaying the log message</string>
</item>
</layout>
</item>
</layout>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">

View File

@@ -588,7 +588,23 @@ bounding box size of the 3D object that is currently displayed.</string>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioPerspective">
<property name="toolTip">
<string>Objects will appear in a perspective projection</string>
</property>
<property name="text">
<string>Perspective renderin&amp;g</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Perspective</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="Gui::PrefRadioButton" name="radioOrthographic">
<property name="toolTip">
<string>Objects will be projected in orthographic projection</string>
@@ -607,23 +623,7 @@ bounding box size of the 3D object that is currently displayed.</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioPerspective">
<property name="toolTip">
<string>Objects will appear in a perspective projection</string>
</property>
<property name="text">
<string>Perspective renderin&amp;g</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Perspective</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item>

View File

@@ -100,16 +100,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButtonZero">
<property name="text">
<string>&amp;Zero</string>
</property>
<property name="shortcut">
<string>Alt+Z</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="radioButtonFlow">
<property name="text">
@@ -123,7 +113,17 @@
</property>
</widget>
</item>
</layout>
<item row="0" column="1">
<widget class="QRadioButton" name="radioButtonZero">
<property name="text">
<string>&amp;Zero</string>
</property>
<property name="shortcut">
<string>Alt+Z</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
@@ -191,22 +191,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>35</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
@@ -224,11 +208,18 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QLineEdit" name="floatLineEditMax"/>
<item row="0" column="0">
<widget class="QLabel" name="textLabelMax">
<property name="text">
<string>Ma&amp;ximum:</string>
</property>
<property name="buddy">
<cstring>floatLineEditMax</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="floatLineEditMin"/>
<item row="0" column="1">
<widget class="QLineEdit" name="floatLineEditMax"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabelMin">
@@ -240,17 +231,26 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabelMax">
<property name="text">
<string>Ma&amp;ximum:</string>
</property>
<property name="buddy">
<cstring>floatLineEditMax</cstring>
</property>
</widget>
<item row="1" column="1">
<widget class="QLineEdit" name="floatLineEditMin"/>
</item>
</layout>
</layout>
</item>
<item row="0" column="1">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>35</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2">
<layout class="QGridLayout">
@@ -269,19 +269,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBoxLabel"/>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBoxDecimals">
<property name="maximum">
<number>6</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="textLabel1">
<property name="text">
@@ -292,6 +279,9 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="spinBoxLabel"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabel1_2">
<property name="text">
@@ -302,7 +292,17 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="1">
<widget class="QSpinBox" name="spinBoxDecimals">
<property name="maximum">
<number>6</number>
</property>
<property name="value">
<number>2</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

View File

@@ -14,7 +14,29 @@
<string>Available Workbenches</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0">
<item row="0" column="0">
<widget class="QLabel" name="noteLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QTableWidget" name="workbenchTable">
<property name="showGrid">
<bool>false</bool>
@@ -47,29 +69,7 @@
</column>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="noteLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;To preserve resources, FreeCAD does not load workbenches until they are used. Loading them may provide access to additional preferences related to their functionality.&lt;/p&gt;&lt;p&gt;The following workbenches are available in your installation:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
<layoutdefault spacing="6" margin="11"/>
<resources/>

View File

@@ -63,6 +63,108 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox8">
<property name="title">
<string>Macro path</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::PrefFileChooser" name="MacroPath">
<property name="toolTip">
<string>The directory in which the application will search for macros</string>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
<property name="prefEntry" stdset="0">
<cstring>MacroPath</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="GroupBox7">
<property name="title">
<string>Gui commands</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::PrefCheckBox" name="PrefCheckBox_RecordGui">
<property name="toolTip">
<string>Recorded macros will also contain user interface commands</string>
</property>
<property name="text">
<string>Record GUI commands</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>RecordGui</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::PrefCheckBox" name="PrefCheckBox_GuiAsComment">
<property name="toolTip">
<string>Recorded macros will also contain user interface commands as comments</string>
</property>
<property name="text">
<string>Record as comment</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>GuiAsComment</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="groupBox4">
<property name="title">
@@ -132,109 +234,7 @@
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="GroupBox7">
<property name="title">
<string>Gui commands</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::PrefCheckBox" name="PrefCheckBox_RecordGui">
<property name="toolTip">
<string>Recorded macros will also contain user interface commands</string>
</property>
<property name="text">
<string>Record GUI commands</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>RecordGui</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::PrefCheckBox" name="PrefCheckBox_GuiAsComment">
<property name="toolTip">
<string>Recorded macros will also contain user interface commands as comments</string>
</property>
<property name="text">
<string>Record as comment</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="prefEntry" stdset="0">
<cstring>GuiAsComment</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox8">
<property name="title">
<string>Macro path</string>
</property>
<layout class="QGridLayout">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="Gui::PrefFileChooser" name="MacroPath">
<property name="toolTip">
<string>The directory in which the application will search for macros</string>
</property>
<property name="mode">
<enum>Gui::FileChooser::Directory</enum>
</property>
<property name="prefEntry" stdset="0">
<cstring>MacroPath</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>Macro</cstring>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="2" column="0">

View File

@@ -20,18 +20,23 @@
<string>Units settings</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>79</height>
</size>
</property>
</spacer>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Unit system:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_ViewSystem">
<property name="toolTip">
<string>Unit system that should be used for all parts the application</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -57,47 +62,6 @@
</item>
</layout>
</item>
<item row="0" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Unit system:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_ViewSystem">
<property name="toolTip">
<string>Unit system that should be used for all parts the application</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<widget class="QTableWidget" name="tableWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<column>
<property name="text">
<string>Magnitude</string>
</property>
</column>
<column>
<property name="text">
<string>Unit</string>
</property>
</column>
</widget>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
@@ -151,7 +115,43 @@
</item>
</layout>
</item>
</layout>
<item row="3" column="0">
<widget class="QTableWidget" name="tableWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property>
<column>
<property name="text">
<string>Magnitude</string>
</property>
</column>
<column>
<property name="text">
<string>Unit</string>
</property>
</column>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>79</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>

View File

@@ -50,19 +50,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer name="spacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>183</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QGridLayout" name="_3">
<property name="leftMargin">
@@ -80,29 +67,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="1">
<widget class="Gui::PrefColorButton" name="SelectionColor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>28</red>
<green>173</green>
<blue>28</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>SelectionColor</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="Gui::PrefCheckBox" name="checkBoxPreselection">
<property name="minimumSize">
@@ -176,9 +140,45 @@
</property>
</widget>
</item>
</layout>
<item row="1" column="1">
<widget class="Gui::PrefColorButton" name="SelectionColor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>28</red>
<green>173</green>
<blue>28</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>SelectionColor</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<item row="0" column="1">
<spacer name="spacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>183</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
@@ -205,19 +205,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer name="spacer">
<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 row="0" column="0">
<layout class="QGridLayout" name="_4">
<property name="leftMargin">
@@ -235,23 +222,29 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<spacer name="spacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioButtonSimple">
<property name="minimumSize">
<size>
<width>171</width>
<height>20</height>
<width>240</width>
<height>0</height>
</size>
</property>
</spacer>
<property name="toolTip">
<string>Background will have selected color</string>
</property>
<property name="text">
<string>Simple color</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>Simple</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="1">
<widget class="Gui::PrefColorButton" name="SelectionColor_Background">
<property name="enabled">
<bool>false</bool>
@@ -283,71 +276,6 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkMidColor">
<property name="toolTip">
<string>Color gradient will get selected color as middle color</string>
</property>
<property name="text">
<string>Middle color</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseBackgroundColorMid</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::PrefColorButton" name="backgroundColorTo">
<property name="toolTip">
<string>Bottom color</string>
</property>
<property name="text">
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>151</red>
<green>151</green>
<blue>170</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>BackgroundColor3</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::PrefColorButton" name="backgroundColorMid">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Middle color</string>
</property>
<property name="text">
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>111</red>
<green>111</green>
<blue>147</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>BackgroundColor4</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="Gui::PrefRadioButton" name="radioButtonGradient">
<property name="toolTip">
@@ -390,31 +318,103 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="Gui::PrefRadioButton" name="radioButtonSimple">
<property name="minimumSize">
<item row="2" column="0">
<spacer name="spacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>240</width>
<height>0</height>
<width>171</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="Gui::PrefColorButton" name="backgroundColorTo">
<property name="toolTip">
<string>Background will have selected color</string>
<string>Bottom color</string>
</property>
<property name="text">
<string>Simple color</string>
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>151</red>
<green>151</green>
<blue>170</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>Simple</cstring>
<cstring>BackgroundColor3</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
</layout>
<item row="3" column="0">
<widget class="Gui::PrefCheckBox" name="checkMidColor">
<property name="toolTip">
<string>Color gradient will get selected color as middle color</string>
</property>
<property name="text">
<string>Middle color</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>UseBackgroundColorMid</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::PrefColorButton" name="backgroundColorMid">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip">
<string>Middle color</string>
</property>
<property name="text">
<string/>
</property>
<property name="color" stdset="0">
<color>
<red>111</red>
<green>111</green>
<blue>147</blue>
</color>
</property>
<property name="prefEntry" stdset="0">
<cstring>BackgroundColor4</cstring>
</property>
<property name="prefPath" stdset="0">
<cstring>View</cstring>
</property>
</widget>
</item>
</layout>
</item>
</layout>
<item row="0" column="1">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
@@ -438,19 +438,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="0" column="1">
<spacer name="spacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>183</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
@@ -545,7 +532,20 @@
</item>
</layout>
</item>
</layout>
<item row="0" column="1">
<spacer name="spacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>183</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">

File diff suppressed because one or more lines are too long

View File

@@ -20,42 +20,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="2" rowspan="8">
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="lb_enabled">
<property name="text">
<string>Enabled workbenches</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidgetCustom" name="lw_enabled_workbenches"/>
</item>
</layout>
</item>
<item row="6" column="3" rowspan="4">
<spacer name="sp_right">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>33</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" rowspan="8">
<layout class="QVBoxLayout">
<property name="spacing">
@@ -76,24 +40,28 @@
</item>
</layout>
</item>
<item row="6" column="1" rowspan="4">
<spacer name="sp_left">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="2" column="2" rowspan="8">
<layout class="QVBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
<property name="margin">
<number>0</number>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>33</width>
<height>57</height>
</size>
</property>
</spacer>
<item>
<widget class="QLabel" name="lb_enabled">
<property name="text">
<string>Enabled workbenches</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidgetCustom" name="lw_enabled_workbenches"/>
</item>
</layout>
</item>
<item row="5" column="3">
<widget class="QPushButton" name="shift_workbench_down_btn">
<item row="3" column="1">
<widget class="QPushButton" name="add_to_enabled_workbenches_btn">
<property name="enabled">
<bool>true</bool>
</property>
@@ -104,17 +72,101 @@
</size>
</property>
<property name="toolTip">
<string>Move down</string>
<string>Move right</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected item down.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved down&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected workbench to enabled workbenches.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_down.svg</normaloff>:/icons/button_down.svg</iconset>
<normaloff>:/icons/button_right.svg</normaloff>:/icons/button_right.svg</iconset>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="shift_workbench_up_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Move up</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected item up.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved up.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_up.svg</normaloff>:/icons/button_up.svg</iconset>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="add_all_to_enabled_workbenches_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Add all to enabled workbenches</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Remove the selected workbench from enabled workbenches&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_add_all.svg</normaloff>:/icons/button_add_all.svg</iconset>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QPushButton" name="sort_enabled_workbenches_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Sort enabled workbenches</string>
</property>
<property name="whatsThis">
<string>&lt;p&gt;Sort enabled workbenches&lt;/p&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_sort.svg</normaloff>:/icons/button_sort.svg</iconset>
</property>
<property name="autoDefault">
<bool>true</bool>
@@ -153,8 +205,8 @@
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="add_to_enabled_workbenches_btn">
<item row="5" column="3">
<widget class="QPushButton" name="shift_workbench_down_btn">
<property name="enabled">
<bool>true</bool>
</property>
@@ -165,74 +217,54 @@
</size>
</property>
<property name="toolTip">
<string>Move right</string>
<string>Move down</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected workbench to enabled workbenches.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected item down.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved down&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_right.svg</normaloff>:/icons/button_right.svg</iconset>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QPushButton" name="sort_enabled_workbenches_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Sort enabled workbenches</string>
</property>
<property name="whatsThis">
<string>&lt;p&gt;Sort enabled workbenches&lt;/p&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_sort.svg</normaloff>:/icons/button_sort.svg</iconset>
<normaloff>:/icons/button_down.svg</normaloff>:/icons/button_down.svg</iconset>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QPushButton" name="shift_workbench_up_btn">
<property name="enabled">
<bool>true</bool>
<item row="6" column="1" rowspan="4">
<spacer name="sp_left">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="minimumSize">
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>30</height>
<width>33</width>
<height>57</height>
</size>
</property>
<property name="toolTip">
<string>Move up</string>
</spacer>
</item>
<item row="6" column="3" rowspan="4">
<spacer name="sp_right">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Move the selected item up.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;The item will be moved up.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="text">
<string/>
<property name="sizeHint" stdset="0">
<size>
<width>33</width>
<height>57</height>
</size>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_up.svg</normaloff>:/icons/button_up.svg</iconset>
</property>
</widget>
</spacer>
</item>
<item row="10" column="0" colspan="4">
<widget class="QLabel" name="label">
@@ -241,39 +273,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="add_all_to_enabled_workbenches_btn">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>30</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Add all to enabled workbenches</string>
</property>
<property name="whatsThis">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=" font-weight:600;"&gt;Remove the selected workbench from enabled workbenches&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/button_add_all.svg</normaloff>:/icons/button_add_all.svg</iconset>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
<customwidgets>
<customwidget>

View File

@@ -26,16 +26,27 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="vectorZ">
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>X:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="vectorX">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
@@ -49,16 +60,6 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QDoubleSpinBox" name="vectorX">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -66,21 +67,20 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Y:</string>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="vectorZ">
<property name="minimum">
<double>-2147480000.000000000000000</double>
</property>
<property name="maximum">
<double>2147480000.000000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>X:</string>
</property>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="1" column="0">

View File

@@ -41,45 +41,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="4" column="0">
<widget class="QLabel" name="TextLabelAxial">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Axial:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabelZ">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelY">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabelX">
<property name="sizePolicy">
@@ -96,12 +57,51 @@
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="xPos"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelY">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="yPos"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabelZ">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="Gui::QuantitySpinBox" name="zPos"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="TextLabelAxial">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Axial:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="Gui::QuantitySpinBox" name="axialPos"/>
</item>
@@ -139,32 +139,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelZ_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabelY_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabelX_2">
<property name="sizePolicy">
@@ -181,9 +155,35 @@
<item row="0" column="1">
<widget class="Gui::QuantitySpinBox" name="xCnt"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabelY_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Y:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="yCnt"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelZ_5">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Z:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="zCnt"/>
</item>
@@ -225,7 +225,21 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<item row="0" column="0">
<widget class="QComboBox" name="rotationInput">
<item>
<property name="text">
<string>Rotation axis with angle</string>
</property>
</item>
<item>
<property name="text">
<string>Euler angles (zy'x'')</string>
</property>
</item>
</widget>
</item>
<item row="1" column="0">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>1</number>
@@ -264,26 +278,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="textLabelAngle">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Angle:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabelAxis">
<property name="sizePolicy">
@@ -297,6 +291,26 @@
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="direction">
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="textLabelAngle">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Angle:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="angle"/>
</item>
@@ -338,32 +352,6 @@
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="0">
<widget class="QLabel" name="TextLabelZ_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Pitch (around y-axis):</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelZ_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Roll (around x-axis):</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabelZ_2">
<property name="sizePolicy">
@@ -384,6 +372,19 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabelZ_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Pitch (around y-axis):</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="Gui::QuantitySpinBox" name="pitchAngle">
<property name="toolTip">
@@ -391,6 +392,19 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabelZ_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Roll (around x-axis):</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="Gui::QuantitySpinBox" name="rollAngle">
<property name="toolTip">
@@ -405,21 +419,7 @@
<widget class="QWidget" name="page_2"/>
</widget>
</item>
<item row="0" column="0">
<widget class="QComboBox" name="rotationInput">
<item>
<property name="text">
<string>Rotation axis with angle</string>
</property>
</item>
<item>
<property name="text">
<string>Euler angles (zy'x'')</string>
</property>
</item>
</widget>
</item>
</layout>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">

View File

@@ -32,22 +32,8 @@
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="recompute">
<property name="text">
<string>Recompute after commit</string>
</property>
</widget>
</item>
<item row="3" column="0">
<layout class="QGridLayout" name="gridLayout_6">
<item row="0" column="2">
<widget class="QPushButton" name="removeSelection">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QPushButton" name="addSelection">
<property name="text">
@@ -55,13 +41,6 @@
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="removeAll">
<property name="text">
<string>Remove all</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="hideSelection">
<property name="text">
@@ -69,6 +48,20 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="removeSelection">
<property name="text">
<string>Remove</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="removeAll">
<property name="text">
<string>Remove all</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPushButton" name="boxSelect">
<property name="text">
@@ -78,6 +71,13 @@
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="recompute">
<property name="text">
<string>Recompute after commit</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="onTop">
<property name="text">