From 2f526a964580c04d5044ba07db7fcb30d755dee1 Mon Sep 17 00:00:00 2001 From: Francesco Spissu Date: Mon, 5 Sep 2022 11:46:46 +0200 Subject: [PATCH 1/4] add ellipsis to dialog buttons --- .../src/browser/library/library-list-widget.ts | 5 ++++- arduino-ide-extension/src/browser/style/index.css | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts index cd2b196df..11e85eabd 100644 --- a/arduino-ide-extension/src/browser/library/library-list-widget.ts +++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts @@ -203,7 +203,10 @@ class MessageBoxDialog extends AbstractDialog { const button = this.createButton(text); const isPrimaryButton = index === (options.buttons ? options.buttons.length - 1 : 0); - button.classList.add(isPrimaryButton ? 'main' : 'secondary'); + button.classList.add( + isPrimaryButton ? 'main' : 'secondary', + 'message-box-dialog-button' + ); this.controlPanel.appendChild(button); this.toDisposeOnDetach.push( addEventListener(button, 'click', () => { diff --git a/arduino-ide-extension/src/browser/style/index.css b/arduino-ide-extension/src/browser/style/index.css index 9feeed7db..e46cdcdd7 100644 --- a/arduino-ide-extension/src/browser/style/index.css +++ b/arduino-ide-extension/src/browser/style/index.css @@ -109,6 +109,13 @@ button.secondary[disabled], .theia-button.secondary[disabled] { background-color: var(--theia-secondaryButton-background); } +button.theia-button.message-box-dialog-button { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + display: inline-block; +} + /* To make the progress-bar slightly thicker, and use the color from the status bar */ .theia-progress-bar-container { width: 100%; From 2bcfc1fb305aefa7aba5392b1458caaf375f030e Mon Sep 17 00:00:00 2001 From: Francesco Spissu <94986937+francescospissu@users.noreply.github.com> Date: Fri, 7 Oct 2022 14:49:27 +0200 Subject: [PATCH 2/4] remove cancel and update button text --- .../src/browser/library/library-list-widget.ts | 6 ++---- i18n/en.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts index 11e85eabd..a1838dda4 100644 --- a/arduino-ide-extension/src/browser/library/library-list-widget.ts +++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts @@ -126,11 +126,9 @@ export class LibraryListWidget extends ListWidget< ), message, buttons: [ - nls.localize('vscode/issueMainService/cancel', 'Cancel'), nls.localize( - 'arduino/library/installOnly', - 'Install {0} only', - item.name + 'arduino/library/installWithoutDependencies', + 'Install without dependencies' ), nls.localize('arduino/library/installAll', 'Install all'), ], diff --git a/i18n/en.json b/i18n/en.json index 77cbfc24c..72eb9d5be 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -259,7 +259,7 @@ "installAll": "Install all", "installMissingDependencies": "Would you like to install all the missing dependencies?", "installOneMissingDependency": "Would you like to install the missing dependency?", - "installOnly": "Install {0} only", + "installWithoutDependencies": "Install without dependencies", "installedSuccessfully": "Successfully installed library {0}:{1}", "libraryAlreadyExists": "A library already exists. Do you want to overwrite it?", "manageLibraries": "Manage Libraries...", From be0c222d8c6cebdd383ecd600c67e005f02ecd5c Mon Sep 17 00:00:00 2001 From: Francesco Spissu <94986937+francescospissu@users.noreply.github.com> Date: Wed, 19 Oct 2022 10:18:06 +0200 Subject: [PATCH 3/4] add title to buttons and changed dialog title --- .../src/browser/library/library-list-widget.ts | 7 +++---- i18n/en.json | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts index a1838dda4..2dbc2b756 100644 --- a/arduino-ide-extension/src/browser/library/library-list-widget.ts +++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts @@ -119,10 +119,8 @@ export class LibraryListWidget extends ListWidget< message.appendChild(question); const result = await new MessageBoxDialog({ title: nls.localize( - 'arduino/library/dependenciesForLibrary', - 'Dependencies for library {0}:{1}', - item.name, - version + 'arduino/library/installLibraryDependencies', + 'Install library dependencies' ), message, buttons: [ @@ -201,6 +199,7 @@ class MessageBoxDialog extends AbstractDialog { const button = this.createButton(text); const isPrimaryButton = index === (options.buttons ? options.buttons.length - 1 : 0); + button.title = text; button.classList.add( isPrimaryButton ? 'main' : 'secondary', 'message-box-dialog-button' diff --git a/i18n/en.json b/i18n/en.json index 72eb9d5be..e018e0881 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -254,9 +254,9 @@ "addZip": "Add .ZIP Library...", "arduinoLibraries": "Arduino libraries", "contributedLibraries": "Contributed libraries", - "dependenciesForLibrary": "Dependencies for library {0}:{1}", "include": "Include Library", "installAll": "Install all", + "installLibraryDependencies": "Install library dependencies", "installMissingDependencies": "Would you like to install all the missing dependencies?", "installOneMissingDependency": "Would you like to install the missing dependency?", "installWithoutDependencies": "Install without dependencies", From d10cd96d51af53f5e2f23685d5ec60d6521249a9 Mon Sep 17 00:00:00 2001 From: Francesco Spissu <94986937+francescospissu@users.noreply.github.com> Date: Thu, 20 Oct 2022 11:21:32 +0200 Subject: [PATCH 4/4] fix buttons behavior and casing alignment --- .../src/browser/library/library-list-widget.ts | 6 +++--- i18n/en.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts index 2dbc2b756..c1ca83b35 100644 --- a/arduino-ide-extension/src/browser/library/library-list-widget.ts +++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts @@ -128,17 +128,17 @@ export class LibraryListWidget extends ListWidget< 'arduino/library/installWithoutDependencies', 'Install without dependencies' ), - nls.localize('arduino/library/installAll', 'Install all'), + nls.localize('arduino/library/installAll', 'Install All'), ], maxWidth: 740, // Aligned with `settings-dialog.css`. }).open(); if (result) { const { response } = result; - if (response === 1) { + if (response === 0) { // Current only installDependencies = false; - } else if (response === 2) { + } else if (response === 1) { // All installDependencies = true; } diff --git a/i18n/en.json b/i18n/en.json index e018e0881..ea6db769a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -255,7 +255,7 @@ "arduinoLibraries": "Arduino libraries", "contributedLibraries": "Contributed libraries", "include": "Include Library", - "installAll": "Install all", + "installAll": "Install All", "installLibraryDependencies": "Install library dependencies", "installMissingDependencies": "Would you like to install all the missing dependencies?", "installOneMissingDependency": "Would you like to install the missing dependency?",