Skip to content

Commit 364f8b8

Browse files
Move primary buttons on the right of the dialogs (#1382)
Closes #1368.
1 parent 671d2ea commit 364f8b8

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

Diff for: arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
181181
);
182182
this.contentNode.appendChild(anchor);
183183

184-
this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
185184
this.appendCloseButton(
186185
nls.localize('vscode/issueMainService/cancel', 'Cancel')
187186
);
187+
this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
188188
}
189189

190190
get value(): string[] {

Diff for: arduino-ide-extension/src/browser/library/library-list-widget.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ export class LibraryListWidget extends ListWidget<
126126
),
127127
message,
128128
buttons: [
129-
nls.localize('arduino/library/installAll', 'Install all'),
129+
nls.localize('vscode/issueMainService/cancel', 'Cancel'),
130130
nls.localize(
131131
'arduino/library/installOnly',
132132
'Install {0} only',
133133
item.name
134134
),
135-
nls.localize('vscode/issueMainService/cancel', 'Cancel'),
135+
nls.localize('arduino/library/installAll', 'Install all'),
136136
],
137137
maxWidth: 740, // Aligned with `settings-dialog.css`.
138138
}).open();
@@ -201,7 +201,9 @@ class MessageBoxDialog extends AbstractDialog<MessageBoxDialog.Result> {
201201
options.buttons || [nls.localize('vscode/issueMainService/ok', 'OK')]
202202
).forEach((text, index) => {
203203
const button = this.createButton(text);
204-
button.classList.add(index === 0 ? 'main' : 'secondary');
204+
const isPrimaryButton =
205+
index === (options.buttons ? options.buttons.length - 1 : 0);
206+
button.classList.add(isPrimaryButton ? 'main' : 'secondary');
205207
this.controlPanel.appendChild(button);
206208
this.toDisposeOnDetach.push(
207209
addEventListener(button, 'click', () => {

Diff for: arduino-ide-extension/src/browser/style/settings-dialog.css

+1
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@
9393

9494
.p-Widget.dialogOverlay .dialogBlock .dialogContent.additional-urls-dialog {
9595
display: block;
96+
overflow: hidden;
9697
}

Diff for: arduino-ide-extension/src/browser/theia/workspace/workspace-input-dialog.ts

+12-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {
1414
constructor(
1515
@inject(WorkspaceInputDialogProps)
1616
protected override readonly props: WorkspaceInputDialogProps,
17-
@inject(LabelProvider) protected override readonly labelProvider: LabelProvider
17+
@inject(LabelProvider)
18+
protected override readonly labelProvider: LabelProvider
1819
) {
1920
super(props, labelProvider);
2021
this.appendCloseButton(
@@ -41,4 +42,14 @@ export class WorkspaceInputDialog extends TheiaWorkspaceInputDialog {
4142
this.errorMessageNode.innerText = DialogError.getMessage(error);
4243
}
4344
}
45+
46+
protected override appendCloseButton(text: string): HTMLButtonElement {
47+
this.closeButton = this.createButton(text);
48+
this.controlPanel.insertBefore(
49+
this.closeButton,
50+
this.controlPanel.lastChild
51+
);
52+
this.closeButton.classList.add('secondary');
53+
return this.closeButton;
54+
}
4455
}

0 commit comments

Comments
 (0)