appicon fix

bluethefoxofficial · Dec 10, 2021 · 833ebda · 833ebda
1 parent 129b66f
commit 833ebda
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 8 deletions.
diff --git a/app.js b/app.js
@@ -141,7 +141,8 @@ app.on('ready', () => {
         });
     });
     const path = require('path');
-    appIcon = new Tray(path.resolve('assets', 'images', 'Global.ico'));
+
+    appIcon = new Tray(path.join(__dirname, '/resources/icons/icon.png'));
     //appIcon=new Tray("assets/images/Global.ico"); Invalid
     //appIcon.setHighlightMode('always'); THIS CAUSES A ERROR FOR SOME REASON.
     appIcon.setContextMenu(menu);

diff --git a/installers/windows/createinstaller.js b/installers/windows/createinstaller.js
@@ -1,6 +1,8 @@
 const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
 const path = require('path')
 
+if (require('electron-squirrel-startup')) return;
+
 getInstallerConfig()
     .then(createWindowsInstaller)
     .catch((error) => {

diff --git a/js/login.js b/js/login.js
@@ -9,7 +9,7 @@ function login(e) {
         host = localStorage.getItem("host");
         api = localStorage.getItem("ak");
     } else {
-        host = "csoftware.cf";
+        host = "enclica.com";
         api = "grUs07Md3s4o9WIb7fi3vu0AGdjinGP8BvFFSvcNI6viEkXFhNY9ZODlNnNWMXfaapeb20NbVBadZtwH9kFUnOgPXn8oWuPPnqJL";
     }
     var username = document.getElementById("username").value;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,18 +1,19 @@
 {
     "name": "enclica",
-    "version": "2.0.8",
+    "version": "2.0.9",
     "description": "The easy opensource messaging solution for you.",
     "main": "app.js",
     "scripts": {
         "test": "electron .",
-        "winbuild": "electron-packager . Enclica --platform win32 --arch x64 --asar --icon=assets/images/Global.ico --out release/",
+        "winbuild": "electron-packager . Enclica --overwrite --platform win32 --arch x64 --asar --icon=assets/images/Global.ico --out release/",
         "build": "electron-packager . Enclica --overwrite --platform=all --arch=x64 --asar --icon=assets/images/Global.ico --prune=true --out=release",
         "debug": ".\\node_modules\\electron\\dist\\electron.exe index.js --enable-logging"
     },
     "keywords": [
         "messaging",
         "msn"
     ],
+
     "author": "Enclica Software UK",
     "license": "ISC",
     "dependencies": {
@@ -21,6 +22,7 @@
         "electron-is": "^3.0.0",
         "electron-localstorage": "^1.0.5",
         "electron-packager": "^15.4.0",
+        "electron-squirrel-startup": "^1.0.0",
         "jquery": "^3.6.0",
         "md5": "^2.3.0",
         "path": "^0.12.7",
@@ -36,6 +38,13 @@
         "electron-winstaller": "^5.0.0"
     },
     "build": {
+        "extraResources": [{
+            "from": "./assets/images/",
+            "to": "imgassets",
+            "filter": [
+                "**/*"
+            ]
+        }],
         "productName": "Enclica",
         "appId": "org.enclicasoftware.enclica",
         "directories": {

diff --git a/renderer.js b/renderer.js
@@ -2,10 +2,10 @@ const { Color } = require('custom-electron-titlebar');
 //titlebar code it kind of works but not.
 const customTitlebar = require('custom-electron-titlebar');
 
-
+const path = require('path');
 const tb = new customTitlebar.Titlebar({
-    icon: "../assets/images/Enclica_logo_small.png",
-    backgroundColor: Color.BLUE,
+    icon: '../resources/icons/icon.png',
+    backgroundColor: Color.BLACK,
 });
 //customTitlebar.updateBackground(new Color(new RGBA(0, 0, 0, .3))); //rgba is not working here, what the fuck.
 tb.backgroundColor = Color.RED;

diff --git a/win_installer_config.json b/win_installer_config.json
@@ -3,7 +3,10 @@
     "options.exe": "Enclica.exe",
     "options.noMsi": false,
     "options.autostart": true,
-
+    "extraResources": [
+        "assets",
+        "assets/images/enclica_small_icon.png"
+    ],
     "options.tags": [
         "messaging",
         "IM"