PSForever/GameLauncher
1
0
Fork 0
mirror of https://github.com/psforever/GameLauncher.git synced 2026-03-10 07:50:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix web responses, about box

Browse source
This commit is contained in:
Chord 2016-06-19 23:02:15 -04:00
parent 71665d8718
commit 824d7b5a7b
6 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

29
PS2ModLauncher/AboutBox1.Designer.cs generated
View file

@ -31,7 +31,7 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.appVersion = new System.Windows.Forms.Label();
this.versionInfo = new System.Windows.Forms.TextBox();
this.SuspendLayout();
//
// okButton
@ -71,7 +71,9 @@
//
this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Top;
this.linkLabel1.Location = new System.Drawing.Point(9, 55);
this.linkLabel1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Padding = new System.Windows.Forms.Padding(0, 0, 0, 5);
this.linkLabel1.Size = new System.Drawing.Size(328, 22);
this.linkLabel1.TabIndex = 28;
this.linkLabel1.TabStop = true;
@ -79,22 +81,26 @@
this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
//
// appVersion
// versionInfo
//
this.appVersion.Dock = System.Windows.Forms.DockStyle.Top;
this.appVersion.Location = new System.Drawing.Point(9, 77);
this.appVersion.Name = "appVersion";
this.appVersion.Size = new System.Drawing.Size(328, 27);
this.appVersion.TabIndex = 29;
this.appVersion.Text = "label3";
this.appVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.versionInfo.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.versionInfo.Dock = System.Windows.Forms.DockStyle.Top;
this.versionInfo.Location = new System.Drawing.Point(9, 77);
this.versionInfo.Margin = new System.Windows.Forms.Padding(3, 10, 3, 10);
this.versionInfo.Name = "versionInfo";
this.versionInfo.ReadOnly = true;
this.versionInfo.Size = new System.Drawing.Size(328, 13);
this.versionInfo.TabIndex = 29;
this.versionInfo.TabStop = false;
this.versionInfo.Text = "Version 1.x.x.x";
this.versionInfo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// About
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(346, 142);
this.Controls.Add(this.appVersion);
this.Controls.Add(this.versionInfo);
this.Controls.Add(this.linkLabel1);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
@ -109,6 +115,7 @@
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "About PS1 GameLauncher";
this.ResumeLayout(false);
this.PerformLayout();
}
@ -118,6 +125,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Label appVersion;
private System.Windows.Forms.TextBox versionInfo;
}
}

2
PS2ModLauncher/AboutBox1.cs
View file

@ -19,7 +19,7 @@ namespace PSLauncher
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
string version = fvi.FileVersion;
appVersion.Text = "Version " + version;
versionInfo.Text = "Version " + version;
}
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)

20
PS2ModLauncher/LauncherForm.Designer.cs generated
View file

@ -90,7 +90,7 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.ps_consoleOutput);
this.splitContainer1.Size = new System.Drawing.Size(384, 287);
this.splitContainer1.Size = new System.Drawing.Size(404, 287);
this.splitContainer1.SplitterDistance = this.splitContainer1.Panel1MinSize;
this.splitContainer1.TabIndex = 0;
//
@ -98,7 +98,7 @@
//
this.hideShowOutput.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.hideShowOutput.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.hideShowOutput.Location = new System.Drawing.Point(297, 69);
this.hideShowOutput.Location = new System.Drawing.Point(317, 69);
this.hideShowOutput.Name = "hideShowOutput";
this.hideShowOutput.Size = new System.Drawing.Size(84, 21);
this.hideShowOutput.TabIndex = 23;
@ -171,10 +171,10 @@
this.launchMessage.ForeColor = System.Drawing.Color.Red;
this.launchMessage.Location = new System.Drawing.Point(202, 37);
this.launchMessage.Name = "launchMessage";
this.launchMessage.Size = new System.Drawing.Size(172, 27);
this.launchMessage.Size = new System.Drawing.Size(197, 27);
this.launchMessage.TabIndex = 22;
this.launchMessage.Text = "Error message";
this.launchMessage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
this.launchMessage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.launchMessage.Visible = false;
//
// spinner
@ -198,7 +198,7 @@
this.ps_consoleOutput.Name = "ps_consoleOutput";
this.ps_consoleOutput.ReadOnly = true;
this.ps_consoleOutput.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.ps_consoleOutput.Size = new System.Drawing.Size(384, 188);
this.ps_consoleOutput.Size = new System.Drawing.Size(404, 188);
this.ps_consoleOutput.TabIndex = 1;
this.ps_consoleOutput.WordWrap = false;
//
@ -256,7 +256,7 @@
this.aboutToolStripMenuItem1});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(384, 24);
this.menuStrip1.Size = new System.Drawing.Size(404, 24);
this.menuStrip1.TabIndex = 2;
this.menuStrip1.Text = "menuStrip1";
//
@ -280,13 +280,13 @@
// toolStripContainer1.ContentPanel
//
this.toolStripContainer1.ContentPanel.Controls.Add(this.splitContainer1);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(384, 287);
this.toolStripContainer1.ContentPanel.Size = new System.Drawing.Size(404, 287);
this.toolStripContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.toolStripContainer1.LeftToolStripPanelVisible = false;
this.toolStripContainer1.Location = new System.Drawing.Point(0, 0);
this.toolStripContainer1.Name = "toolStripContainer1";
this.toolStripContainer1.RightToolStripPanelVisible = false;
this.toolStripContainer1.Size = new System.Drawing.Size(384, 311);
this.toolStripContainer1.Size = new System.Drawing.Size(404, 311);
this.toolStripContainer1.TabIndex = 3;
this.toolStripContainer1.Text = "toolStripContainer1";
//
@ -299,10 +299,10 @@
this.AcceptButton = this.launchGame;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(384, 311);
this.ClientSize = new System.Drawing.Size(404, 311);
this.Controls.Add(this.toolStripContainer1);
this.MainMenuStrip = this.menuStrip1;
this.MinimumSize = new System.Drawing.Size(400, 350);
this.MinimumSize = new System.Drawing.Size(420, 350);
this.Name = "LauncherForm";
this.Text = "PS1 GameLauncher";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.LauncherForm_FormClosing);

