diff --git a/README.md b/README.md index 3ee614df..92004c49 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# OpenFlexure.vue +# OpenFlexure eV A user client for the OpenFlexure Microscope, written in Vue.js. ## Install diff --git a/icons/icon_base.png b/icons/icon_base.png index 8d2dd9c6..1e9e1f78 100644 Binary files a/icons/icon_base.png and b/icons/icon_base.png differ diff --git a/icons/mac/icon.icns b/icons/mac/icon.icns index 396b005d..4e71f4f9 100644 Binary files a/icons/mac/icon.icns and b/icons/mac/icon.icns differ diff --git a/icons/png/1024x1024.png b/icons/png/1024x1024.png index c0c4ade3..da3847c9 100644 Binary files a/icons/png/1024x1024.png and b/icons/png/1024x1024.png differ diff --git a/icons/png/128x128.png b/icons/png/128x128.png index 413dc2a5..b6a8b1e7 100644 Binary files a/icons/png/128x128.png and b/icons/png/128x128.png differ diff --git a/icons/png/16x16.png b/icons/png/16x16.png index a169074e..564e1431 100644 Binary files a/icons/png/16x16.png and b/icons/png/16x16.png differ diff --git a/icons/png/24x24.png b/icons/png/24x24.png index 4864ecbb..524d3e7e 100644 Binary files a/icons/png/24x24.png and b/icons/png/24x24.png differ diff --git a/icons/png/256x256.png b/icons/png/256x256.png index ee52e36a..bf2a9b46 100644 Binary files a/icons/png/256x256.png and b/icons/png/256x256.png differ diff --git a/icons/png/32x32.png b/icons/png/32x32.png index 241e7645..5d498780 100644 Binary files a/icons/png/32x32.png and b/icons/png/32x32.png differ diff --git a/icons/png/48x48.png b/icons/png/48x48.png index 24c04c8e..0d2dbc25 100644 Binary files a/icons/png/48x48.png and b/icons/png/48x48.png differ diff --git a/icons/png/512x512.png b/icons/png/512x512.png index 60e25b07..29f6a569 100644 Binary files a/icons/png/512x512.png and b/icons/png/512x512.png differ diff --git a/icons/png/64x64.png b/icons/png/64x64.png index 1283c9ad..ab298141 100644 Binary files a/icons/png/64x64.png and b/icons/png/64x64.png differ diff --git a/icons/win/icon.ico b/icons/win/icon.ico index 406b15b1..3f382123 100644 Binary files a/icons/win/icon.ico and b/icons/win/icon.ico differ diff --git a/installers/appx/AppXManifest.xml b/installers/appx/AppXManifest.xml deleted file mode 100644 index 22cfd28c..00000000 --- a/installers/appx/AppXManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - OpenFlexure Microscope JS - OpenFlexure - A user client for the OpenFlexure Microscope Server - assets\SampleAppx.50x50.png - - - - - - - - - - - - - - - - - - diff --git a/installers/create-appx.js b/installers/create-appx.js index 8d250cb0..bf4e5a5b 100644 --- a/installers/create-appx.js +++ b/installers/create-appx.js @@ -4,11 +4,11 @@ const package = require('../package.json'); convertToWindowsStore({ containerVirtualization: false, - inputDirectory: path.join(__dirname, '../release-builds/openflexure-microscope-js-win32-x64'), + inputDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'), outputDirectory: path.join(__dirname, '../release-builds/installers'), assets: path.join(__dirname, '/appx/assets'), - packageExecutable: 'app/openflexure-microscope-js.exe', - packageName: 'OpenFlexureMicroscopeJS', + packageExecutable: 'app/openflexure-ev.exe', + packageName: 'OpenFlexureEV', packageVersion: `${package.version}.0`, packageDisplayName: package.productName, packageDescription: package.description, @@ -17,6 +17,6 @@ convertToWindowsStore({ deploy: false, publisher: 'CN=bath-open-instrumentation-group', publisherDisplayName: "Bath Open Instrumentation Group", - devCert: "C:\\Certs\\openflexure-microscope-js-appx\\openflexure-microscope-js-appx.pfx", + devCert: "C:\\Certs\\openflexure-ev-appx\\openflexure-ev-appx.pfx", windowsKit: 'C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.17763.0\\x64' }) \ No newline at end of file diff --git a/installers/create-deb-arm.js b/installers/create-deb-arm.js index 57e5ff2b..24afeeb1 100644 --- a/installers/create-deb-arm.js +++ b/installers/create-deb-arm.js @@ -2,7 +2,7 @@ const installer = require('electron-installer-debian') const path = require('path') const options = { - src: path.join(__dirname, '../release-builds/openflexure-microscope-js-linux-armv7l/'), + src: path.join(__dirname, '../release-builds/openflexure-ev-linux-armv7l/'), dest: path.join(__dirname, '../release-builds/installers'), arch: 'armhf', icon: path.join(__dirname, '../icons/png/1024x1024.png'), diff --git a/installers/create-deb-x64.js b/installers/create-deb-x64.js index c9d65d37..dfef925d 100644 --- a/installers/create-deb-x64.js +++ b/installers/create-deb-x64.js @@ -2,7 +2,7 @@ const installer = require('electron-installer-debian') const path = require('path') const options = { - src: path.join(__dirname, '../release-builds/openflexure-microscope-js-linux-x64/'), + src: path.join(__dirname, '../release-builds/openflexure-ev-linux-x64/'), dest: path.join(__dirname, '../release-builds/installers'), arch: 'amd64', icon: path.join(__dirname, '../icons/png/1024x1024.png'), diff --git a/installers/create-exe.js b/installers/create-exe.js index b409aeb5..b4ec6052 100644 --- a/installers/create-exe.js +++ b/installers/create-exe.js @@ -12,13 +12,13 @@ function getInstallerConfig () { console.log('creating windows installer') return Promise.resolve({ - appDirectory: path.join(__dirname, '../release-builds/openflexure-microscope-js-win32-x64'), + appDirectory: path.join(__dirname, '../release-builds/openflexure-ev-win32-x64'), authors: 'OpenFlexure', noMsi: true, outputDirectory: path.join(__dirname, '../release-builds/installers'), - exe: 'openflexure-microscope-js.exe', - setupExe: 'OpenFlexureMicroscopeJsInstaller.exe', + exe: 'openflexure-ev.exe', + setupExe: 'OpenFlexureEvInstaller.exe', setupIcon: path.join(__dirname, '../icons/win/icon.ico'), - certificateFile: "C:\\Certs\\openflexure-microscope-js-exe\\openflexure-microscope-js-exe.pfx" + certificateFile: "C:\\Certs\\openflexure-ev-exe\\openflexure-ev-exe.pfx" }) } \ No newline at end of file diff --git a/package.json b/package.json index a54d5973..fb7c34ca 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "openflexure-microscope-js", - "productName": "OpenFlexure Microscope JS", - "displayName": "OpenFlexure Microscope JS", + "name": "openflexure-ev", + "productName": "OpenFlexure eV", + "displayName": "OpenFlexure eV", "publisher": "Bath Open Instrumentation Group", "author": "OpenFlexure", - "description": "A user client for the OpenFlexure Microscope Server", + "description": "An electron-based user client for the OpenFlexure Microscope Server", "main": "app.js", "version": "0.1.0", "private": true, @@ -13,10 +13,10 @@ "build": "vue-cli-service build", "dev": "set NODE_ENV=DEV&& electron app.dev.js", "run": "vue-cli-service build && electron app.js", - "package-win": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", - "package-linux": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package-rpi": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --asar=true --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds", - "package-darwin": "electron-packager . openflexure-microscope-js --ignore=^/src --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds", + "package-win": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"OpenFlexure Microscope JS\"", + "package-linux": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --arch=x64 --icon=icons/png/1024x1024.png --prune=true --out=release-builds", + "package-rpi": "electron-packager . openflexure-ev --ignore=^/src --overwrite --asar=true --platform=linux --electron-version=3.0.13 --arch=armv7l --icon=icons/png/1024x1024.png --prune=true --out=release-builds", + "package-darwin": "electron-packager . openflexure-ev --ignore=^/src --overwrite --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --prune=true --out=release-builds", "package-all": "npm run package-win && npm run package-linux && npm run package-rpi && npm run package-darwin", "make": "npm run build && npm run package-all" }, diff --git a/public/index.html b/public/index.html index 375edb52..68a4801b 100644 --- a/public/index.html +++ b/public/index.html @@ -5,7 +5,7 @@ - OpenFlexure Microscope + OpenFlexure eV