From 9be00ba3ca41c271a2af2cd52957daab759e9aba Mon Sep 17 00:00:00 2001
From: WarmUpTill <WarmUpTill@web.de>
Date: Sat, 2 Oct 2021 19:47:06 +0200
Subject: [PATCH] Rework to use transition selection widget

---
 src/headers/macro-action-transition.hpp |  7 +++--
 src/macro-action-transition.cpp         | 38 ++++++++++++-------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/headers/macro-action-transition.hpp b/src/headers/macro-action-transition.hpp
index 95d49218..b56f3fd8 100644
--- a/src/headers/macro-action-transition.hpp
+++ b/src/headers/macro-action-transition.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "macro-action-edit.hpp"
 #include "duration-control.hpp"
+#include "transition-selection.hpp"
 
 #include <QCheckBox>
 #include <QHBoxLayout>
@@ -20,7 +21,7 @@ public:
 
 	bool _setDuration = true;
 	bool _setType = true;
-	OBSWeakSource _transition;
+	TransitionSelection _transition;
 	Duration _duration;
 
 private:
@@ -48,7 +49,7 @@ public:
 private slots:
 	void SetTypeChanged(int state);
 	void SetDurationChanged(int state);
-	void TransitionChanged(const QString &text);
+	void TransitionChanged(const TransitionSelection &);
 	void DurationChanged(double seconds);
 signals:
 	void HeaderInfoChanged(const QString &);
@@ -56,7 +57,7 @@ signals:
 protected:
 	QCheckBox *_setType;
 	QCheckBox *_setDuration;
-	QComboBox *_transitions;
+	TransitionSelectionWidget *_transitions;
 	DurationSelection *_duration;
 	QHBoxLayout *_typeLayout;
 	QHBoxLayout *_durationLayout;
diff --git a/src/macro-action-transition.cpp b/src/macro-action-transition.cpp
index e4191753..cf2ff18f 100644
--- a/src/macro-action-transition.cpp
+++ b/src/macro-action-transition.cpp
@@ -12,7 +12,8 @@ bool MacroActionTransition::_registered = MacroActionFactory::Register(
 bool MacroActionTransition::PerformAction()
 {
 	if (_setType) {
-		auto t = obs_weak_source_get_source(_transition);
+		auto t =
+			obs_weak_source_get_source(_transition.GetTransition());
 		obs_frontend_set_current_transition(t);
 		obs_source_release(t);
 	}
@@ -30,7 +31,7 @@ void MacroActionTransition::LogAction()
 	}
 	if (_setType) {
 		vblog(LOG_INFO, "set transition type to \"%s\"",
-		      GetWeakSourceName(_transition).c_str());
+		      _transition.ToString().c_str());
 	}
 }
 
@@ -38,8 +39,7 @@ bool MacroActionTransition::Save(obs_data_t *obj)
 {
 	MacroAction::Save(obj);
 	_duration.Save(obj);
-	obs_data_set_string(obj, "transition",
-			    GetWeakSourceName(_transition).c_str());
+	_transition.Save(obj);
 	obs_data_set_bool(obj, "setDuration", _setDuration);
 	obs_data_set_bool(obj, "setType", _setType);
 	return true;
@@ -49,8 +49,7 @@ bool MacroActionTransition::Load(obs_data_t *obj)
 {
 	MacroAction::Load(obj);
 	_duration.Load(obj);
-	const char *transitionName = obs_data_get_string(obj, "transition");
-	_transition = GetWeakTransitionByQString(transitionName);
+	_transition.Load(obj);
 	_setDuration = obs_data_get_bool(obj, "setDuration");
 	_setType = obs_data_get_bool(obj, "setType");
 	return true;
@@ -58,26 +57,22 @@ bool MacroActionTransition::Load(obs_data_t *obj)
 
 std::string MacroActionTransition::GetShortDesc()
 {
-	if (_transition) {
-		return GetWeakSourceName(_transition);
-	}
-	return "";
+	return _transition.ToString();
 }
 
 MacroActionTransitionEdit::MacroActionTransitionEdit(
 	QWidget *parent, std::shared_ptr<MacroActionTransition> entryData)
 	: QWidget(parent)
 {
-	_transitions = new QComboBox();
+	_transitions = new TransitionSelectionWidget(this, false);
 	_duration = new DurationSelection(this, false);
 	_setType = new QCheckBox();
 	_setDuration = new QCheckBox();
 
-	populateTransitionSelection(_transitions, false);
-
 	QWidget::connect(_transitions,
-			 SIGNAL(currentTextChanged(const QString &)), this,
-			 SLOT(TransitionChanged(const QString &)));
+			 SIGNAL(TransitionChanged(const TransitionSelection &)),
+			 this,
+			 SLOT(TransitionChanged(const TransitionSelection &)));
 	QWidget::connect(_duration, SIGNAL(DurationChanged(double)), this,
 			 SLOT(DurationChanged(double)));
 	QWidget::connect(_setType, SIGNAL(stateChanged(int)), this,
@@ -118,20 +113,19 @@ void MacroActionTransitionEdit::UpdateEntryData()
 	_setDuration->setChecked(_entryData->_setDuration);
 	_duration->SetDuration(_entryData->_duration);
 	_setType->setChecked(_entryData->_setType);
-	_transitions->setCurrentText(
-		GetWeakSourceName(_entryData->_transition).c_str());
+	_transitions->SetTransition(_entryData->_transition);
 	_transitions->setEnabled(_entryData->_setType);
 	_duration->setEnabled(_entryData->_setDuration);
 }
 
-void MacroActionTransitionEdit::TransitionChanged(const QString &text)
+void MacroActionTransitionEdit::TransitionChanged(const TransitionSelection &t)
 {
 	if (_loading || !_entryData) {
 		return;
 	}
 
 	std::lock_guard<std::mutex> lock(switcher->m);
-	_entryData->_transition = GetWeakTransitionByQString(text);
+	_entryData->_transition = t;
 	emit HeaderInfoChanged(
 		QString::fromStdString(_entryData->GetShortDesc()));
 }
@@ -155,6 +149,12 @@ void MacroActionTransitionEdit::SetTypeChanged(int state)
 	std::lock_guard<std::mutex> lock(switcher->m);
 	_entryData->_setType = state;
 	_transitions->setEnabled(state);
+	if (state) {
+		emit HeaderInfoChanged(
+			QString::fromStdString(_entryData->GetShortDesc()));
+	} else {
+		emit HeaderInfoChanged("");
+	}
 }
 
 void MacroActionTransitionEdit::SetDurationChanged(int state)