UI: Remove properties window UI file (not needed)

The properties window UI file has no point at this time.  It's just a
window with a widget inside of it.

obs/CMakeLists.txt

@@ -184,7 +184,6 @@ set(obs_UI
 	forms/OBSBasicSettings.ui
 	forms/OBSBasicSourceSelect.ui
 	forms/OBSBasicInteraction.ui
-	forms/OBSBasicProperties.ui
 	forms/OBSRemux.ui)
 
 set(obs_QRC

obs/forms/OBSBasicProperties.ui

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>OBSBasicProperties</class>
- <widget class="QDialog" name="OBSBasicProperties">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>664</width>
-    <height>562</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <property name="sizeGripEnabled">
-   <bool>true</bool>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="OBSQTDisplay" name="preview" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>OBSQTDisplay</class>
-   <extends>QWidget</extends>
-   <header>qt-display.hpp</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

obs/window-basic-properties.cpp

@@ -31,9 +31,9 @@ using namespace std;
 
 OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 	: QDialog                (parent),
+	  preview                (new OBSQTDisplay(this)),
 	  main                   (qobject_cast<OBSBasic*>(parent)),
 	  acceptClicked          (false),
-	  ui                     (new Ui::OBSBasicProperties),
 	  source                 (source_),
 	  removedSignal          (obs_source_get_signal_handler(source),
 	                          "remove", OBSBasicProperties::SourceRemoved,
@@ -53,11 +53,11 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 			QDialogButtonBox::Cancel);
 	buttonBox->setObjectName(QStringLiteral("buttonBox"));
 
-	ui->setupUi(this);
-
 	if (cx > 400 && cy > 400)
 		resize(cx, cy);
 
+	QMetaObject::connectSlotsByName(this);
+
 	/* The OBSData constructor increments the reference once */
 	obs_data_release(oldSettings);
 
@@ -69,6 +69,12 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 			(PropertiesReloadCallback)obs_source_properties,
 			(PropertiesUpdateCallback)obs_source_update);
 
+	preview->setMinimumSize(20, 20);
+	preview->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
+				QSizePolicy::Expanding));
+
+	setLayout(new QVBoxLayout(this));
+	layout()->addWidget(preview);
 	layout()->addWidget(view);
 	layout()->addWidget(buttonBox);
 	layout()->setAlignment(buttonBox, Qt::AlignRight | Qt::AlignBottom);
@@ -83,7 +89,7 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_)
 			this, SLOT(OnPropertiesResized()));
 
 	connect(windowHandle(), &QWindow::screenChanged, [this]() {
-		QSize size = GetPixelSize(ui->preview);
+		QSize size = GetPixelSize(preview);
 		obs_display_resize(display, size.width(), size.height());
 	});
 
@@ -186,14 +192,14 @@ void OBSBasicProperties::DrawPreview(void *data, uint32_t cx, uint32_t cy)
 
 void OBSBasicProperties::OnPropertiesResized()
 {
-	QSize size = GetPixelSize(ui->preview);
+	QSize size = GetPixelSize(preview);
 	obs_display_resize(display, size.width(), size.height());
 }
 
 void OBSBasicProperties::resizeEvent(QResizeEvent *event)
 {
 	if (isVisible()) {
-		QSize size = GetPixelSize(ui->preview);
+		QSize size = GetPixelSize(preview);
 		obs_display_resize(display, size.width(), size.height());
 	}
 
@@ -248,11 +254,11 @@ void OBSBasicProperties::Init()
 
 	show();
 
-	QSize previewSize = GetPixelSize(ui->preview);
+	QSize previewSize = GetPixelSize(preview);
 	init_data.cx      = uint32_t(previewSize.width());
 	init_data.cy      = uint32_t(previewSize.height());
 	init_data.format  = GS_RGBA;
-	QTToGSWindow(ui->preview->winId(), init_data.window);
+	QTToGSWindow(preview->winId(), init_data.window);
 
 	display = obs_display_create(&init_data);
 

obs/window-basic-properties.hpp

@@ -19,22 +19,22 @@
 
 #include <QDialog>
 #include <QDialogButtonBox>
-#include <memory>
+#include <QPointer>
+#include "qt-display.hpp"
 #include <obs.hpp>
 
 class OBSPropertiesView;
 class OBSBasic;
 
-#include "ui_OBSBasicProperties.h"
-
 class OBSBasicProperties : public QDialog {
 	Q_OBJECT
 
 private:
+	QPointer<OBSQTDisplay> preview;
+
 	OBSBasic   *main;
 	bool       acceptClicked;
 
-	std::unique_ptr<Ui::OBSBasicProperties> ui;
 	OBSSource  source;
 	OBSDisplay display;
 	OBSSignal  removedSignal;