diff --git a/examples/filebrowser/src/index.ts b/examples/filebrowser/src/index.ts index 62d6f4c9e7c2..4fa761d29ad8 100644 --- a/examples/filebrowser/src/index.ts +++ b/examples/filebrowser/src/index.ts @@ -194,7 +194,7 @@ function createApp(manager: ServiceManager.IManager): void { } }); commands.addCommand('file-shutdown-kernel', { - label: 'Shutdown Kernel', + label: 'Shut Down Kernel', icon: 'fa fa-stop-circle-o', execute: () => { return fbWidget.shutdownKernels(); diff --git a/packages/apputils/src/clientsession.tsx b/packages/apputils/src/clientsession.tsx index df0262b694f7..2ad1679586f5 100644 --- a/packages/apputils/src/clientsession.tsx +++ b/packages/apputils/src/clientsession.tsx @@ -370,7 +370,7 @@ export class ClientSession implements IClientSession { if (this._session) { if (this.kernelPreference.shutdownOnClose) { this._session.shutdown().catch(reason => { - console.error(`Kernel not shutdown ${reason}`); + console.error(`Kernel not shut down ${reason}`); }); } this._session = null; diff --git a/packages/console-extension/src/index.ts b/packages/console-extension/src/index.ts index fa09e247f8f4..07852e9050d1 100644 --- a/packages/console-extension/src/index.ts +++ b/packages/console-extension/src/index.ts @@ -428,14 +428,14 @@ async function activateConsole( }); commands.addCommand(CommandIDs.closeAndShutdown, { - label: 'Close and Shutdown…', + label: 'Close and Shut Down…', execute: args => { const current = getCurrent(args); if (!current) { return; } return showDialog({ - title: 'Shutdown the console?', + title: 'Shut down the console?', body: `Are you sure you want to close "${current.title.label}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { @@ -509,7 +509,7 @@ async function activateConsole( name: 'Console', closeAndCleanup: (current: ConsolePanel) => { return showDialog({ - title: 'Shutdown the console?', + title: 'Shut down the console?', body: `Are you sure you want to close "${current.title.label}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { diff --git a/packages/filebrowser-extension/src/index.ts b/packages/filebrowser-extension/src/index.ts index 12e47e1df77f..0e90fdac8bf8 100644 --- a/packages/filebrowser-extension/src/index.ts +++ b/packages/filebrowser-extension/src/index.ts @@ -625,7 +625,7 @@ function addCommands( } }, iconClass: 'jp-MaterialIcon jp-StopIcon', - label: 'Shutdown Kernel' + label: 'Shut Down Kernel' }); commands.addCommand(CommandIDs.toggleBrowser, { diff --git a/packages/filebrowser/src/listing.ts b/packages/filebrowser/src/listing.ts index 63ce5afbbaa6..71b1c36403bc 100644 --- a/packages/filebrowser/src/listing.ts +++ b/packages/filebrowser/src/listing.ts @@ -440,7 +440,7 @@ export class DirListing extends Widget { return undefined; }) .catch(error => { - void showErrorMessage('Shutdown kernel', error); + void showErrorMessage('Shut down kernel', error); }); } diff --git a/packages/mainmenu-extension/src/index.ts b/packages/mainmenu-extension/src/index.ts index e8236bafee61..f8dc44a9924a 100644 --- a/packages/mainmenu-extension/src/index.ts +++ b/packages/mainmenu-extension/src/index.ts @@ -207,6 +207,10 @@ const plugin: JupyterFrontEndPlugin = { command: CommandIDs.shutdown, category: 'Main Area' }); + palette.addItem({ + command: CommandIDs.logout, + category: 'Main Area' + }); } palette.addItem({ @@ -348,7 +352,7 @@ export function createFileMenu( }); commands.addCommand(CommandIDs.shutdown, { - label: 'Shutdown', + label: 'Shut Down', caption: 'Shut down JupyterLab', execute: () => { return showDialog({ @@ -392,7 +396,7 @@ export function createFileMenu( }); commands.addCommand(CommandIDs.logout, { - label: 'Logout', + label: 'Log Out', caption: 'Log out of JupyterLab', execute: () => { router.navigate('/logout', { hard: true }); @@ -506,23 +510,23 @@ export function createKernelMenu(app: JupyterFrontEnd, menu: KernelMenu): void { }); commands.addCommand(CommandIDs.shutdownKernel, { - label: 'Shutdown Kernel', + label: 'Shut Down Kernel', isEnabled: Private.delegateEnabled(app, menu.kernelUsers, 'shutdownKernel'), execute: Private.delegateExecute(app, menu.kernelUsers, 'shutdownKernel') }); commands.addCommand(CommandIDs.shutdownAllKernels, { - label: 'Shutdown All Kernels…', + label: 'Shut Down All Kernels…', isEnabled: () => { return app.serviceManager.sessions.running().next() !== undefined; }, execute: () => { return showDialog({ - title: 'Shutdown All?', + title: 'Shut Down All?', body: 'Shut down all kernels?', buttons: [ Dialog.cancelButton(), - Dialog.warnButton({ label: 'SHUTDOWN' }) + Dialog.warnButton({ label: 'SHUT DOWN ALL' }) ] }).then(result => { if (result.button.accept) { diff --git a/packages/notebook-extension/src/index.ts b/packages/notebook-extension/src/index.ts index 5525a96d130e..fece5ae28614 100644 --- a/packages/notebook-extension/src/index.ts +++ b/packages/notebook-extension/src/index.ts @@ -1089,7 +1089,7 @@ function addCommands( isEnabled }); commands.addCommand(CommandIDs.closeAndShutdown, { - label: 'Close and Shutdown', + label: 'Close and Shut Down', execute: args => { const current = getCurrent(args); @@ -1100,7 +1100,7 @@ function addCommands( const fileName = current.title.label; return showDialog({ - title: 'Shutdown the notebook?', + title: 'Shut down the notebook?', body: `Are you sure you want to close "${fileName}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { @@ -1927,7 +1927,7 @@ function populateMenus( closeAndCleanup: (current: NotebookPanel) => { const fileName = current.title.label; return showDialog({ - title: 'Shutdown the notebook?', + title: 'Shut down the notebook?', body: `Are you sure you want to close "${fileName}"?`, buttons: [Dialog.cancelButton(), Dialog.warnButton()] }).then(result => { diff --git a/packages/running/src/index.tsx b/packages/running/src/index.tsx index 2c5c095df869..b059bd5d7611 100644 --- a/packages/running/src/index.tsx +++ b/packages/running/src/index.tsx @@ -173,7 +173,7 @@ function Item(props: SessionProps & { model: M }) { className={`${SHUTDOWN_BUTTON_CLASS} jp-mod-styled`} onClick={() => props.shutdown(model)} > - SHUTDOWN + SHUT DOWN ); @@ -218,8 +218,11 @@ function List(props: SessionProps) { function Section(props: SessionProps) { function onShutdown() { void showDialog({ - title: `Shutdown All ${props.name} Sessions?`, - buttons: [Dialog.cancelButton(), Dialog.warnButton({ label: 'SHUTDOWN' })] + title: `Shut Down All ${props.name} Sessions?`, + buttons: [ + Dialog.cancelButton(), + Dialog.warnButton({ label: 'SHUT DOWN ALL' }) + ] }).then(result => { if (result.button.accept) { props.manager.shutdownAll(); @@ -233,7 +236,7 @@ function Section(props: SessionProps) {

{props.name} Sessions