diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-06-16 10:22:34 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2016-06-16 08:39:59 +0000 |
| commit | 62acb38d56beb12910fe0cd839f35485c720fc2c (patch) | |
| tree | 339a811cdc054320b31335c415a2bf7c093cab0d /src/plugins/qmldesigner/settingspage.ui | |
| parent | 4a74b6184ff9d1fb88e5df830f12a119af969061 (diff) | |
QmlDesigner: Adding support for Controls 2 styles
The environment variable used for styling is the same as for
Controls 1.0.
I added a combo box that allows to easliy choose the styles shipped by us:
Default, Material and Universal.
I also set the environment variable for labs Controls so this can be used
with Qt 5.6.
Change-Id: I73a4dd2b4132175638c99cf9be65f1ab1b7e6d8e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/settingspage.ui')
| -rw-r--r-- | src/plugins/qmldesigner/settingspage.ui | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/settingspage.ui b/src/plugins/qmldesigner/settingspage.ui index 0ca22cc9cd..e28d166aa0 100644 --- a/src/plugins/qmldesigner/settingspage.ui +++ b/src/plugins/qmldesigner/settingspage.ui @@ -113,29 +113,61 @@ <property name="title"> <string>Styling</string> </property> - <layout class="QHBoxLayout" name="horizontalLayout_6"> - <item> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> <widget class="QLabel" name="label_3"> <property name="text"> <string>Controls style:</string> </property> </widget> </item> - <item> + <item row="0" column="1"> <widget class="QLineEdit" name="styleLineEdit"> <property name="placeholderText"> <string>Default style</string> </property> </widget> </item> - <item> + <item row="0" column="2"> <widget class="QPushButton" name="resetStyle"> <property name="text"> <string>Reset Style</string> </property> </widget> </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Controls 2 style</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="QComboBox" name="controls2StyleComboBox"> + <item> + <property name="text"> + <string>Default</string> + </property> + </item> + <item> + <property name="text"> + <string>Material</string> + </property> + </item> + <item> + <property name="text"> + <string>Universal</string> + </property> + </item> + </widget> + </item> </layout> + <zorder>label_3</zorder> + <zorder>styleLineEdit</zorder> + <zorder>label_6</zorder> + <zorder>controls2StyleComboBox</zorder> + <zorder>resetStyle</zorder> + <zorder>groupBox_6</zorder> </widget> </item> </layout> |