diff --git a/obs/forms/OBSBasic.ui b/obs/forms/OBSBasic.ui index 278214bb1..cdd206e15 100644 --- a/obs/forms/OBSBasic.ui +++ b/obs/forms/OBSBasic.ui @@ -72,10 +72,10 @@ 16777215 - 154 + 165 - + 0 @@ -88,227 +88,21 @@ 0 - - + + 2 + + + - + 0 0 - - - 150 - 0 - - - - - 0 + + + 4 - - 0 - - - 0 - - - 0 - - - - - Basic.Main.Scenes - - - - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - QFrame::NoFrame - - - QFrame::Plain - - - - - - - - - 16 - 16 - - - - false - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Basic.Main.Sources - - - - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - QFrame::NoFrame - - - - - - - - - 16 - 16 - - - - false - - - - - - - - - - - - - - - - - - 0 @@ -323,11 +117,61 @@ + + + 0 + 0 + + Mixer + + + + + 0 + 0 + + + + + 22 + 22 + + + + + + + + :/res/images/configuration21_16.png:/res/images/configuration21_16.png + + + true + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + @@ -410,7 +254,211 @@ - + + + + + 0 + 0 + + + + + 150 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + QFrame::NoFrame + + + QFrame::Plain + + + + + + + + + 16 + 16 + + + + false + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + Qt::CustomContextMenu + + + QFrame::NoFrame + + + + + + + + + 16 + 16 + + + + false + + + + + + + + + + + + + + + + @@ -432,7 +480,7 @@ 0 - 20 + 0 0 @@ -480,6 +528,20 @@ + + + + Basic.Main.Sources + + + + + + + Basic.Main.Scenes + + + diff --git a/obs/forms/images/configuration21_16.png b/obs/forms/images/configuration21_16.png new file mode 100644 index 000000000..d165a7a8a Binary files /dev/null and b/obs/forms/images/configuration21_16.png differ diff --git a/obs/forms/obs.qrc b/obs/forms/obs.qrc index 27c7587ad..0dfe70e1e 100644 --- a/obs/forms/obs.qrc +++ b/obs/forms/obs.qrc @@ -1,5 +1,6 @@ + images/configuration21_16.png images/list_remove.png images/add.png images/down.png diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index a25fa19de..af3054d8e 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -1632,6 +1632,11 @@ void OBSBasic::on_actionAdvAudioProperties_triggered() advAudioWindow->setAttribute(Qt::WA_DeleteOnClose, true); } +void OBSBasic::on_advAudioProps_clicked() +{ + on_actionAdvAudioProperties_triggered(); +} + void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current, QListWidgetItem *prev) { diff --git a/obs/window-basic-main.hpp b/obs/window-basic-main.hpp index 63b713ee8..145512aaf 100644 --- a/obs/window-basic-main.hpp +++ b/obs/window-basic-main.hpp @@ -231,6 +231,7 @@ private slots: void on_actionRemux_triggered(); void on_action_Settings_triggered(); void on_actionAdvAudioProperties_triggered(); + void on_advAudioProps_clicked(); void on_actionShowLogs_triggered(); void on_actionUploadCurrentLog_triggered(); void on_actionUploadLastLog_triggered();