Skip to content

Commit

Permalink
YEN/METAL - UI changes, new About, version change, rollback Combobox …
Browse files Browse the repository at this point in the history
…behavior
  • Loading branch information
GlitchyPSIX committed Dec 16, 2019
1 parent 29a2c03 commit e070c1e
Show file tree
Hide file tree
Showing 15 changed files with 3,160 additions and 301 deletions.
2 changes: 1 addition & 1 deletion M64MM.Utils/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("M64MM.Utils")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyCopyright("Copyright © Project Comet")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
72 changes: 45 additions & 27 deletions M64MM2/AboutForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 25 additions & 9 deletions M64MM2/AboutForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,45 @@ public AboutForm()
InitializeComponent();
}

private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
Process.Start("mailto:" + lnkEmail.Text);
}

private void btnOK_Click(object sender, EventArgs e)
{
this.Close();
Close();
}

private void AboutForm_Load(object sender, EventArgs e)
{
lnkDiscord.Text = (Resources.discordInvite);
lnkDiscord.Text = ("Discord: " + Resources.discordInvite);
lblWhosInBanner.Text = Resources.picturedInBannerMsg + Resources.picturedInBannerPeople;
lblVersion.Text = ("Version: " + Application.ProductVersion + Resources.prereleaseString);
}

private void lnkDiscord_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
Process.Start("http://discord.gg/" + Resources.discordInvite);
Process.Start(Resources.discordInvite);
}

private void lnkGithubIssues_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
Process.Start("http://github.com/jpmac26/M64MM2/issues");
Process.Start("http://github.com/projectcomet64/M64MM/issues");
}

// 2e 54 54 20 2c 62 76 66 20 7a 7a 70 74 20 50
/*
,---,.
,' .' |
,---.' |
| | .'
: : :
: | |-,
| : ;/|
| | .'
' : '
| | |
| : \
| | ,'
`----'
*/

}
}

0 comments on commit e070c1e

Please sign in to comment.