From 0817fddce1dbae9aefffab17b3bab959bd95890e Mon Sep 17 00:00:00 2001
From: Christopher Willis-Ford <cwillisf@media.mit.edu>
Date: Tue, 4 Aug 2020 10:41:32 -0700
Subject: [PATCH] Revert "Merge pull request #131 from
 cwillisf/rename-to-scratch"

This reverts commit 71cc32e5bf6278c0c5e133697de235c3c2a7a97f, reversing
changes made to 43daa269df721b64df8a1f8d2b54598a092f3631.
---
 README.md               |  6 +++---
 electron-builder.yaml   |  2 +-
 package.json            |  2 +-
 src/main/index.js       |  5 ++---
 src/renderer/about.jsx  | 22 ++++++++++------------
 src/renderer/index.html |  2 +-
 6 files changed, 18 insertions(+), 21 deletions(-)

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'
             }}
         /></div>
-        <div style={{margin: '1.5rem'}}>
-            <h2>{productName}</h2>
-            <div>Version {version}</div>
-            <table style={{fontSize: 'x-small'}}>
-                {
-                    ['Electron', 'Chrome'].map(component => {
-                        const componentVersion = process.versions[component.toLowerCase()];
-                        return <tr key={component}><td>{component}</td><td>{componentVersion}</td></tr>;
-                    })
-                }
-            </table>
-        </div>
+        <h2>{productName}</h2>
+        <div>Version {version}</div>
+        <table style={{fontSize: 'x-small'}}>
+            {
+                ['Electron', 'Chrome'].map(component => {
+                    const componentVersion = process.versions[component.toLowerCase()];
+                    return <tr key={component}><td>{component}</td><td>{componentVersion}</td></tr>;
+                })
+            }
+        </table>
     </div>
 );
 
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 @@
     </style>
 </head>
 <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>
 </html>