Rename macro condition "region" to "cursor"

CMakeLists.txt

@@ -182,6 +182,7 @@ set(advanced-scene-switcher_HEADERS
     src/headers/macro-action-wait.hpp
     src/headers/macro-condition-edit.hpp
     src/headers/macro-condition-audio.hpp
+    src/headers/macro-condition-cursor.hpp
     src/headers/macro-condition-date.hpp
     src/headers/macro-condition-file.hpp
     src/headers/macro-condition-filter.hpp
@@ -192,7 +193,6 @@ set(advanced-scene-switcher_HEADERS
     src/headers/macro-condition-plugin-state.hpp
     src/headers/macro-condition-process.hpp
     src/headers/macro-condition-recording.hpp
-    src/headers/macro-condition-region.hpp
     src/headers/macro-condition-replay-buffer.hpp
     src/headers/macro-condition-scene-order.hpp
     src/headers/macro-condition-scene.hpp
@@ -262,6 +262,7 @@ set(advanced-scene-switcher_SOURCES
     src/macro-action-wait.cpp
     src/macro-condition-edit.cpp
     src/macro-condition-audio.cpp
+    src/macro-condition-cursor.cpp
     src/macro-condition-date.cpp
     src/macro-condition-file.cpp
     src/macro-condition-filter.cpp
@@ -272,7 +273,6 @@ set(advanced-scene-switcher_SOURCES
     src/macro-condition-plugin-state.cpp
     src/macro-condition-process.cpp
     src/macro-condition-recording.cpp
-    src/macro-condition-region.cpp
     src/macro-condition-replay-buffer.cpp
     src/macro-condition-scene-order.cpp
     src/macro-condition-scene.cpp

data/locale/en-US.ini

@@ -83,8 +83,10 @@ AdvSceneSwitcher.condition.audio="Audio"
 AdvSceneSwitcher.condition.audio.state.below="Below"
 AdvSceneSwitcher.condition.audio.state.above="Above"
 AdvSceneSwitcher.condition.audio.entry="Volume of {{audioSources}} is {{condition}} {{volume}}"
-AdvSceneSwitcher.condition.region="Screen region"
-AdvSceneSwitcher.condition.region.entry="Cursor is in {{minX}} {{minY}} x {{maxX}} {{maxY}}"
+AdvSceneSwitcher.condition.cursor="Screen region"
+AdvSceneSwitcher.condition.cursor.type.region="is in region"
+AdvSceneSwitcher.condition.cursor.type.moving="is moving"
+AdvSceneSwitcher.condition.cursor.entry="Cursor is {{conditions}} {{minX}} {{minY}} {{maxX}} {{maxY}}"
 AdvSceneSwitcher.condition.scene="Scene"
 AdvSceneSwitcher.condition.scene.type.current="Current"
 AdvSceneSwitcher.condition.scene.type.previous="Previous"

data/locale/ru-RU.ini

@@ -81,8 +81,7 @@ AdvSceneSwitcher.condition.audio="Аудио"
 AdvSceneSwitcher.ondition.audio.state.below="Ниже"
 AdvSceneSwitcher.ondition.audio.state.above="Выше"
 AdvSceneSwitcher.condition.audio.entry="Громкость {{audioSources}} равна {{condition}} {{volume}} в течении {{duration}} секунд"
-AdvSceneSwitcher.condition.region="Область экрана"
-AdvSceneSwitcher.condition.region.entry="Курсор находится в {{minX}} {{minY}} x {{maxX}} {{maxY}}"
+AdvSceneSwitcher.condition.cursor="Область экрана"
 AdvSceneSwitcher.condition.scene="Сцена"
 AdvSceneSwitcher.condition.scene.type.current="Текущий"
 AdvSceneSwitcher.condition.scene.type.previous="Предыдущий"

src/headers/macro-condition-cursor.hpp

@@ -3,7 +3,7 @@
 #include <QWidget>
 #include <QComboBox>
 
-class MacroConditionRegion : public MacroCondition {
+class MacroConditionCursor : public MacroCondition {
 public:
 	bool CheckCondition();
 	bool Save(obs_data_t *obj);
@@ -11,7 +11,7 @@ public:
 	std::string GetId() { return id; };
 	static std::shared_ptr<MacroCondition> Create()
 	{
-		return std::make_shared<MacroConditionRegion>();
+		return std::make_shared<MacroConditionCursor>();
 	}
 
 	int _minX = 0, _minY = 0, _maxX = 0, _maxY = 0;
@@ -21,20 +21,20 @@ private:
 	static const std::string id;
 };
 
-class MacroConditionRegionEdit : public QWidget {
+class MacroConditionCursorEdit : public QWidget {
 	Q_OBJECT
 
 public:
-	MacroConditionRegionEdit(
+	MacroConditionCursorEdit(
 		QWidget *parent,
-		std::shared_ptr<MacroConditionRegion> cond = nullptr);
+		std::shared_ptr<MacroConditionCursor> cond = nullptr);
 	void UpdateEntryData();
 	static QWidget *Create(QWidget *parent,
 			       std::shared_ptr<MacroCondition> cond)
 	{
-		return new MacroConditionRegionEdit(
+		return new MacroConditionCursorEdit(
 			parent,
-			std::dynamic_pointer_cast<MacroConditionRegion>(cond));
+			std::dynamic_pointer_cast<MacroConditionCursor>(cond));
 	}
 
 private slots:
@@ -48,7 +48,7 @@ protected:
 	QSpinBox *_minY;
 	QSpinBox *_maxX;
 	QSpinBox *_maxY;
-	std::shared_ptr<MacroConditionRegion> _entryData;
+	std::shared_ptr<MacroConditionCursor> _entryData;
 
 private:
 	bool _loading = true;

src/macro-condition-cursor.cpp

@@ -1,23 +1,29 @@
 #include "headers/macro-condition-edit.hpp"
-#include "headers/macro-condition-region.hpp"
+#include "headers/macro-condition-cursor.hpp"
 #include "headers/utility.hpp"
 #include "headers/advanced-scene-switcher.hpp"
 
-const std::string MacroConditionRegion::id = "region";
+const std::string MacroConditionCursor::id = "cursor";
 
-bool MacroConditionRegion::_registered = MacroConditionFactory::Register(
-	MacroConditionRegion::id,
-	{MacroConditionRegion::Create, MacroConditionRegionEdit::Create,
-	 "AdvSceneSwitcher.condition.region"});
+bool MacroConditionCursor::_registered = MacroConditionFactory::Register(
+	MacroConditionCursor::id,
+	{MacroConditionCursor::Create, MacroConditionCursorEdit::Create,
+	 "AdvSceneSwitcher.condition.cursor"});
 
-bool MacroConditionRegion::CheckCondition()
+// TODO: Remove in future version - just added for backwards compatibility
+static const std::string idOld = "region";
+static bool oldRegisterd = MacroConditionFactory::Register(
+	idOld, {MacroConditionCursor::Create, MacroConditionCursorEdit::Create,
+		"AdvSceneSwitcher.condition.region"});
+
+bool MacroConditionCursor::CheckCondition()
 {
 	std::pair<int, int> cursorPos = getCursorPos();
 	return cursorPos.first >= _minX && cursorPos.second >= _minY &&
 	       cursorPos.first <= _maxX && cursorPos.second <= _maxY;
 }
 
-bool MacroConditionRegion::Save(obs_data_t *obj)
+bool MacroConditionCursor::Save(obs_data_t *obj)
 {
 	MacroCondition::Save(obj);
 	obs_data_set_int(obj, "minX", _minX);
@@ -27,7 +33,7 @@ bool MacroConditionRegion::Save(obs_data_t *obj)
 	return true;
 }
 
-bool MacroConditionRegion::Load(obs_data_t *obj)
+bool MacroConditionCursor::Load(obs_data_t *obj)
 {
 	MacroCondition::Load(obj);
 	_minX = obs_data_get_int(obj, "minX");
@@ -37,8 +43,8 @@ bool MacroConditionRegion::Load(obs_data_t *obj)
 	return true;
 }
 
-MacroConditionRegionEdit::MacroConditionRegionEdit(
-	QWidget *parent, std::shared_ptr<MacroConditionRegion> entryData)
+MacroConditionCursorEdit::MacroConditionCursorEdit(
+	QWidget *parent, std::shared_ptr<MacroConditionCursor> entryData)
 	: QWidget(parent)
 {
 	_minX = new QSpinBox();
@@ -78,7 +84,7 @@ MacroConditionRegionEdit::MacroConditionRegionEdit(
 		{"{{maxX}}", _maxX},
 		{"{{maxY}}", _maxY}};
 
-	placeWidgets(obs_module_text("AdvSceneSwitcher.condition.region.entry"),
+	placeWidgets(obs_module_text("AdvSceneSwitcher.condition.cursor.entry"),
 		     mainLayout, widgetPlaceholders);
 	setLayout(mainLayout);
 
@@ -87,7 +93,7 @@ MacroConditionRegionEdit::MacroConditionRegionEdit(
 	_loading = false;
 }
 
-void MacroConditionRegionEdit::MinXChanged(int pos)
+void MacroConditionCursorEdit::MinXChanged(int pos)
 {
 	if (_loading || !_entryData) {
 		return;
@@ -97,7 +103,7 @@ void MacroConditionRegionEdit::MinXChanged(int pos)
 	_entryData->_minX = pos;
 }
 
-void MacroConditionRegionEdit::MinYChanged(int pos)
+void MacroConditionCursorEdit::MinYChanged(int pos)
 {
 	if (_loading || !_entryData) {
 		return;
@@ -107,7 +113,7 @@ void MacroConditionRegionEdit::MinYChanged(int pos)
 	_entryData->_minY = pos;
 }
 
-void MacroConditionRegionEdit::MaxXChanged(int pos)
+void MacroConditionCursorEdit::MaxXChanged(int pos)
 {
 	if (_loading || !_entryData) {
 		return;
@@ -117,7 +123,7 @@ void MacroConditionRegionEdit::MaxXChanged(int pos)
 	_entryData->_maxX = pos;
 }
 
-void MacroConditionRegionEdit::MaxYChanged(int pos)
+void MacroConditionCursorEdit::MaxYChanged(int pos)
 {
 	if (_loading || !_entryData) {
 		return;
@@ -127,7 +133,7 @@ void MacroConditionRegionEdit::MaxYChanged(int pos)
 	_entryData->_maxY = pos;
 }
 
-void MacroConditionRegionEdit::UpdateEntryData()
+void MacroConditionCursorEdit::UpdateEntryData()
 {
 	if (!_entryData) {
 		return;