From 8ecce8561b7573cac1e9674c12ea93f287e1dd8f Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Sun, 23 Jun 2024 12:13:17 -0600 Subject: [PATCH 1/8] Add screenshot command disabling tag --- plugin/screenshot/screenshot.talon | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin/screenshot/screenshot.talon b/plugin/screenshot/screenshot.talon index c159d181fa..7b436bcd54 100644 --- a/plugin/screenshot/screenshot.talon +++ b/plugin/screenshot/screenshot.talon @@ -1,3 +1,6 @@ +mode: command +and not tag: user.disable_screenshots +- ^grab screen$: user.screenshot() ^grab screen $: user.screenshot(number_small) ^grab window$: user.screenshot_window() From 164c5e615432d7836772684119b6ddaef32353f8 Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:06:05 -0600 Subject: [PATCH 2/8] Add the tag --- tags/feature_disabling/feature_disabling_tags.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tags/feature_disabling/feature_disabling_tags.py diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py new file mode 100644 index 0000000000..8f5bb1a7d7 --- /dev/null +++ b/tags/feature_disabling/feature_disabling_tags.py @@ -0,0 +1,4 @@ +from talon import Module + +mod = Module() +mod.tag('disable_screenshots', desc='Activating this tag disables screenshot commands') \ No newline at end of file From 8a957187376398e6e4130bd79f092df64b4268cd Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:11:11 -0600 Subject: [PATCH 3/8] Improve tag name --- plugin/screenshot/screenshot.talon | 3 ++- tags/feature_disabling/feature_disabling_tags.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugin/screenshot/screenshot.talon b/plugin/screenshot/screenshot.talon index 7b436bcd54..bb34ae9b7f 100644 --- a/plugin/screenshot/screenshot.talon +++ b/plugin/screenshot/screenshot.talon @@ -1,6 +1,7 @@ mode: command -and not tag: user.disable_screenshots +and not tag: user.screen_shots_disabled - + ^grab screen$: user.screenshot() ^grab screen $: user.screenshot(number_small) ^grab window$: user.screenshot_window() diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py index 8f5bb1a7d7..9d5992b4f5 100644 --- a/tags/feature_disabling/feature_disabling_tags.py +++ b/tags/feature_disabling/feature_disabling_tags.py @@ -1,4 +1,4 @@ from talon import Module mod = Module() -mod.tag('disable_screenshots', desc='Activating this tag disables screenshot commands') \ No newline at end of file +mod.tag('screen_shots_disabled', desc='Activating this tag disables screenshot commands') \ No newline at end of file From 2612e6097da4b1a916b2dc27a2acf53073751de0 Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:19:04 -0600 Subject: [PATCH 4/8] Revert to when it worked --- plugin/screenshot/screenshot.talon | 2 +- tags/feature_disabling/feature_disabling_tags.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/screenshot/screenshot.talon b/plugin/screenshot/screenshot.talon index bb34ae9b7f..99cc3c6c3a 100644 --- a/plugin/screenshot/screenshot.talon +++ b/plugin/screenshot/screenshot.talon @@ -1,5 +1,5 @@ mode: command -and not tag: user.screen_shots_disabled +and not tag: user.disable_screenshots - ^grab screen$: user.screenshot() diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py index 9d5992b4f5..8f5bb1a7d7 100644 --- a/tags/feature_disabling/feature_disabling_tags.py +++ b/tags/feature_disabling/feature_disabling_tags.py @@ -1,4 +1,4 @@ from talon import Module mod = Module() -mod.tag('screen_shots_disabled', desc='Activating this tag disables screenshot commands') \ No newline at end of file +mod.tag('disable_screenshots', desc='Activating this tag disables screenshot commands') \ No newline at end of file From 770bd38ad488c2eace17a9d7538193574f96e59f Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Sun, 30 Jun 2024 16:27:49 -0600 Subject: [PATCH 5/8] Update name again --- plugin/screenshot/screenshot.talon | 2 +- tags/feature_disabling/feature_disabling_tags.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/screenshot/screenshot.talon b/plugin/screenshot/screenshot.talon index 99cc3c6c3a..cb1f8908e9 100644 --- a/plugin/screenshot/screenshot.talon +++ b/plugin/screenshot/screenshot.talon @@ -1,5 +1,5 @@ mode: command -and not tag: user.disable_screenshots +and not tag: user.screenshots_disabled - ^grab screen$: user.screenshot() diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py index 8f5bb1a7d7..a80077c8b0 100644 --- a/tags/feature_disabling/feature_disabling_tags.py +++ b/tags/feature_disabling/feature_disabling_tags.py @@ -1,4 +1,4 @@ from talon import Module mod = Module() -mod.tag('disable_screenshots', desc='Activating this tag disables screenshot commands') \ No newline at end of file +mod.tag('screenshots_disabled', desc='Activating this tag disables screenshot commands') \ No newline at end of file From 42c30fd7b6b773d9c6314496fb0975ad417a9dde Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2024 22:30:30 +0000 Subject: [PATCH 6/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- tags/feature_disabling/feature_disabling_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py index a80077c8b0..7734c3a7e9 100644 --- a/tags/feature_disabling/feature_disabling_tags.py +++ b/tags/feature_disabling/feature_disabling_tags.py @@ -1,4 +1,4 @@ from talon import Module mod = Module() -mod.tag('screenshots_disabled', desc='Activating this tag disables screenshot commands') \ No newline at end of file +mod.tag("screenshots_disabled", desc="Activating this tag disables screenshot commands") From 1af6d16dbb3ab703d571c9773562e5ed893910e8 Mon Sep 17 00:00:00 2001 From: FireChickenProductivity <107892169+FireChickenProductivity@users.noreply.github.com> Date: Tue, 2 Jul 2024 20:23:09 -0600 Subject: [PATCH 7/8] Make requested changes --- plugin/screenshot/screenshot.py | 2 ++ plugin/screenshot/screenshot.talon | 3 +-- tags/feature_disabling/feature_disabling_tags.py | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 tags/feature_disabling/feature_disabling_tags.py diff --git a/plugin/screenshot/screenshot.py b/plugin/screenshot/screenshot.py index 650a161656..86d8c68728 100644 --- a/plugin/screenshot/screenshot.py +++ b/plugin/screenshot/screenshot.py @@ -7,6 +7,8 @@ mod = Module() +mod.tag('screenshot_disabled', desc='Activating this tag disables screenshot commands') + default_folder = "" if app.platform == "windows": default_folder = os.path.expanduser(os.path.join("~", r"OneDrive\\Pictures")) diff --git a/plugin/screenshot/screenshot.talon b/plugin/screenshot/screenshot.talon index cb1f8908e9..6aeed3b8a4 100644 --- a/plugin/screenshot/screenshot.talon +++ b/plugin/screenshot/screenshot.talon @@ -1,5 +1,4 @@ -mode: command -and not tag: user.screenshots_disabled +not tag: user.screenshot_disabled - ^grab screen$: user.screenshot() diff --git a/tags/feature_disabling/feature_disabling_tags.py b/tags/feature_disabling/feature_disabling_tags.py deleted file mode 100644 index a80077c8b0..0000000000 --- a/tags/feature_disabling/feature_disabling_tags.py +++ /dev/null @@ -1,4 +0,0 @@ -from talon import Module - -mod = Module() -mod.tag('screenshots_disabled', desc='Activating this tag disables screenshot commands') \ No newline at end of file From 7111c8cea4924d585ac4146484fe3cf00feb0a2a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 02:27:06 +0000 Subject: [PATCH 8/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- plugin/screenshot/screenshot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/screenshot/screenshot.py b/plugin/screenshot/screenshot.py index 86d8c68728..8152bc6501 100644 --- a/plugin/screenshot/screenshot.py +++ b/plugin/screenshot/screenshot.py @@ -7,7 +7,7 @@ mod = Module() -mod.tag('screenshot_disabled', desc='Activating this tag disables screenshot commands') +mod.tag("screenshot_disabled", desc="Activating this tag disables screenshot commands") default_folder = "" if app.platform == "windows":