Collapse time restriction to clock symbol if no restriction is set

src/duration-control.cpp

@@ -209,21 +209,28 @@ DurationConstraintEdit::DurationConstraintEdit(QWidget *parent)
 {
 	_condition = new QComboBox(parent);
 	_duration = new DurationSelection(parent);
+	_toggle = new QPushButton(parent);
+	_toggle->setMaximumSize(22, 22);
+	_toggle->setIcon(
+		QIcon(QString::fromStdString(getDataFilePath("res/time.svg"))));
 	populateConditions(_condition);
 	QWidget::connect(_condition, SIGNAL(currentIndexChanged(int)), this,
 			 SLOT(_ConditionChanged(int)));
-
 	QObject::connect(_duration, &DurationSelection::DurationChanged, this,
 			 &DurationConstraintEdit::DurationChanged);
 	QObject::connect(_duration, &DurationSelection::UnitChanged, this,
 			 &DurationConstraintEdit::UnitChanged);
+	QWidget::connect(_toggle, SIGNAL(clicked()), this,
+			 SLOT(ToggleClicked()));
 
 	QHBoxLayout *layout = new QHBoxLayout;
 	layout->setContentsMargins(0, 0, 0, 0);
 	layout->setSpacing(11);
+	layout->addWidget(_toggle);
 	layout->addWidget(_condition);
 	layout->addWidget(_duration);
 	setLayout(layout);
+	Collapse(true);
 }
 
 void DurationConstraintEdit::SetValue(DurationConstraint &value)
@@ -246,6 +253,18 @@ void DurationConstraintEdit::SetDuration(const Duration &d)
 void DurationConstraintEdit::_ConditionChanged(int value)
 {
 	auto cond = static_cast<DurationCondition>(value);
-	_duration->setVisible(cond != DurationCondition::NONE);
+	Collapse(cond == DurationCondition::NONE);
 	emit ConditionChanged(cond);
 }
+
+void DurationConstraintEdit::ToggleClicked()
+{
+	Collapse(false);
+}
+
+void DurationConstraintEdit::Collapse(bool collapse)
+{
+	_toggle->setVisible(collapse);
+	_duration->setVisible(!collapse);
+	_condition->setVisible(!collapse);
+}

src/headers/duration-control.hpp

@@ -2,6 +2,7 @@
 #include <QWidget>
 #include <QDoubleSpinBox>
 #include <QComboBox>
+#include <QPushButton>
 #include <chrono>
 
 #include "obs-data.h"
@@ -94,12 +95,16 @@ public:
 
 private slots:
 	void _ConditionChanged(int value);
+	void ToggleClicked();
 signals:
 	void DurationChanged(double value);
 	void UnitChanged(DurationUnit u);
 	void ConditionChanged(DurationCondition value);
 
 private:
+	void Collapse(bool collapse);
+
 	DurationSelection *_duration;
 	QComboBox *_condition;
+	QPushButton *_toggle;
 };

src/headers/utility.hpp

@@ -10,7 +10,6 @@
 #include <obs-frontend-api.h>
 #include <deque>
 #include <unordered_map>
-#include <filesystem>
 #include "scene-group.hpp"
 
 bool WeakSourceValid(obs_weak_source_t *ws);
@@ -23,7 +22,7 @@ OBSWeakSource GetWeakFilterByName(OBSWeakSource source, const char *name);
 OBSWeakSource GetWeakFilterByQString(OBSWeakSource source, const QString &name);
 bool compareIgnoringLineEnding(QString &s1, QString &s2);
 std::string getSourceSettings(OBSWeakSource ws);
-std::filesystem::path getDataFilePath(const std::string &file);
+std::string getDataFilePath(const std::string &file);
 
 /**
  * Populate layout with labels and widgets based on provided text

src/utility.cpp

@@ -218,13 +218,11 @@ std::string getSourceSettings(OBSWeakSource ws)
 	return settings;
 }
 
-std::filesystem::path getDataFilePath(const std::string &file)
+std::string getDataFilePath(const std::string &file)
 {
-	const char *root_path = obs_get_module_data_path(obs_current_module());
-	if (root_path) {
-		auto ret = std::filesystem::u8path(root_path);
-		ret.append(file.data());
-		return ret;
+	std::string root_path = obs_get_module_data_path(obs_current_module());
+	if (!root_path.empty()) {
+		return root_path + "/" + file;
 	}
 	return "";
 }