diff --git a/install.py b/install.py index 8dbd346..59c207d 100644 --- a/install.py +++ b/install.py @@ -37,8 +37,8 @@ def list_models(model_path): python = sys.executable -run(f'"{python}" -m pip install lightning-utilities==0.4.0', desc=f"Installing lightning-utilities", errdesc=f"Couldn't install lightning-utilities") -run(f'"{python}" -m pip install pytorch-lightning==1.7.6', desc=f"Installing pytorch-lightning", errdesc=f"Couldn't install pytorch-lightning") +run(f'"{python}" -m pip install lightning-utilities==0.4.0', desc=None, errdesc=f"Couldn't install lightning-utilities") +run(f'"{python}" -m pip install pytorch-lightning==1.7.6', desc=None, errdesc=f"Couldn't install pytorch-lightning") if not is_installed("dlib"): run(f'"{python}" -m pip install setuptools', desc="Installing setuptools", errdesc="Couldn't install setuptools") diff --git a/javascript/eyemask.js b/javascript/eyemask.js index 6f5dcbb..6210629 100644 --- a/javascript/eyemask.js +++ b/javascript/eyemask.js @@ -8,12 +8,7 @@ document.addEventListener('DOMContentLoaded', function() { timeOut: 3500 }; - window.gradioRoot = gradioApp().querySelector('.gradio-container'); - window.$gradioRoot = $(window.gradioRoot); - onUiLoaded(EyeMaskController.load); - - $gradioRoot.append('
') }); @@ -42,6 +37,12 @@ const EyeMaskController = (function () { return '/sdapi/v1/eyemask/v1' + path; } + function initRoot() { + window.gradioRoot = gradioApp().querySelector('.gradio-container'); + window.$gradioRoot = $(window.gradioRoot); + $gradioRoot.append(''); + } + function loadTitles() { gradioApp().querySelectorAll('span, button, select, p').forEach(function(elem) { if (elem) { @@ -176,6 +177,7 @@ const EyeMaskController = (function () { function onFirstLoad() { getConfig(); + initRoot(); loadTitles(); loadPlaceHolders(); } @@ -187,6 +189,7 @@ const EyeMaskController = (function () { function showInfo() { dialog.image('mask-types.jpg', 'Mask Types', null, '80%'); + return true; } return { diff --git a/scripts/eyemask/ui.py b/scripts/eyemask/ui.py index 5577ada..79d892e 100644 --- a/scripts/eyemask/ui.py +++ b/scripts/eyemask/ui.py @@ -97,9 +97,9 @@ class EyeMaskUI(): value=self.eye_mask_core.MASK_TYPES[0], type="index" ) - em_info = ToolButton(value="\u2139\uFE0F", elem_id="eye-info-button", full_width=False) + em_info = ToolButton(value="\u2139\uFE0F", elem_id=get_id("eye-info-button"), full_width=False) em_info.click( - fn=lambda: '', + fn=lambda: True, _js="() => EyeMaskController.showInfo()", show_progress=False ) diff --git a/style/_main.scss b/style/_main.scss index ee07921..faeb149 100644 --- a/style/_main.scss +++ b/style/_main.scss @@ -14,8 +14,8 @@ )); @include select('mask-type-row', ( + margin-top: 20px, margin-bottom: 20px, - padding: 0 12px, font-size: 12px ));