From a31b70389212110516ea089f46bf74c8997d9809 Mon Sep 17 00:00:00 2001
From: Patrick Albus <34771575+Narua2010@users.noreply.github.com>
Date: Sat, 8 May 2021 21:53:46 +0200
Subject: [PATCH] fix: Quick Search and installation bug
---
README.md | 2 +-
.../QuickSearch.cs | 1 -
.../TheOtherRoles.cs | 12 +-
.../AmongUsModUpdater.csproj | 6 +-
.../AmongUsModUpdater.csproj.user | 2 +-
.../AmongUsModUpdater/MainWindow.Designer.cs | 197 ++++++++----------
6 files changed, 102 insertions(+), 118 deletions(-)
diff --git a/README.md b/README.md
index 40dba0f..caec393 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ The **The Other Roles**, is a mod for Among Us which currently adds 20 additiona
## Installation
-1. Download and unzip the [AmongUsModUpdater.zip](https://github.com/Narua2010/AmongUsModUpdater/releases/download/v2.2.1/AmongUsModUpdater.zip).
+1. Download and unzip the [AmongUsModUpdater.zip](https://github.com/Narua2010/AmongUsModUpdater/releases/download/v2.2.2/AmongUsModUpdater.zip).
2. Unzip the folder wherever you want.
3. Run the setup.exe.
4. The program is then started each time via desktop shortcut.
diff --git a/source/GuiVersion/AmongUsModUpdater.ModFunctions/QuickSearch.cs b/source/GuiVersion/AmongUsModUpdater.ModFunctions/QuickSearch.cs
index 0b63285..1393806 100644
--- a/source/GuiVersion/AmongUsModUpdater.ModFunctions/QuickSearch.cs
+++ b/source/GuiVersion/AmongUsModUpdater.ModFunctions/QuickSearch.cs
@@ -95,7 +95,6 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs ex)
if (Directory.GetFiles(path, @"Among Us.exe", options).Any())
ex.Result = path;
}
- ex.Result = path;
}
catch (Exception e)
{
diff --git a/source/GuiVersion/AmongUsModUpdater.TheOtherRoles/TheOtherRoles.cs b/source/GuiVersion/AmongUsModUpdater.TheOtherRoles/TheOtherRoles.cs
index ff2f0a4..23d82d8 100644
--- a/source/GuiVersion/AmongUsModUpdater.TheOtherRoles/TheOtherRoles.cs
+++ b/source/GuiVersion/AmongUsModUpdater.TheOtherRoles/TheOtherRoles.cs
@@ -31,10 +31,16 @@ public static async void getTheOtherRoles(dynamic mainWindow)
Properties.Settings.Default.Save();
#endif
dynamic json = await ModFunctions.getModData(projectApi);
- downloadUrl = json.assets[0].browser_download_url;
+ foreach(var value in json.assets)
+ {
+ if(value.content_type == "application/x-zip-compressed")
+ {
+ downloadUrl = value.browser_download_url;
+ currentReleaseId = value.id.ToString();
+ }
+ }
releaseName = json.name;
- currentReleaseId = json.assets[0].id.ToString();
-
+
if (string.IsNullOrWhiteSpace(Properties.Settings.Default.ReleaseId))
{
mainWindow.buttonHomeInstall.Visible = true;
diff --git a/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj b/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj
index 36f20ea..6f2a2a6 100644
--- a/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj
+++ b/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj
@@ -5,15 +5,15 @@
net5.0-windows
true
installer.ico
- 2.2.0.0
- 2.2.0
+ 2.2.2.0
+ 2.2.2
Jolle & Narua
Jolle & Narua
Logo.png
https://github.com/Narua2010/AmongUsModUpdater
false
- 2.2.1.14
+ 2.2.2.0
diff --git a/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user b/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user
index 2953deb..78f6609 100644
--- a/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user
+++ b/source/GuiVersion/AmongUsModUpdater/AmongUsModUpdater.csproj.user
@@ -1,7 +1,7 @@
- <_LastSelectedProfileId>D:\AmongUsModUpdater\source\GuiVersion\AmongUsModUpdater\Properties\PublishProfiles\ClickOnceProfile.pubxml
+ <_LastSelectedProfileId>D:\Github\AmongUsModUpdater\source\GuiVersion\AmongUsModUpdater\Properties\PublishProfiles\ClickOnceProfile.pubxml
diff --git a/source/GuiVersion/AmongUsModUpdater/MainWindow.Designer.cs b/source/GuiVersion/AmongUsModUpdater/MainWindow.Designer.cs
index 6bf458f..4a3a8ae 100644
--- a/source/GuiVersion/AmongUsModUpdater/MainWindow.Designer.cs
+++ b/source/GuiVersion/AmongUsModUpdater/MainWindow.Designer.cs
@@ -84,10 +84,10 @@ private void InitializeComponent()
this.homeButton.FlatAppearance.BorderSize = 0;
this.homeButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.homeButton.ForeColor = System.Drawing.Color.White;
- this.homeButton.Location = new System.Drawing.Point(0, 60);
- this.homeButton.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+ this.homeButton.Location = new System.Drawing.Point(0, 100);
+ this.homeButton.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.homeButton.Name = "homeButton";
- this.homeButton.Size = new System.Drawing.Size(158, 75);
+ this.homeButton.Size = new System.Drawing.Size(226, 125);
this.homeButton.TabIndex = 5;
this.homeButton.Text = "Home";
this.homeButton.UseVisualStyleBackColor = true;
@@ -98,10 +98,10 @@ private void InitializeComponent()
this.settingsButton.FlatAppearance.BorderSize = 0;
this.settingsButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.settingsButton.ForeColor = System.Drawing.Color.White;
- this.settingsButton.Location = new System.Drawing.Point(0, 135);
- this.settingsButton.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+ this.settingsButton.Location = new System.Drawing.Point(0, 225);
+ this.settingsButton.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.settingsButton.Name = "settingsButton";
- this.settingsButton.Size = new System.Drawing.Size(158, 75);
+ this.settingsButton.Size = new System.Drawing.Size(226, 125);
this.settingsButton.TabIndex = 6;
this.settingsButton.Text = "Settings";
this.settingsButton.UseVisualStyleBackColor = true;
@@ -112,10 +112,10 @@ private void InitializeComponent()
this.helpButton.FlatAppearance.BorderSize = 0;
this.helpButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.helpButton.ForeColor = System.Drawing.Color.White;
- this.helpButton.Location = new System.Drawing.Point(0, 210);
- this.helpButton.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
+ this.helpButton.Location = new System.Drawing.Point(0, 350);
+ this.helpButton.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.helpButton.Name = "helpButton";
- this.helpButton.Size = new System.Drawing.Size(158, 75);
+ this.helpButton.Size = new System.Drawing.Size(226, 125);
this.helpButton.TabIndex = 7;
this.helpButton.Text = "Help";
this.helpButton.UseVisualStyleBackColor = true;
@@ -129,9 +129,10 @@ private void InitializeComponent()
this.panelHome.Controls.Add(this.otherRolesBanner);
this.panelHome.Controls.Add(this.downloadProgress);
this.panelHome.Controls.Add(this.buttonHomeStart);
- this.panelHome.Location = new System.Drawing.Point(172, 60);
+ this.panelHome.Location = new System.Drawing.Point(246, 100);
+ this.panelHome.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panelHome.Name = "panelHome";
- this.panelHome.Size = new System.Drawing.Size(528, 372);
+ this.panelHome.Size = new System.Drawing.Size(754, 620);
this.panelHome.TabIndex = 8;
this.panelHome.Visible = false;
this.panelHome.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
@@ -147,11 +148,10 @@ private void InitializeComponent()
this.buttonHomeInstall.ForeColor = System.Drawing.Color.White;
this.buttonHomeInstall.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.buttonHomeInstall.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.buttonHomeInstall.Location = new System.Drawing.Point(176, 102);
- this.buttonHomeInstall.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonHomeInstall.Location = new System.Drawing.Point(251, 170);
this.buttonHomeInstall.Name = "buttonHomeInstall";
this.buttonHomeInstall.Radius = 10;
- this.buttonHomeInstall.Size = new System.Drawing.Size(176, 72);
+ this.buttonHomeInstall.Size = new System.Drawing.Size(251, 120);
this.buttonHomeInstall.Stroke = false;
this.buttonHomeInstall.StrokeColor = System.Drawing.Color.Gray;
this.buttonHomeInstall.TabIndex = 9;
@@ -163,10 +163,9 @@ private void InitializeComponent()
// waitingInfoForStart
//
this.waitingInfoForStart.AutoSize = true;
- this.waitingInfoForStart.Location = new System.Drawing.Point(121, 226);
- this.waitingInfoForStart.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.waitingInfoForStart.Location = new System.Drawing.Point(173, 377);
this.waitingInfoForStart.Name = "waitingInfoForStart";
- this.waitingInfoForStart.Size = new System.Drawing.Size(276, 15);
+ this.waitingInfoForStart.Size = new System.Drawing.Size(417, 25);
this.waitingInfoForStart.TabIndex = 8;
this.waitingInfoForStart.Text = "It takes a little while to start Among Us. Please wait.";
this.waitingInfoForStart.Visible = false;
@@ -181,11 +180,10 @@ private void InitializeComponent()
this.buttonHomeUpdate.ForeColor = System.Drawing.Color.White;
this.buttonHomeUpdate.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.buttonHomeUpdate.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.buttonHomeUpdate.Location = new System.Drawing.Point(176, 102);
- this.buttonHomeUpdate.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonHomeUpdate.Location = new System.Drawing.Point(251, 170);
this.buttonHomeUpdate.Name = "buttonHomeUpdate";
this.buttonHomeUpdate.Radius = 10;
- this.buttonHomeUpdate.Size = new System.Drawing.Size(176, 72);
+ this.buttonHomeUpdate.Size = new System.Drawing.Size(251, 120);
this.buttonHomeUpdate.Stroke = false;
this.buttonHomeUpdate.StrokeColor = System.Drawing.Color.Gray;
this.buttonHomeUpdate.TabIndex = 5;
@@ -197,10 +195,9 @@ private void InitializeComponent()
// otherRolesBanner
//
this.otherRolesBanner.Image = ((System.Drawing.Image)(resources.GetObject("otherRolesBanner.Image")));
- this.otherRolesBanner.Location = new System.Drawing.Point(32, 0);
- this.otherRolesBanner.Margin = new System.Windows.Forms.Padding(2);
+ this.otherRolesBanner.Location = new System.Drawing.Point(46, 0);
this.otherRolesBanner.Name = "otherRolesBanner";
- this.otherRolesBanner.Size = new System.Drawing.Size(470, 77);
+ this.otherRolesBanner.Size = new System.Drawing.Size(671, 128);
this.otherRolesBanner.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.otherRolesBanner.TabIndex = 7;
this.otherRolesBanner.TabStop = false;
@@ -210,10 +207,10 @@ private void InitializeComponent()
//
// downloadProgress
//
- this.downloadProgress.Location = new System.Drawing.Point(69, 190);
- this.downloadProgress.Margin = new System.Windows.Forms.Padding(10);
+ this.downloadProgress.Location = new System.Drawing.Point(99, 317);
+ this.downloadProgress.Margin = new System.Windows.Forms.Padding(14, 17, 14, 17);
this.downloadProgress.Name = "downloadProgress";
- this.downloadProgress.Size = new System.Drawing.Size(398, 23);
+ this.downloadProgress.Size = new System.Drawing.Size(569, 38);
this.downloadProgress.TabIndex = 4;
this.downloadProgress.Visible = false;
//
@@ -227,11 +224,10 @@ private void InitializeComponent()
this.buttonHomeStart.ForeColor = System.Drawing.Color.White;
this.buttonHomeStart.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.buttonHomeStart.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.buttonHomeStart.Location = new System.Drawing.Point(176, 103);
- this.buttonHomeStart.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonHomeStart.Location = new System.Drawing.Point(251, 172);
this.buttonHomeStart.Name = "buttonHomeStart";
this.buttonHomeStart.Radius = 10;
- this.buttonHomeStart.Size = new System.Drawing.Size(176, 71);
+ this.buttonHomeStart.Size = new System.Drawing.Size(251, 118);
this.buttonHomeStart.Stroke = false;
this.buttonHomeStart.StrokeColor = System.Drawing.Color.Gray;
this.buttonHomeStart.TabIndex = 6;
@@ -254,9 +250,10 @@ private void InitializeComponent()
this.panelSettings.Controls.Add(this.settingsToggleBackup);
this.panelSettings.Controls.Add(this.settingsGamePathTextBox);
this.panelSettings.Controls.Add(this.labelSettingsPath);
- this.panelSettings.Location = new System.Drawing.Point(172, 60);
+ this.panelSettings.Location = new System.Drawing.Point(246, 100);
+ this.panelSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panelSettings.Name = "panelSettings";
- this.panelSettings.Size = new System.Drawing.Size(528, 372);
+ this.panelSettings.Size = new System.Drawing.Size(754, 620);
this.panelSettings.TabIndex = 9;
this.panelSettings.Visible = false;
this.panelSettings.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
@@ -272,11 +269,10 @@ private void InitializeComponent()
this.settingsButtonQuickSearch.ForeColor = System.Drawing.Color.White;
this.settingsButtonQuickSearch.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.settingsButtonQuickSearch.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.settingsButtonQuickSearch.Location = new System.Drawing.Point(156, 109);
- this.settingsButtonQuickSearch.Margin = new System.Windows.Forms.Padding(2);
+ this.settingsButtonQuickSearch.Location = new System.Drawing.Point(223, 182);
this.settingsButtonQuickSearch.Name = "settingsButtonQuickSearch";
this.settingsButtonQuickSearch.Radius = 10;
- this.settingsButtonQuickSearch.Size = new System.Drawing.Size(108, 29);
+ this.settingsButtonQuickSearch.Size = new System.Drawing.Size(154, 48);
this.settingsButtonQuickSearch.Stroke = false;
this.settingsButtonQuickSearch.StrokeColor = System.Drawing.Color.Gray;
this.settingsButtonQuickSearch.TabIndex = 13;
@@ -294,11 +290,10 @@ private void InitializeComponent()
this.settingsOpenFolder.ForeColor = System.Drawing.Color.White;
this.settingsOpenFolder.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.settingsOpenFolder.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.settingsOpenFolder.Location = new System.Drawing.Point(397, 109);
- this.settingsOpenFolder.Margin = new System.Windows.Forms.Padding(2);
+ this.settingsOpenFolder.Location = new System.Drawing.Point(567, 182);
this.settingsOpenFolder.Name = "settingsOpenFolder";
this.settingsOpenFolder.Radius = 10;
- this.settingsOpenFolder.Size = new System.Drawing.Size(122, 29);
+ this.settingsOpenFolder.Size = new System.Drawing.Size(174, 48);
this.settingsOpenFolder.Stroke = false;
this.settingsOpenFolder.StrokeColor = System.Drawing.Color.Gray;
this.settingsOpenFolder.TabIndex = 12;
@@ -311,10 +306,9 @@ private void InitializeComponent()
this.buttonWorkerCancel.FlatAppearance.BorderSize = 0;
this.buttonWorkerCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonWorkerCancel.ForeColor = System.Drawing.Color.Silver;
- this.buttonWorkerCancel.Location = new System.Drawing.Point(386, 226);
- this.buttonWorkerCancel.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonWorkerCancel.Location = new System.Drawing.Point(551, 377);
this.buttonWorkerCancel.Name = "buttonWorkerCancel";
- this.buttonWorkerCancel.Size = new System.Drawing.Size(27, 23);
+ this.buttonWorkerCancel.Size = new System.Drawing.Size(39, 38);
this.buttonWorkerCancel.TabIndex = 11;
this.buttonWorkerCancel.Text = "X";
this.buttonWorkerCancel.UseVisualStyleBackColor = true;
@@ -324,18 +318,20 @@ private void InitializeComponent()
// labelProcessedDrives
//
this.labelProcessedDrives.AutoSize = true;
- this.labelProcessedDrives.Location = new System.Drawing.Point(32, 252);
+ this.labelProcessedDrives.Location = new System.Drawing.Point(46, 420);
+ this.labelProcessedDrives.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.labelProcessedDrives.Name = "labelProcessedDrives";
- this.labelProcessedDrives.Size = new System.Drawing.Size(95, 15);
+ this.labelProcessedDrives.Size = new System.Drawing.Size(146, 25);
this.labelProcessedDrives.TabIndex = 9;
this.labelProcessedDrives.Text = "Processed Drives";
this.labelProcessedDrives.Visible = false;
//
// progressBarSearch
//
- this.progressBarSearch.Location = new System.Drawing.Point(32, 226);
+ this.progressBarSearch.Location = new System.Drawing.Point(46, 377);
+ this.progressBarSearch.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.progressBarSearch.Name = "progressBarSearch";
- this.progressBarSearch.Size = new System.Drawing.Size(349, 23);
+ this.progressBarSearch.Size = new System.Drawing.Size(499, 38);
this.progressBarSearch.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
this.progressBarSearch.TabIndex = 8;
this.progressBarSearch.Visible = false;
@@ -350,11 +346,10 @@ private void InitializeComponent()
this.settingsButtonAutomated.ForeColor = System.Drawing.Color.White;
this.settingsButtonAutomated.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.settingsButtonAutomated.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.settingsButtonAutomated.Location = new System.Drawing.Point(276, 109);
- this.settingsButtonAutomated.Margin = new System.Windows.Forms.Padding(2);
+ this.settingsButtonAutomated.Location = new System.Drawing.Point(394, 182);
this.settingsButtonAutomated.Name = "settingsButtonAutomated";
this.settingsButtonAutomated.Radius = 10;
- this.settingsButtonAutomated.Size = new System.Drawing.Size(108, 29);
+ this.settingsButtonAutomated.Size = new System.Drawing.Size(154, 48);
this.settingsButtonAutomated.Stroke = false;
this.settingsButtonAutomated.StrokeColor = System.Drawing.Color.Gray;
this.settingsButtonAutomated.TabIndex = 7;
@@ -372,11 +367,10 @@ private void InitializeComponent()
this.settingButtonManual.ForeColor = System.Drawing.Color.White;
this.settingButtonManual.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.settingButtonManual.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.settingButtonManual.Location = new System.Drawing.Point(35, 109);
- this.settingButtonManual.Margin = new System.Windows.Forms.Padding(2);
+ this.settingButtonManual.Location = new System.Drawing.Point(50, 182);
this.settingButtonManual.Name = "settingButtonManual";
this.settingButtonManual.Radius = 10;
- this.settingButtonManual.Size = new System.Drawing.Size(108, 29);
+ this.settingButtonManual.Size = new System.Drawing.Size(154, 48);
this.settingButtonManual.Stroke = false;
this.settingButtonManual.StrokeColor = System.Drawing.Color.Gray;
this.settingButtonManual.TabIndex = 6;
@@ -388,20 +382,18 @@ private void InitializeComponent()
//
this.labelSettingsHeader.AutoSize = true;
this.labelSettingsHeader.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
- this.labelSettingsHeader.Location = new System.Drawing.Point(32, 28);
- this.labelSettingsHeader.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelSettingsHeader.Location = new System.Drawing.Point(46, 47);
this.labelSettingsHeader.Name = "labelSettingsHeader";
- this.labelSettingsHeader.Size = new System.Drawing.Size(178, 19);
+ this.labelSettingsHeader.Size = new System.Drawing.Size(252, 28);
this.labelSettingsHeader.TabIndex = 5;
this.labelSettingsHeader.Text = "Among Us Game Settings";
//
// labelSettingsBackup
//
this.labelSettingsBackup.AutoSize = true;
- this.labelSettingsBackup.Location = new System.Drawing.Point(32, 165);
- this.labelSettingsBackup.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelSettingsBackup.Location = new System.Drawing.Point(46, 275);
this.labelSettingsBackup.Name = "labelSettingsBackup";
- this.labelSettingsBackup.Size = new System.Drawing.Size(212, 15);
+ this.labelSettingsBackup.Size = new System.Drawing.Size(324, 25);
this.labelSettingsBackup.TabIndex = 4;
this.labelSettingsBackup.Text = "Should a copy of the game be created?";
//
@@ -411,14 +403,13 @@ private void InitializeComponent()
this.settingsToggleBackup.Cursor = System.Windows.Forms.Cursors.Hand;
this.settingsToggleBackup.ForeColor = System.Drawing.Color.White;
this.settingsToggleBackup.IsOn = false;
- this.settingsToggleBackup.Location = new System.Drawing.Point(32, 190);
- this.settingsToggleBackup.Margin = new System.Windows.Forms.Padding(2);
+ this.settingsToggleBackup.Location = new System.Drawing.Point(46, 317);
this.settingsToggleBackup.Name = "settingsToggleBackup";
this.settingsToggleBackup.OffColor = System.Drawing.Color.DarkGray;
this.settingsToggleBackup.OffText = "";
this.settingsToggleBackup.OnColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.settingsToggleBackup.OnText = "";
- this.settingsToggleBackup.Size = new System.Drawing.Size(34, 19);
+ this.settingsToggleBackup.Size = new System.Drawing.Size(60, 32);
this.settingsToggleBackup.TabIndex = 3;
this.settingsToggleBackup.Text = "customToggle1";
this.settingsToggleBackup.TextEnabled = true;
@@ -431,20 +422,18 @@ private void InitializeComponent()
this.settingsGamePathTextBox.Enabled = false;
this.settingsGamePathTextBox.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.settingsGamePathTextBox.ForeColor = System.Drawing.Color.DimGray;
- this.settingsGamePathTextBox.Location = new System.Drawing.Point(32, 69);
- this.settingsGamePathTextBox.Margin = new System.Windows.Forms.Padding(2);
+ this.settingsGamePathTextBox.Location = new System.Drawing.Point(46, 115);
this.settingsGamePathTextBox.Name = "settingsGamePathTextBox";
- this.settingsGamePathTextBox.Size = new System.Drawing.Size(487, 30);
+ this.settingsGamePathTextBox.Size = new System.Drawing.Size(696, 50);
this.settingsGamePathTextBox.TabIndex = 2;
this.settingsGamePathTextBox.TextChanged += new System.EventHandler(this.settingsGamePathTextBox_TextChanged);
//
// labelSettingsPath
//
this.labelSettingsPath.AutoSize = true;
- this.labelSettingsPath.Location = new System.Drawing.Point(32, 52);
- this.labelSettingsPath.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelSettingsPath.Location = new System.Drawing.Point(46, 87);
this.labelSettingsPath.Name = "labelSettingsPath";
- this.labelSettingsPath.Size = new System.Drawing.Size(305, 15);
+ this.labelSettingsPath.Size = new System.Drawing.Size(459, 25);
this.labelSettingsPath.TabIndex = 1;
this.labelSettingsPath.Text = "Please specify the folder where Among Us.exe is located.";
//
@@ -457,9 +446,10 @@ private void InitializeComponent()
this.panelHelp.Controls.Add(this.labelResourcesHeader);
this.panelHelp.Controls.Add(this.labelVersionHeader);
this.panelHelp.Controls.Add(this.labelVersion);
- this.panelHelp.Location = new System.Drawing.Point(172, 60);
+ this.panelHelp.Location = new System.Drawing.Point(246, 100);
+ this.panelHelp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.panelHelp.Name = "panelHelp";
- this.panelHelp.Size = new System.Drawing.Size(528, 372);
+ this.panelHelp.Size = new System.Drawing.Size(754, 620);
this.panelHelp.TabIndex = 10;
this.panelHelp.Visible = false;
this.panelHelp.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
@@ -469,10 +459,9 @@ private void InitializeComponent()
//
this.labelCopyright.AutoSize = true;
this.labelCopyright.ForeColor = System.Drawing.Color.Silver;
- this.labelCopyright.Location = new System.Drawing.Point(32, 150);
- this.labelCopyright.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelCopyright.Location = new System.Drawing.Point(46, 250);
this.labelCopyright.Name = "labelCopyright";
- this.labelCopyright.Size = new System.Drawing.Size(78, 15);
+ this.labelCopyright.Size = new System.Drawing.Size(117, 25);
this.labelCopyright.TabIndex = 6;
this.labelCopyright.Text = "Jolle && Narua";
//
@@ -480,10 +469,9 @@ private void InitializeComponent()
//
this.labelCopyrightHeader.AutoSize = true;
this.labelCopyrightHeader.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
- this.labelCopyrightHeader.Location = new System.Drawing.Point(32, 133);
- this.labelCopyrightHeader.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelCopyrightHeader.Location = new System.Drawing.Point(46, 222);
this.labelCopyrightHeader.Name = "labelCopyrightHeader";
- this.labelCopyrightHeader.Size = new System.Drawing.Size(76, 19);
+ this.labelCopyrightHeader.Size = new System.Drawing.Size(105, 28);
this.labelCopyrightHeader.TabIndex = 5;
this.labelCopyrightHeader.Text = "Copyright";
//
@@ -493,10 +481,9 @@ private void InitializeComponent()
this.linkLabelResourcesGit.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
this.linkLabelResourcesGit.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline;
this.linkLabelResourcesGit.LinkColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(90)))), ((int)(((byte)(255)))));
- this.linkLabelResourcesGit.Location = new System.Drawing.Point(84, 92);
- this.linkLabelResourcesGit.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.linkLabelResourcesGit.Location = new System.Drawing.Point(120, 153);
this.linkLabelResourcesGit.Name = "linkLabelResourcesGit";
- this.linkLabelResourcesGit.Size = new System.Drawing.Size(295, 15);
+ this.linkLabelResourcesGit.Size = new System.Drawing.Size(445, 25);
this.linkLabelResourcesGit.TabIndex = 4;
this.linkLabelResourcesGit.TabStop = true;
this.linkLabelResourcesGit.Text = "https://github.com/Narua2010/AmongUsModUpdater";
@@ -508,10 +495,9 @@ private void InitializeComponent()
//
this.labelResourcesGit.AutoSize = true;
this.labelResourcesGit.ForeColor = System.Drawing.Color.Silver;
- this.labelResourcesGit.Location = new System.Drawing.Point(32, 92);
- this.labelResourcesGit.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelResourcesGit.Location = new System.Drawing.Point(46, 153);
this.labelResourcesGit.Name = "labelResourcesGit";
- this.labelResourcesGit.Size = new System.Drawing.Size(46, 15);
+ this.labelResourcesGit.Size = new System.Drawing.Size(69, 25);
this.labelResourcesGit.TabIndex = 3;
this.labelResourcesGit.Text = "Github:";
//
@@ -519,10 +505,9 @@ private void InitializeComponent()
//
this.labelResourcesHeader.AutoSize = true;
this.labelResourcesHeader.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
- this.labelResourcesHeader.Location = new System.Drawing.Point(32, 75);
- this.labelResourcesHeader.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelResourcesHeader.Location = new System.Drawing.Point(46, 125);
this.labelResourcesHeader.Name = "labelResourcesHeader";
- this.labelResourcesHeader.Size = new System.Drawing.Size(76, 19);
+ this.labelResourcesHeader.Size = new System.Drawing.Size(107, 28);
this.labelResourcesHeader.TabIndex = 2;
this.labelResourcesHeader.Text = "Resources";
//
@@ -530,10 +515,9 @@ private void InitializeComponent()
//
this.labelVersionHeader.AutoSize = true;
this.labelVersionHeader.Font = new System.Drawing.Font("Segoe UI", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point);
- this.labelVersionHeader.Location = new System.Drawing.Point(32, 20);
- this.labelVersionHeader.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelVersionHeader.Location = new System.Drawing.Point(46, 33);
this.labelVersionHeader.Name = "labelVersionHeader";
- this.labelVersionHeader.Size = new System.Drawing.Size(141, 19);
+ this.labelVersionHeader.Size = new System.Drawing.Size(201, 28);
this.labelVersionHeader.TabIndex = 1;
this.labelVersionHeader.Text = "Version Information";
//
@@ -541,10 +525,9 @@ private void InitializeComponent()
//
this.labelVersion.AutoSize = true;
this.labelVersion.ForeColor = System.Drawing.Color.Silver;
- this.labelVersion.Location = new System.Drawing.Point(32, 37);
- this.labelVersion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.labelVersion.Location = new System.Drawing.Point(46, 62);
this.labelVersion.Name = "labelVersion";
- this.labelVersion.Size = new System.Drawing.Size(216, 15);
+ this.labelVersion.Size = new System.Drawing.Size(333, 25);
this.labelVersion.TabIndex = 0;
this.labelVersion.Text = "Among Us Mod Updater Version: 0.0.0.0";
//
@@ -556,9 +539,8 @@ private void InitializeComponent()
this.panelMenu.Controls.Add(this.helpButton);
this.panelMenu.Dock = System.Windows.Forms.DockStyle.Left;
this.panelMenu.Location = new System.Drawing.Point(0, 0);
- this.panelMenu.Margin = new System.Windows.Forms.Padding(2);
this.panelMenu.Name = "panelMenu";
- this.panelMenu.Size = new System.Drawing.Size(158, 332);
+ this.panelMenu.Size = new System.Drawing.Size(226, 553);
this.panelMenu.TabIndex = 9;
this.panelMenu.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
this.panelMenu.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseMove);
@@ -568,9 +550,9 @@ private void InitializeComponent()
this.panelLogo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.panelLogo.Controls.Add(this.Logo);
this.panelLogo.Location = new System.Drawing.Point(0, 0);
- this.panelLogo.Margin = new System.Windows.Forms.Padding(2, 2, 0, 2);
+ this.panelLogo.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
this.panelLogo.Name = "panelLogo";
- this.panelLogo.Size = new System.Drawing.Size(158, 60);
+ this.panelLogo.Size = new System.Drawing.Size(226, 100);
this.panelLogo.TabIndex = 0;
this.panelLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
this.panelLogo.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseMove);
@@ -578,10 +560,9 @@ private void InitializeComponent()
// Logo
//
this.Logo.Image = ((System.Drawing.Image)(resources.GetObject("Logo.Image")));
- this.Logo.Location = new System.Drawing.Point(47, 0);
- this.Logo.Margin = new System.Windows.Forms.Padding(2);
+ this.Logo.Location = new System.Drawing.Point(67, 0);
this.Logo.Name = "Logo";
- this.Logo.Size = new System.Drawing.Size(68, 60);
+ this.Logo.Size = new System.Drawing.Size(97, 100);
this.Logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.Logo.TabIndex = 0;
this.Logo.TabStop = false;
@@ -594,10 +575,9 @@ private void InitializeComponent()
this.panelTop.Controls.Add(this.newVersionButton);
this.panelTop.Controls.Add(this.buttonExit);
this.panelTop.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelTop.Location = new System.Drawing.Point(158, 0);
- this.panelTop.Margin = new System.Windows.Forms.Padding(2);
+ this.panelTop.Location = new System.Drawing.Point(226, 0);
this.panelTop.Name = "panelTop";
- this.panelTop.Size = new System.Drawing.Size(542, 60);
+ this.panelTop.Size = new System.Drawing.Size(774, 100);
this.panelTop.TabIndex = 10;
this.panelTop.MouseDown += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseDown);
this.panelTop.MouseMove += new System.Windows.Forms.MouseEventHandler(this.panelMenu_MouseMove);
@@ -612,15 +592,17 @@ private void InitializeComponent()
this.newVersionButton.ForeColor = System.Drawing.Color.White;
this.newVersionButton.Inactive1 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
this.newVersionButton.Inactive2 = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.newVersionButton.Location = new System.Drawing.Point(361, 7);
+ this.newVersionButton.Location = new System.Drawing.Point(516, 12);
+ this.newVersionButton.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.newVersionButton.Name = "newVersionButton";
this.newVersionButton.Radius = 10;
- this.newVersionButton.Size = new System.Drawing.Size(144, 23);
+ this.newVersionButton.Size = new System.Drawing.Size(206, 38);
this.newVersionButton.Stroke = false;
this.newVersionButton.StrokeColor = System.Drawing.Color.Gray;
this.newVersionButton.TabIndex = 11;
this.newVersionButton.Text = "New Updater Version";
this.newVersionButton.Transparency = false;
+ this.newVersionButton.Visible = false;
this.newVersionButton.Click += new System.EventHandler(this.newVersionButton_Click);
this.newVersionButton.Enter += new System.EventHandler(this.newVersionButton_MouseHover);
this.newVersionButton.Leave += new System.EventHandler(this.newVersionButton_MouseLeave);
@@ -630,10 +612,9 @@ private void InitializeComponent()
this.buttonExit.FlatAppearance.BorderSize = 0;
this.buttonExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.buttonExit.ForeColor = System.Drawing.Color.Silver;
- this.buttonExit.Location = new System.Drawing.Point(507, 7);
- this.buttonExit.Margin = new System.Windows.Forms.Padding(2);
+ this.buttonExit.Location = new System.Drawing.Point(724, 12);
this.buttonExit.Name = "buttonExit";
- this.buttonExit.Size = new System.Drawing.Size(28, 24);
+ this.buttonExit.Size = new System.Drawing.Size(40, 40);
this.buttonExit.TabIndex = 10;
this.buttonExit.Text = "X";
this.buttonExit.UseVisualStyleBackColor = true;
@@ -642,19 +623,18 @@ private void InitializeComponent()
// panelMenuActive
//
this.panelMenuActive.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(28)))), ((int)(((byte)(72)))), ((int)(((byte)(33)))));
- this.panelMenuActive.Location = new System.Drawing.Point(158, 60);
- this.panelMenuActive.Margin = new System.Windows.Forms.Padding(2);
+ this.panelMenuActive.Location = new System.Drawing.Point(226, 100);
this.panelMenuActive.Name = "panelMenuActive";
- this.panelMenuActive.Size = new System.Drawing.Size(7, 75);
+ this.panelMenuActive.Size = new System.Drawing.Size(10, 125);
this.panelMenuActive.TabIndex = 11;
//
// MainWindow
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(44)))), ((int)(((byte)(51)))));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
- this.ClientSize = new System.Drawing.Size(700, 332);
+ this.ClientSize = new System.Drawing.Size(1000, 553);
this.Controls.Add(this.panelMenuActive);
this.Controls.Add(this.panelTop);
this.Controls.Add(this.panelMenu);
@@ -665,7 +645,6 @@ private void InitializeComponent()
this.ForeColor = System.Drawing.Color.Silver;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.Margin = new System.Windows.Forms.Padding(2);
this.Name = "MainWindow";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Among Us Mod Updater";