1 files changed, 255 insertions, 149 deletions
diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui
index fc81c8b85..077ff24b4 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.ui
+++ b/src/designer/src/components/propertyeditor/previewwidget.ui
@@ -1,4 +1,5 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <comment>*********************************************************************
 **
 ** Copyright (C) 2016 The Qt Company Ltd.
@@ -27,191 +28,296 @@
 **
 *********************************************************************</comment>
  <class>qdesigner_internal::PreviewWidget</class>
- <widget class="QWidget" name="qdesigner_internal::PreviewWidget" >
-  <property name="geometry" >
+ <widget class="QWidget" name="qdesigner_internal::PreviewWidget">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>471</width>
-    <height>251</height>
+    <width>608</width>
+    <height>367</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>1</hsizetype>
-    <vsizetype>1</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string extracomment="Palette Editor Preview Widget">Preview Window</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item rowspan="3" row="0" column="1" >
-    <layout class="QVBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="buttonGroup">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Buttons</string>
      </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
-     <item>
-      <widget class="QLineEdit" name="LineEdit1" >
-       <property name="text" >
-        <string extracomment="Palette Editor Preview Widget">LineEdit</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QComboBox" name="ComboBox1" >
-       <item>
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">ComboBox</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" >
-       <property name="margin" >
-        <number>0</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
-       <item>
-        <widget class="QSpinBox" name="SpinBox1" />
-       </item>
-       <item>
-        <widget class="QPushButton" name="PushButton1" >
-         <property name="text" >
-          <string extracomment="Palette Editor Preview Widget">PushButton</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item>
-      <widget class="QScrollBar" name="ScrollBar1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSlider" name="Slider1" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QListWidget" name="listWidget" >
-       <property name="maximumSize" >
-        <size>
-         <width>32767</width>
-         <height>50</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QProgressBar" name="ProgressBar1" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="QRadioButton" name="RadioButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="RadioButton3">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="CheckBox2">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Tristate CheckBox</string>
+          </property>
+          <property name="tristate">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <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>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QPushButton" name="PushButton1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">PushButton</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="toggleButton">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">ToggleButton</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+          <property name="flat">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QToolButton" name="toolButton">
+            <property name="text">
+             <string extracomment="Palette Editor Preview Widget">ToolButton</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QToolButton" name="menuToolButton">
+            <property name="text">
+             <string extracomment="Palette Editor Preview Widget">Menu</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+        <item>
+         <spacer name="verticalSpacer_2">
+          <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>
+      </item>
+     </layout>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup2" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup2</string>
+   <item row="0" column="1">
+    <widget class="QGroupBox" name="itemGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Item Views</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
       <item>
-       <widget class="QCheckBox" name="CheckBox1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox1</string>
-        </property>
-        <property name="checked" >
+       <widget class="QTreeWidget" name="treeWidget">
+        <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
+        <column>
+         <property name="text">
+          <string extracomment="Palette Editor Preview Widget">Column 1</string>
+         </property>
+        </column>
+        <item>
+         <property name="text">
+          <string extracomment="Palette Editor Preview Widget">Top Level 1</string>
+         </property>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 1</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 2</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">Nested Item 3</string>
+          </property>
+         </item>
+        </item>
        </widget>
       </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QGroupBox" name="simpleGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Simple Input Widgets</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLineEdit" name="LineEdit1">
+          <property name="text">
+           <string extracomment="Palette Editor Preview Widget">LineEdit</string>
+          </property>
+          <property name="clearButtonEnabled">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="ComboBox1">
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">ComboBox</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">Item1</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string extracomment="Palette Editor Preview Widget">Item2</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
       <item>
-       <widget class="QCheckBox" name="CheckBox2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">CheckBox2</string>
-        </property>
-       </widget>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <item>
+         <widget class="QSpinBox" name="SpinBox1"/>
+        </item>
+        <item>
+         <widget class="QScrollBar" name="ScrollBar1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSlider" name="Slider1">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="ButtonGroup1" >
-     <property name="title" >
-      <string extracomment="Palette Editor Preview Widget">ButtonGroup</string>
+   <item row="1" column="1">
+    <widget class="QGroupBox" name="displayGroupBox">
+     <property name="title">
+      <string extracomment="Palette Editor Preview Widget">Display Widgets</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
       <item>
-       <widget class="QRadioButton" name="RadioButton1" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton1</string>
+       <widget class="QProgressBar" name="ProgressBar1">
+        <property name="value">
+         <number>50</number>
         </property>
-        <property name="checked" >
-         <bool>true</bool>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton2" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton2</string>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string extracomment="Palette Editor Preview Widget">QLabel</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="RadioButton3" >
-        <property name="text" >
-         <string extracomment="Palette Editor Preview Widget">RadioButton3</string>
+       <widget class="QLabel" name="label_2">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="text">
+         <string extracomment="Palette Editor Preview Widget">QLabel with frame</string>
         </property>
        </widget>
       </item>