Add program icon for Windows (#51)

Co-authored-by: Mark Wang <carbonylgp@gmail.com>
2024-02-05 18:57:27 -05:00
parent 242f98a87b
commit fe6db9a86f
9 changed files with 76 additions and 57 deletions
@@ -5,3 +5,4 @@
 third_party
 *.exe
 *.dmg
+.idea/
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/mira_sharer.iml" filepath="$PROJECT_DIR$/mira_sharer.iml" />
-    </modules>
-  </component>
-</project>
@@ -427,7 +427,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -661,7 +661,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -843,7 +843,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -912,12 +912,28 @@ dependencies = [
 "block",
 "cocoa-foundation",
 "core-foundation",
- "core-graphics",
+ "core-graphics 0.22.3",
 "foreign-types 0.3.2",
 "libc",
 "objc",
 ]

+[[package]]
+name = "cocoa"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
+ "libc",
+ "objc",
+]
+
 [[package]]
 name = "cocoa-foundation"
 version = "0.1.1"
@@ -1035,6 +1051,19 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "core-graphics"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics-types"
 version = "0.1.2"
@@ -1048,13 +1077,13 @@ dependencies = [

 [[package]]
 name = "core-text"
-version = "19.2.0"
+version = "20.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25"
+checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5"
 dependencies = [
 "core-foundation",
- "core-graphics",
- "foreign-types 0.3.2",
+ "core-graphics 0.23.1",
+ "foreign-types 0.5.0",
 "libc",
 ]

@@ -1181,14 +1210,14 @@ dependencies = [

 [[package]]
 name = "crossfont"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45"
+checksum = "3eb5a3822b594afc99b503cc1859b94686d3c3efdd60507a28587dab80ee1071"
 dependencies = [
- "cocoa",
+ "cocoa 0.25.0",
 "core-foundation",
 "core-foundation-sys 0.8.4",
- "core-graphics",
+ "core-graphics 0.23.1",
 "core-text",
 "dwrote",
 "foreign-types 0.5.0",
@@ -1529,7 +1558,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -1666,7 +1695,7 @@ name = "enigo"
 version = "0.1.2"
 source = "git+https://github.com/mira-screen-share/enigo?branch=master#8e5908a99a95f758b2cf39f88a303cc6948aba3d"
 dependencies = [
- "core-graphics",
+ "core-graphics 0.22.3",
 "libc",
 "objc",
 "pkg-config",
@@ -1907,7 +1936,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -2010,7 +2039,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -2182,9 +2211,9 @@ dependencies = [

 [[package]]
 name = "glyph_brush"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d"
+checksum = "a3676f482c536a985fca36ce320a5e5b8fafd7b260806742af1963b71c5dc38c"
 dependencies = [
 "glyph_brush_draw_cache",
 "glyph_brush_layout",
@@ -3621,7 +3650,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -3650,9 +3679,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "ordered-float"
-version = "3.7.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fc2dbde8f8a79f2102cc474ceb0ad68e3b80b85289ea62389b60e66777e4213"
+checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
 dependencies = [
 "num-traits",
 ]
@@ -3865,7 +3894,7 @@ checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -3971,9 +4000,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.60"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
 "unicode-ident",
 ]
@@ -4575,7 +4604,7 @@ checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -4933,9 +4962,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -5003,7 +5032,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -5147,7 +5176,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -5661,7 +5690,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 "wasm-bindgen-shared",
 ]

@@ -5695,7 +5724,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -6451,9 +6480,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c"
 dependencies = [
 "bitflags 1.3.2",
- "cocoa",
+ "cocoa 0.24.1",
 "core-foundation",
- "core-graphics",
+ "core-graphics 0.22.3",
 "dispatch",
 "instant",
 "libc",
@@ -6630,7 +6659,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.18",
+ "syn 2.0.43",
 ]

 [[package]]
@@ -1,2 +1,3 @@
 #define RT_MANIFEST 24
-1 RT_MANIFEST "mira_sharer.exe.manifest"
+1 RT_MANIFEST "mira_sharer.exe.manifest"
+MAINICON ICON "resources/icons/mira.ico"
@@ -5,6 +5,7 @@
    <content url="file://$MODULE_DIR$">
      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
      <excludeFolder url="file://$MODULE_DIR$/target" />
+      <excludeFolder url="file://$MODULE_DIR$/third_party" />
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
@@ -1,3 +1,5 @@
+#![windows_subsystem = "windows"]
+
 extern crate core;
 #[macro_use]
 extern crate log;
@@ -45,6 +47,13 @@ async fn main() {
        window: iced::window::Settings {
            size: (640, 373),
            min_size: Some((400, 300)),
+            icon: Some(
+                iced::window::icon::from_file_data(
+                    include_bytes!("../resources/icons/256x256.png"),
+                    None,
+                )
+                .unwrap(),
+            ),
            ..Default::default()
        },
        ..Default::default()