Skip to content
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

Jump to bottom

Harmonize the use of ellipses in command and menu items #16237

Merged
merged 16 commits into from
Apr 26, 2024
Merged

Harmonize the use of ellipses in command and menu items #16237

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a305b31
Update browser.json
Rob-P-Smith Apr 24, 2024
2a125a7
-Removed elipses from:
Rob-P-Smith Apr 24, 2024
7074846
-Removed elipses from:
Rob-P-Smith Apr 24, 2024
fdf4593
Merge branch 'main' of https://github.com/Rob-P-Smith/jupyterlab
Rob-P-Smith Apr 24, 2024
7455639
Delete Untitled.ipynb
Rob-P-Smith Apr 24, 2024
8ab5c04
Delete Untitled1.ipynb
Rob-P-Smith Apr 24, 2024
0bea50e
Merge branch 'jupyterlab:main' into elipses
Rob-P-Smith Apr 24, 2024
10165a8
Update Playwright Snapshots
github-actions[bot] Apr 25, 2024
1fad340
Update Playwright Snapshots
github-actions[bot] Apr 25, 2024
9222a07
Corrections Applied per JasonWeill's feedback.
Rob-P-Smith Apr 26, 2024
110c2f4
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 26, 2024
a91123e
Update Playwright Snapshots
github-actions[bot] Apr 26, 2024
64814ee
Update Playwright Snapshots
github-actions[bot] Apr 26, 2024
5053709
Revert unrelated changes
krassowski Apr 26, 2024
4edca34
Merge branch 'main' into elipses
krassowski Apr 26, 2024
39211ef
Fix test
krassowski Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions galata/test/documentation/commands.test.ts-snapshots/commandsList-documentation-linux.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
},
{
"id": "apputils:display-shortcuts",
"label": "Show Keyboard Shortcuts",
"label": "Show Keyboard Shortcuts…",
"caption": "Show relevant keyboard shortcuts for the current active widget",
"shortcuts": [
"Ctrl Shift H"
Expand Down Expand Up @@ -1586,7 +1586,7 @@
},
{
"id": "notebook:close-and-shutdown",
"label": "Close and Shut Down Notebook",
"label": "Close and Shut Down Notebook…",
"caption": "",
"shortcuts": []
},
Expand Down Expand Up @@ -2515,7 +2515,7 @@
},
{
"id": "workspace-ui:save",
"label": "Save Current Workspace…",
"label": "Save Current Workspace",
"caption": "",
"shortcuts": []
},
Expand Down
Binary file modified ...tation/export_notebook.test.ts-snapshots/exporting-menu-documentation-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...tation/general.test.ts-snapshots/files-create-text-file-documentation-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified .../documentation/general.test.ts-snapshots/files-menu-top-documentation-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...a/test/jupyterlab/menus.test.ts-snapshots/opened-menu-file-jupyterlab-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...terlab/menus.test.ts-snapshots/opened-menu-file-workspaces-jupyterlab-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...a/test/jupyterlab/menus.test.ts-snapshots/opened-menu-help-jupyterlab-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...yterlab/notebook-create.test.ts-snapshots/opened-menu-file-jupyterlab-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...yterlab/notebook-create.test.ts-snapshots/opened-menu-help-jupyterlab-linux.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/apputils-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ const utilityCommands: JupyterFrontEndPlugin<void> = {
});

commands.addCommand(CommandIDs.displayShortcuts, {
label: trans.__('Show Keyboard Shortcuts'),
label: trans.__('Show Keyboard Shortcuts…'),
caption: trans.__(
'Show relevant keyboard shortcuts for the current active widget'
),
Expand Down
2 changes: 1 addition & 1 deletion packages/notebook-extension/schema/export.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"rank": 10,
"submenu": {
"id": "jp-mainmenu-file-notebookexport",
"label": "Save and Export Notebook As…"
"label": "Save and Export Notebook As"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion packages/notebook-extension/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2417,7 +2417,7 @@ function addCommands(
isEnabled
});
commands.addCommand(CommandIDs.closeAndShutdown, {
label: trans.__('Close and Shut Down Notebook'),
label: trans.__('Close and Shut Down Notebook…'),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is an ellipsis needed here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah because it shows a confirmation dialog.

execute: args => {
const current = getCurrent(tracker, shell, args);

Expand Down
2 changes: 1 addition & 1 deletion packages/workspaces-extension/src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ export const commandsPlugin: JupyterFrontEndPlugin<IWorkspaceCommands> = {
});

app.commands.addCommand(CommandIDs.save, {
label: trans.__('Save Current Workspace…'),
label: trans.__('Save Current Workspace'),
execute: async () => {
const { contents } = app.serviceManager;
const data = app.serviceManager.workspaces.fetch(resolver.name);
Expand Down