birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'stabilization/2106' into LYN-2509b

Browse Source
This commit is contained in:
jjjoness
2021-06-22 10:07:28 +01:00
committed by GitHub
parent 2dce6954a1 4d02e0b8bb
commit 1ec238685d
4 changed files with 218 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/NewLevelDialog.ui
+96 -6
View File
@@ -38,12 +38,94 @@
<cstring>LEVEL</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="LEVEL">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="STATIC_GROUP1">
<property name="styleSheet">
<string notr="true">border: 0px;</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="STATIC2">
<property name="text">
<string>Name</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="buddy">
<cstring>LEVEL</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="LEVEL">
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="STATIC1">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Location</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
<property name="buddy">
<cstring>LEVEL_FOLDERS</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="AzQtComponents::BrowseEdit" name="LEVEL_FOLDERS" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item row="1" column="0">
@@ -80,6 +162,14 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>AzQtComponents::BrowseEdit</class>
<extends>QWidget</extends>
<header location="global">AzQtComponents/Components/Widgets/BrowseEdit.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>