OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Move adv. audio props. to each audio config button

Browse source 
Instead of having an extra config button that essentially wastes
valuable window space, allow the ability to open advanced audio
properties from each audio meter config button.
This commit is contained in:
jp9000 2017-08-05 21:20:08 -07:00
parent 7549b3a092
commit 10d6c347cc
2 changed files with 5 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
UI/forms/OBSBasic.ui
View file

@ -659,58 +659,6 @@
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="mixadvHLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<spacer name="mixadvHSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="advAudioProps">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximumSize">
<size>
<width>22</width>
<height>22</height>
</size>
</property>
<property name="accessibleName">
<string>Basic.AdvAudio</string>
</property>
<property name="text">
<string notr="true"/>
</property>
<property name="icon">
<iconset resource="obs.qrc">
<normaloff>:/res/images/configuration21_16.png</normaloff>:/res/images/configuration21_16.png</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
<property name="themeID" stdset="0">
<string notr="true">configIconSmall</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>

5
UI/window-basic-main.cpp
View file

@ -2210,6 +2210,7 @@ void OBSBasic::VolControlContextMenu()
QAction filtersAction(QTStr("Filters"), this);
QAction propertiesAction(QTStr("Properties"), this);
QAction advPropAction(QTStr("Basic.MainMenu.Edit.AdvAudio"), this);
connect(&filtersAction, &QAction::triggered,
this, &OBSBasic::GetAudioSourceFilters,
@ -2217,6 +2218,9 @@ void OBSBasic::VolControlContextMenu()
connect(&propertiesAction, &QAction::triggered,
this, &OBSBasic::GetAudioSourceProperties,
Qt::DirectConnection);
connect(&advPropAction, &QAction::triggered,
this, &OBSBasic::on_actionAdvAudioProperties_triggered,
Qt::DirectConnection);
filtersAction.setProperty("volControl",
QVariant::fromValue<VolControl*>(vol));
@ -2226,6 +2230,7 @@ void OBSBasic::VolControlContextMenu()
QMenu popup(this);
popup.addAction(&filtersAction);
popup.addAction(&propertiesAction);
popup.addAction(&advPropAction);
popup.exec(QCursor::pos());
}