From e3e00fc2ea38a66055eeb0db409b1356df169250 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 02:43:55 +1300 Subject: [PATCH 1/9] App version and about info code update --- main.js | 9 ++++++++- package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index 872fc12..81633d3 100644 --- a/main.js +++ b/main.js @@ -24,7 +24,8 @@ var express = require('express'), Promise = require('bluebird'); -app.setName('Iguana'); +app.setName('Agama'); +app.setVersion('0.1.5.6e-beta'); if (os.platform() === 'linux') { process.env.ELECTRON_RUN_AS_NODE = true; @@ -55,6 +56,12 @@ process.once('loaded', () => { if (os.platform() === 'darwin') { process.setFdLimit(appConfig.maxDescriptors.darwin); + app.setAboutPanelOptions({ + applicationName: app.getName(), + applicationVersion: app.getVersion(), + copyright: "Released under the MIT license", + credits: "jl777, satindergrewal, ca333, pbca26, pedjaman, mmaxian, fadedreamz" + }) } if (os.platform() === 'linux') { process.setFdLimit(appConfig.maxDescriptors.linux); diff --git a/package.json b/package.json index b111e3a..327c6ba 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "iguana_app", "productName": "Agama", - "version": "0.1.0", + "version": "0.1.5", "description": "iguana Desktop App", "main": "main.js", "scripts": { From 4ec0b5e77fc8da42b671cd0b1142c23c32cc8284 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 02:53:03 +1300 Subject: [PATCH 2/9] icons path corrected --- gui/EasyDEX-GUI | 2 +- main.js | 4 ++-- routes/shepherd.js | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gui/EasyDEX-GUI b/gui/EasyDEX-GUI index c8eec9c..3fbbb33 160000 --- a/gui/EasyDEX-GUI +++ b/gui/EasyDEX-GUI @@ -1 +1 @@ -Subproject commit c8eec9cb3164e74d092b8f58a139de94907e5e4e +Subproject commit 3fbbb33437be0c7907d8f6ca818711223933a1e1 diff --git a/main.js b/main.js index 81633d3..63f6db3 100644 --- a/main.js +++ b/main.js @@ -151,10 +151,10 @@ if (os.platform() === 'win32') { */ if (os.platform() === 'linux') { - var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png'); + var iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'); } if (os.platform() === 'win32') { - var iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'); + var iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'); } //console.log(iguanaDir); diff --git a/routes/shepherd.js b/routes/shepherd.js index 5fe3f75..ccc5129 100644 --- a/routes/shepherd.js +++ b/routes/shepherd.js @@ -48,7 +48,7 @@ if (os.platform() === 'linux') { var iguanaBin = path.join(__dirname, '../assets/bin/linux64/iguana'), iguanaDir = process.env.HOME + '/.iguana', iguanaConfsDir = iguanaDir + '/confs', - iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon_png/128x128.png'), + iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/128x128.png'), komododBin = path.join(__dirname, '../assets/bin/linux64/komodod'), komodocliBin = path.join(__dirname, '../assets/bin/linux64/komodo-cli'), komodoDir = process.env.HOME + '/.komodo'; @@ -61,7 +61,7 @@ if (os.platform() === 'win32') { iguanaDir = path.normalize(iguanaDir); iguanaConfsDir = process.env.APPDATA + '/iguana/confs'; iguanaConfsDir = path.normalize(iguanaConfsDir); - iguanaIcon = path.join(__dirname, '/assets/icons/iguana_app_icon.ico'), + iguanaIcon = path.join(__dirname, '/assets/icons/agama_icons/agama_app_icon.ico'), iguanaConfsDirSrc = path.normalize(iguanaConfsDirSrc); komododBin = path.join(__dirname, '../assets/bin/win64/komodod.exe'), From 9fa6434cdb3a0b3c51161e6682cb6b7dd30056e0 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:00:47 +1300 Subject: [PATCH 3/9] ReadMe file update --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 7336e76..c7bb951 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Iguana Desktop App +# Agama Desktop App Desktop App for SuperNET DAPPs #### For Developers You must have `node.js` and `npm` installed on your machine. -Clone Iguana Desktop App with EasyDEX-GUI submodule +Clone Agama Desktop App with EasyDEX-GUI submodule ```shell git clone --recursive https://github.com/SuperNETorg/iguana.git cd gui/EasyDEX-GUI/ @@ -13,19 +13,19 @@ git pull cd ../../ ``` -Install Iguana App +Install Agama App ```shell cd iguana npm install ``` -Then start Iguana App +Then start Agama App ```shell npm start ``` #### For end users -The instructions to make production build of Iguana App will be updated soon. +The instructions to make production build of Agama App will be updated soon. To build the production ready app, install `electron-packager` and `electron-prebuilt` packages from npm ```shell @@ -71,4 +71,4 @@ change architecture build parameter to ```--arch=x64``` for 64 bit build ### Windows DLL issues On Windows it's noticed iguana.exe complains about `VCRUNTIME140D.DLL` and `ucrtbased.dll` file. -Please see **windeps** directory and README file for instructions to install the required DLL files on Windows, and then try again running Iguana App. +Please see **windeps** directory and README file for instructions to install the required DLL files on Windows, and then try again running Agama App. From 45bbe03297b6c7bbb5e82ccdeb1e3e8e08362767 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:01:57 +1300 Subject: [PATCH 4/9] ReadMe update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7bb951..d7e1386 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ You must have `node.js` and `npm` installed on your machine. Clone Agama Desktop App with EasyDEX-GUI submodule ```shell -git clone --recursive https://github.com/SuperNETorg/iguana.git +git clone --recursive https://github.com/SuperNETorg/agama.git cd gui/EasyDEX-GUI/ git checkout master git pull From 7b8b45e522f4f9087debb56ceefa7b5be573f59e Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:07:01 +1300 Subject: [PATCH 5/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7e1386..5e6e693 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ You must have `node.js` and `npm` installed on your machine. Clone Agama Desktop App with EasyDEX-GUI submodule ```shell -git clone --recursive https://github.com/SuperNETorg/agama.git +git clone --recursive https://github.com/SuperNETorg/Agama.git cd gui/EasyDEX-GUI/ git checkout master git pull From 743111b8abba6ca37f75e591179c6dda3b190045 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:47:05 +1300 Subject: [PATCH 6/9] Installer XML files updated with directory path change --- .../IgaunaApp-Linux.xml | 32 +++++++-------- .../BitRock Installer Files/IgaunaApp-OSX.xml | 2 +- .../BitRock Installer Files/IgaunaApp-Win.xml | 40 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/assets/BitRock Installer Files/IgaunaApp-Linux.xml b/assets/BitRock Installer Files/IgaunaApp-Linux.xml index f9ec9fd..beedb21 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Linux.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Linux.xml @@ -39,52 +39,52 @@ all - ../../build/Iguana-linux-x64/locales + ../../build/Agama-linux-x64/locales - ../../build/Iguana-linux-x64/resources + ../../build/Agama-linux-x64/resources - ../../build/Iguana-linux-x64/version + ../../build/Agama-linux-x64/version - ../../build/Iguana-linux-x64/content_resources_200_percent.pak + ../../build/Agama-linux-x64/content_resources_200_percent.pak - ../../build/Iguana-linux-x64/LICENSE + ../../build/Agama-linux-x64/LICENSE - ../../build/Iguana-linux-x64/blink_image_resources_200_percent.pak + ../../build/Agama-linux-x64/blink_image_resources_200_percent.pak - ../../build/Iguana-linux-x64/views_resources_200_percent.pak + ../../build/Agama-linux-x64/views_resources_200_percent.pak - ../../build/Iguana-linux-x64/ui_resources_200_percent.pak + ../../build/Agama-linux-x64/ui_resources_200_percent.pak - ../../build/Iguana-linux-x64/natives_blob.bin + ../../build/Agama-linux-x64/natives_blob.bin - ../../build/Iguana-linux-x64/snapshot_blob.bin + ../../build/Agama-linux-x64/snapshot_blob.bin - ../../build/Iguana-linux-x64/LICENSES.chromium.html + ../../build/Agama-linux-x64/LICENSES.chromium.html - ../../build/Iguana-linux-x64/libffmpeg.so + ../../build/Agama-linux-x64/libffmpeg.so - ../../build/Iguana-linux-x64/content_shell.pak + ../../build/Agama-linux-x64/content_shell.pak - ../../build/Iguana-linux-x64/icudtl.dat + ../../build/Agama-linux-x64/icudtl.dat - ../../build/Iguana-linux-x64/libnode.so + ../../build/Agama-linux-x64/libnode.so - ../../build/Iguana-linux-x64/Iguana + ../../build/Agama-linux-x64/Iguana diff --git a/assets/BitRock Installer Files/IgaunaApp-OSX.xml b/assets/BitRock Installer Files/IgaunaApp-OSX.xml index 3e8759b..b09de95 100644 --- a/assets/BitRock Installer Files/IgaunaApp-OSX.xml +++ b/assets/BitRock Installer Files/IgaunaApp-OSX.xml @@ -41,7 +41,7 @@ osx - ../../build/Iguana-darwin-x64/Iguana.app + ../../build/Agama-darwin-x64/Agama.app diff --git a/assets/BitRock Installer Files/IgaunaApp-Win.xml b/assets/BitRock Installer Files/IgaunaApp-Win.xml index a7cc447..020f4db 100644 --- a/assets/BitRock Installer Files/IgaunaApp-Win.xml +++ b/assets/BitRock Installer Files/IgaunaApp-Win.xml @@ -67,64 +67,64 @@ windows - ../../build/Iguana-win32-x64/locales + ../../build/Agama-win32-x64/locales - ../../build/Iguana-win32-x64/resources + ../../build/Agama-win32-x64/resources - ../../build/Iguana-win32-x64/blink_image_resources_200_percent.pak + ../../build/Agama-win32-x64/blink_image_resources_200_percent.pak - ../../build/Iguana-win32-x64/content_resources_200_percent.pak + ../../build/Agama-win32-x64/content_resources_200_percent.pak - ../../build/Iguana-win32-x64/content_shell.pak + ../../build/Agama-win32-x64/content_shell.pak - ../../build/Iguana-win32-x64/ui_resources_200_percent.pak + ../../build/Agama-win32-x64/ui_resources_200_percent.pak - ../../build/Iguana-win32-x64/views_resources_200_percent.pak + ../../build/Agama-win32-x64/views_resources_200_percent.pak - ../../build/Iguana-win32-x64/icudtl.dat + ../../build/Agama-win32-x64/icudtl.dat - ../../build/Iguana-win32-x64/LICENSES.chromium.html + ../../build/Agama-win32-x64/LICENSES.chromium.html - ../../build/Iguana-win32-x64/natives_blob.bin + ../../build/Agama-win32-x64/natives_blob.bin - ../../build/Iguana-win32-x64/snapshot_blob.bin + ../../build/Agama-win32-x64/snapshot_blob.bin - ../../build/Iguana-win32-x64/d3dcompiler_47.dll + ../../build/Agama-win32-x64/d3dcompiler_47.dll - ../../build/Iguana-win32-x64/ffmpeg.dll + ../../build/Agama-win32-x64/ffmpeg.dll - ../../build/Iguana-win32-x64/libEGL.dll + ../../build/Agama-win32-x64/libEGL.dll - ../../build/Iguana-win32-x64/libGLESv2.dll + ../../build/Agama-win32-x64/libGLESv2.dll - ../../build/Iguana-win32-x64/node.dll + ../../build/Agama-win32-x64/node.dll - ../../build/Iguana-win32-x64/xinput1_3.dll + ../../build/Agama-win32-x64/xinput1_3.dll - ../../build/Iguana-win32-x64/LICENSE + ../../build/Agama-win32-x64/LICENSE - ../../build/Iguana-win32-x64/version + ../../build/Agama-win32-x64/version - ../../build/Iguana-win32-x64/Iguana.exe + ../../build/Agama-win32-x64/Iguana.exe From 2ad46d9dc70bffc3c51aa6812a11993b65841e8a Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:52:29 +1300 Subject: [PATCH 7/9] Added rnr to credits --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 63f6db3..346ce74 100644 --- a/main.js +++ b/main.js @@ -60,7 +60,7 @@ process.once('loaded', () => { applicationName: app.getName(), applicationVersion: app.getVersion(), copyright: "Released under the MIT license", - credits: "jl777, satindergrewal, ca333, pbca26, pedjaman, mmaxian, fadedreamz" + credits: "jl777, satindergrewal, ca333, pbca26, pedjaman, mmaxian, fadedreamz, rnr" }) } if (os.platform() === 'linux') { From 002f45058e9bc21f156a9ae013689cbd4e585935 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 03:55:33 +1300 Subject: [PATCH 8/9] few more credits update --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 346ce74..a7ff777 100644 --- a/main.js +++ b/main.js @@ -60,7 +60,7 @@ process.once('loaded', () => { applicationName: app.getName(), applicationVersion: app.getVersion(), copyright: "Released under the MIT license", - credits: "jl777, satindergrewal, ca333, pbca26, pedjaman, mmaxian, fadedreamz, rnr" + credits: "jl777, fadedreamz, radix42, vineetbhargav86, satindergrewal, ca333, pbca26, pedjaman, mmaxian, rnr" }) } if (os.platform() === 'linux') { From bcb6023eada4cea0e19e01ac6185b5c5b4df8794 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 24 Mar 2017 04:04:43 +1300 Subject: [PATCH 9/9] credits changed to SuperNET Team --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index a7ff777..f60c5d1 100644 --- a/main.js +++ b/main.js @@ -60,7 +60,7 @@ process.once('loaded', () => { applicationName: app.getName(), applicationVersion: app.getVersion(), copyright: "Released under the MIT license", - credits: "jl777, fadedreamz, radix42, vineetbhargav86, satindergrewal, ca333, pbca26, pedjaman, mmaxian, rnr" + credits: "SuperNET Team" }) } if (os.platform() === 'linux') {