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: Add multiview menus to UI file

Browse source
This commit is contained in:
gxalpha 2022-10-04 14:48:17 +02:00 committed by Jim
parent ba77ca6592
commit e4a9c7da9c
3 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
UI/forms/OBSBasic.ui
View file

@ -690,6 +690,14 @@
<addaction name="toggleStatusBar"/>
<addaction name="separator"/>
<addaction name="stats"/>
<addaction name="separator"/>
<addaction name="multiviewProjectorMenu"/>
<addaction name="multiviewProjectorWindowed"/>
</widget>
<widget class="QMenu" name="multiviewProjectorMenu">
<property name="title">
<string>MultiviewProjector</string>
</property>
</widget>
<widget class="QMenu" name="menuTools">
<property name="title">
@ -2155,6 +2163,11 @@
<string>Basic.Stats</string>
</property>
</action>
<action name="multiviewProjectorWindowed">
<property name="text">
<string>MultiviewWindowed</string>
</property>
</action>
<action name="resetDocks">
<property name="text">
<string>Basic.MainMenu.Docks.ResetDocks</string>

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

@ -2036,14 +2036,10 @@ void OBSBasic::OBSInit()
ui->viewMenu->addSeparator();
multiviewProjectorMenu = new QMenu(QTStr("MultiviewProjector"));
ui->viewMenu->addMenu(multiviewProjectorMenu);
AddProjectorMenuMonitors(multiviewProjectorMenu, this,
AddProjectorMenuMonitors(ui->multiviewProjectorMenu, this,
SLOT(OpenMultiviewProjector()));
connect(ui->viewMenu->menuAction(), &QAction::hovered, this,
&OBSBasic::UpdateMultiviewProjectorMenu);
ui->viewMenu->addAction(QTStr("MultiviewWindowed"), this,
SLOT(OpenMultiviewWindow()));
ui->sources->UpdateIcons();
@ -2279,8 +2275,8 @@ void OBSBasic::ShowWhatsNew(const QString &url)
void OBSBasic::UpdateMultiviewProjectorMenu()
{
multiviewProjectorMenu->clear();
AddProjectorMenuMonitors(multiviewProjectorMenu, this,
ui->multiviewProjectorMenu->clear();
AddProjectorMenuMonitors(ui->multiviewProjectorMenu, this,
SLOT(OpenMultiviewProjector()));
}
@ -2604,7 +2600,6 @@ OBSBasic::~OBSBasic()
updateCheckThread->wait();
delete screenshotData;
delete multiviewProjectorMenu;
delete previewProjector;
delete studioProgramProjector;
delete previewProjectorSource;
@ -8800,11 +8795,6 @@ void OBSBasic::OpenSourceWindow()
ProjectorType::Source);
}
void OBSBasic::OpenMultiviewWindow()
{
OpenProjector(nullptr, -1, ProjectorType::Multiview);
}
void OBSBasic::OpenSceneWindow()
{
OBSScene scene = GetCurrentScene();
@ -9021,6 +9011,11 @@ void OBSBasic::on_resetUI_triggered()
ui->toggleStatusBar->setChecked(true);
}
void OBSBasic::on_multiviewProjectorWindowed_triggered()
{
OpenProjector(nullptr, -1, ProjectorType::Multiview);
}
void OBSBasic::on_toggleListboxToolbars_toggled(bool visible)
{
ui->sourcesToolbar->setVisible(visible);

3
UI/window-basic-main.hpp
View file

@ -316,7 +316,6 @@ private:
QPointer<QMenu> trayMenu;
QPointer<QMenu> previewProjector;
QPointer<QMenu> studioProgramProjector;
QPointer<QMenu> multiviewProjectorMenu;
QPointer<QMenu> previewProjectorSource;
QPointer<QMenu> previewProjectorMain;
QPointer<QMenu> sceneProjectorMenu;
@ -1124,6 +1123,7 @@ private slots:
void on_resetUI_triggered();
void on_resetDocks_triggered(bool force = false);
void on_lockDocks_toggled(bool lock);
void on_multiviewProjectorWindowed_triggered();
void PauseToggled();
@ -1170,7 +1170,6 @@ private slots:
void OpenStudioProgramWindow();
void OpenPreviewWindow();
void OpenSourceWindow();
void OpenMultiviewWindow();
void OpenSceneWindow();
void StackedMixerAreaContextMenuRequested();