natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sshumakov3
2020-11-18 14:27:41 +03:00
parent ddf46f9a02 4e60c7f336
commit 80b703a900
3 changed files with 89 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/noggit/Red/AssetBrowser/Ui/AssetBrowser.cpp
View File

@@ -56,7 +56,7 @@ AssetBrowserWidget::AssetBrowserWidget(QWidget *parent)
viewport_overlay_ui->toggleAnimationButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_ANIMATION));
viewport_overlay_ui->toggleModelsButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_DOODADS));
viewport_overlay_ui->toggleParticlesButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_UNUSED));
viewport_overlay_ui->toggleParticlesButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_PARTICLES));
viewport_overlay_ui->toggleBoundingBoxButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WITH_BOX));
viewport_overlay_ui->toggleWMOButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_WMO));
viewport_overlay_ui->toggleGridButton->setIcon(font_noggit_icon(font_noggit::icons::VISIBILITY_LINES));

13
src/noggit/Red/AssetBrowser/Ui/AssetBrowser.ui
View File

@@ -6,10 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>1300</width>
<height>792</height>
<width>1400</width>
<height>800</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="acceptDrops">
<bool>true</bool>
</property>
@@ -117,6 +123,9 @@
<height>0</height>
</size>
</property>
<property name="accessibleName">
<string>ab_treeview</string>
</property>
<property name="verticalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOn</enum>
</property>

92
src/noggit/Red/AssetBrowser/Ui/AssetBrowserOverlay.ui
View File

@@ -6,10 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>1007</width>
<height>667</height>
<width>1000</width>
<height>650</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
@@ -69,8 +75,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -109,8 +115,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -149,8 +155,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -189,8 +195,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -229,8 +235,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -266,8 +272,8 @@
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
<width>26</width>
<height>26</height>
</size>
</property>
<property name="checkable">
@@ -339,6 +345,9 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<property name="spacing">
@@ -346,6 +355,12 @@
</property>
<item>
<widget class="QPushButton" name="cameraXButton">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>X</string>
</property>
@@ -353,6 +368,12 @@
</item>
<item>
<widget class="QPushButton" name="cameraYButton">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Y</string>
</property>
@@ -360,6 +381,12 @@
</item>
<item>
<widget class="QPushButton" name="cameraZButton">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="text">
<string>Z</string>
</property>
@@ -367,6 +394,12 @@
</item>
<item>
<widget class="QPushButton" name="cameraResetButton">
<property name="minimumSize">
<size>
<width>45</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Reset</string>
</property>
@@ -401,7 +434,14 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="doodadSetSelector"/>
<widget class="QComboBox" name="doodadSetSelector">
<property name="minimumSize">
<size>
<width>155</width>
<height>27</height>
</size>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_4">
@@ -451,12 +491,28 @@
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<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>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_4">
<property name="orientation">
@@ -475,6 +531,12 @@
</item>
<item>
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>0</width>
<height>27</height>
</size>
</property>
<property name="accessibleName">
<string>overlay_label</string>
</property>