Fix linux app icon and use electron-icon-maker for generating icons

2022-05-11 21:31:46 +05:30
parent 55e2a869ec
commit 5ea6f9f802
12 changed files with 1377 additions and 61 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
      - name: Install Node.js, NPM and Yarn
        uses: actions/setup-node@v1
        with:
-          node-version: 17
+          node-version: 18

      - name: Build and release with electron-builder
        run: |
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /node_modules/
 /.idea/
 /release/
-.DS_Store
+.DS_Store
+/assets/generated
--- a/README.md
+++ b/README.md
@@ -49,9 +49,9 @@

 As we know that Microsoft Office is a paid service, they also have a free Web version [here](https://office.com).

-For those people who can't afford Microsoft Office Subscription, or don't want to pay for that, or like the web version of it, Then **MS Office - Electron** is the app you require.
+For those people who can't afford Microsoft Office Subscription, or don't want to pay for that, or like the web version of it, Then **MS-Office-Electron** is the app you require.

-**MS Office - Electron** is the app in which the Web Version of Microsoft Office is wrapped into a Cross-Platform App with Electron. And all the Services of Microsoft Office will work for free.
+**MS-Office-Electron** is the app in which the Web Version of Microsoft Office is wrapped into a Cross-Platform App with Electron. And all the Services of Microsoft Office will work for free.

 Note - Windows Hello or Sign in with Security key is not currently supported and will show you an error. You will have to manually sign in with your E-Mail and Password.

--- a/assets/icon.png
+++ b/assets/icon.png
--- a/assets/icons/icon.icns
+++ b/assets/icons/icon.icns
--- a/assets/icons/icon.ico
+++ b/assets/icons/icon.ico
--- a/assets/icons/icon.png
+++ b/assets/icons/icon.png
--- a/docs/index.html
+++ b/docs/index.html
@@ -6,7 +6,7 @@
 -->
 <html>
  <head>
-    <title>MS Office - Electron</title>
+    <title>MS-Office-Electron</title>
    <meta charset="utf-8" />
    <meta
      name="viewport"
@@ -22,7 +22,7 @@
          ><img src="images/logo.png" alt=""
        /></a>
        <h1>
-          <strong>MS Office - Electron</strong><br />
+          <strong>MS-Office-Electron</strong><br />
          Free Office Online Desktop Client
        </h1>
      </div>
@@ -46,7 +46,7 @@
            height="auto"
            class="floatright"
          />
-          MS Office - Electron is an app in which the Web Version of MS Office
+          MS-Office-Electron is an app in which the Web Version of MS Office
          is wrapped into a Cross-Platform App with Electron. And all the
          Services of Microsoft Office will work for free. It is available for
          Windows, Mac OS, and Linux! If you like the project, do not forget to
--- a/docs/loading/index.html
+++ b/docs/loading/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <title>Loading MS Office - Electron</title>
+    <title>Loading MS-Office-Electron</title>
    <link
      rel="stylesheet"
      href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css"
@@ -15,7 +15,7 @@

    <div class="logo">
      <a href="https://github.com/agam778/MS-Office-Electron" target="_blank"
-        ><img src="./MSlogo.svg" alt="MS Office - Electron"
+        ><img src="./MSlogo.svg" alt="MS-Office-Electron"
      /></a>
    </div>
  </body>
--- a/main.js
+++ b/main.js
@@ -111,12 +111,12 @@ const menulayout = [
    label: "Application",
    submenu: [
      {
-        label: "About MS Office - Electron",
+        label: "About MS-Office-Electron",
        click: () =>
          openAboutWindow({
            icon_path:
-              "https://raw.githubusercontent.com/agam778/MS-Office-Electron/main/assets/icons/icon.png",
-            product_name: "MS Office - Electron",
+              "https://raw.githubusercontent.com/agam778/MS-Office-Electron/main/assets/icon.png",
+            product_name: "MS-Office-Electron",
            copyright:
              "Copyright (c) 2022 Agampreet Singh\nOffice, the name, website, images/icons\nare the intellectual properties of Microsoft.",
            package_json_dir: __dirname,
@@ -505,7 +505,7 @@ function createWindow() {
  const win = new BrowserWindow({
    width: 1181,
    height: 670,
-    icon: path.join(__dirname, "/assets/icons/icon.png"),
+    icon: path.join(__dirname, "/assets/generated/icons/png/1024x1024.png"),
    show: false,
    webPreferences: {
      nodeIntegration: true,
@@ -525,7 +525,7 @@ function createWindow() {
    transparent: true,
    frame: false,
    alwaysOnTop: true,
-    icon: path.join(__dirname, "/assets/icons/icon.png"),
+    icon: path.join(__dirname, "/assets/generated/icons/png/1024x1024.png"),
  });

  splash.loadURL(`https://agam778.github.io/MS-Office-Electron/loading`);
--- a/package.json
+++ b/package.json
@@ -7,6 +7,11 @@
    "type": "git",
    "url": "https://github.com/agam778/MS-Office-Electron.git"
  },
+  "author": {
+    "name": "Agampreet Singh",
+    "email": "agam778@zohomail.in",
+    "url": "https://agam778.is-a.dev/"
+  },
  "build": {
    "extraFiles": [
      "/assets",
@@ -15,32 +20,19 @@
    "appId": "com.agampreet.ms-office-electron",
    "productName": "MS-Office-Electron",
    "artifactName": "MS-Office-Electron-Setup-v${version}-${os}-${arch}.${ext}",
-    "linux": {
-      "category": "Office",
-      "desktop": {
-        "Comment": "An Unofficial Microsoft Office Online Desktop Client. Free of Cost.",
-        "Name": "MS-Office-Electron",
-        "StartupNotify": "true",
-        "Terminal": "false",
-        "Type": "Application",
-        "Categories": "Office;"
-      },
-      "icon": "./assets/icons/icon.png",
-      "executableName": "MS-Office-Electron",
-      "maintainer": "Agampreet Singh <agam778@zohomail.in>",
-      "target": [
-        "deb",
-        "rpm",
-        "AppImage"
-      ]
-    },
-
    "mac": {
+      "identity": "null",
      "category": "public.app-category.office",
      "target": [
        "dmg"
      ],
-      "icon": "./assets/icons/icon.icns"
+      "icon": "./assets/generated/icons/mac/icon.icns"
+    },
+    "win": {
+      "target": [
+        "nsis"
+      ],
+      "icon": "./assets/generated/icons/win/icon.ico"
    },
    "nsis": {
      "oneClick": false,
@@ -48,11 +40,16 @@
      "allowToChangeInstallationDirectory": false,
      "license": "LICENSE"
    },
-    "win": {
+    "linux": {
+      "category": "Office",
+      "icon": "./assets/generated/icons/png",
+      "executableName": "ms-office-electron",
+      "maintainer": "Agampreet Singh <agam778@zohomail.in>",
      "target": [
-        "nsis"
-      ],
-      "icon": "./assets/icons/icon.ico"
+        "deb",
+        "rpm",
+        "AppImage"
+      ]
    },
    "directories": {
      "output": "release"
@@ -60,14 +57,10 @@
  },
  "scripts": {
    "start": "electron .",
-    "pack": "electron-builder --dir",
+    "genicon": "rm -rf ./assets/generated && electron-icon-maker --input=assets/icon.png --output=assets/generated",
+    "pack": "yarn genicon && electron-builder --dir",
    "dist": "electron-builder"
  },
-  "author": {
-    "name": "Agampreet Singh",
-    "email": "agam778@zohomail.in",
-    "url": "https://agam778.is-a.dev/"
-  },
  "license": "MIT",
  "devDependencies": {
    "electron": "^18.2.2",
@@ -82,6 +75,7 @@
    "electron-log": "^4.4.7",
    "electron-store": "^8.0.1",
    "electron-updater": "^5.0.1",
-    "is-online": "^9.0.1"
+    "is-online": "^9.0.1",
+    "electron-icon-maker": "0.0.5"
  }
 }
--- a/yarn.lock
+++ b/yarn.lock