scratchfoundation/scratch-desktop
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-desktop.git synced 2024-12-22 21:52:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge pull request #131 from cwillisf/rename-to-scratch"

Browse source 
This reverts commit 71cc32e5bf, reversing
changes made to 43daa269df.
This commit is contained in:
Christopher Willis-Ford 2020-08-04 10:41:32 -07:00
parent 8f4cab598e
commit 0817fddce1
6 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -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 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 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 #### 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` 2. `npm link scratch-gui`
3. `npm run build-gui` or `npm run watch-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 #### 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: for an entry similar to this:
```text ```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, This appears to be an issue with `codesign` itself. Rebooting your computer and trying to build again might help. Yes,

2
electron-builder.yaml
View file

@ -2,7 +2,7 @@ directories:
buildResources: buildResources buildResources: buildResources
output: dist output: dist
appId: edu.mit.scratch.scratch-desktop appId: edu.mit.scratch.scratch-desktop
productName: "Scratch" productName: "Scratch Desktop"
publish: # empty provider list = don't publish publish: # empty provider list = don't publish
mac: mac:
category: public.app-category.education category: public.app-category.education

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "scratch-desktop", "name": "scratch-desktop",
"productName": "Scratch", "productName": "Scratch Desktop",
"description": "Scratch 3.0 as a self-contained desktop application", "description": "Scratch 3.0 as a self-contained desktop application",
"author": "Scratch Foundation", "author": "Scratch Foundation",
"version": "3.13.0", "version": "3.13.0",

5
src/main/index.js
View file

@ -7,7 +7,6 @@ import {getFilterForExtension} from './FileFilters';
import telemetry from './ScratchDesktopTelemetry'; import telemetry from './ScratchDesktopTelemetry';
import MacOSMenu from './MacOSMenu'; import MacOSMenu from './MacOSMenu';
import log from '../common/log.js'; import log from '../common/log.js';
import {productName, version} from '../../package.json';
// suppress deprecation warning; this will be the default in Electron 9 // suppress deprecation warning; this will be the default in Electron 9
app.allowRendererProcessReuse = true; app.allowRendererProcessReuse = true;
@ -173,7 +172,7 @@ const createAboutWindow = () => {
height: 400, height: 400,
parent: _windows.main, parent: _windows.main,
search: 'route=about', search: 'route=about',
title: `About ${productName}` title: 'About Scratch Desktop'
}); });
return window; return window;
}; };
@ -190,7 +189,7 @@ const createMainWindow = () => {
const window = createWindow({ const window = createWindow({
width: defaultSize.width, width: defaultSize.width,
height: defaultSize.height, height: defaultSize.height,
title: `${productName} ${version}` // something like "Scratch 3.14" title: 'Scratch Desktop'
}); });
const webContents = window.webContents; const webContents = window.webContents;

2
src/renderer/about.jsx
View file

@ -26,7 +26,6 @@ const AboutElement = () => (
maxHeight: '10rem' maxHeight: '10rem'
}} }}
/></div> /></div>
<div style={{margin: '1.5rem'}}>
<h2>{productName}</h2> <h2>{productName}</h2>
<div>Version {version}</div> <div>Version {version}</div>
<table style={{fontSize: 'x-small'}}> <table style={{fontSize: 'x-small'}}>
@ -38,7 +37,6 @@ const AboutElement = () => (
} }
</table> </table>
</div> </div>
</div>
); );
const appTarget = document.getElementById('app'); const appTarget = document.getElementById('app');

2
src/renderer/index.html
View file

@ -20,6 +20,6 @@
</style> </style>
</head> </head>
<body> <body>
<div id="app"><p class="splash">Scratch is loading...</p></div> <div id="app"><p class="splash">Scratch Desktop is loading...</p></div>
</body> </body>
</html> </html>