From 43fbefb9efd9a854784ece0bddc2dba0490abd08 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Tue, 12 Feb 2019 12:55:31 +0100 Subject: [PATCH] UI: Remove additional unused help icons --- UI/window-basic-about.cpp | 2 ++ UI/window-basic-adv-audio.cpp | 1 + UI/window-basic-auto-config.cpp | 1 + UI/window-basic-filters.cpp | 1 + UI/window-basic-properties.cpp | 2 ++ UI/window-basic-settings.cpp | 2 ++ UI/window-namedialog.cpp | 1 + 7 files changed, 10 insertions(+) diff --git a/UI/window-basic-about.cpp b/UI/window-basic-about.cpp index e07fe1b6a..4985bffd6 100644 --- a/UI/window-basic-about.cpp +++ b/UI/window-basic-about.cpp @@ -14,6 +14,8 @@ OBSAbout::OBSAbout(QWidget *parent) setFixedSize(size()); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + QString bitness; if(sizeof(void*) == 4) diff --git a/UI/window-basic-adv-audio.cpp b/UI/window-basic-adv-audio.cpp index 312401901..03b423311 100644 --- a/UI/window-basic-adv-audio.cpp +++ b/UI/window-basic-adv-audio.cpp @@ -89,6 +89,7 @@ OBSBasicAdvAudio::OBSBasicAdvAudio(QWidget *parent) resize(1000, 340); setWindowTitle(QTStr("Basic.AdvAudio")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setSizeGripEnabled(true); setWindowModality(Qt::NonModal); setAttribute(Qt::WA_DeleteOnClose, true); diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp index 6df9ca3aa..8bc16bed3 100644 --- a/UI/window-basic-auto-config.cpp +++ b/UI/window-basic-auto-config.cpp @@ -732,6 +732,7 @@ AutoConfig::AutoConfig(QWidget *parent) setPage(StreamPage, streamPage); setPage(TestPage, new AutoConfigTestPage()); setWindowTitle(QTStr("Basic.AutoConfig")); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); obs_video_info ovi; obs_get_video_info(&ovi); diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 51d5d867e..8db101946 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -71,6 +71,7 @@ OBSBasicFilters::OBSBasicFilters(QWidget *parent, OBSSource source_) const char *name = obs_source_get_name(source); setWindowTitle(QTStr("Basic.Filters.Title").arg(QT_UTF8(name))); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); #ifndef QT_NO_SHORTCUT ui->actionRemoveFilter->setShortcut(QApplication::translate("OBSBasicFilters", "Del", nullptr)); diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index 4f2a1afe5..4516f0789 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -64,6 +64,8 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) else resize(720, 580); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + QMetaObject::connectSlotsByName(this); /* The OBSData constructor increments the reference once */ diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index aa68bc0dc..ed921efcb 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -282,6 +282,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) ui->setupUi(this); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + main->EnableOutputs(false); PopulateAACBitrates({ui->simpleOutputABitrate, diff --git a/UI/window-namedialog.cpp b/UI/window-namedialog.cpp index 0a90e97cb..18b2fee5e 100644 --- a/UI/window-namedialog.cpp +++ b/UI/window-namedialog.cpp @@ -45,6 +45,7 @@ bool NameDialog::AskForName(QWidget *parent, const QString &title, NameDialog dialog(parent); dialog.setWindowTitle(title); + dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); dialog.ui->label->setText(text); dialog.ui->userText->setMaxLength(maxSize); dialog.ui->userText->setText(placeHolder);