diff --git a/app/assets/img/icon.png b/app/assets/img/icon.png deleted file mode 100644 index 23bd394c..00000000 Binary files a/app/assets/img/icon.png and /dev/null differ diff --git a/app/assets/img/shortcut.ico b/app/assets/img/shortcut.ico deleted file mode 100644 index 1346d1ca..00000000 Binary files a/app/assets/img/shortcut.ico and /dev/null differ diff --git a/app/assets/img/tray-darwin.png b/app/assets/img/tray-darwin.png deleted file mode 100644 index 8c16bc6f..00000000 Binary files a/app/assets/img/tray-darwin.png and /dev/null differ diff --git a/app/assets/img/tray-darwin@2x.png b/app/assets/img/tray-darwin@2x.png deleted file mode 100644 index 53fc0978..00000000 Binary files a/app/assets/img/tray-darwin@2x.png and /dev/null differ diff --git a/app/assets/img/tray-linux.png b/app/assets/img/tray-linux.png deleted file mode 100644 index a683b350..00000000 Binary files a/app/assets/img/tray-linux.png and /dev/null differ diff --git a/app/assets/img/tray-win32.png b/app/assets/img/tray-win32.png deleted file mode 100644 index a683b350..00000000 Binary files a/app/assets/img/tray-win32.png and /dev/null differ diff --git a/app/package.json b/app/package.json index 6f178bb6..53e8e9ad 100644 --- a/app/package.json +++ b/app/package.json @@ -3,6 +3,7 @@ "description": "A terminal for a modern age", "author": "Eugene Pankov", "main": "main.js", + "version": "0.0.2", "scripts": { "build": "../node_modules/.bin/webpack --progress --color --display-modules", "watch": "../node_modules/.bin/webpack --progress --color --watch" diff --git a/build/config.gypi b/build/config.gypi deleted file mode 100644 index cc03d65a..00000000 --- a/build/config.gypi +++ /dev/null @@ -1,62 +0,0 @@ -# Do not edit. File was generated by node-gyp's "configure" step -{ - "target_defaults": { - "cflags": [], - "default_configuration": "Release", - "defines": [], - "include_dirs": [], - "libraries": [] - }, - "variables": { - "asan": 0, - "debug_devtools": "node", - "force_dynamic_crt": 0, - "host_arch": "x64", - "icu_data_file": "icudt57l.dat", - "icu_data_in": "..\\..\\deps/icu-small\\source/data/in\\icudt57l.dat", - "icu_endianness": "l", - "icu_gyp_path": "tools/icu/icu-generic.gyp", - "icu_locales": "en,root", - "icu_path": "deps/icu-small", - "icu_small": "true", - "icu_ver_major": "57", - "node_byteorder": "little", - "node_enable_d8": "false", - "node_enable_v8_vtunejit": "false", - "node_install_npm": "true", - "node_module_version": 48, - "node_no_browser_globals": "false", - "node_prefix": "/usr/local", - "node_release_urlbase": "https://nodejs.org/download/release/", - "node_shared": "false", - "node_shared_cares": "false", - "node_shared_http_parser": "false", - "node_shared_libuv": "false", - "node_shared_openssl": "false", - "node_shared_zlib": "false", - "node_tag": "", - "node_use_bundled_v8": "true", - "node_use_dtrace": "false", - "node_use_etw": "true", - "node_use_lttng": "false", - "node_use_openssl": "true", - "node_use_perfctr": "true", - "node_use_v8_platform": "true", - "openssl_fips": "", - "openssl_no_asm": 0, - "shlib_suffix": "so.48", - "target_arch": "x64", - "v8_enable_gdbjit": 0, - "v8_enable_i18n_support": 1, - "v8_inspector": "true", - "v8_no_strict_aliasing": 1, - "v8_optimized_debug": 0, - "v8_random_seed": 0, - "v8_use_snapshot": "true", - "want_separate_host_toolset": 0, - "nodedir": "C:\\cygwin64\\home\\Avid\\.node-gyp\\iojs-1.3.5", - "copy_dev_lib": "true", - "standalone_static_library": 1, - "target": "1.3.5" - } -} diff --git a/build/icon.ico b/build/icon.ico deleted file mode 100644 index 1346d1ca..00000000 Binary files a/build/icon.ico and /dev/null differ diff --git a/build/icons/1024x1024.png b/build/icons/1024x1024.png deleted file mode 100644 index 23bd394c..00000000 Binary files a/build/icons/1024x1024.png and /dev/null differ diff --git a/build/icons/128x128.png b/build/icons/128x128.png index a511d927..5776baf9 100644 Binary files a/build/icons/128x128.png and b/build/icons/128x128.png differ diff --git a/build/icons/16x16.png b/build/icons/16x16.png index cb302c1f..e630b2a4 100644 Binary files a/build/icons/16x16.png and b/build/icons/16x16.png differ diff --git a/build/icons/256x256.png b/build/icons/256x256.png index 65dd9fac..f9eb7a65 100644 Binary files a/build/icons/256x256.png and b/build/icons/256x256.png differ diff --git a/build/icons/32x32.png b/build/icons/32x32.png index a1dd8fe8..ee79ae12 100644 Binary files a/build/icons/32x32.png and b/build/icons/32x32.png differ diff --git a/build/icons/512x512.png b/build/icons/512x512.png index 799c58d7..26c650b8 100644 Binary files a/build/icons/512x512.png and b/build/icons/512x512.png differ diff --git a/build/icons/64x64.png b/build/icons/64x64.png index bd3f036e..bc990f65 100644 Binary files a/build/icons/64x64.png and b/build/icons/64x64.png differ diff --git a/build/icons/Icon.psd b/build/icons/Icon.psd new file mode 100644 index 00000000..093e6d4f Binary files /dev/null and b/build/icons/Icon.psd differ diff --git a/build/logo.png b/build/logo.png deleted file mode 100644 index 1d24636d..00000000 Binary files a/build/logo.png and /dev/null differ diff --git a/build/mac/Distribution.xml b/build/mac/Distribution.xml deleted file mode 100644 index f4096e3b..00000000 --- a/build/mac/Distribution.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - ELEMENTS Client - - - - - - - - - - - - - - - - ElementsDriver.pkg - - - - - Elements.pkg - - - - - - - - - - AFPTuner.pkg - diff --git a/build/mac/Elements.component.plist b/build/mac/Elements.component.plist deleted file mode 100644 index 7deefe81..00000000 --- a/build/mac/Elements.component.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - BundleHasStrictIdentifier - - BundleIsRelocatable - - BundleIsVersionChecked - - BundleOverwriteAction - upgrade - BundlePostInstallScriptPath - Elements.postinst.sh - RootRelativeBundlePath - Applications/ELEMENTS.app - - - diff --git a/build/mac/Elements.postinst.sh b/build/mac/Elements.postinst.sh deleted file mode 100755 index e322a593..00000000 --- a/build/mac/Elements.postinst.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -e - -cat > /Library/LaunchDaemons/com.elements.VolumesFix.plist << EOF - - - - -KeepAlive - -Label -com.elements.VolumesFix -ProgramArguments - -/bin/bash --c -sleep 3; chmod 777 /Volumes - -RunAtLoad - -StandardErrorPath -/dev/null -StandardOutPath -/dev/null -UserName -root - - -EOF - -chmod 600 /Library/LaunchDaemons/com.elements.VolumesFix.plist - -cat > /etc/nsmb.conf << EOF -[default] -minauth=none -streams=yes -soft=yes -notify_off=yes -port445=no_netbios -signing_required=false -EOF - -launchctl load -w /Library/LaunchDaemons/com.elements.VolumesFix.plist -launchctl start com.elements.VolumesFix diff --git a/build/mac/codesign b/build/mac/codesign deleted file mode 100755 index 4124b442..00000000 Binary files a/build/mac/codesign and /dev/null differ diff --git a/build/mac/icon.icns b/build/mac/icon.icns index 07e08278..fa396ca1 100644 Binary files a/build/mac/icon.icns and b/build/mac/icon.icns differ diff --git a/build/windows/icon.ico b/build/windows/icon.ico new file mode 100644 index 00000000..2f63a466 Binary files /dev/null and b/build/windows/icon.ico differ diff --git a/package.json b/package.json index b396481c..b4b6fee7 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "builtin-plugins" ], "win": { - "icon": "./app/assets/img/shortcut.ico" + "icon": "./build/windows/icon.ico" }, "mac": { "category": "public.app-category.video", diff --git a/scripts/vars.js b/scripts/vars.js index 68860458..2f5bc832 100755 --- a/scripts/vars.js +++ b/scripts/vars.js @@ -1,3 +1,16 @@ -exports.builtinPlugins = ['terminus-core', 'terminus-settings', 'terminus-terminal'] -exports.electronVersion = '1.6.2' -exports.version = '0.0.1' +const path = require('path') +const fs = require('fs') + +const appInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../app/package.json'))) +const pkgInfo = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../package.json'))) + +exports.builtinPlugins = [ + 'terminus-core', + 'terminus-settings', + 'terminus-terminal', + 'terminus-clickable-links', + 'terminus-community-color-schemes', + 'terminus-theme-hype', +] +exports.version = appInfo.version +exports.electronVersion = pkgInfo.devDependencies.electron diff --git a/terminus-core/src/components/tabHeader.component.pug b/terminus-core/src/components/tabHeader.component.pug index b9d37d5e..c4eaf3bc 100644 --- a/terminus-core/src/components/tabHeader.component.pug +++ b/terminus-core/src/components/tabHeader.component.pug @@ -1,3 +1,3 @@ .index {{index + 1}} -.name {{(tab.title$ || "Terminal") | async}} +.name {{tab.title$ | async}} button((click)='closeClicked.emit()') × diff --git a/terminus-terminal/src/components/terminalTab.component.ts b/terminus-terminal/src/components/terminalTab.component.ts index d3636ef5..09320a89 100644 --- a/terminus-terminal/src/components/terminalTab.component.ts +++ b/terminus-terminal/src/components/terminalTab.component.ts @@ -39,6 +39,7 @@ export class TerminalTabComponent extends BaseTabComponent { ) { super() this.decorators = this.decorators || [] + this.title$.next('Terminal') this.configSubscription = config.change.subscribe(() => { this.configure() })