17
PS2ModLauncher/LauncherForm.cs
View file

@ -321,24 +321,24 @@ namespace PSLauncher
try
{
JObject obj2 = JObject.Parse(txt);
errorDetail = (string)obj2["errorDetail"];
errorDetail = (string)obj2["error"];
}
catch (Newtonsoft.Json.JsonException x2)
{
errorDetail = "Json parse error: " + x2.Message;
}
if (errorDetail == "INVALID_ACCOUNT_ID")
if (errorDetail == "INVALID_ACCOUNT_ID") // not sure if we still get this...
{
setErrorMessage("Unknown username");
}
else if (errorDetail == "RESET_ACCOUNT_PASSWORD")
else if (errorDetail == "NEED_PASSWORD_RESET")
{
setErrorMessage("Your account needs a password reset");
}
else if (errorDetail == "PASSWORD_MISMATCH")
else if (errorDetail == "BAD_LOGIN")
{
setErrorMessage("Bad password");
setErrorMessage("Bad password or username");
}
else // unrecognized!
{
@ -446,7 +446,6 @@ namespace PSLauncher
else // unrecognized!
{
setErrorMessage("Unknown error - see output window");
}
addLine("Get token failure: " + x.Status);
@ -627,9 +626,9 @@ namespace PSLauncher
oldSize = this.Size;
this.hideShowOutput.Text = "vv Show vv";
this.MinimumSize = this.MaximumSize = new System.Drawing.Size(400, 160);
this.MinimumSize = this.MaximumSize = new System.Drawing.Size(420, 160);
this.Size = new System.Drawing.Size(400, 190);
this.Size = new System.Drawing.Size(420, 160);
this.WindowState = FormWindowState.Normal;
this.MaximizeBox = false;
@ -638,7 +637,7 @@ namespace PSLauncher
else
{
this.hideShowOutput.Text = "^^ Hide ^^";
this.MinimumSize = new System.Drawing.Size(400, 350);
this.MinimumSize = new System.Drawing.Size(420, 350);
this.MaximumSize = new System.Drawing.Size(0, 0);
if (oldSize.IsEmpty)

11
PS2ModLauncher/PSLauncher.csproj
View file

@ -9,11 +9,13 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PSLauncher</RootNamespace>
<AssemblyName>PSEmu_LaunchPad</AssemblyName>
<AssemblyName>PS1_GameLauncher</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@ -135,6 +137,9 @@
<PropertyGroup>
<SignManifests>false</SignManifests>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json">
@ -204,8 +209,6 @@
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="PSLauncher_1_TemporaryKey.pfx" />
<None Include="PSLauncher_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@ -232,4 +235,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>

3
PS2ModLauncher/Properties/AssemblyInfo.cs
View file

@ -34,3 +34,6 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
// Stamp
// [assembly: AssemblyInformationalVersion("%version% [ %branch% @ %shorthash%%haschanges% ]")]