From 15d1a1963e5f3b796bd5cb88a86256109984e616 Mon Sep 17 00:00:00 2001 From: "stam@epicm.org" Date: Wed, 13 Apr 2022 18:52:51 +0300 Subject: [PATCH] 1.0.0.3 fixes --- README.md | 2 + .../UI/FormAbout.Designer.cs | 22 +- src/UniversalValveToolbox/UI/FormAbout.cs | 6 - src/UniversalValveToolbox/UI/FormAbout.resx | 974 ++++++++---------- 4 files changed, 461 insertions(+), 543 deletions(-) diff --git a/README.md b/README.md index bbb7547..f86b149 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ # Description Toolbox for easy launching some officials Valve's SDK such as Source SDK 2013 SP or MP. +`Universal Valve Toolbox is not affiliated with Valve Corporation.` + # Settings Mod could be changed at `settings.json` with `ToolboxMod` section. Supported mods: `retail`, `bundle`, `dev`. ## Retail diff --git a/src/UniversalValveToolbox/UI/FormAbout.Designer.cs b/src/UniversalValveToolbox/UI/FormAbout.Designer.cs index cc24c2f..37e7e51 100644 --- a/src/UniversalValveToolbox/UI/FormAbout.Designer.cs +++ b/src/UniversalValveToolbox/UI/FormAbout.Designer.cs @@ -40,11 +40,9 @@ this.labelIconsBy = new System.Windows.Forms.Label(); this.linkLabelthoseicons = new System.Windows.Forms.LinkLabel(); this.linkLabelsmashicons = new System.Windows.Forms.LinkLabel(); - this.labelEpicMorgSteamPathsLibdll = new System.Windows.Forms.Label(); this.labelFacepunchSteamworksWin32dll = new System.Windows.Forms.Label(); this.labelkasthackbindingwfdll = new System.Windows.Forms.Label(); this.labelNewtonsoftJsondll = new System.Windows.Forms.Label(); - this.labelGameloopVdf = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLogo)).BeginInit(); this.groupBox1.SuspendLayout(); @@ -87,8 +85,8 @@ // // pictureBoxLogo // - resources.ApplyResources(this.pictureBoxLogo, "pictureBoxLogo"); this.pictureBoxLogo.Image = global::UniversalValveToolbox.Properties.Resources.toolbox64; + resources.ApplyResources(this.pictureBoxLogo, "pictureBoxLogo"); this.pictureBoxLogo.Name = "pictureBoxLogo"; this.pictureBoxLogo.TabStop = false; // @@ -117,12 +115,6 @@ this.linkLabelsmashicons.TabStop = true; this.linkLabelsmashicons.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabelSI_LinkClicked); // - // labelEpicMorgSteamPathsLibdll - // - resources.ApplyResources(this.labelEpicMorgSteamPathsLibdll, "labelEpicMorgSteamPathsLibdll"); - this.labelEpicMorgSteamPathsLibdll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.labelEpicMorgSteamPathsLibdll.Name = "labelEpicMorgSteamPathsLibdll"; - // // labelFacepunchSteamworksWin32dll // resources.ApplyResources(this.labelFacepunchSteamworksWin32dll, "labelFacepunchSteamworksWin32dll"); @@ -141,20 +133,12 @@ this.labelNewtonsoftJsondll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.labelNewtonsoftJsondll.Name = "labelNewtonsoftJsondll"; // - // labelGameloopVdf - // - resources.ApplyResources(this.labelGameloopVdf, "labelGameloopVdf"); - this.labelGameloopVdf.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.labelGameloopVdf.Name = "labelGameloopVdf"; - // // groupBox1 // - resources.ApplyResources(this.groupBox1, "groupBox1"); - this.groupBox1.Controls.Add(this.labelEpicMorgSteamPathsLibdll); this.groupBox1.Controls.Add(this.labelkasthackbindingwfdll); - this.groupBox1.Controls.Add(this.labelGameloopVdf); this.groupBox1.Controls.Add(this.labelNewtonsoftJsondll); this.groupBox1.Controls.Add(this.labelFacepunchSteamworksWin32dll); + resources.ApplyResources(this.groupBox1, "groupBox1"); this.groupBox1.Name = "groupBox1"; this.groupBox1.TabStop = false; // @@ -200,11 +184,9 @@ private System.Windows.Forms.Label labelIconsBy; private System.Windows.Forms.LinkLabel linkLabelthoseicons; private System.Windows.Forms.LinkLabel linkLabelsmashicons; - private System.Windows.Forms.Label labelEpicMorgSteamPathsLibdll; private System.Windows.Forms.Label labelFacepunchSteamworksWin32dll; private System.Windows.Forms.Label labelkasthackbindingwfdll; private System.Windows.Forms.Label labelNewtonsoftJsondll; - private System.Windows.Forms.Label labelGameloopVdf; private System.Windows.Forms.GroupBox groupBox1; } } \ No newline at end of file diff --git a/src/UniversalValveToolbox/UI/FormAbout.cs b/src/UniversalValveToolbox/UI/FormAbout.cs index 8b88286..64459ba 100644 --- a/src/UniversalValveToolbox/UI/FormAbout.cs +++ b/src/UniversalValveToolbox/UI/FormAbout.cs @@ -8,16 +8,12 @@ namespace UniversalValveToolbox { InitializeComponent(); #region move to helper - System.Reflection.Assembly assemblyEpicMorgSteamPathsLib = System.Reflection.Assembly.LoadFrom("EpicMorg.SteamPathsLib.dll"); System.Reflection.Assembly assemblyFacepunchSteamworksWin32 = System.Reflection.Assembly.LoadFrom("Facepunch.Steamworks.Win32.dll"); System.Reflection.Assembly assemblykasthackbindingwf = System.Reflection.Assembly.LoadFrom("kasthack.binding.wf.dll"); - System.Reflection.Assembly assemblyGameloopVdf = System.Reflection.Assembly.LoadFrom("Gameloop.Vdf.dll"); System.Reflection.Assembly assemblyNewtonsoftJson = System.Reflection.Assembly.LoadFrom("Newtonsoft.Json.dll"); - Version verEpicMorgSteamPathsLib = assemblyEpicMorgSteamPathsLib.GetName().Version; Version verFacepunchSteamworksWin32 = assemblyFacepunchSteamworksWin32.GetName().Version; Version verkasthackbindingwf = assemblykasthackbindingwf.GetName().Version; - Version verGameloopVdf = assemblyGameloopVdf.GetName().Version; Version verNewtonsoftJson = assemblyNewtonsoftJson.GetName().Version; #endregion @@ -26,10 +22,8 @@ namespace UniversalValveToolbox { labelCopy.Text = Utils.VersionHelper.AssemblyCopyright; labelCaution.Text = labelTitle.Text + " " + labelCaution.Text; - labelEpicMorgSteamPathsLibdll.Text = "EpicMorg.SteamPathsLib.dll " + verEpicMorgSteamPathsLib.ToString(); labelFacepunchSteamworksWin32dll.Text = "Facepunch.Steamworks.Win32.dll " + verFacepunchSteamworksWin32.ToString(); labelkasthackbindingwfdll.Text = "kasthack.binding.wf.dll " + verkasthackbindingwf.ToString(); - labelGameloopVdf.Text = "Gameloop.Vdf.dll " + verGameloopVdf.ToString(); labelNewtonsoftJsondll.Text = "Newtonsoft.Json.dll " + verNewtonsoftJson.ToString(); } diff --git a/src/UniversalValveToolbox/UI/FormAbout.resx b/src/UniversalValveToolbox/UI/FormAbout.resx index ed3c0fa..af217ab 100644 --- a/src/UniversalValveToolbox/UI/FormAbout.resx +++ b/src/UniversalValveToolbox/UI/FormAbout.resx @@ -117,141 +117,483 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True + + + Top, Left, Right - - groupBox1 - - - labelDivider - - - 2 - - - labelNewtonsoftJsondll + + NoControl - - BottomLeft - - - 28 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - buttonOK - - - labelIconsBy - - - 6, 16 + + 86, 35 305, 23 - - - Bottom, Left, Right - - + + 0 - - Third party libs: - - - groupBox1 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - NoControl - - - $this - - - MiddleCenter - - - Copy - - - 1 - - - 25 - - - 3 - - - 64, 64 - - - groupBox1 - 0.0.0.0 - - labelCopy + + MiddleLeft - - 10 + + labelVersion - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - NoControl - - - Top, Left, Right - - - OK - - - About - - - labelGameloopVdf - - + $this - - 12, 263 - - - 6, 116 - - - 1 - - - 8 - - - Bottom, Left, Right + + 11 Top, Left, Right + + Microsoft Sans Serif, 9.75pt, style=Bold + + + NoControl + + + 86, 12 + + + 305, 23 + + + 2 + + + Title + + + labelTitle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 8 + + + Bottom, Left, Right + + + NoControl + + + 9, 266 + + + 301, 13 + + + 0 + + + Copy + + + BottomLeft + + + labelCopy + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 10 + + + Bottom, Left, Right + + + NoControl + + + -96, 249 + + + 594, 2 + + + 25 + + + labelDivider + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Bottom, Right + + + NoControl + + + 316, 260 + + + 75, 23 + + + 26 + + + OK + + + buttonOK + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Bottom, Left, Right + + + True + + + NoControl + + + 68, 193 + + + 42, 13 + + + 28 + + + Freepik + + + linkLabelFP + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + NoControl + + + 12, 12 + + + 64, 64 + + + AutoSize + + + 1 + + + pictureBoxLogo + + + System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + Bottom, Left, Right + + + NoControl + + + 12, 214 + + + 379, 25 + + + 0 + + + is not affiliated with Valve Corporation. + + + MiddleCenter + + + labelCaution + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Bottom, Left, Right + + + True + + + NoControl + + + 12, 193 + + + 50, 13 + + + 0 + + + Icons by: + + + MiddleLeft + + + labelIconsBy + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Bottom, Left, Right + + + True + + + NoControl + + + 116, 193 + + + 66, 13 + + + 28 + + + Those Icons + + + linkLabelthoseicons + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Bottom, Left, Right + + + True + + + NoControl + + + 188, 193 + + + 64, 13 + + + 28 + + + Smashicons + + + linkLabelsmashicons + + + System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + Top, Left, Right + + + NoControl + + + 6, 16 + + + 367, 23 + + + 0 + + + MiddleLeft + + + labelFacepunchSteamworksWin32dll + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 2 + + + Top, Left, Right + + + NoControl + + + 6, 41 + + + 367, 23 + + + 0 + + + MiddleLeft + + + labelkasthackbindingwfdll + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 0 + + + Top, Left, Right + + + NoControl + + + 6, 66 + + + 367, 23 + + + 0 + + + MiddleLeft + + + labelNewtonsoftJsondll + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + groupBox1 + + + 1 + + + 12, 82 + + + 379, 103 + + + 29 + + + Third party libs: + groupBox1 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 403, 295 + AAABAAYAAAAAAAEAIAAiOgAAZgAAAICAAAABACAAKAgBAIg6AABAQAAAAQAgAChCAACwQgEAMDAAAAEA @@ -2166,418 +2508,16 @@ GBgAABgYAAAQCAAAAAAAAAGAAACDwQAAgAEAAMADAADwDwAA - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Freepik - - - $this - - - NoControl - - - MiddleLeft - - - NoControl - - - labelEpicMorgSteamPathsLibdll - - - Bottom, Right - - - 6, 41 - - - 29 - - - Top, Left, Right - - - 367, 23 - - - -96, 298 - - - linkLabelFP - - - 379, 25 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 26 - - - 0 - - - 2 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - is not affiliated with Valve Corporation. - - - 367, 23 - - - 4 - - - 5 - - - 594, 2 - - - NoControl - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 11 - - - labelTitle - - - NoControl - - - 0 - - - 75, 23 - - - 12, 12 - - - labelkasthackbindingwfdll - - - 0 - - - NoControl - - - $this - - - 4 - - - 9 - CenterParent - - 28 - - - Those Icons - - - 0 - - - MiddleLeft - - - linkLabelthoseicons - - - 301, 13 - - - 305, 23 - - - $this - - - $this - - - 7 - - - NoControl - - - Bottom, Left, Right - - - 50, 13 - - - 12, 82 - - - 188, 242 - - - MiddleLeft - - - 42, 13 - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MiddleLeft - - - 28 - - - 6, 66 - - - Title - - - Top, Left, Right - - - $this - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox1 - - - 6 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 116, 242 - - - Top, Left, Right - - - Bottom, Left, Right - - - 86, 12 - - - $this - - - 3 - - - MiddleLeft - - - System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - NoControl - - - MiddleLeft - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - NoControl - - - 6, 91 - - - True - - - 64, 13 - - - linkLabelsmashicons - - - NoControl - - - 316, 309 - - - pictureBoxLogo - - - labelCaution - - - 6, 13 - - - NoControl - - - Icons by: - - - $this - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 66, 13 - - - $this - - - Bottom, Left, Right - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 12, 242 - - - 367, 23 - - - 0 - - - 0 - - - Top, Left, Right - - - AutoSize - - - 2 - - - 86, 35 - - - 403, 344 - - - NoControl - - - Smashicons - - - 367, 23 - - - labelVersion - - - 379, 151 - - - NoControl - - - True - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 9, 315 - - - 367, 23 - - - $this - - - 0 - - - True - - - Bottom, Left, Right - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 68, 242 - - - MiddleLeft - - - Microsoft Sans Serif, 9.75pt, style=Bold + + About FormAbout - - groupBox1 + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 - - - labelFacepunchSteamworksWin32dll - - - NoControl - - - 0 - - - Top, Left, Right - - - Bottom, Left, Right - - - 0 - - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - True - \ No newline at end of file