diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-08 10:38:38 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-01-08 11:03:02 +0100 |
commit | 7fd5d435b76460e42cd25004056a39e05f376baa (patch) | |
tree | 9a6775b2aaf798c1807d0969ece27a6b5b576084 /src | |
parent | c56a6a47bfd7b8e974bdddfe4df87da4c67fc521 (diff) | |
download | qttools-7fd5d435b76460e42cd25004056a39e05f376baa.tar.gz |
Qt Designer/Palette Editor: Improve the Preview Widget
Add more widgets. Most importantly, add an item view with alternate
colors to be able to view selection colors.
Change-Id: I263ad4b5109e42b3e839892af5fd8d8d7066ca30
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/designer/src/components/propertyeditor/previewwidget.cpp | 15 | ||||
-rw-r--r-- | src/designer/src/components/propertyeditor/previewwidget.ui | 404 |
2 files changed, 270 insertions, 149 deletions
diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp index cc5a3af31..d041ec9be 100644 --- a/src/designer/src/components/propertyeditor/previewwidget.cpp +++ b/src/designer/src/components/propertyeditor/previewwidget.cpp @@ -28,6 +28,11 @@ #include "previewwidget.h" +#include <QtWidgets/qaction.h> +#include <QtWidgets/qmenu.h> + +#include <QtCore/qabstractitemmodel.h> + QT_BEGIN_NAMESPACE using namespace qdesigner_internal; @@ -36,6 +41,16 @@ PreviewWidget::PreviewWidget(QWidget *parent) : QWidget(parent) { ui.setupUi(this); + ui.treeWidget->expandAll(); + auto model = ui.treeWidget->model(); + ui.treeWidget->setCurrentIndex(model->index(0, 0, model->index(0, 0))); + auto toolButtonMenu = new QMenu(ui.menuToolButton); + toolButtonMenu->addAction(tr("Option 1")); + toolButtonMenu->addSeparator(); + auto checkable = toolButtonMenu->addAction(tr("Checkable")); + checkable->setCheckable(true); + ui.menuToolButton->setMenu(toolButtonMenu); + ui.menuToolButton->setPopupMode(QToolButton::InstantPopup); } PreviewWidget::~PreviewWidget() = default; diff --git a/src/designer/src/components/propertyeditor/previewwidget.ui b/src/designer/src/components/propertyeditor/previewwidget.ui index fc81c8b85..64c29229f 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>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>ToolButton</string> + </property> + </widget> + </item> + <item> + <widget class="QToolButton" name="menuToolButton"> + <property name="text"> + <string>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>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>Column 1</string> + </property> + </column> + <item> + <property name="text"> + <string>Top Level 1</string> + </property> + <item> + <property name="text"> + <string>Nested Item 1</string> + </property> + </item> + <item> + <property name="text"> + <string>Nested Item 2</string> + </property> + </item> + <item> + <property name="text"> + <string>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>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>Item1</string> + </property> + </item> + <item> + <property name="text"> + <string>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>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>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>QLabel with frame</string> </property> </widget> </item> |