Revert "macOS: Improved appearance of application icon"

This reverts commit 334347a.
e-mhui · May 31, 2020 · a8cffb9 · a8cffb9
1 parent 334347a
commit a8cffb9
Show file tree

Hide file tree

Showing 14 changed files with 6 additions and 14 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -61,8 +61,6 @@ Modules/TinyMCE/IconPack/postinstall.js
 Modules/TinyMCE/langs/
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-CliClient/tests-build/support/plugins/withExternalModules/global.d.js
-CliClient/tests-build/support/plugins/withExternalModules/src/index.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js

diff --git a/.gitignore b/.gitignore
@@ -51,8 +51,6 @@ Tools/commit_hook.txt
 *.map
 
 # AUTO-GENERATED - EXCLUDED TYPESCRIPT BUILD
-CliClient/tests-build/support/plugins/withExternalModules/global.d.js
-CliClient/tests-build/support/plugins/withExternalModules/src/index.js
 ElectronClient/gui/MultiNoteActions.js
 ElectronClient/gui/NoteContentPropertiesDialog.js
 ElectronClient/gui/NoteEditor/NoteBody/AceEditor/AceEditor.js

diff --git a/Assets/ImageSources/RoundedCornersMac_1024x1024.png b/Assets/ImageSources/RoundedCornersMac_1024x1024.png
diff --git a/Assets/macOs.icns b/Assets/macOs.icns
diff --git a/Assets/macOs.iconset/icon_128x128.png b/Assets/macOs.iconset/icon_128x128.png
diff --git a/Assets/macOs.iconset/[email protected] b/Assets/macOs.iconset/[email protected]
diff --git a/Assets/macOs.iconset/icon_256x256.png b/Assets/macOs.iconset/icon_256x256.png
diff --git a/Assets/macOs.iconset/[email protected] b/Assets/macOs.iconset/[email protected]
diff --git a/Assets/macOs.iconset/icon_512x512.png b/Assets/macOs.iconset/icon_512x512.png
diff --git a/Assets/macOs.iconset/[email protected] b/Assets/macOs.iconset/[email protected]
diff --git a/Assets/macOsIcon.psd b/Assets/macOsIcon.psd
diff --git a/ElectronClient/build-win/icons/SmallTile.png b/ElectronClient/build-win/icons/SmallTile.png
diff --git a/ElectronClient/build-win/icons/Square150x150Logo.png b/ElectronClient/build-win/icons/Square150x150Logo.png
diff --git a/Tools/generate-images.js b/Tools/generate-images.js
@@ -31,10 +31,6 @@ const sources = [
 		id: 6,
 		name: '../JoplinLetter.png',
 	},
-	{
-		id: 7,
-		name: 'RoundedCornersMac_1024x1024.png',
-	},
 ];
 
 function sourceById(id) {
@@ -188,37 +184,37 @@ const operations = [
 		height: 64,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/icon_128x128.png',
 		width: 128,
 		height: 128,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/[email protected]',
 		width: 256,
 		height: 256,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/icon_256x256.png',
 		width: 256,
 		height: 256,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/[email protected]',
 		width: 512,
 		height: 512,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/icon_512x512.png',
 		width: 512,
 		height: 512,
 	},
 	{
-		source: 7,
+		source: 4,
 		dest: 'Assets/macOs.iconset/[email protected]',
 		width: 1024,
 		height: 1024,