From 5851bc839b6f639cda59e84eb1ee8c706986633d Mon Sep 17 00:00:00 2001
From: me <25877290+Kryptortio@users.noreply.github.com>
Date: Wed, 4 Jan 2023 22:03:32 +0100
Subject: Add element ids for script components and a few more in ui.py

---
 scripts/prompt_matrix.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts/prompt_matrix.py')

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 4c79eaef..59172315 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -45,8 +45,10 @@ class Script(scripts.Script):
         return "Prompt matrix"
 
     def ui(self, is_img2img):
-        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False)
-        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False)
+        elem_prefix = ('i2i' if is_img2img else 't2i') + '_script_prompt_matrix_'
+        
+        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=elem_prefix + "put_at_start")
+        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=elem_prefix + "different_seeds")
 
         return [put_at_start, different_seeds]
 
-- 
cgit v1.2.1


From c3109fa18a5a105eea5e343875b540939884f304 Mon Sep 17 00:00:00 2001
From: me <25877290+Kryptortio@users.noreply.github.com>
Date: Thu, 5 Jan 2023 08:27:09 +0100
Subject: Adjusted prefix from i2i/t2i to txt2img and img2img and removed those
 prefixes from img exclusive scripts

---
 scripts/prompt_matrix.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/prompt_matrix.py')

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 59172315..f610c334 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -45,7 +45,7 @@ class Script(scripts.Script):
         return "Prompt matrix"
 
     def ui(self, is_img2img):
-        elem_prefix = ('i2i' if is_img2img else 't2i') + '_script_prompt_matrix_'
+        elem_prefix = ('img2img' if is_img2img else 'txt2txt') + '_script_prompt_matrix_'
         
         put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=elem_prefix + "put_at_start")
         different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=elem_prefix + "different_seeds")
-- 
cgit v1.2.1


From f185baeb28f348e4ec97cd7070ed219b5f74a48e Mon Sep 17 00:00:00 2001
From: me <25877290+Kryptortio@users.noreply.github.com>
Date: Thu, 5 Jan 2023 09:29:07 +0100
Subject: Refactor elem_prefix as function elem_id

---
 scripts/prompt_matrix.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'scripts/prompt_matrix.py')

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index f610c334..278d2e68 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -10,6 +10,7 @@ from modules import images
 from modules.processing import process_images, Processed
 from modules.shared import opts, cmd_opts, state
 import modules.sd_samplers
+import re
 
 
 def draw_xy_grid(xs, ys, x_label, y_label, cell):
@@ -44,11 +45,14 @@ class Script(scripts.Script):
     def title(self):
         return "Prompt matrix"
 
-    def ui(self, is_img2img):
-        elem_prefix = ('img2img' if is_img2img else 'txt2txt') + '_script_prompt_matrix_'
-        
-        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=elem_prefix + "put_at_start")
-        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=elem_prefix + "different_seeds")
+    def elem_id(self, item_id):
+        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id
+        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)
+        return gen_elem_id
+
+    def ui(self, is_img2img):        
+        put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))
+        different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))
 
         return [put_at_start, different_seeds]
 
-- 
cgit v1.2.1


From f8d0cf6a6ec4911559cfecb9a9d1d46b547b38e8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Thu, 5 Jan 2023 12:08:11 +0300
Subject: rework #6329 to remove duplicate code and add prevent tab names for
 showing in ids for scripts that only exist on one tab

---
 scripts/prompt_matrix.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'scripts/prompt_matrix.py')

diff --git a/scripts/prompt_matrix.py b/scripts/prompt_matrix.py
index 278d2e68..dd95e588 100644
--- a/scripts/prompt_matrix.py
+++ b/scripts/prompt_matrix.py
@@ -10,7 +10,6 @@ from modules import images
 from modules.processing import process_images, Processed
 from modules.shared import opts, cmd_opts, state
 import modules.sd_samplers
-import re
 
 
 def draw_xy_grid(xs, ys, x_label, y_label, cell):
@@ -45,11 +44,6 @@ class Script(scripts.Script):
     def title(self):
         return "Prompt matrix"
 
-    def elem_id(self, item_id):
-        gen_elem_id = ('img2img' if self.is_img2img else 'txt2txt') + '_script_' + re.sub(r'\s', '_', self.title().lower()) + '_' + item_id
-        gen_elem_id = re.sub(r'[^a-z_0-9]', '', gen_elem_id)
-        return gen_elem_id
-
     def ui(self, is_img2img):        
         put_at_start = gr.Checkbox(label='Put variable parts at start of prompt', value=False, elem_id=self.elem_id("put_at_start"))
         different_seeds = gr.Checkbox(label='Use different seed for each picture', value=False, elem_id=self.elem_id("different_seeds"))
-- 
cgit v1.2.1