Update app & RLOG icons

Mechanical-Advantage · Aug 5, 2023 · c4eddf1 · c4eddf1
1 parent 503658b
commit c4eddf1
Show file tree

Hide file tree

Showing 36 changed files with 6 additions and 8 deletions.
diff --git a/icons/app/app-icon-mac.iconset/icon_128x128.png b/icons/app/app-icon-mac.iconset/icon_128x128.png
diff --git a/icons/app/app-icon-mac.iconset/[email protected] b/icons/app/app-icon-mac.iconset/[email protected]
diff --git a/icons/app/app-icon-mac.iconset/icon_16x16.png b/icons/app/app-icon-mac.iconset/icon_16x16.png
diff --git a/icons/app/app-icon-mac.iconset/[email protected] b/icons/app/app-icon-mac.iconset/[email protected]
diff --git a/icons/app/app-icon-mac.iconset/icon_256x256.png b/icons/app/app-icon-mac.iconset/icon_256x256.png
diff --git a/icons/app/app-icon-mac.iconset/[email protected] b/icons/app/app-icon-mac.iconset/[email protected]
diff --git a/icons/app/app-icon-mac.iconset/icon_32x32.png b/icons/app/app-icon-mac.iconset/icon_32x32.png
diff --git a/icons/app/app-icon-mac.iconset/[email protected] b/icons/app/app-icon-mac.iconset/[email protected]
diff --git a/icons/app/app-icon-mac.iconset/icon_512x512.png b/icons/app/app-icon-mac.iconset/icon_512x512.png
diff --git a/icons/app/app-icon-mac.iconset/[email protected] b/icons/app/app-icon-mac.iconset/[email protected]
diff --git a/icons/app/app-icon.icns b/icons/app/app-icon.icns
diff --git a/icons/app/app-icon.ico b/icons/app/app-icon.ico
diff --git a/icons/app/rlog-icon-mac.iconset/icon_128x128.png b/icons/app/rlog-icon-mac.iconset/icon_128x128.png
diff --git a/icons/app/rlog-icon-mac.iconset/[email protected] b/icons/app/rlog-icon-mac.iconset/[email protected]
diff --git a/icons/app/rlog-icon-mac.iconset/icon_16x16.png b/icons/app/rlog-icon-mac.iconset/icon_16x16.png
diff --git a/icons/app/rlog-icon-mac.iconset/[email protected] b/icons/app/rlog-icon-mac.iconset/[email protected]
diff --git a/icons/app/rlog-icon-mac.iconset/icon_256x256.png b/icons/app/rlog-icon-mac.iconset/icon_256x256.png
diff --git a/icons/app/rlog-icon-mac.iconset/[email protected] b/icons/app/rlog-icon-mac.iconset/[email protected]
diff --git a/icons/app/rlog-icon-mac.iconset/icon_32x32.png b/icons/app/rlog-icon-mac.iconset/icon_32x32.png
diff --git a/icons/app/rlog-icon-mac.iconset/[email protected] b/icons/app/rlog-icon-mac.iconset/[email protected]
diff --git a/icons/app/rlog-icon-mac.iconset/icon_512x512.png b/icons/app/rlog-icon-mac.iconset/icon_512x512.png
diff --git a/icons/app/rlog-icon-mac.iconset/[email protected] b/icons/app/rlog-icon-mac.iconset/[email protected]
diff --git a/icons/app/rlog-icon.icns b/icons/app/rlog-icon.icns
diff --git a/icons/app/rlog-icon.ico b/icons/app/rlog-icon.ico
diff --git a/icons/download/rlog-icon-linux.png b/icons/download/rlog-icon-linux.png
diff --git a/icons/download/rlog-icon-linuxwin.png b/icons/download/rlog-icon-linuxwin.png
diff --git a/icons/download/rlog-icon-mac.png b/icons/download/rlog-icon-mac.png
diff --git a/icons/download/rlog-icon-win.png b/icons/download/rlog-icon-win.png
diff --git a/icons/download/wpilog-icon-linux.png → icons/download/wpilog-icon-linuxwin.png b/icons/download/wpilog-icon-linux.png → icons/download/wpilog-icon-linuxwin.png
diff --git a/icons/download/wpilog-icon-win.png b/icons/download/wpilog-icon-win.png
diff --git a/icons/window-icon.png b/icons/window-icon.png
diff --git a/icons/window/window-icon-linux.png b/icons/window/window-icon-linux.png
diff --git a/icons/window/window-icon-win.png b/icons/window/window-icon-win.png
diff --git a/package.json b/package.json
@@ -63,6 +63,7 @@
       "www/**/*",
       "bundles/*",
       "icons/**/*",
+      "!icons/**/*.iconset",
       "frcData/**/*",
       "docs/**/*",
       "!**/.*"

diff --git a/src/download.ts b/src/download.ts
@@ -225,11 +225,9 @@ function handleMainMessage(message: NamedMessage) {
             img.src = "../icons/download/" + extension + "-icon-mac.png";
             img.classList.add("mac");
             break;
-          case "win32":
-            img.src = "../icons/download/" + extension + "-icon-win.png";
-            break;
           case "linux":
-            img.src = "../icons/download/" + extension + "-icon-linux.png";
+          case "win32":
+            img.src = "../icons/download/" + extension + "-icon-linuxwin.png";
             break;
         }
         let filenameSpan = document.createElement("span");

diff --git a/src/main/Constants.ts b/src/main/Constants.ts
@@ -14,10 +14,9 @@ export const LAST_OPEN_FILE = path.join(app.getPath("temp"), "akit-log-path.txt"
 export const VIDEO_CACHE = path.join(app.getPath("temp"), "advantagescope-videos");
 export const WINDOW_ICON: string | undefined = (() => {
   switch (process.platform) {
-    case "win32": // Square icon
-      return path.join(__dirname, "../icons/window/window-icon-win.png");
-    case "linux": // Rounded icon
-      return path.join(__dirname, "../icons/window/window-icon-linux.png");
+    case "linux":
+    case "win32":
+      return path.join(__dirname, "../icons/window-icon.png");
     default: // macOS uses the app icon by default
       return undefined;
   }