Browse Source
Merge pull request #9668 from Morph1984/qt-why-is-this-not-the-default
main: Globally disable the "?" button on dialogs
pull/15/merge
liamwhite
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with
8 additions and
17 deletions
-
src/yuzu/configuration/configure_dialog.cpp
-
src/yuzu/configuration/configure_motion_touch.cpp
-
src/yuzu/configuration/configure_per_game.cpp
-
src/yuzu/configuration/configure_tas.cpp
-
src/yuzu/debugger/controller.cpp
-
src/yuzu/debugger/profiler.cpp
-
src/yuzu/install_dialog.cpp
-
src/yuzu/main.cpp
-
src/yuzu/util/limitable_input_dialog.cpp
-
src/yuzu/util/sequence_dialog/sequence_dialog.cpp
|
|
|
@ -66,7 +66,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry_, |
|
|
|
|
|
|
|
web_tab->SetWebServiceConfigEnabled(enable_web_config); |
|
|
|
hotkeys_tab->Populate(registry); |
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
|
|
|
|
input_tab->Initialize(input_subsystem); |
|
|
|
|
|
|
|
|
|
|
|
@ -89,7 +89,6 @@ ConfigureMotionTouch::ConfigureMotionTouch(QWidget* parent, |
|
|
|
"using-a-controller-or-android-phone-for-motion-or-touch-input'><span " |
|
|
|
"style=\"text-decoration: underline; color:#039be5;\">Learn More</span></a>")); |
|
|
|
|
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
SetConfiguration(); |
|
|
|
UpdateUiDisplay(); |
|
|
|
ConnectEvents(); |
|
|
|
|
|
|
|
@ -66,8 +66,6 @@ ConfigurePerGame::ConfigurePerGame(QWidget* parent, u64 title_id_, const std::st |
|
|
|
|
|
|
|
setFocusPolicy(Qt::ClickFocus); |
|
|
|
setWindowTitle(tr("Properties")); |
|
|
|
// remove Help question mark button from the title bar
|
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
|
|
|
|
addons_tab->SetTitleId(title_id); |
|
|
|
|
|
|
|
|
|
|
|
@ -17,7 +17,6 @@ ConfigureTasDialog::ConfigureTasDialog(QWidget* parent) |
|
|
|
|
|
|
|
setFocusPolicy(Qt::ClickFocus); |
|
|
|
setWindowTitle(tr("TAS Configuration")); |
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
|
|
|
|
connect(ui->tas_path_button, &QToolButton::pressed, this, |
|
|
|
[this] { SetDirectory(DirectoryTarget::TAS, ui->tas_path_edit); }); |
|
|
|
|
|
|
|
@ -20,9 +20,8 @@ ControllerDialog::ControllerDialog(Core::HID::HIDCore& hid_core_, |
|
|
|
setWindowTitle(tr("Controller P1")); |
|
|
|
resize(500, 350); |
|
|
|
setMinimumSize(500, 350); |
|
|
|
// Remove the "?" button from the titlebar and enable the maximize button
|
|
|
|
setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) | |
|
|
|
Qt::WindowMaximizeButtonHint); |
|
|
|
// Enable the maximize button
|
|
|
|
setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint); |
|
|
|
|
|
|
|
widget = new PlayerControlPreview(this); |
|
|
|
refreshConfiguration(); |
|
|
|
|
|
|
|
@ -49,9 +49,8 @@ MicroProfileDialog::MicroProfileDialog(QWidget* parent) : QWidget(parent, Qt::Di |
|
|
|
setObjectName(QStringLiteral("MicroProfile")); |
|
|
|
setWindowTitle(tr("&MicroProfile")); |
|
|
|
resize(1000, 600); |
|
|
|
// Remove the "?" button from the titlebar and enable the maximize button
|
|
|
|
setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) | |
|
|
|
Qt::WindowMaximizeButtonHint); |
|
|
|
// Enable the maximize button
|
|
|
|
setWindowFlags(windowFlags() | Qt::WindowMaximizeButtonHint); |
|
|
|
|
|
|
|
#if MICROPROFILE_ENABLED
|
|
|
|
|
|
|
|
|
|
|
|
@ -46,7 +46,6 @@ InstallDialog::InstallDialog(QWidget* parent, const QStringList& files) : QDialo |
|
|
|
vbox_layout->addLayout(hbox_layout); |
|
|
|
|
|
|
|
setLayout(vbox_layout); |
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
setWindowTitle(tr("Install Files to NAND")); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -2758,8 +2758,7 @@ void GMainWindow::OnMenuInstallToNAND() { |
|
|
|
ui->action_Install_File_NAND->setEnabled(false); |
|
|
|
|
|
|
|
install_progress = new QProgressDialog(QString{}, tr("Cancel"), 0, total_size, this); |
|
|
|
install_progress->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint & |
|
|
|
~Qt::WindowMaximizeButtonHint); |
|
|
|
install_progress->setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint); |
|
|
|
install_progress->setAttribute(Qt::WA_DeleteOnClose, true); |
|
|
|
install_progress->setFixedWidth(installDialog.GetMinimumWidth() + 40); |
|
|
|
install_progress->show(); |
|
|
|
@ -4456,6 +4455,9 @@ int main(int argc, char* argv[]) { |
|
|
|
} |
|
|
|
#endif
|
|
|
|
|
|
|
|
// Disables the "?" button on all dialogs.
|
|
|
|
QCoreApplication::setAttribute(Qt::AA_DisableWindowContextHelpButton); |
|
|
|
|
|
|
|
// Enables the core to make the qt created contexts current on std::threads
|
|
|
|
QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); |
|
|
|
QApplication app(argc, argv); |
|
|
|
|
|
|
|
@ -16,8 +16,6 @@ LimitableInputDialog::LimitableInputDialog(QWidget* parent) : QDialog{parent} { |
|
|
|
LimitableInputDialog::~LimitableInputDialog() = default; |
|
|
|
|
|
|
|
void LimitableInputDialog::CreateUI() { |
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
|
|
|
|
text_label = new QLabel(this); |
|
|
|
text_entry = new QLineEdit(this); |
|
|
|
text_label_invalid = new QLabel(this); |
|
|
|
|
|
|
|
@ -8,7 +8,6 @@ |
|
|
|
|
|
|
|
SequenceDialog::SequenceDialog(QWidget* parent) : QDialog(parent) { |
|
|
|
setWindowTitle(tr("Enter a hotkey")); |
|
|
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); |
|
|
|
|
|
|
|
key_sequence = new QKeySequenceEdit; |
|
|
|
|
|
|
|
|