diff --git a/README.md b/README.md index 6dcca139..51ba812a 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,11 @@ Does not require technical knowledge, does not require pre-installed software. 1-click install, powerful features, friendly community. -[Installation guide](#step-1-download-and-extract-the-installer) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) +[Installation guide](#installation) | [Troubleshooting guide](https://github.com/cmdr2/stable-diffusion-ui/wiki/Troubleshooting) | [![Discord Server](https://img.shields.io/discord/1014774730907209781?label=Discord)](https://discord.com/invite/u9yhsFmEkB) (for support queries, and development discussions) ![t2i](https://raw.githubusercontent.com/Stability-AI/stablediffusion/main/assets/stable-samples/txt2img/768/merged-0006.png) -# Step 1: Download and extract the installer +# Installation Click the download button for your operating system:

@@ -16,29 +16,23 @@ Click the download button for your operating system:

+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. + ## On Windows: 1. Run the downloaded `Easy-Diffusion-Windows.exe` file. +2. Run `Easy Diffusion` once the installation finishes. You can also start from your Start Menu, or from your desktop (if you created a shortcut). + +If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`. **Tip:** On Windows 10, please install at the top level in your drive, e.g. `C:\EasyDiffusion` or `D:\EasyDiffusion`. This will avoid a common problem with Windows 10 (file path length limits). ## On Linux/Mac: -1. Unzip/extract the folder `stable-diffusion-ui` which should be in your downloads folder, unless you changed your default downloads destination. -2. Open a terminal window, and navigate to the `stable-diffusion-ui` directory. +1. Unzip/extract the folder `easy-diffusion` which should be in your downloads folder, unless you changed your default downloads destination. +2. Open a terminal window, and navigate to the `easy-diffusion` directory. +3. Run `./start.sh` (or `bash start.sh`) in a terminal. -# Step 2: Run the program -## On Windows: -Run `Easy Diffusion` once the installation finishes. You can also start from your Start Menu, or from your desktop (if you created a shortcut). - -**Tip:** If Windows SmartScreen prevents you from running the program click `More info` and then `Run anyway`. - -## On Linux/Mac: -Run `./start.sh` (or `bash start.sh`) in a terminal. - -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. - -# Step 3: There is no Step 3. It's that simple! - -**To Uninstall:** Just delete the `stable-diffusion-ui` folder to uninstall all the downloaded packages. +# To remove/uninstall: +Just delete the `EasyDiffusion` folder to uninstall all the downloaded packages. ---- diff --git a/ui/index.html b/ui/index.html index edec89c5..9a3ad73a 100644 --- a/ui/index.html +++ b/ui/index.html @@ -154,11 +154,11 @@ - - - - - + + + + + diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 95b8d5c5..c5e7c251 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -831,7 +831,7 @@ input::file-selector-button { } /* Small screens */ -@media screen and (max-width: 1265px) { +@media screen and (max-width: 1365px) { #top-nav { flex-direction: column; } diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js index e3b8cc9f..f1f00911 100644 --- a/ui/media/js/dnd.js +++ b/ui/media/js/dnd.js @@ -490,6 +490,7 @@ async function parseContent(text) { return true } else { console.warn(`Raw text content couldn't be parsed.`) + promptField.value = text return false } } diff --git a/ui/media/js/main.js b/ui/media/js/main.js index 1b70a678..7c5148e9 100644 --- a/ui/media/js/main.js +++ b/ui/media/js/main.js @@ -1622,7 +1622,7 @@ promptsFromFileBtn.addEventListener('click', function() { promptsFromFileSelector.click() }) -promptsFromFileSelector.addEventListener('change', function() { +promptsFromFileSelector.addEventListener('change', async function() { if (promptsFromFileSelector.files.length === 0) { return } @@ -1630,8 +1630,8 @@ promptsFromFileSelector.addEventListener('change', function() { let reader = new FileReader() let file = promptsFromFileSelector.files[0] - reader.addEventListener('load', function() { - promptField.value = reader.result + reader.addEventListener('load', async function() { + await parseContent(reader.result) }) if (file) {