AbdullahAlfaraj · AbdullahAlfaraj · Nov 30, 2023 · Aug 23, 2023 · Sep 6, 2023 · Sep 8, 2023
diff --git a/i18n/zh_CN/ps-plugin.json b/i18n/zh_CN/ps-plugin.json
@@ -11,7 +11,11 @@
     "Select Lora": "选择 Lora",
     "use lora in your prompt": "在提示中使用 lora",
     "Generate": "生成",
-    "Generate txt2img": "生成 txt2img",
+    "Generate Txt2Img": "生成 Txt2Img",
+    "Generate Img2Img": "生成 Img2Img",
+    "Generate Inpaint": "生成 Inpaint",
+    "Generate Outpaint": "生成 Outpaint",
+    "outpaint": "outpaint",
     "Progress...": "进度...",
     "Toggle the visibility of the Preview Image on the canvas": "切换画布上预览图像的可见性",
     "Move and reSize the highlighted layer to fit into the Selection Area": "移动和调整突出显示的图层以适合选择区域",
@@ -67,6 +71,7 @@
     "Random": "随机",
     "Last": "最后",
     "Show Samplers": "显示采样器",
+    "Sampling Steps:": "Sampling Steps:",
     "Select A Script": "选择脚本",
     "Activate": "激活",
     "Viewer": "查看器",
@@ -181,4 +186,4 @@
     "Delete all generated images from the canvas": "在画布上删除所有生成图像",
     "Keep only the highlighted images": "在画布上保留选中的图像",
     "Generate More": "生成更多"
-  }
+}
diff --git a/index.html b/index.html
@@ -344,7 +344,7 @@
             /* display: none; */
             flex: 1 1 auto;
             /* overflow: scroll; */
-            overflow-y: scroll;
+            /* overflow-y: scroll; */
             padding: 12px 0;
             flex-direction: column;
         }
@@ -721,6 +721,43 @@
         }
     </style>
 
+    <!-- searchable menu CSS -->
+    <style>
+        #mySearch {
+            width: 100%;
+            font-size: 18px;
+            padding: 5px;
+            color: white;
+            background-color: #222;
+            font-weight: bold;
+        }
+        #mySearch:focus {
+            border: 1px solid;
+            border-color: #7a97e4;
+        }
+        #myMenu {
+            list-style-type: none;
+            padding: 0;
+            margin: 0;
+            max-height: 150px;
+            overflow-y: scroll;
+            background-color: #222;
+        }
+        #myMenu li {
+            color: white;
+        }
+        #myMenu li a {
+            padding: 12px;
+            text-decoration: none;
+            color: white;
+            display: block;
+            font-weight: bold;
+        }
+        #myMenu li a:hover {
+            background-color: #333;
+        }
+    </style>
+
     <body>
         <!-- <sp-textarea id="tool_tip" open placement="top">use this when you want to fill empty areas of the canvas</sp-textarea> -->
         <!-- <sp-tooltip id="tool_tip" open placement="top">use this when you want to fill empty areas of the canvas</sp-tooltip> -->
@@ -1161,6 +1198,9 @@
                     <div id="PresetTabContainer"></div>
                     <sp-divider class="line-divider" size="large"></sp-divider>
                     <sp-divider class="line-divider" size="large"></sp-divider>
+                    <div id="ComfyUIContainer"></div>
+                    <sp-divider class="line-divider" size="large"></sp-divider>
+                    <sp-divider class="line-divider" size="large"></sp-divider>
                 </div>
             </div>
         </div>
@@ -1182,6 +1222,7 @@
                 <div class="lexicaContainer"></div>
                 <sp-divider class="line-divider" size="large"></sp-divider>
                 <sp-divider class="line-divider" size="large"></sp-divider>
+                <!-- <div id="ComfyUIContainer"></div> -->
             </div>
         </uxp-panel>
 

diff --git a/index.js b/index.js
@@ -70,6 +70,7 @@ const {
     logger,
     toJS,
     viewer,
+    viewer_util,
     preview,
     // session_ts,
     session_store,
@@ -93,6 +94,11 @@ const {
     stores,
     lexica,
     api_ts,
+    comfyui,
+    comfyui_util,
+    comfyui_main_ui,
+
+    comfyapi,
 } = require('./typescripts/dist/bundle')
 
 const io = require('./utility/io')
@@ -532,8 +538,6 @@ let g_selection = {}
 let g_b_use_smart_object = true // true to keep layer as smart objects, false to rasterize them
 let g_sd_options_obj = new sd_options.SdOptions()
 
-g_sd_options_obj.getOptions()
-
 let g_controlnet_max_models
 
 let g_generation_session = new session.GenerationSession(0) //session manager
@@ -1795,9 +1799,13 @@ async function openFileFromUrl(url, format = 'gif') {
 
         // Save the image to a temporary file
         const tempFolder = await storage.localFileSystem.getTemporaryFolder()
-        const tempFile = await tempFolder.createFile(`temp.${format}`, {
-            overwrite: true,
-        })
+        const randomNumber = Math.floor(Math.random() * 1000000000) // generates a random number between 0 and 999999999
+        const tempFile = await tempFolder.createFile(
+            `temp_${randomNumber}.${format}`,
+            {
+                overwrite: true,
+            }
+        )
         await tempFile.write(arrayBuffer)
 
         // Open the file in Photoshop

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,6 +30,7 @@
         "@babel/plugin-transform-react-jsx": "^7.21.5",
         "@svgr/webpack": "^8.0.1",
         "babel-loader": "^9.1.2",
+        "chalk": "^5.3.0",
         "clean-webpack-plugin": "^4.0.0",
         "commander": "^11.0.0",
         "copy-webpack-plugin": "^11.0.0",
@@ -45,7 +46,6 @@
         "url-loader": "^4.1.1",
         "webpack": "^5.82.1",
         "webpack-cli": "^5.1.1",
-        "chalk": "^5.3.0",
         "yazl": "^2.5.1"
     },
     "scripts": {
@@ -64,4 +64,4 @@
         "url": "https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin/issues"
     },
     "homepage": "https://github.com/AbdullahAlfaraj/Auto-Photoshop-StableDiffusion-Plugin#readme"
-}
+}
diff --git a/presets/img2img.json b/presets/img2img.json
@@ -6,8 +6,7 @@
         "batch_size": 1,
         "batch_count": 1,
         "steps": 20,
-        "width": 512,
-        "height": 512,
+
         "ratio": 1,
         "cfg": 7,
         "b_width_height_link": true,
@@ -28,13 +27,5 @@
         "hr_upscaler": "",
         "selection_mode": "ratio"
     },
-    "controlnet_tab_preset": [
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {}
-    ]
-}
+    "controlnet_tab_preset": [{}, {}, {}, {}, {}, {}, {}]
+}
diff --git a/presets/inpaint.json b/presets/inpaint.json
@@ -6,8 +6,6 @@
         "batch_size": 1,
         "batch_count": 1,
         "steps": 20,
-        "width": 512,
-        "height": 512,
         "ratio": 1,
         "cfg": 7,
         "b_width_height_link": true,
@@ -28,13 +26,5 @@
         "hr_upscaler": "",
         "selection_mode": "ratio"
     },
-    "controlnet_tab_preset": [
-        {},
-        {},
-        {},
-        {},
-        {},
-        {},
-        {}
-    ]
-}
+    "controlnet_tab_preset": [{}, {}, {}, {}, {}, {}, {}]
+}