From 27b5e43ea41d18fef99a98e1b9f92bfb895ca002 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Thu, 8 Jun 2023 16:37:10 -0400 Subject: [PATCH] add messages to the user to tell them to enlarge window --- installer/install.bat.in | 1 + installer/install.sh.in | 1 + installer/lib/messages.py | 2 ++ invokeai/frontend/install/model_install.py | 10 ++++++---- invokeai/frontend/install/widgets.py | 12 ++++++++++++ 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/installer/install.bat.in b/installer/install.bat.in index 924f2cd40d..8f729e758d 100644 --- a/installer/install.bat.in +++ b/installer/install.bat.in @@ -38,6 +38,7 @@ echo https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist echo. echo See %INSTRUCTIONS% for more details. echo. +echo "For the best user experience we suggest enlarging or maximizing this window now." pause @rem ---------------------------- check Python version --------------- diff --git a/installer/install.sh.in b/installer/install.sh.in index c1014b2496..987197d78b 100755 --- a/installer/install.sh.in +++ b/installer/install.sh.in @@ -26,6 +26,7 @@ done if [ -z "$PYTHON" ]; then echo "A suitable Python interpreter could not be found" echo "Please install Python 3.9 or higher before running this script. See instructions at $INSTRUCTIONS for help." + echo "For the best user experience we suggest enlarging or maximizing this window now." read -p "Press any key to exit" exit -1 fi diff --git a/installer/lib/messages.py b/installer/lib/messages.py index dfc09dd94a..196c0e1eb0 100644 --- a/installer/lib/messages.py +++ b/installer/lib/messages.py @@ -293,6 +293,8 @@ def introduction() -> None: "3. Create initial configuration files.", "", "[i]At any point you may interrupt this program and resume later.", + "", + "[b]For the best user experience, please enlarge or maximize this window", ), ) ) diff --git a/invokeai/frontend/install/model_install.py b/invokeai/frontend/install/model_install.py index d956299bdf..a816eb199c 100644 --- a/invokeai/frontend/install/model_install.py +++ b/invokeai/frontend/install/model_install.py @@ -964,13 +964,15 @@ def main(): logger.error( "Insufficient vertical space for the interface. Please make your window taller and try again" ) - elif str(e).startswith("addwstr"): + input('Press any key to continue...') + except Exception as e: + if str(e).startswith("addwstr"): logger.error( "Insufficient horizontal space for the interface. Please make your window wider and try again." ) - except Exception as e: - print(f'An exception has occurred: {str(e)} Details:') - print(traceback.format_exc(), file=sys.stderr) + else: + print(f'An exception has occurred: {str(e)} Details:') + print(traceback.format_exc(), file=sys.stderr) input('Press any key to continue...') diff --git a/invokeai/frontend/install/widgets.py b/invokeai/frontend/install/widgets.py index 14167d4ee0..6f717bf625 100644 --- a/invokeai/frontend/install/widgets.py +++ b/invokeai/frontend/install/widgets.py @@ -42,6 +42,18 @@ def set_terminal_size(columns: int, lines: int, launch_command: str=None): elif OS in ["Darwin", "Linux"]: _set_terminal_size_unix(width,height) + # check whether it worked.... + ts = get_terminal_size() + pause = False + if ts.columns < columns: + print('\033[1mThis window is too narrow for the user interface. Please make it wider.\033[0m') + pause = True + if ts.lines < lines: + print('\033[1mThis window is too short for the user interface. Please make it taller.\033[0m') + pause = True + if pause: + input('Press any key to continue..') + def _set_terminal_size_powershell(width: int, height: int): script=f''' $pshost = get-host