Remove PTZDevice reference from SourceNameDelegate

Source name delegate was directly accessing PTZDevice in the
displayText() method. It had to do that because displayText doesn't have
access to the QModelIndex which is needed to look up additional data.
Replace this with overriding paint() and sizeHint() instead. Those
methods are passed the index, which it can use to fetch more data from
the model.

This patch also enables using Qt::UserRole to fetch the connection
details as a string from the camera device.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Author: glikely

src/ptz-device.cpp

@@ -68,11 +68,11 @@ QVariant PTZListModel::data(const QModelIndex &index, int role) const
 	if (role == Qt::DisplayRole || role == Qt::EditRole) {
 		return devices.value(devices.keys().at(index.row()))->objectName();
 	}
-#if 0
+
 	if (role == Qt::UserRole) {
-		return get_device(index.row());
+		return devices.value(devices.keys().at(index.row()))->description();
 	}
-#endif
+
 	return QVariant();
 }
 

src/settings.cpp

@@ -35,14 +35,34 @@ static PTZSettings *ptzSettingsWindow = nullptr;
 
 /* ----------------------------------------------------------------- */
 
-QString SourceNameDelegate::displayText(const QVariant &value, const QLocale &locale) const
-{
-	auto string = QStyledItemDelegate::displayText(value, locale);
-	auto ptz = ptzDeviceList.getDeviceByName(string);
-	if (ptz)
-		return ptz->description() + " - " + string;
-	return string;
-}
+class SourceNameDelegate : public QStyledItemDelegate {
+	Q_DISABLE_COPY(SourceNameDelegate)
+
+public:
+	using QStyledItemDelegate::QStyledItemDelegate;
+	void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
+	{
+		Q_ASSERT(index.isValid());
+		QStyleOptionViewItem opt = option;
+		initStyleOption(&opt, index);
+		opt.text = opt.text + " [" + index.data(Qt::UserRole).toString() + "]";
+		const QWidget *widget = option.widget;
+		QStyle *style = widget ? widget->style() : QApplication::style();
+		style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, widget);
+	};
+	QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override
+	{
+		QVariant value = index.data(Qt::SizeHintRole);
+		if (value.isValid())
+			return qvariant_cast<QSize>(value);
+		QStyleOptionViewItem opt = option;
+		initStyleOption(&opt, index);
+		opt.text = opt.text + " [" + index.data(Qt::UserRole).toString() + "]";
+		const QWidget *widget = option.widget;
+		QStyle *style = widget ? widget->style() : QApplication::style();
+		return style->sizeFromContents(QStyle::CT_ItemViewItem, &opt, QSize(), widget);
+	};
+};
 
 obs_properties_t *PTZSettings::getProperties(void)
 {

src/settings.hpp

@@ -35,14 +35,6 @@ public slots:
 };
 #endif
 
-class SourceNameDelegate : public QStyledItemDelegate {
-	Q_OBJECT
-
-public:
-	SourceNameDelegate(QObject *parent = nullptr) : QStyledItemDelegate(parent) {};
-	virtual QString displayText(const QVariant &value, const QLocale &locale) const;
-};
-
 class PTZSettings : public QWidget {
 	Q_OBJECT