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

Merge pull request #6480 from imginimg/ace_improvements

Browse Source 
[AudioSystem] Audio Controls Editor minor improvements.
This commit is contained in:
Chris Galvan
2022-01-03 13:40:25 -06:00
committed by GitHub
parent aa17120f09 3ecf622804
commit 2b4ccfd630
3 changed files with 141 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorMainWindow.ui
+125 -93
View File
@@ -28,101 +28,105 @@
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QDockWidget" name="m_pATLControlsDockWidget"> <widget class="QSplitter" name="splitter">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <enum>Qt::Horizontal</enum>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="features"> <property name="childrenCollapsible">
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>ATL Controls</string>
</property>
<widget class="QWidget" name="m_pATLControlsWidget">
<layout class="QVBoxLayout" name="m_pATLControlsDockLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QDockWidget" name="m_pInspectorDockWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="features">
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Inspector</string>
</property>
<widget class="QWidget" name="m_pInspectorWidget">
<layout class="QVBoxLayout" name="m_pInspectorDockLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QDockWidget" name="m_pMiddlewareDockWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="floating">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="features"> <widget class="QDockWidget" name="m_pATLControlsDockWidget">
<set>QDockWidget::NoDockWidgetFeatures</set> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<property name="windowTitle"> <horstretch>1</horstretch>
<string>Audio Middleware Controls</string> <verstretch>0</verstretch>
</property> </sizepolicy>
<widget class="QWidget" name="m_pMiddlewareWidget"> </property>
<layout class="QVBoxLayout" name="m_pMiddlewareDockLayout"> <property name="features">
<property name="leftMargin"> <set>QDockWidget::NoDockWidgetFeatures</set>
<number>4</number> </property>
</property> <property name="windowTitle">
<property name="topMargin"> <string>ATL Controls</string>
<number>9</number> </property>
</property> <widget class="QWidget" name="m_pATLControlsWidget">
<property name="rightMargin"> <layout class="QVBoxLayout" name="m_pATLControlsDockLayout">
<number>4</number> <property name="leftMargin">
</property> <number>4</number>
<property name="bottomMargin"> </property>
<number>9</number> <property name="topMargin">
</property> <number>9</number>
</layout> </property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</widget>
<widget class="QDockWidget" name="m_pInspectorDockWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>2</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="features">
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Inspector</string>
</property>
<widget class="QWidget" name="m_pInspectorWidget">
<layout class="QVBoxLayout" name="m_pInspectorDockLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</widget>
<widget class="QDockWidget" name="m_pMiddlewareDockWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="floating">
<bool>false</bool>
</property>
<property name="features">
<set>QDockWidget::NoDockWidgetFeatures</set>
</property>
<property name="windowTitle">
<string>Audio Middleware Controls</string>
</property>
<widget class="QWidget" name="m_pMiddlewareWidget">
<layout class="QVBoxLayout" name="m_pMiddlewareDockLayout">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>4</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</widget> </widget>
</widget> </widget>
</item> </item>
@@ -134,7 +138,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>972</width> <width>972</width>
<height>21</height> <height>26</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
@@ -143,6 +147,7 @@
</property> </property>
<addaction name="actionSaveAll"/> <addaction name="actionSaveAll"/>
<addaction name="actionReload"/> <addaction name="actionReload"/>
<addaction name="actionRefreshAudioSystem"/>
</widget> </widget>
<addaction name="menuFile"/> <addaction name="menuFile"/>
</widget> </widget>
@@ -166,6 +171,17 @@
<property name="text"> <property name="text">
<string>Reload</string> <string>Reload</string>
</property> </property>
<property name="shortcut">
<string>Ctrl+R</string>
</property>
</action>
<action name="actionRefreshAudioSystem">
<property name="text">
<string>Refresh Audio System</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+R</string>
</property>
</action> </action>
</widget> </widget>
<resources> <resources>
@@ -204,6 +220,22 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>actionRefreshAudioSystem</sender>
<signal>triggered()</signal>
<receiver>MainWindow</receiver>
<slot>RefreshAudioSystem()</slot>
<hints>
<hint type="sourcelabel">
<x>-1</x>
<y>-1</y>
</hint>
<hint type="destinationlabel">
<x>485</x>
<y>336</y>
</hint>
</hints>
</connection>
</connections> </connections>
<slots> <slots>
<signal>CurrentControlNameChanged(QString)</signal> <signal>CurrentControlNameChanged(QString)</signal>
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.cpp
+15 -9
View File
@@ -198,6 +198,20 @@ namespace AudioControls
} }
} }
//-------------------------------------------------------------------------------------------//
void CAudioControlsEditorWindow::RefreshAudioSystem()
{
QString sLevelName = GetIEditor()->GetLevelName();
if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
{
// Rather pass empty QString to indicate that no level is loaded!
sLevelName = QString();
}
Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
}
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
void CAudioControlsEditorWindow::Save() void CAudioControlsEditorWindow::Save()
{ {
@@ -215,15 +229,7 @@ namespace AudioControls
messageBox.setWindowTitle("Audio Controls Editor"); messageBox.setWindowTitle("Audio Controls Editor");
if (messageBox.exec() == QMessageBox::Yes) if (messageBox.exec() == QMessageBox::Yes)
{ {
QString sLevelName = GetIEditor()->GetLevelName(); RefreshAudioSystem();
if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
{
// Rather pass empty QString to indicate that no level is loaded!
sLevelName = QString();
}
Audio::AudioSystemRequestBus::Broadcast(&Audio::AudioSystemRequestBus::Events::RefreshAudioSystem, sLevelName.toUtf8().data());
} }
} }
m_pATLModel->ClearDirtyFlags(); m_pATLModel->ClearDirtyFlags();
Gems/AudioSystem/Code/Source/Editor/AudioControlsEditorWindow.h
+1
View File
@@ -61,6 +61,7 @@ namespace AudioControls
void UpdateInspector(); void UpdateInspector();
void FilterControlType(EACEControlType type, bool bShow); void FilterControlType(EACEControlType type, bool bShow);
void Update(); void Update();
void RefreshAudioSystem();
protected: protected:
void closeEvent(QCloseEvent* pEvent) override; void closeEvent(QCloseEvent* pEvent) override;