settings: Move apply button into the designer form

There is no need to create the apply button manually. Move it into the
designer form so that all the UI elements are managed in the same place.
The one exception is the OBSPropertiesView widget, but that is because
it needs extra context when it is created that designer does not have.

Signed-off-by: Grant Likely <[email protected]>

Author: glikely

src/settings.cpp

@@ -65,13 +65,6 @@ QString SourceNameDelegate::displayText(const QVariant &value, const QLocale &lo
 
 obs_properties_t *PTZSettings::getProperties(void)
 {
-	auto applycb = [](obs_properties_t *, obs_property_t *, void *data_) {
-		auto s = static_cast<PTZSettings *>(data_);
-		PTZDevice *ptz = ptzDeviceList.getDevice(s->ui->deviceList->currentIndex());
-		if (ptz)
-			ptz->set_config(s->propertiesView->GetSettings());
-		return true;
-	};
 	auto cb = [](obs_properties_t *, obs_property_t *, void *data_) {
 		auto data = static_cast<obs_data_t *>(data_);
 		blog(LOG_INFO, "%s", obs_data_get_string(data, "debug_info"));
@@ -83,13 +76,6 @@ obs_properties_t *PTZSettings::getProperties(void)
 		return obs_properties_create();
 
 	auto props = ptz->get_obs_properties();
-	auto p = obs_properties_get(props, "interface");
-	if (p) {
-		auto iface = obs_property_group_content(p);
-		if (iface)
-			obs_properties_add_button2(iface, "iface_apply", "Apply", applycb, this);
-	}
-
 	auto debug = obs_properties_create();
 	obs_properties_add_text(debug, "debug_info", NULL, OBS_TEXT_INFO);
 	obs_properties_add_button2(debug, "dbgdump", "Write to OBS log", cb, settings);
@@ -301,6 +287,13 @@ void PTZSettings::on_removePTZ_clicked()
 	delete ptz;
 }
 
+void PTZSettings::on_applyButton_clicked()
+{
+	PTZDevice *ptz = ptzDeviceList.getDevice(ui->deviceList->currentIndex());
+	if (ptz)
+		ptz->set_config(propertiesView->GetSettings());
+}
+
 void PTZSettings::currentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
 	auto ptz = ptzDeviceList.getDevice(previous);

src/settings.hpp

@@ -57,6 +57,7 @@ protected slots:
 public slots:
 	void on_addPTZ_clicked();
 	void on_removePTZ_clicked();
+	void on_applyButton_clicked();
 
 	void currentChanged(const QModelIndex &current, const QModelIndex &previous);
 	void settingsChanged(OBSData settings);

src/settings.ui

@@ -260,20 +260,34 @@
           </layout>
          </widget>
          <widget class="QWidget" name="widget" native="true">
-          <layout class="QVBoxLayout" name="verticalLayout_4" stretch="0">
+          <layout class="QVBoxLayout" name="propertiesLayout" stretch="0">
            <property name="sizeConstraint">
             <enum>QLayout::SizeConstraint::SetDefaultConstraint</enum>
            </property>
-           <item>
-            <layout class="QHBoxLayout" name="propertiesLayout">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-             <property name="sizeConstraint">
-              <enum>QLayout::SizeConstraint::SetNoConstraint</enum>
-             </property>
-            </layout>
-           </item>
+             <item>
+              <layout class="QHBoxLayout" name="horizontalLayout_4">
+               <item>
+                <spacer name="horizontalSpacer">
+                 <property name="orientation">
+                  <enum>Qt::Orientation::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+               <item>
+                <widget class="QPushButton" name="applyButton">
+                 <property name="text">
+                  <string>Apply</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
           </layout>
          </widget>
         </widget>