diff --git a/README.md b/README.md index 281b4da4..90352c5c 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. -️‍🔥🎉 **New!** Support for SDXL, ControlNet, multiple LoRA files, embeddings (and a lot more) have been added! +️‍🔥🎉 **New!** Support for Flux has been added in the beta branch (v3.5 engine)! [Installation guide](#installation) | [Troubleshooting guide](https://github.com/easydiffusion/easydiffusion/wiki/Troubleshooting) | [User guide](https://github.com/easydiffusion/easydiffusion/wiki) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) @@ -21,15 +21,15 @@ Click the download button for your operating system:

**Hardware requirements:** -- **Windows:** NVIDIA graphics card¹ (minimum 2 GB RAM), or run on your CPU. +- **Windows:** NVIDIA¹ or AMD graphics card (minimum 2 GB RAM), or run on your CPU. - **Linux:** NVIDIA¹ or AMD² graphics card (minimum 2 GB RAM), or run on your CPU. -- **Mac:** M1 or M2, or run on your CPU. +- **Mac:** M1/M2/M3/M4 or AMD graphics card (Intel Mac), or run on your CPU. - Minimum 8 GB of system RAM. - Atleast 25 GB of space on the hard disk. ¹) [CUDA Compute capability](https://en.wikipedia.org/wiki/CUDA#GPUs_supported) level of 3.7 or higher required. -²) ROCm 5.2 support required. +²) ROCm 5.2 (or newer) support required. The installer will take care of whatever is needed. If you face any problems, you can join the friendly [Discord community](https://discord.com/invite/u9yhsFmEkB) and ask for assistance. diff --git a/ui/index.html b/ui/index.html index 1c7e5161..ec241a7f 100644 --- a/ui/index.html +++ b/ui/index.html @@ -162,7 +162,7 @@
Image Settings - +
diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 39b7b6e4..77c1c7dc 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -2053,3 +2053,7 @@ div#enlarge-buttons { padding-top: 6pt; color: var(--small-label-color); } + +.imgCount { + width: 42pt; +} \ No newline at end of file diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 755bca2f..a2233c4d 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1198,7 +1198,7 @@ function createTask(task) { } taskConfig += `
${createTaskConfig(task)}
` - + let imgCount = task.numOutputsTotal let taskEntry = document.createElement("div") taskEntry.id = `imageTaskContainer-${Date.now()}` taskEntry.className = "imageTaskContainer" @@ -1207,6 +1207,8 @@ function createTask(task) {
Enqueued
+ +
${taskConfig}
@@ -1269,6 +1271,16 @@ function createTask(task) { task["previewPrompt"] = taskEntry.querySelector(".preview-prompt") task["progressBar"] = taskEntry.querySelector(".progress-bar") task["stopTask"] = taskEntry.querySelector(".stopTask") + task["imgCount"] = taskEntry.querySelector(".imgCount") + + task["imgCount"].addEventListener("change", (e) => { + e.stopPropagation() + task.batchCount = e.target.value / (task.numOutputsTotal / task.batchCount) + task.numOutputsTotal = e.target.value + }) + task["imgCount"].addEventListener("click", (e) => { + e.stopPropagation(); // Prevent propagation of the click event to the parent + }); task["stopTask"].addEventListener("click", (e) => { e.stopPropagation() diff --git a/ui/media/js/task-manager.js b/ui/media/js/task-manager.js index 71fd7803..85047616 100644 --- a/ui/media/js/task-manager.js +++ b/ui/media/js/task-manager.js @@ -165,12 +165,14 @@ function getTaskUpdater(task, reqBody, outputContainer) { task["taskStatusLabel"].innerText = "Waiting" task["taskStatusLabel"].classList.add("waitingTaskLabel") task["taskStatusLabel"].classList.remove("activeTaskLabel") + task["imgCount"].setAttribute("disabled", true) break case SD.TaskStatus.processing: case SD.TaskStatus.completed: task["taskStatusLabel"].innerText = "Processing" task["taskStatusLabel"].classList.add("activeTaskLabel") task["taskStatusLabel"].classList.remove("waitingTaskLabel") + task["imgCount"].setAttribute("disabled", true) break case SD.TaskStatus.stopped: break