From e02250e8c6bb6d0b38bad7c8b6b98cb14de97a46 Mon Sep 17 00:00:00 2001 From: Keavon Chambers Date: Sat, 31 Jul 2021 14:30:31 -0700 Subject: [PATCH] Add DialogModal and use it for close confirmations and "coming soon" features (#322) Closes #269 Closes #196 * Add DialogModal and use it for close confirmations and "coming soon" features * Code cleanup; add Enter key to accept emphasized dialog button --- client/web/assets/12px-solid/warning.svg | 3 + client/web/src/App.vue | 8 +- client/web/src/components/panels/Document.vue | 56 ++++----- .../widgets/floating-menus/DialogModal.vue | 109 ++++++++++++++++++ .../widgets/floating-menus/FloatingMenu.vue | 13 ++- .../widgets/inputs/MenuBarInput.vue | 16 +-- .../widgets/inputs/ShelfItemInput.vue | 3 +- .../components/widgets/labels/IconLabel.vue | 2 + .../widgets/options/ToolOptions.vue | 37 +++--- client/web/src/components/widgets/widgets.ts | 2 +- .../web/src/components/window/MainWindow.vue | 1 + .../components/window/title-bar/TitleBar.vue | 3 +- client/web/src/components/workspace/Panel.vue | 62 ++++++++-- .../src/components/workspace/Workspace.vue | 15 ++- client/web/src/main.ts | 3 +- client/web/src/utilities/coming-soon.ts | 22 ++++ client/web/src/utilities/dialog.ts | 37 ++++++ client/web/src/utilities/document.ts | 24 ++++ client/web/src/utilities/input.ts | 25 ++++ core/editor/src/input/input_mapper.rs | 1 - 20 files changed, 375 insertions(+), 67 deletions(-) create mode 100644 client/web/assets/12px-solid/warning.svg create mode 100644 client/web/src/components/widgets/floating-menus/DialogModal.vue create mode 100644 client/web/src/utilities/coming-soon.ts create mode 100644 client/web/src/utilities/dialog.ts create mode 100644 client/web/src/utilities/document.ts diff --git a/client/web/assets/12px-solid/warning.svg b/client/web/assets/12px-solid/warning.svg new file mode 100644 index 00000000..977a8ba2 --- /dev/null +++ b/client/web/assets/12px-solid/warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/client/web/src/App.vue b/client/web/src/App.vue index 363c93aa..cbf729e0 100644 --- a/client/web/src/App.vue +++ b/client/web/src/App.vue @@ -216,12 +216,18 @@ img { diff --git a/client/web/src/components/widgets/floating-menus/FloatingMenu.vue b/client/web/src/components/widgets/floating-menus/FloatingMenu.vue index b6d1e5e0..02218b3e 100644 --- a/client/web/src/components/widgets/floating-menus/FloatingMenu.vue +++ b/client/web/src/components/widgets/floating-menus/FloatingMenu.vue @@ -1,5 +1,5 @@ @@ -52,6 +52,9 @@