Skip to content

Move primary buttons on the right of the dialogs #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 20, 2022
Merged

Move primary buttons on the right of the dialogs #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7bcd43b
move primary buttons on the right of the dialogs
francescospissu Sep 1, 2022
3e435b4
fix overflow in additional urls dialog
francescospissu Sep 1, 2022
1420c9b
accept button on the right for new sketch dialog
francescospissu Sep 2, 2022
eb37f68
improve primary button check
francescospissu Sep 6, 2022
c7cdaa6
override appendCloseButton
francescospissu Sep 7, 2022
769f08c
remove useless question mark
francescospissu Sep 15, 2022
04f23de
insert close button before last child
francescospissu Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
);
this.contentNode.appendChild(anchor);

this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
this.appendCloseButton(
nls.localize('vscode/issueMainService/cancel', 'Cancel')
);
this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
}

get value(): string[] {
Expand Down
8 changes: 5 additions & 3 deletions arduino-ide-extension/src/browser/library/library-list-widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,13 @@ export class LibraryListWidget extends ListWidget<
),
message,
buttons: [
nls.localize('arduino/library/installAll', 'Install all'),
nls.localize('vscode/issueMainService/cancel', 'Cancel'),
nls.localize(
'arduino/library/installOnly',
'Install {0} only',
item.name
),
nls.localize('vscode/issueMainService/cancel', 'Cancel'),
nls.localize('arduino/library/installAll', 'Install all'),
],
maxWidth: 740, // Aligned with `settings-dialog.css`.
}).open();
Expand Down Expand Up @@ -201,7 +201,9 @@ class MessageBoxDialog extends AbstractDialog<MessageBoxDialog.Result> {
options.buttons || [nls.localize('vscode/issueMainService/ok', 'OK')]
).forEach((text, index) => {
const button = this.createButton(text);
button.classList.add(index === 0 ? 'main' : 'secondary');
const isPrimaryButton =
index === (options.buttons ? options.buttons.length - 1 : 0);
button.classList.add(isPrimaryButton ? 'main' : 'secondary');
this.controlPanel.appendChild(button);
this.toDisposeOnDetach.push(
addEventListener(button, 'click', () => {
Expand Down
1 change: 1 addition & 0 deletions arduino-ide-extension/src/browser/style/settings-dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,4 +93,5 @@

.p-Widget.dialogOverlay .dialogBlock .dialogContent.additional-urls-dialog {
display: block;
overflow: hidden;
}
13 changes: 12 additions & 1 deletion arduino-ide-extension/src/browser/theia/workspace/workspace-input-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {
constructor(
@inject(WorkspaceInputDialogProps)
protected override readonly props: WorkspaceInputDialogProps,
@inject(LabelProvider) protected override readonly labelProvider: LabelProvider
@inject(LabelProvider)
protected override readonly labelProvider: LabelProvider
) {
super(props, labelProvider);
this.appendCloseButton(
Expand All @@ -41,4 +42,14 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {
this.errorMessageNode.innerText = DialogError.getMessage(error);
}
}

protected override appendCloseButton(text: string): HTMLButtonElement {
this.closeButton = this.createButton(text);
this.controlPanel.insertBefore(
this.closeButton,
this.controlPanel.lastChild
);
this.closeButton.classList.add('secondary');
return this.closeButton;
}
}