Skip to content

Commit a4030c3

Browse files
committed
Add History for macOS. Close #6
1 parent 8fc4d65 commit a4030c3

File tree

5 files changed

+283
-86
lines changed

5 files changed

+283
-86
lines changed

NX_Game_Info/Common.cs

+45-42
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#if WINDOWS
55
using System.Drawing;
66
#endif
7+
#if MACOS
8+
using System.IO;
9+
#endif
710
using System.Linq;
811
using System.Runtime.InteropServices;
912
using System.Text;
@@ -209,13 +212,13 @@ public enum Permission
209212
public Title() { }
210213

211214
[XmlElement("TitleID")]
212-
public string titleID { get; set; }
215+
public string titleID { get; set; } = "";
213216
[XmlElement("BaseTitleID")]
214-
public string baseTitleID { get; set; }
217+
public string baseTitleID { get; set; } = "";
215218
[XmlElement("TitleName")]
216-
public string titleName { get; set; }
219+
public string titleName { get; set; } = "";
217220
[XmlElement("DisplayVersion")]
218-
public string displayVersion { get; set; }
221+
public string displayVersion { get; set; } = "";
219222
[XmlElement("Version")]
220223
public uint version { get; set; } = unchecked((uint)-1);
221224
public string versionString { get { return version != unchecked((uint)-1) ? version.ToString() : ""; } }
@@ -262,41 +265,6 @@ public string systemUpdateString
262265
}
263266
}
264267
}
265-
[XmlElement("Masterkey")]
266-
public uint masterkey { get; set; } = unchecked((uint)-1);
267-
public string masterkeyString
268-
{
269-
get
270-
{
271-
switch (masterkey)
272-
{
273-
case 0:
274-
return masterkey.ToString() + " (1.0.0-2.3.0)";
275-
case 1:
276-
return masterkey.ToString() + " (3.0.0)";
277-
case 2:
278-
return masterkey.ToString() + " (3.0.1-3.0.2)";
279-
case 3:
280-
return masterkey.ToString() + " (4.0.0-4.1.0)";
281-
case 4:
282-
return masterkey.ToString() + " (5.0.0-5.1.0)";
283-
case 5:
284-
return masterkey.ToString() + " (6.0.0-6.1.0)";
285-
case 6:
286-
return masterkey.ToString() + " (6.2.0)";
287-
case 7:
288-
return masterkey.ToString() + " (7.0.0-8.0.1)";
289-
case 8:
290-
return masterkey.ToString() + " (8.1.0)";
291-
case 9:
292-
return masterkey.ToString() + " (9.0.0)";
293-
case unchecked((uint)-1):
294-
return "";
295-
default:
296-
return masterkey.ToString();
297-
}
298-
}
299-
}
300268
[XmlElement("SystemVersion")]
301269
public uint systemVersion { get; set; } = unchecked((uint)-1);
302270
public string systemVersionString
@@ -340,10 +308,45 @@ public string systemVersionString
340308
[XmlElement("ApplicationVersion")]
341309
public uint applicationVersion { get; set; } = unchecked((uint)-1);
342310
public string applicationVersionString { get { return applicationVersion != unchecked((uint)-1) ? applicationVersion.ToString() : ""; } }
311+
[XmlElement("Masterkey")]
312+
public uint masterkey { get; set; } = unchecked((uint)-1);
313+
public string masterkeyString
314+
{
315+
get
316+
{
317+
switch (masterkey)
318+
{
319+
case 0:
320+
return masterkey.ToString() + " (1.0.0-2.3.0)";
321+
case 1:
322+
return masterkey.ToString() + " (3.0.0)";
323+
case 2:
324+
return masterkey.ToString() + " (3.0.1-3.0.2)";
325+
case 3:
326+
return masterkey.ToString() + " (4.0.0-4.1.0)";
327+
case 4:
328+
return masterkey.ToString() + " (5.0.0-5.1.0)";
329+
case 5:
330+
return masterkey.ToString() + " (6.0.0-6.1.0)";
331+
case 6:
332+
return masterkey.ToString() + " (6.2.0)";
333+
case 7:
334+
return masterkey.ToString() + " (7.0.0-8.0.1)";
335+
case 8:
336+
return masterkey.ToString() + " (8.1.0)";
337+
case 9:
338+
return masterkey.ToString() + " (9.0.0)";
339+
case unchecked((uint)-1):
340+
return "";
341+
default:
342+
return masterkey.ToString();
343+
}
344+
}
345+
}
343346
[XmlElement("Filename")]
344-
public string filename { get; set; }
347+
public string filename { get; set; } = "";
345348
[XmlElement("Filesize")]
346-
public long filesize { get; set; }
349+
public long filesize { get; set; } = 0;
347350
public string filesizeString
348351
{
349352
get
@@ -436,7 +439,7 @@ public string structureString
436439
public Permission permission { get; set; } = Permission.Invalid;
437440
public string permissionString { get { return permission == Permission.Invalid ? "" : permission.ToString(); } }
438441
[XmlElement("Error")]
439-
public string error { get; set; }
442+
public string error { get; set; } = "";
440443
}
441444

442445
public class VersionTitle

Windows/Main.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ private void Main_Load(object sender, EventArgs e)
163163
historyToolStripMenuItem.DropDownItems.Add(menuItem);
164164
}
165165

166-
(historyToolStripMenuItem.DropDownItems[index - 1] as ToolStripMenuItem).Checked = true;
166+
if (index > 0)
167+
(historyToolStripMenuItem.DropDownItems[index - 1] as ToolStripMenuItem).Checked = true;
167168

168169
titles = Process.processHistory();
169170

macOS/MainMenu.xib

+4
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@
101101
</items>
102102
</menu>
103103
</menuItem>
104+
<menuItem title="History" id="s7d-PH-jCu">
105+
<modifierMask key="keyEquivalentModifierMask"/>
106+
<menu key="submenu" title="History" id="h0J-2S-vTz"/>
107+
</menuItem>
104108
</items>
105109
</menu>
106110
</objects>

0 commit comments

Comments
 (0)