[WIP] Services Overhaul

UI/properties-view.cpp

@@ -21,6 +21,7 @@
 #include <QDir>
 #include <QGroupBox>
 #include <QObject>
+#include <QDesktopServices>
 #include "double-slider.hpp"
 #include "slider-ignorewheel.hpp"
 #include "spinbox-ignorewheel.hpp"
@@ -1397,6 +1398,51 @@ void OBSPropertiesView::AddGroup(obs_property_t *prop, QFormLayout *layout)
 	connect(groupBox, SIGNAL(toggled(bool)), info, SLOT(ControlChanged()));
 }
 
+QWidget *OBSPropertiesView::AddOpenUrl(obs_property_t *prop)
+{
+	const char *name = obs_property_name(prop);
+	const char *desc = obs_property_description(prop);
+	const char *val = obs_data_get_string(settings, name);
+
+	QPushButton *button = new QPushButton(QT_UTF8(desc));
+	button->setProperty("themeID", "settingsButtons");
+	button->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
+	QUrl qurl = QString::fromUtf8(val);
+	connect(button, &QPushButton::clicked, this,
+		[=]() { this->OpenUrl(qurl); });
+	return NewWidget(prop, button, SIGNAL(clicked()));
+}
+
+QWidget *OBSPropertiesView::AddInfo(obs_property_t *prop)
+{
+	const char *desc = obs_property_description(prop);
+
+	QLabel *label = new QLabel(QT_UTF8(desc));
+	return NewWidget(prop, label, SIGNAL(linkActivated(QString)));
+}
+
+QWidget *OBSPropertiesView::AddInfoBitrate(obs_property_t *prop)
+{
+	const char *name = obs_property_name(prop);
+	const char *desc = obs_property_description(prop);
+	int val = obs_data_get_int(settings, name);
+
+	QLabel *label = new QLabel(QT_UTF8(desc) + " " + QString::number(val) +
+				   " kbps");
+	return NewWidget(prop, label, SIGNAL(linkActivated(QString)));
+}
+
+QWidget *OBSPropertiesView::AddInfoFPS(obs_property_t *prop)
+{
+	const char *name = obs_property_name(prop);
+	const char *desc = obs_property_description(prop);
+	int val = obs_data_get_int(settings, name);
+
+	QLabel *label =
+		new QLabel(QT_UTF8(desc) + " " + QString::number(val) + " FPS");
+	return NewWidget(prop, label, SIGNAL(linkActivated(QString)));
+}
+
 void OBSPropertiesView::AddProperty(obs_property_t *property,
 				    QFormLayout *layout)
 {
@@ -1451,13 +1497,27 @@ void OBSPropertiesView::AddProperty(obs_property_t *property,
 		break;
 	case OBS_PROPERTY_COLOR_ALPHA:
 		AddColorAlpha(property, layout, label);
+		break;
+	case OBS_PROPERTY_OPEN_URL:
+		widget = AddOpenUrl(property);
+		break;
+	case OBS_PROPERTY_INFO:
+		widget = AddInfo(property);
+		break;
+	case OBS_PROPERTY_INFO_BITRATE:
+		widget = AddInfoBitrate(property);
+		break;
+	case OBS_PROPERTY_INFO_FPS:
+		widget = AddInfoFPS(property);
 	}
 
 	if (widget && !obs_property_enabled(property))
 		widget->setEnabled(false);
 
 	if (!label && type != OBS_PROPERTY_BOOL &&
-	    type != OBS_PROPERTY_BUTTON && type != OBS_PROPERTY_GROUP)
+	    type != OBS_PROPERTY_BUTTON && type != OBS_PROPERTY_GROUP &&
+	    type != OBS_PROPERTY_OPEN_URL && type != OBS_PROPERTY_INFO &&
+	    type != OBS_PROPERTY_INFO_BITRATE && type != OBS_PROPERTY_INFO_FPS)
 		label = new QLabel(QT_UTF8(obs_property_description(property)));
 
 	if (warning && label) //TODO: select color based on background color
@@ -1529,6 +1589,11 @@ void OBSPropertiesView::SignalChanged()
 	emit Changed();
 }
 
+void OBSPropertiesView::OpenUrl(QUrl url)
+{
+	QDesktopServices::openUrl(url);
+}
+
 static bool FrameRateChangedVariant(const QVariant &variant,
 				    media_frames_per_second &fps,
 				    obs_data_item_t *&obj,
@@ -1950,6 +2015,14 @@ void WidgetInfo::ControlChanged()
 		if (!ColorAlphaChanged(setting))
 			return;
 		break;
+	case OBS_PROPERTY_OPEN_URL:
+		return;
+	case OBS_PROPERTY_INFO:
+		return;
+	case OBS_PROPERTY_INFO_BITRATE:
+		return;
+	case OBS_PROPERTY_INFO_FPS:
+		return;
 	}
 
 	if (!recently_updated) {

UI/properties-view.hpp

@@ -134,6 +134,11 @@ class OBSPropertiesView : public VScrollArea {
 
 	void AddGroup(obs_property_t *prop, QFormLayout *layout);
 
+	QWidget *AddOpenUrl(obs_property_t *prop);
+	QWidget *AddInfo(obs_property_t *prop);
+	QWidget *AddInfoBitrate(obs_property_t *prop);
+	QWidget *AddInfoFPS(obs_property_t *prop);
+
 	void AddProperty(obs_property_t *property, QFormLayout *layout);
 
 	void resizeEvent(QResizeEvent *event) override;
@@ -145,6 +150,7 @@ public slots:
 	void ReloadProperties();
 	void RefreshProperties();
 	void SignalChanged();
+	void OpenUrl(QUrl url);
 
 signals:
 	void PropertiesResized();