From 40e63591494bcd65e84db54371f397809ef1a9c2 Mon Sep 17 00:00:00 2001
From: juju <gliheng@gmail.com>
Date: Fri, 8 Mar 2019 22:03:11 +0800
Subject: [PATCH 1/2] set_icon support an optional nameId

---
 lib.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib.rs b/lib.rs
index 464ed43..6ebc160 100644
--- a/lib.rs
+++ b/lib.rs
@@ -84,6 +84,7 @@ pub struct WindowsResource {
     properties: HashMap<String, String>,
     version_info: HashMap<VersionInfo, u64>,
     rc_file: Option<String>,
+    icon_id: Option<String>,
     icon: Option<String>,
     language: u16,
     manifest: Option<String>,
@@ -178,6 +179,7 @@ impl WindowsResource {
             properties: props,
             version_info: ver,
             rc_file: None,
+            icon_id: None,
             icon: None,
             language: 0,
             manifest: None,
@@ -289,8 +291,9 @@ impl WindowsResource {
     ///
     /// This icon need to be in `ico` format. The filename can be absolute
     /// or relative to the projects root.
-    pub fn set_icon<'a>(&mut self, path: &'a str) -> &mut Self {
+    pub fn set_icon<'a>(&mut self, path: &'a str, icon_id: Option<&'a str>) -> &mut Self {
         self.icon = Some(path.to_string());
+        self.icon_id = icon_id.map(|s| s.to_string());
         self
     }
 
@@ -379,7 +382,12 @@ impl WindowsResource {
         writeln!(f, "VALUE \"Translation\", {:#x}, 0x04b0", self.language)?;
         writeln!(f, "}}\n}}")?;
         if let Some(ref icon) = self.icon {
-            writeln!(f, "1 ICON \"{}\"", escape_string(icon))?;
+            let name_id = if let Some(s) = &self.icon_id {
+                s
+            } else {
+                "1"
+            };
+            writeln!(f, "{} ICON \"{}\"", escape_string(name_id), escape_string(icon))?;
         }
         if let Some(e) = self.version_info.get(&VersionInfo::FILETYPE) {
             if let Some(manf) = self.manifest.as_ref() {

From 3814607498f9bb2f4dceb0817cf39d5f37f2a0ac Mon Sep 17 00:00:00 2001
From: juju <gliheng@gmail.com>
Date: Sun, 24 Mar 2019 11:12:57 +0800
Subject: [PATCH 2/2] add set_icon_with_id method

---
 lib.rs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib.rs b/lib.rs
index 6ebc160..2bf9646 100644
--- a/lib.rs
+++ b/lib.rs
@@ -291,9 +291,18 @@ impl WindowsResource {
     ///
     /// This icon need to be in `ico` format. The filename can be absolute
     /// or relative to the projects root.
-    pub fn set_icon<'a>(&mut self, path: &'a str, icon_id: Option<&'a str>) -> &mut Self {
+    pub fn set_icon<'a>(&mut self, path: &'a str) -> &mut Self {
         self.icon = Some(path.to_string());
-        self.icon_id = icon_id.map(|s| s.to_string());
+        self
+    }
+
+    /// Set an icon filename and icon id
+    ///
+    /// This icon need to be in `ico` format. The filename can be absolute
+    /// or relative to the projects root.
+    pub fn set_icon_with_id<'a>(&mut self, path: &'a str, icon_id: &'a str) -> &mut Self {
+        self.icon = Some(path.to_string());
+        self.icon_id = Some(icon_id.to_string());
         self
     }
 
@@ -382,11 +391,7 @@ impl WindowsResource {
         writeln!(f, "VALUE \"Translation\", {:#x}, 0x04b0", self.language)?;
         writeln!(f, "}}\n}}")?;
         if let Some(ref icon) = self.icon {
-            let name_id = if let Some(s) = &self.icon_id {
-                s
-            } else {
-                "1"
-            };
+            let name_id = self.icon_id.as_ref().map(String::as_str).unwrap_or("1");
             writeln!(f, "{} ICON \"{}\"", escape_string(name_id), escape_string(icon))?;
         }
         if let Some(e) = self.version_info.get(&VersionInfo::FILETYPE) {