From b71a64ca33d439685210faa60b6108454904381c Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 3 Mar 2024 21:21:00 -0600
Subject: [PATCH] Add Apply button to settings dialog

---
 src/settingsdialog.cpp | 15 +++++++++++----
 src/settingsdialog.hpp |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index f193cc6..28a13da 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -56,7 +56,7 @@ QWidget *SettingsDialog::setupNetworkInputs(QWidget *parent) {
 		m_cameraHostLe->setText(c.host);
 		m_cameraPortLe->setText(QString::number(c.port));
 		m_cameraPortLe->setValidator(portValidator);
-		lyt->addRow(tr("C&amera Host:"), m_cameraHostLe);
+		lyt->addRow(tr("Camera &Host:"), m_cameraHostLe);
 		lyt->addRow(tr("Ca&mera Port:"), m_cameraPortLe);
 	}
 	// OpenLP settings
@@ -108,7 +108,7 @@ QWidget *SettingsDialog::setupImageConfig(QWidget *parent) {
 		m_vidBrightness = mkSb(tr("&Brightness:"));
 		m_vidSaturation = mkSb(tr("&Saturation:"));
 		m_vidContrast = mkSb(tr("Con&trast:"));
-		m_vidSharpness = mkSb(tr("Sh&arpness:"));
+		m_vidSharpness = mkSb(tr("Sharpn&ess:"));
 		m_vidHue = mkSb(tr("&Hue:"));
 		updateVidConfigPreset(0);
 	}
@@ -154,7 +154,7 @@ QWidget *SettingsDialog::setupViewConfig(QWidget *parent) {
 	}
 	{ // add/removes buttons
 		auto const btnsLyt = new QHBoxLayout(btnsRoot);
-		auto const addBtn = new QPushButton("&Add", btnsRoot);
+		auto const addBtn = new QPushButton("A&dd", btnsRoot);
 		auto const rmBtn = new QPushButton("&Remove", btnsRoot);
 		addBtn->setFixedWidth(70);
 		rmBtn->setFixedWidth(70);
@@ -192,17 +192,20 @@ QWidget *SettingsDialog::setupButtons(QWidget *parent) {
 	auto const lyt = new QHBoxLayout(root);
 	m_errLbl = new QLabel(root);
 	auto const okBtn = new QPushButton(tr("&OK"), root);
+	auto const applyBtn = new QPushButton(tr("&Apply"), root);
 	auto const cancelBtn = new QPushButton(tr("&Cancel"), root);
 	lyt->addWidget(m_errLbl);
 	lyt->addSpacerItem(new QSpacerItem(1000, 0, QSizePolicy::Expanding, QSizePolicy::Ignored));
 	lyt->addWidget(okBtn);
+	lyt->addWidget(applyBtn);
 	lyt->addWidget(cancelBtn);
 	connect(okBtn, &QPushButton::clicked, this, &SettingsDialog::handleOK);
+	connect(applyBtn, &QPushButton::clicked, this, &SettingsDialog::handleApply);
 	connect(cancelBtn, &QPushButton::clicked, this, &SettingsDialog::reject);
 	return root;
 }
 
-void SettingsDialog::handleOK() {
+void SettingsDialog::handleApply() {
 	QSettings settings;
 	QVector<View> views;
 	auto const viewsErr = collectViews(views);
@@ -224,6 +227,10 @@ void SettingsDialog::handleOK() {
 	});
 	collectVideoConfig();
 	setVideoConfig(settings, m_videoConfig);
+}
+
+void SettingsDialog::handleOK() {
+	handleApply();
 	accept();
 }
 
diff --git a/src/settingsdialog.hpp b/src/settingsdialog.hpp
index 9674197..fd0d7e9 100644
--- a/src/settingsdialog.hpp
+++ b/src/settingsdialog.hpp
@@ -38,6 +38,7 @@ class SettingsDialog: public QDialog {
 		QWidget *setupViewConfig(QWidget *parent);
 		QWidget *setupImageConfig(QWidget *parent);
 		QWidget *setupButtons(QWidget *parent);
+		void handleApply();
 		void handleOK();
 		void setupViewRow(int row, View const&view = {});
 		/**