diff --git a/UI/forms/OBSBasic.ui b/UI/forms/OBSBasic.ui index 3b72c6295..90935fca2 100644 --- a/UI/forms/OBSBasic.ui +++ b/UI/forms/OBSBasic.ui @@ -40,30 +40,102 @@ - - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - Basic.Main.PreviewDisabled - - - Qt::AlignCenter - - - 2 + + + + + 0 + 0 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + + + + Basic.Main.PreviewDisabled + + + Qt::AlignCenter + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Basic.Main.PreviewConextMenu.Enable + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + @@ -709,8 +781,8 @@ 0 0 - 16 - 28 + 28 + 16 diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index f482e33a4..e8dc0fe84 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -212,7 +212,7 @@ OBSBasic::OBSBasic(QWidget *parent) api = InitializeAPIInterface(this); ui->setupUi(this); - ui->previewDisabledLabel->setVisible(false); + ui->previewDisabledWidget->setVisible(false); startingDockLayout = saveState(); @@ -381,6 +381,13 @@ OBSBasic::OBSBasic(QWidget *parent) ui->previewLabel->setHidden(true); else ui->previewLabel->setHidden(!labels); + + ui->previewDisabledWidget->setContextMenuPolicy(Qt::CustomContextMenu); + connect(ui->previewDisabledWidget, + SIGNAL(customContextMenuRequested(const QPoint &)), this, + SLOT(PreviewDisabledMenu(const QPoint &))); + connect(ui->enablePreviewButton, SIGNAL(clicked()), this, + SLOT(TogglePreview())); } static void SaveAudioDevice(const char *name, int channel, obs_data_t *parent, @@ -5759,8 +5766,7 @@ void OBSBasic::on_program_customContextMenuRequested(const QPoint &) popup.exec(QCursor::pos()); } -void OBSBasic::on_previewDisabledLabel_customContextMenuRequested( - const QPoint &pos) +void OBSBasic::PreviewDisabledMenu(const QPoint &pos) { QMenu popup(this); delete previewProjectorMain; @@ -6219,7 +6225,7 @@ void OBSBasic::EnablePreviewDisplay(bool enable) { obs_display_set_enabled(ui->preview->GetDisplay(), enable); ui->preview->setVisible(enable); - ui->previewDisabledLabel->setVisible(!enable); + ui->previewDisabledWidget->setVisible(!enable); } void OBSBasic::TogglePreview() diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 287b4957a..ff4ddb1ce 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -729,8 +729,7 @@ private slots: void on_preview_customContextMenuRequested(const QPoint &pos); void on_program_customContextMenuRequested(const QPoint &pos); - void - on_previewDisabledLabel_customContextMenuRequested(const QPoint &pos); + void PreviewDisabledMenu(const QPoint &pos); void on_actionNewSceneCollection_triggered(); void on_actionDupSceneCollection_triggered();