diff --git a/README.md b/README.md index 5f158ac..7abefa5 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Scratch 3.0 as a standalone desktop application This step is temporary: eventually, the `scratch-desktop` branch of the Scratch GUI repository will be merged with that repository's main development line. For now, though, the `scratch-desktop` branch holds a few changes that are -necessary for the Scratch app to function correctly but are not yet merged into the main development branch. +necessary for Scratch Desktop to function correctly but are not yet merged into the main development branch. #### Prepare `scratch-gui`: Quick Start @@ -23,7 +23,7 @@ necessary for the Scratch app to function correctly but are not yet merged into 2. `npm link scratch-gui` 3. `npm run build-gui` or `npm run watch-gui` -Your copy of `scratch-gui` should now be ready for use with the `scratch-desktop` build process. +Your copy of `scratch-gui` should now be ready for use with Scratch Desktop. #### Prepare `scratch-gui`: Detailed Version @@ -85,7 +85,7 @@ Sometimes the macOS build process will result in a build which crashes on startu for an entry similar to this: ```text -failed to parse entitlements for Scratch[12345]: OSUnserializeXML: syntax error near line 1 +failed to parse entitlements for Scratch Desktop[12345]: OSUnserializeXML: syntax error near line 1 ``` This appears to be an issue with `codesign` itself. Rebooting your computer and trying to build again might help. Yes, diff --git a/electron-builder.yaml b/electron-builder.yaml index 7e05c42..fc32724 100644 --- a/electron-builder.yaml +++ b/electron-builder.yaml @@ -2,7 +2,7 @@ directories: buildResources: buildResources output: dist appId: edu.mit.scratch.scratch-desktop -productName: "Scratch" +productName: "Scratch Desktop" publish: # empty provider list = don't publish mac: category: public.app-category.education diff --git a/package.json b/package.json index 02cea5f..d84d2d0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "scratch-desktop", - "productName": "Scratch", + "productName": "Scratch Desktop", "description": "Scratch 3.0 as a self-contained desktop application", "author": "Scratch Foundation", "version": "3.13.0", diff --git a/src/main/index.js b/src/main/index.js index fdae67e..f7bfd5f 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -7,7 +7,6 @@ import {getFilterForExtension} from './FileFilters'; import telemetry from './ScratchDesktopTelemetry'; import MacOSMenu from './MacOSMenu'; import log from '../common/log.js'; -import {productName, version} from '../../package.json'; // suppress deprecation warning; this will be the default in Electron 9 app.allowRendererProcessReuse = true; @@ -173,7 +172,7 @@ const createAboutWindow = () => { height: 400, parent: _windows.main, search: 'route=about', - title: `About ${productName}` + title: 'About Scratch Desktop' }); return window; }; @@ -190,7 +189,7 @@ const createMainWindow = () => { const window = createWindow({ width: defaultSize.width, height: defaultSize.height, - title: `${productName} ${version}` // something like "Scratch 3.14" + title: 'Scratch Desktop' }); const webContents = window.webContents; diff --git a/src/renderer/about.jsx b/src/renderer/about.jsx index 9b121bc..8906fe3 100644 --- a/src/renderer/about.jsx +++ b/src/renderer/about.jsx @@ -26,18 +26,16 @@ const AboutElement = () => ( maxHeight: '10rem' }} /> -
-

{productName}

-
Version {version}
- - { - ['Electron', 'Chrome'].map(component => { - const componentVersion = process.versions[component.toLowerCase()]; - return ; - }) - } -
{component}{componentVersion}
-
+

{productName}

+
Version {version}
+ + { + ['Electron', 'Chrome'].map(component => { + const componentVersion = process.versions[component.toLowerCase()]; + return ; + }) + } +
{component}{componentVersion}
); diff --git a/src/renderer/index.html b/src/renderer/index.html index 7efeb1d..a9665fa 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -20,6 +20,6 @@ -

Scratch is loading...

+

Scratch Desktop is loading...