19gjpfix toggle option (not in ui, yet.) and tweaked sizes for render

This commit is contained in:
Xytrizareal committed 2024-04-19 23:51:48 -07:00
1 parent d2b651bcf9
commit bcd8d0053e
2 files changed
+30 -9

No files matched your search

+6 -6
View File
@@ -417,7 +417,7 @@ namespace XPSLauncher
this.pictureBox5.Image = global::XPS.Properties.Resources.Twitch; this.pictureBox5.Image = global::XPS.Properties.Resources.Twitch;
this.pictureBox5.Location = new System.Drawing.Point(517, 571); this.pictureBox5.Location = new System.Drawing.Point(517, 571);
this.pictureBox5.Name = "pictureBox5"; this.pictureBox5.Name = "pictureBox5";
this.pictureBox5.Size = new System.Drawing.Size(65, 62); this.pictureBox5.Size = new System.Drawing.Size(64, 64);
this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox5.TabIndex = 9; this.pictureBox5.TabIndex = 9;
this.pictureBox5.TabStop = false; this.pictureBox5.TabStop = false;
@@ -429,7 +429,7 @@ namespace XPSLauncher
this.pictureBox4.Image = global::XPS.Properties.Resources.YouTube; this.pictureBox4.Image = global::XPS.Properties.Resources.YouTube;
this.pictureBox4.Location = new System.Drawing.Point(447, 571); this.pictureBox4.Location = new System.Drawing.Point(447, 571);
this.pictureBox4.Name = "pictureBox4"; this.pictureBox4.Name = "pictureBox4";
this.pictureBox4.Size = new System.Drawing.Size(61, 62); this.pictureBox4.Size = new System.Drawing.Size(64, 64);
this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox4.TabIndex = 8; this.pictureBox4.TabIndex = 8;
this.pictureBox4.TabStop = false; this.pictureBox4.TabStop = false;
@@ -441,7 +441,7 @@ namespace XPSLauncher
this.pictureBox3.Image = global::XPS.Properties.Resources.Twitter; this.pictureBox3.Image = global::XPS.Properties.Resources.Twitter;
this.pictureBox3.Location = new System.Drawing.Point(376, 571); this.pictureBox3.Location = new System.Drawing.Point(376, 571);
this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Name = "pictureBox3";
this.pictureBox3.Size = new System.Drawing.Size(61, 62); this.pictureBox3.Size = new System.Drawing.Size(64, 64);
this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox3.TabIndex = 7; this.pictureBox3.TabIndex = 7;
this.pictureBox3.TabStop = false; this.pictureBox3.TabStop = false;
@@ -453,7 +453,7 @@ namespace XPSLauncher
this.pictureBox2.Image = global::XPS.Properties.Resources.Discord; this.pictureBox2.Image = global::XPS.Properties.Resources.Discord;
this.pictureBox2.Location = new System.Drawing.Point(306, 571); this.pictureBox2.Location = new System.Drawing.Point(306, 571);
this.pictureBox2.Name = "pictureBox2"; this.pictureBox2.Name = "pictureBox2";
this.pictureBox2.Size = new System.Drawing.Size(61, 62); this.pictureBox2.Size = new System.Drawing.Size(64, 64);
this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox2.TabIndex = 6; this.pictureBox2.TabIndex = 6;
this.pictureBox2.TabStop = false; this.pictureBox2.TabStop = false;
@@ -463,9 +463,9 @@ namespace XPSLauncher
// //
this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Default; this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Default;
this.pictureBox1.Image = global::XPS.Properties.Resources.logoPng; this.pictureBox1.Image = global::XPS.Properties.Resources.logoPng;
this.pictureBox1.Location = new System.Drawing.Point(190, -60); this.pictureBox1.Location = new System.Drawing.Point(172, -60);
this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(222, 238); this.pictureBox1.Size = new System.Drawing.Size(256, 256);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 5; this.pictureBox1.TabIndex = 5;
this.pictureBox1.TabStop = false; this.pictureBox1.TabStop = false;
+24 -3
View File
@@ -42,6 +42,7 @@ namespace XPSLauncher
private static bool settingsOpen = false; private static bool settingsOpen = false;
private static bool settingCloseOnLoad = false; private static bool settingCloseOnLoad = false;
private static bool settingAllowMultipleInstances = false; private static bool settingAllowMultipleInstances = false;
private static bool settingFix19GJP = false;
public Form1() public Form1()
{ {
@@ -183,10 +184,10 @@ namespace XPSLauncher
if (File.Exists(path) && !downloadingVersions[version] && !errorVersions[version]) if (File.Exists(path) && !downloadingVersions[version] && !errorVersions[version])
{ {
if (settingAllowMultipleInstances || !IsProcessOpen(path) || forceOpen) if ((settingAllowMultipleInstances && !IsProcessOpen(path)) || forceOpen)
{ {
StartProcess(path); StartProcess(path);
if(version == "1.9") { if(version == "1.9" && settingFix19GJP) {
StartProcess(Path.Combine(executionPath, "gdps", "1.9", "XPS-Proxy.exe")); StartProcess(Path.Combine(executionPath, "gdps", "1.9", "XPS-Proxy.exe"));
} }
if (settingCloseOnLoad && !downloadingVersions["2.2"] && !downloadingVersions["2.1"] && !downloadingVersions["2.0"] && !downloadingVersions["1.9"]) if (settingCloseOnLoad && !downloadingVersions["2.2"] && !downloadingVersions["2.1"] && !downloadingVersions["2.0"] && !downloadingVersions["1.9"])
@@ -691,7 +692,8 @@ namespace XPSLauncher
lastVersion = currentVersion, lastVersion = currentVersion,
closeOnLoad = false, closeOnLoad = false,
allowMultipleInstances = false, allowMultipleInstances = false,
theme = 0 theme = 0,
fix19GJP = false
}; };
string jsonText = Newtonsoft.Json.JsonConvert.SerializeObject(json, Newtonsoft.Json.Formatting.Indented); string jsonText = Newtonsoft.Json.JsonConvert.SerializeObject(json, Newtonsoft.Json.Formatting.Indented);
File.WriteAllText(configPath, jsonText); File.WriteAllText(configPath, jsonText);
@@ -757,6 +759,12 @@ namespace XPSLauncher
config.closeOnLoad = config.closeOnExit ?? false; config.closeOnLoad = config.closeOnExit ?? false;
} }
if (config.lastVersion == "2.2.0")
{
WriteConfig("fix19GJP", false);
config.fix19GJP = false;
}
settingCloseOnLoad = config.closeOnLoad; settingCloseOnLoad = config.closeOnLoad;
settingAllowMultipleInstances = config.allowMultipleInstances; settingAllowMultipleInstances = config.allowMultipleInstances;
if (settingsOpen && settingCloseOnLoad) if (settingsOpen && settingCloseOnLoad)
@@ -853,6 +861,19 @@ namespace XPSLauncher
WriteConfig("allowMultipleInstances", settingAllowMultipleInstances); WriteConfig("allowMultipleInstances", settingAllowMultipleInstances);
} }
private void Toggle19GJPFix(object sender = null, EventArgs e = null)
{
if (settingFix19GJP)
{
settingFix19GJP = false;
}
else
{
settingFix19GJP = true;
}
WriteConfig("fix19GJP", settingAllowMultipleInstances);
}
public List<int> GetPIDsByApplicationPath(string applicationPath) public List<int> GetPIDsByApplicationPath(string applicationPath)
{ {
var pids = new List<int>(); var pids = new List<int>();