diff --git a/.gitignore b/.gitignore
index 93ebcbf49..8a3c63247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,6 @@ cordova/*.keystore
cache
webkitbuilds/*
!webkitbuilds/README.md
-!webkitbuilds/setup-win.iss
-!webkitbuilds/favicon.ico
-!webkitbuilds/.desktop
-!webkitbuilds/build-osx.sh
-!webkitbuilds/Background.png
# chrome extensions
chrome-app/build/*
@@ -105,7 +100,6 @@ externalServices.json
cordova/Makefile
cordova/ProjectMakefile
app-template/bitpay-wallet
-cordova/ProjectMakefile
cordova/config.xml
cordova/wp/Package.appxmanifest
www/img/logo-negative.svg
@@ -113,22 +107,10 @@ www/img/logo.svg
src/js/appConfig.js
src/js/externalServices.js
chrome-app/manifest.json
-webkitbuilds/.desktop
-webkitbuilds/setup-win.iss
www/img/favicon.ico
www/img/icon-128.png
-cordova/Makefile
-cordova/ProjectMakefile
-app-template/bitpay-wallet
-cordova/ProjectMakefile
-cordova/config.xml
-cordova/wp/Package.appxmanifest
-www/img/logo-negative.svg
-www/img/logo.svg
-src/js/appConfig.js
-
cordova/android/res/
cordova/wp/Assets/
cordova/wp/*.png
diff --git a/Gruntfile.js b/Gruntfile.js
index 9e263d139..0a92a9b0f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
command: 'make -C cordova clean'
},
osx: {
- command: 'webkitbuilds/build-osx.sh sign'
+ command: 'webkitbuilds/build-macos.sh sign'
},
coveralls: {
command: 'cat coverage/report-lcov/lcov.info |./node_modules/coveralls/bin/coveralls.js'
@@ -209,7 +209,7 @@ module.exports = function(grunt) {
files: [{
expand: true,
cwd: 'webkitbuilds/',
- src: ['.desktop', '../www/img/icons/favicon.ico', '../www/img/icons/icon-256.png'],
+ src: ['.desktop', '../www/img/icons/favicon.ico', '../www/img/icons/512x512.png'],
dest: 'webkitbuilds/Copay/linux64/',
flatten: true,
filter: 'isFile'
@@ -222,8 +222,8 @@ module.exports = function(grunt) {
platforms: ['win64', 'osx64', 'linux64'],
buildDir: './webkitbuilds',
version: '0.16.0',
- macIcns: './www/img/icons/icon.icns',
- exeIco: './www/img/icons/icon.ico'
+ macIcns: './www/img/icons/logo.icns',
+ exeIco: './www/img/icons/logo.ico'
},
src: ['./package.json', './www/**/*']
},
diff --git a/app-template/apply.js b/app-template/apply.js
index b02b14c80..1fc9f93ec 100755
--- a/app-template/apply.js
+++ b/app-template/apply.js
@@ -13,7 +13,7 @@ var templates = {
'Package.appxmanifest': 'cordova/wp/',
'.desktop': 'webkitbuilds/',
'setup-win.iss': 'webkitbuilds/',
- 'manifest.json': 'chrome-app/',
+ 'build-macos.sh': 'webkitbuilds/',
// 'bower.json': '/',
};
var configDir = process.argv[2] || 'copay';
diff --git a/app-template/bitpay/appConfig.json b/app-template/bitpay/appConfig.json
index 54faf2203..99c45da61 100644
--- a/app-template/bitpay/appConfig.json
+++ b/app-template/bitpay/appConfig.json
@@ -18,6 +18,7 @@
"winAppName": "BitPayWallet",
"wpPublisherId": "{}",
"wpProductId": "{}",
+ "windowsAppId": "",
"pushSenderId": "1036948132229",
"description": "Secure Bitcoin Wallet",
"version": "0.14.0",
diff --git a/app-template/bitpay/img/Background.png b/app-template/bitpay/img/Background.png
new file mode 100644
index 000000000..8e7f9a152
Binary files /dev/null and b/app-template/bitpay/img/Background.png differ
diff --git a/app-template/bitpay/img/icon-128.png b/app-template/bitpay/img/icon-128.png
deleted file mode 100644
index 6958667cd..000000000
Binary files a/app-template/bitpay/img/icon-128.png and /dev/null differ
diff --git a/app-template/bitpay/img/icons/128x128.png b/app-template/bitpay/img/icons/128x128.png
new file mode 100755
index 000000000..0a03f7ed3
Binary files /dev/null and b/app-template/bitpay/img/icons/128x128.png differ
diff --git a/app-template/bitpay/img/icons/16x16.png b/app-template/bitpay/img/icons/16x16.png
new file mode 100755
index 000000000..973de1c65
Binary files /dev/null and b/app-template/bitpay/img/icons/16x16.png differ
diff --git a/app-template/bitpay/img/icons/24x24.png b/app-template/bitpay/img/icons/24x24.png
new file mode 100755
index 000000000..7ec13aba4
Binary files /dev/null and b/app-template/bitpay/img/icons/24x24.png differ
diff --git a/app-template/bitpay/img/icons/256x256.png b/app-template/bitpay/img/icons/256x256.png
new file mode 100755
index 000000000..c2d0ac1d8
Binary files /dev/null and b/app-template/bitpay/img/icons/256x256.png differ
diff --git a/app-template/bitpay/img/icons/32x32.png b/app-template/bitpay/img/icons/32x32.png
new file mode 100755
index 000000000..74816f940
Binary files /dev/null and b/app-template/bitpay/img/icons/32x32.png differ
diff --git a/app-template/bitpay/img/icons/48x48.png b/app-template/bitpay/img/icons/48x48.png
new file mode 100755
index 000000000..1544ac1f1
Binary files /dev/null and b/app-template/bitpay/img/icons/48x48.png differ
diff --git a/app-template/bitpay/img/icons/512x512.png b/app-template/bitpay/img/icons/512x512.png
new file mode 100755
index 000000000..19185804c
Binary files /dev/null and b/app-template/bitpay/img/icons/512x512.png differ
diff --git a/app-template/bitpay/img/icons/64x64.png b/app-template/bitpay/img/icons/64x64.png
new file mode 100755
index 000000000..ed9b64f6c
Binary files /dev/null and b/app-template/bitpay/img/icons/64x64.png differ
diff --git a/app-template/bitpay/img/icons/96x96.png b/app-template/bitpay/img/icons/96x96.png
new file mode 100755
index 000000000..8d473f1c8
Binary files /dev/null and b/app-template/bitpay/img/icons/96x96.png differ
diff --git a/app-template/bitpay/img/favicon.ico b/app-template/bitpay/img/icons/favicon.ico
similarity index 100%
rename from app-template/bitpay/img/favicon.ico
rename to app-template/bitpay/img/icons/favicon.ico
diff --git a/app-template/bitpay/img/icons/logo.icns b/app-template/bitpay/img/icons/logo.icns
new file mode 100644
index 000000000..d8f330e8f
Binary files /dev/null and b/app-template/bitpay/img/icons/logo.icns differ
diff --git a/app-template/bitpay/img/icons/logo.ico b/app-template/bitpay/img/icons/logo.ico
new file mode 100644
index 000000000..f91c730f2
Binary files /dev/null and b/app-template/bitpay/img/icons/logo.ico differ
diff --git a/app-template/build-macos.sh b/app-template/build-macos.sh
new file mode 100755
index 000000000..95631e0fc
--- /dev/null
+++ b/app-template/build-macos.sh
@@ -0,0 +1,146 @@
+#!/bin/bash
+
+SHOULD_SIGN=$1
+if [ "$SHOULD_SIGN" ]
+then
+ echo "Will sign the APP"
+fi
+
+# by Andy Maloney
+# http://asmaloney.com/2013/07/howto/packaging-a-mac-os-x-application-using-a-dmg/
+
+# make sure we are in the correct dir when we double-click a .command file
+dir=${0%/*}
+if [ -d "$dir" ]; then
+ cd "$dir"
+fi
+
+# set up your app name, architecture, and background image file name
+APP_NAME="*USERVISIBLENAME*"
+DMG_BACKGROUND_IMG="../www/img/Background.png"
+
+PATH_NAME="${APP_NAME}/osx64/"
+# you should not need to change these
+APP_EXE="${PATH_NAME}${APP_NAME}.app/Contents/MacOS/nwjs"
+
+VOL_NAME="${APP_NAME}-osx"
+DMG_TMP="${VOL_NAME}-temp.dmg"
+DMG_FINAL="${VOL_NAME}.dmg"
+STAGING_DIR="tmp"
+
+# Check the background image DPI and convert it if it isn't 72x72
+_BACKGROUND_IMAGE_DPI_H=`sips -g dpiHeight ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9]+\.[0-9]+'`
+_BACKGROUND_IMAGE_DPI_W=`sips -g dpiWidth ${DMG_BACKGROUND_IMG} | grep -Eo '[0-9]+\.[0-9]+'`
+
+if [ $(echo " $_BACKGROUND_IMAGE_DPI_H != 72.0 " | bc) -eq 1 -o $(echo " $_BACKGROUND_IMAGE_DPI_W != 72.0 " | bc) -eq 1 ]; then
+ echo "WARNING: The background image's DPI is not 72. This will result in distorted backgrounds on Mac OS X 10.7+."
+ echo " I will convert it to 72 DPI for you."
+
+ _DMG_BACKGROUND_TMP="${DMG_BACKGROUND_IMG%.*}"_dpifix."${DMG_BACKGROUND_IMG##*.}"
+
+ sips -s dpiWidth 72 -s dpiHeight 72 ${DMG_BACKGROUND_IMG} --out ${_DMG_BACKGROUND_TMP}
+
+ DMG_BACKGROUND_IMG="${_DMG_BACKGROUND_TMP}"
+fi
+
+# clear out any old data
+rm -rf "${STAGING_DIR}" "${DMG_TMP}" "${DMG_FINAL}"
+
+# copy over the stuff we want in the final disk image to our staging dir
+mkdir -p "${STAGING_DIR}"
+cp -rpf "${PATH_NAME}${APP_NAME}.app" "${STAGING_DIR}"
+# ... cp anything else you want in the DMG - documentation, etc.
+
+pushd "${STAGING_DIR}"
+
+popd
+
+# Fix size to 250MB
+SIZE=250
+
+if [ $? -ne 0 ]; then
+ echo "Error: Cannot compute size of staging dir"
+ exit
+ fi
+
+# Sign Code (MATIAS)
+if [ $SHOULD_SIGN ]
+then
+ echo "Signing ${APP_NAME} DMG"
+
+ export IDENTITY="3rd Party Mac Developer Application: BitPay, Inc. (884JRH5R93)"
+
+ # not need for 'out of app store' distribution (?)
+# export PARENT_PLIST=parent.plist
+# export CHILD_PLIST=child.plist
+ export APP_PATH=${STAGING_DIR}/${APP_NAME}.app
+
+ codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Helper.app" && echo "Sign 1"
+ codesign --deep -s "${IDENTITY}" $APP_PATH"/Contents/Versions/52.0.2743.82/nwjs Framework.framework/Resources/app_mode_loader.app" && echo "Sign 2"
+ codesign --deep -s "${IDENTITY}" $APP_PATH && echo "Sign 3"
+ echo "Signing Done"
+
+fi
+
+# create the temp DMG file
+hdiutil create -srcfolder "${STAGING_DIR}" -volname "${VOL_NAME}" -fs HFS+ \
+ -fsargs "-c c=64,a=16,e=16" -format UDRW -megabytes ${SIZE} "${DMG_TMP}"
+
+echo "Created DMG: ${DMG_TMP}"
+
+# mount it and save the device
+DEVICE=$(hdiutil attach -readwrite -noverify "${DMG_TMP}" | \
+ egrep '^/dev/' | sed 1q | awk '{print $1}')
+
+sleep 2
+
+# add a link to the Applications dir
+echo "Add link to /Applications"
+pushd /Volumes/"${VOL_NAME}"
+ln -s /Applications
+popd
+
+# add a background image
+mkdir /Volumes/"${VOL_NAME}"/.background
+cp "${DMG_BACKGROUND_IMG}" /Volumes/"${VOL_NAME}"/.background/
+
+# tell the Finder to resize the window, set the background,
+# change the icon size, place the icons in the right position, etc.
+echo '
+ tell application "Finder"
+ tell disk "'${VOL_NAME}'"
+ open
+ set current view of container window to icon view
+ set toolbar visible of container window to false
+ set statusbar visible of container window to false
+ set the bounds of container window to {400, 100, 920, 440}
+ set viewOptions to the icon view options of container window
+ set arrangement of viewOptions to not arranged
+ set icon size of viewOptions to 72
+ set background picture of viewOptions to file ".background:'${DMG_BACKGROUND_IMG}'"
+ set position of item "'${APP_NAME}'.app" of container window to {160, 205}
+ set position of item "Applications" of container window to {360, 205}
+ close
+ open
+ update without registering applications
+ delay 2
+ end tell
+ end tell
+' | osascript
+
+sync
+
+# unmount it
+hdiutil detach "${DEVICE}"
+
+# now make the final image a compressed disk image
+echo "Creating compressed image"
+hdiutil convert "${DMG_TMP}" -format UDZO -imagekey zlib-level=9 -o "${DMG_FINAL}"
+
+# clean up
+rm -rf "${DMG_TMP}"
+rm -rf "${STAGING_DIR}"
+
+echo 'Done.'
+
+exit
diff --git a/app-template/copay/appConfig.json b/app-template/copay/appConfig.json
index 6e66bd2bf..f0bea8816 100644
--- a/app-template/copay/appConfig.json
+++ b/app-template/copay/appConfig.json
@@ -18,6 +18,7 @@
"winAppName": "CopayWallet",
"wpPublisherId": "{31cdd08b-457c-413d-b440-f6665eec847d}",
"wpProductId": "{5381aa50-9069-11e4-84cc-293caf9cbdc8}",
+ "windowsAppId": "804636ee-b017-4cad-8719-e58ac97ffa5c",
"pushSenderId": "1036948132229",
"description": "A Secure Bitcoin Wallet",
"version": "2.5.0",
diff --git a/app-template/copay/img/Background.png b/app-template/copay/img/Background.png
new file mode 100644
index 000000000..8e7f9a152
Binary files /dev/null and b/app-template/copay/img/Background.png differ
diff --git a/app-template/copay/img/icon-128.png b/app-template/copay/img/icon-128.png
deleted file mode 100644
index 8624a0189..000000000
Binary files a/app-template/copay/img/icon-128.png and /dev/null differ
diff --git a/app-template/copay/img/icon-chrome-128.png b/app-template/copay/img/icon-chrome-128.png
deleted file mode 100644
index 0044af9ca..000000000
Binary files a/app-template/copay/img/icon-chrome-128.png and /dev/null differ
diff --git a/app-template/copay/img/icons/128x128.png b/app-template/copay/img/icons/128x128.png
new file mode 100755
index 000000000..e2a715a69
Binary files /dev/null and b/app-template/copay/img/icons/128x128.png differ
diff --git a/app-template/copay/img/icons/16x16.png b/app-template/copay/img/icons/16x16.png
new file mode 100755
index 000000000..66a7f6960
Binary files /dev/null and b/app-template/copay/img/icons/16x16.png differ
diff --git a/app-template/copay/img/icons/24x24.png b/app-template/copay/img/icons/24x24.png
new file mode 100755
index 000000000..f857b2562
Binary files /dev/null and b/app-template/copay/img/icons/24x24.png differ
diff --git a/app-template/copay/img/icons/256x256.png b/app-template/copay/img/icons/256x256.png
new file mode 100755
index 000000000..8f2f6d5c9
Binary files /dev/null and b/app-template/copay/img/icons/256x256.png differ
diff --git a/app-template/copay/img/icons/32x32.png b/app-template/copay/img/icons/32x32.png
new file mode 100755
index 000000000..6111d3120
Binary files /dev/null and b/app-template/copay/img/icons/32x32.png differ
diff --git a/app-template/copay/img/icons/48x48.png b/app-template/copay/img/icons/48x48.png
new file mode 100755
index 000000000..b8206bd53
Binary files /dev/null and b/app-template/copay/img/icons/48x48.png differ
diff --git a/app-template/copay/img/icons/512x512.png b/app-template/copay/img/icons/512x512.png
new file mode 100755
index 000000000..8df121629
Binary files /dev/null and b/app-template/copay/img/icons/512x512.png differ
diff --git a/app-template/copay/img/icons/64x64.png b/app-template/copay/img/icons/64x64.png
new file mode 100755
index 000000000..87985f3e4
Binary files /dev/null and b/app-template/copay/img/icons/64x64.png differ
diff --git a/app-template/copay/img/icons/96x96.png b/app-template/copay/img/icons/96x96.png
new file mode 100755
index 000000000..047a88431
Binary files /dev/null and b/app-template/copay/img/icons/96x96.png differ
diff --git a/app-template/copay/img/favicon.ico b/app-template/copay/img/icons/favicon.ico
similarity index 100%
rename from app-template/copay/img/favicon.ico
rename to app-template/copay/img/icons/favicon.ico
diff --git a/app-template/copay/img/icons/logo.icns b/app-template/copay/img/icons/logo.icns
new file mode 100644
index 000000000..b19117e91
Binary files /dev/null and b/app-template/copay/img/icons/logo.icns differ
diff --git a/app-template/copay/img/icons/logo.ico b/app-template/copay/img/icons/logo.ico
new file mode 100644
index 000000000..32a1d2291
Binary files /dev/null and b/app-template/copay/img/icons/logo.ico differ
diff --git a/app-template/package.json b/app-template/package.json
index fa24526d1..e5906b11d 100644
--- a/app-template/package.json
+++ b/app-template/package.json
@@ -14,7 +14,7 @@
"main": "www/index.html",
"window": {
"title": "*USERVISIBLENAME* - *PURPOSELINE*",
- "icon": "www/img/icon-128.png",
+ "icon": "www/img/icons/logo.ico",
"toolbar": false,
"show": true,
"visible": true,
diff --git a/app-template/setup-win.iss b/app-template/setup-win.iss
index d2443afef..762d1434e 100755
--- a/app-template/setup-win.iss
+++ b/app-template/setup-win.iss
@@ -5,10 +5,11 @@
#define MyAppVersion "*VERSION*"
#define MyAppPublisher "BitPay"
#define MyAppURL "*URL*"
-#define MyAppExeName "*PACKAGENAME.exe"
+#define MyAppExeName "*PACKAGENAME*.exe"
+#define AppId "*WINDOWSAPPID*"
[Setup]
-AppId={804636ee-b017-4cad-8719-e58ac97ffa5c}
+AppId={#AppId}
AppName={#MyAppName}
AppVersion={#MyAppVersion}
;AppVerName={#MyAppName} {#MyAppVersion}
diff --git a/www/img/icons/copy.png b/www/img/icons/copy.png
deleted file mode 100644
index b43ca0634..000000000
Binary files a/www/img/icons/copy.png and /dev/null differ
diff --git a/www/img/icons/favicon.ico b/www/img/icons/favicon.ico
deleted file mode 100644
index 03f394e70..000000000
Binary files a/www/img/icons/favicon.ico and /dev/null differ
diff --git a/www/img/icons/icon-16.png b/www/img/icons/icon-16.png
deleted file mode 100644
index d4664c57a..000000000
Binary files a/www/img/icons/icon-16.png and /dev/null differ
diff --git a/www/img/icons/icon-256.png b/www/img/icons/icon-256.png
deleted file mode 100644
index f9978eb28..000000000
Binary files a/www/img/icons/icon-256.png and /dev/null differ
diff --git a/www/img/icons/icon-32.png b/www/img/icons/icon-32.png
deleted file mode 100644
index eca42cbc5..000000000
Binary files a/www/img/icons/icon-32.png and /dev/null differ
diff --git a/www/img/icons/icon-64.png b/www/img/icons/icon-64.png
deleted file mode 100644
index fec1daa73..000000000
Binary files a/www/img/icons/icon-64.png and /dev/null differ
diff --git a/www/img/icons/icon-chrome-128.png b/www/img/icons/icon-chrome-128.png
deleted file mode 100644
index 0044af9ca..000000000
Binary files a/www/img/icons/icon-chrome-128.png and /dev/null differ
diff --git a/www/img/icons/icon.icns b/www/img/icons/icon.icns
deleted file mode 100644
index 8fc084681..000000000
Binary files a/www/img/icons/icon.icns and /dev/null differ
diff --git a/www/img/icons/icon.ico b/www/img/icons/icon.ico
deleted file mode 100644
index e40c22dcf..000000000
Binary files a/www/img/icons/icon.ico and /dev/null differ
diff --git a/www/img/icons/icon.png b/www/img/icons/icon.png
deleted file mode 100644
index 47cdc4b1f..000000000
Binary files a/www/img/icons/icon.png and /dev/null differ
diff --git a/www/img/icons/logo-chrome-256.png b/www/img/icons/logo-chrome-256.png
deleted file mode 100644
index 803f97494..000000000
Binary files a/www/img/icons/logo-chrome-256.png and /dev/null differ
diff --git a/www/img/icons/logo-chrome-64.png b/www/img/icons/logo-chrome-64.png
deleted file mode 100644
index b09c6b57a..000000000
Binary files a/www/img/icons/logo-chrome-64.png and /dev/null differ
diff --git a/www/index.html b/www/index.html
index fe0611bae..6e59ea513 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,7 +8,7 @@
{{appConfig.nameCase}} - {{appConfig.description}}
-
+