From 27a8f69eea145c5eb9d7e3b3f497601837b08c76 Mon Sep 17 00:00:00 2001 From: Christoph Hohmann Date: Tue, 22 Aug 2017 14:41:54 +0200 Subject: [PATCH] UI: Use Qt standard buttons in source properties Use the Qt standard buttons in the source properties dialog to make the UI consistent. Also remove the right alignment of the button box to allow Qt to align standard buttons on the left side of the dialog. Closes jp9000/obs-studio#1013 --- UI/window-basic-properties.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index 3f7fb3aea..1bd3a260e 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -49,13 +49,15 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) int cy = (int)config_get_int(App()->GlobalConfig(), "PropertiesWindow", "cy"); - QPushButton *b; - b = buttonBox->addButton(QTStr("OK"), QDialogButtonBox::AcceptRole); - buttonBox->addButton(QTStr("Cancel"), QDialogButtonBox::RejectRole); - buttonBox->addButton(QTStr("Defaults"), QDialogButtonBox::ResetRole); buttonBox->setObjectName(QStringLiteral("buttonBox")); + buttonBox->setStandardButtons(QDialogButtonBox::Ok | + QDialogButtonBox::Cancel | + QDialogButtonBox::RestoreDefaults); - b->setDefault(true); + buttonBox->button(QDialogButtonBox::Ok)->setText(QTStr("OK")); + buttonBox->button(QDialogButtonBox::Cancel)->setText(QTStr("Cancel")); + buttonBox->button(QDialogButtonBox::RestoreDefaults)-> + setText(QTStr("Defaults")); if (cx > 400 && cy > 400) resize(cx, cy); @@ -92,7 +94,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) setLayout(new QVBoxLayout(this)); layout()->addWidget(windowSplitter); layout()->addWidget(buttonBox); - layout()->setAlignment(buttonBox, Qt::AlignRight | Qt::AlignBottom); + layout()->setAlignment(buttonBox, Qt::AlignBottom); view->show(); installEventFilter(CreateShortcutFilter());