Skip to content

Commit 258a6f5

Browse files
committed
UI normalization
1 parent b485dde commit 258a6f5

12 files changed

+26
-26
lines changed

src/commands/addServerNamespaceToWorkspace.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async function pickNamespaceOnServer(serverName: string): Promise<string> {
7373
}
7474
// Get user's choice of namespace
7575
const namespace = await vscode.window.showQuickPick(allNamespaces, {
76-
placeHolder: `Namespace on server '${serverName}' (${connDisplayString})`,
76+
title: `Pick a namespace on server '${serverName}' (${connDisplayString})`,
7777
ignoreFocusOut: true,
7878
});
7979
return namespace;
@@ -133,7 +133,7 @@ export async function addServerNamespaceToWorkspace(resource?: vscode.Uri): Prom
133133
detail: "Documents opened in this folder will be read-only.",
134134
},
135135
],
136-
{ placeHolder: "Choose the type of access", ignoreFocusOut: true }
136+
{ title: "Pick the type of access", ignoreFocusOut: true }
137137
)
138138
.then((mode) => mode?.value);
139139
}
@@ -194,7 +194,7 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
194194
const filterType = await new Promise<string | undefined>((resolve) => {
195195
let result: string;
196196
const quickPick = vscode.window.createQuickPick();
197-
quickPick.placeholder = "Choose what to show in the workspace folder";
197+
quickPick.title = "Pick what to show in the workspace folder";
198198
quickPick.ignoreFocusOut = true;
199199
quickPick.items = [
200200
{
@@ -203,11 +203,11 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
203203
},
204204
{
205205
label: "$(file-code) Web Application Files",
206-
detail: "Choose a specific web application, or show all.",
206+
detail: "Pick a specific web application, or show all.",
207207
},
208208
{
209209
label: "$(files) Contents of a Server-side Project",
210-
detail: "Choose an existing project, or create a new one.",
210+
detail: "Pick an existing project, or create a new one.",
211211
},
212212
];
213213
quickPick.activeItems = [project ? quickPick.items[2] : csp ? quickPick.items[1] : quickPick.items[0]];
@@ -263,7 +263,7 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
263263
let result: string;
264264
const allItem: vscode.QuickPickItem = { label: "All" };
265265
const quickPick = vscode.window.createQuickPick();
266-
quickPick.placeholder = "Pick a specific web application to show, or show all";
266+
quickPick.title = "Pick a specific web application to show, or show all";
267267
quickPick.ignoreFocusOut = true;
268268
quickPick.items = [
269269
allItem,
@@ -331,7 +331,7 @@ async function modifyWsFolderUri(uri: vscode.Uri): Promise<vscode.Uri | undefine
331331
const otherParams = await vscode.window.showQuickPick(items, {
332332
ignoreFocusOut: true,
333333
canPickMany: true,
334-
placeHolder: "Add optional filters",
334+
title: "Pick optional filters",
335335
});
336336
if (!otherParams) {
337337
return;

src/commands/connectFolderToServerNamespace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export async function connectFolderToServerNamespace(): Promise<void> {
3737
const pick =
3838
items.length === 1 && !items[0].detail
3939
? items[0]
40-
: await vscode.window.showQuickPick(items, { placeHolder: "Choose folder" });
40+
: await vscode.window.showQuickPick(items, { title: "Pick a folder" });
4141
const folder = allFolders.find((el) => el.name === pick.label);
4242
// Get user's choice of server
4343
const options: vscode.QuickPickOptions = {};
@@ -78,7 +78,7 @@ export async function connectFolderToServerNamespace(): Promise<void> {
7878
}
7979
// Get user's choice of namespace
8080
const namespace = await vscode.window.showQuickPick(allNamespaces, {
81-
placeHolder: `Namespace on server '${serverName}' (${connDisplayString})`,
81+
title: `Pick a namespace on server '${serverName}' (${connDisplayString})`,
8282
});
8383
if (!namespace) {
8484
return;

src/commands/export.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ export async function exportAll(): Promise<any> {
165165
.map((el) => el.name);
166166
if (workspaceList.length > 1) {
167167
const selection = await vscode.window.showQuickPick(workspaceList, {
168-
placeHolder: "Select the workspace folder to export files to.",
168+
title: "Pick the workspace folder to export files to.",
169169
});
170170
if (selection === undefined) {
171171
return;

src/commands/project.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export async function pickProject(api: AtelierAPI): Promise<string | undefined>
2626
if (projects.length === 0) {
2727
const create = await vscode.window.showQuickPick(["Yes", "No"], {
2828
ignoreFocusOut: true,
29-
placeHolder: `Namespace ${ns} on server '${api.serverId}' contains no projects. Create one?`,
29+
title: `Namespace ${ns} on server '${api.serverId}' contains no projects. Create one?`,
3030
});
3131
if (create == "Yes") {
3232
return createProject(undefined, api);
@@ -839,7 +839,7 @@ export async function modifyProject(
839839
{
840840
ignoreFocusOut: true,
841841
canPickMany: true,
842-
placeHolder: `Select the items to remove from project '${project}'.`,
842+
title: `Pick the items to remove from project '${project}'.`,
843843
}
844844
);
845845
if (removeQPIs !== undefined) {
@@ -942,7 +942,7 @@ export async function exportProjectContents(node: ProjectNode | undefined): Prom
942942
.map((el) => el.name);
943943
if (workspaceList.length > 1) {
944944
const selection = await vscode.window.showQuickPick(workspaceList, {
945-
placeHolder: "Select the workspace folder to export files to.",
945+
title: "Pick the workspace folder to export files to.",
946946
});
947947
if (selection === undefined) {
948948
return;

src/commands/serverActions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export async function serverActions(): Promise<void> {
102102
}
103103

104104
const namespace = await vscode.window.showQuickPick(allNamespaces, {
105-
placeHolder: `Choose the namespace to switch to`,
105+
title: "Pick the namespace to switch to",
106106
ignoreFocusOut: true,
107107
});
108108

@@ -215,7 +215,7 @@ export async function serverActions(): Promise<void> {
215215
}
216216
return vscode.window
217217
.showQuickPick(actions, {
218-
placeHolder: `Pick action to perform for server ${connInfo}`,
218+
title: `Pick action to perform for server ${connInfo}`,
219219
})
220220
.then(connectionActionsHandler)
221221
.then(async (action) => {
@@ -244,7 +244,7 @@ export async function serverActions(): Promise<void> {
244244
});
245245
if (addins != undefined) {
246246
const addin = await vscode.window.showQuickPick(addins, {
247-
placeHolder: `Pick a Studio Add-In to open for server: ${connInfo}`,
247+
title: `Pick a Studio Add-In to open for server: ${connInfo}`,
248248
});
249249
if (addin) {
250250
const token = await getCSPToken(api, addin.id);

src/commands/studio.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ export class StudioActions {
438438
}
439439
return vscode.window.showQuickPick<StudioAction>(menuItems, {
440440
canPickMany: false,
441-
placeHolder: `Pick a server-side ${noun} to execute${suffix}`,
441+
title: `Pick a server-side ${noun} to execute${suffix}`,
442442
});
443443
})
444444
.then((action) => this.userAction(action));

src/commands/subclass.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export async function subclass(): Promise<void> {
3030
vscode.window
3131
.showQuickPick(
3232
list.map((el) => el.Name),
33-
{ placeHolder: "Pick a subclass" }
33+
{ title: "Pick a subclass" }
3434
)
3535
.then((item) => {
3636
open(item);

src/commands/superclass.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export async function superclass(): Promise<void> {
2323
if (!list.length) {
2424
return;
2525
}
26-
vscode.window.showQuickPick(list, { placeHolder: "Pick a superclass" }).then((item) => {
26+
vscode.window.showQuickPick(list, { title: "Pick a superclass" }).then((item) => {
2727
open(item);
2828
});
2929
})

src/commands/unitTest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ async function runHandler(
404404
matchOnDetail: true,
405405
ignoreFocusOut: true,
406406
title: `Cannot ${action} tests from multiple roots at once`,
407-
placeHolder: `Please select a root to ${action} tests from`,
407+
placeHolder: `Pick a root to ${action} tests from`,
408408
}
409409
);
410410
if (picked) {

src/commands/xmlToUdl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export async function extractXMLFileContents(xmlUri?: vscode.Uri): Promise<void>
115115
}),
116116
{
117117
ignoreFocusOut: true,
118-
placeHolder: "Pick the workspace folder to run the command in",
118+
title: "Pick the workspace folder to run the command in",
119119
}
120120
)
121121
)?.wf;
@@ -170,7 +170,7 @@ export async function extractXMLFileContents(xmlUri?: vscode.Uri): Promise<void>
170170
{
171171
canPickMany: true,
172172
ignoreFocusOut: true,
173-
title: "Select the documents to extract",
173+
title: "Pick the documents to extract",
174174
placeHolder: "Files are created using your 'objectscript.export' settings",
175175
}
176176
);

0 commit comments

Comments
 (0)