From 299c55918bdfe7667ca34b5d1ed528e9db53cdf2 Mon Sep 17 00:00:00 2001 From: Christoffer Wadensten Date: Sun, 8 May 2016 17:37:31 +0200 Subject: [PATCH] fixed dependency bug --- TADST/Program.cs | 1 + TADST/Properties/AssemblyInfo.cs | 4 +-- TADST/TADST.csproj | 13 +++----- TADST/forms/InformationForm.Designer.cs | 2 +- TADST/forms/MainForm.Designer.cs | 39 +--------------------- TADST/forms/MainForm.cs | 2 -- TADST/forms/MainForm.resx | 43 ++++++++----------------- 7 files changed, 24 insertions(+), 80 deletions(-) diff --git a/TADST/Program.cs b/TADST/Program.cs index 5a90716..975353a 100644 --- a/TADST/Program.cs +++ b/TADST/Program.cs @@ -11,6 +11,7 @@ static class Program [STAThread] static void Main() { + Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); Application.Run(new MainForm()); diff --git a/TADST/Properties/AssemblyInfo.cs b/TADST/Properties/AssemblyInfo.cs index 2df51a9..7c4670c 100644 --- a/TADST/Properties/AssemblyInfo.cs +++ b/TADST/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.9.5.0")] -[assembly: AssemblyFileVersion("2.9.5.0")] +[assembly: AssemblyVersion("2.9.6.0")] +[assembly: AssemblyFileVersion("2.9.6.0")] diff --git a/TADST/TADST.csproj b/TADST/TADST.csproj index 210508d..d51056c 100644 --- a/TADST/TADST.csproj +++ b/TADST/TADST.csproj @@ -40,6 +40,7 @@ prompt 4 false + true x86 @@ -65,19 +66,15 @@ false + + + + - - - - - - - - diff --git a/TADST/forms/InformationForm.Designer.cs b/TADST/forms/InformationForm.Designer.cs index 499abee..a1d53f9 100644 --- a/TADST/forms/InformationForm.Designer.cs +++ b/TADST/forms/InformationForm.Designer.cs @@ -94,7 +94,7 @@ private void InitializeComponent() this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(333, 100); this.label3.TabIndex = 57; - this.label3.Text = "Tophe\'s Arma Dedicated Server Tool v2.95\r\nreleased 2016-05-08\r\n\r\nBy Tophe of Östg" + + this.label3.Text = "Tophe\'s Arma Dedicated Server Tool v2.96\r\nreleased 2016-05-08\r\n\r\nBy Tophe of Östg" + "öta Ops [oops]\r\nThank you for using TADST!\r\n\r\n\r\n"; this.label3.TextAlign = System.Drawing.ContentAlignment.TopCenter; // diff --git a/TADST/forms/MainForm.Designer.cs b/TADST/forms/MainForm.Designer.cs index a75d143..953eb96 100644 --- a/TADST/forms/MainForm.Designer.cs +++ b/TADST/forms/MainForm.Designer.cs @@ -79,9 +79,6 @@ private void InitializeComponent() this.lblPassword = new System.Windows.Forms.Label(); this.lblHostName = new System.Windows.Forms.Label(); this.txtServerName = new System.Windows.Forms.TextBox(); - this.shapeContainer1 = new Microsoft.VisualBasic.PowerPacks.ShapeContainer(); - this.autoInitShape2 = new Microsoft.VisualBasic.PowerPacks.LineShape(); - this.autoInitShape1 = new Microsoft.VisualBasic.PowerPacks.LineShape(); this.tabServerRules = new System.Windows.Forms.TabPage(); this.chkBattlEye = new System.Windows.Forms.CheckBox(); this.label19 = new System.Windows.Forms.Label(); @@ -300,7 +297,6 @@ private void InitializeComponent() this.tabServerDetails.Controls.Add(this.lblPassword); this.tabServerDetails.Controls.Add(this.lblHostName); this.tabServerDetails.Controls.Add(this.txtServerName); - this.tabServerDetails.Controls.Add(this.shapeContainer1); this.tabServerDetails.ImageIndex = 0; this.tabServerDetails.Location = new System.Drawing.Point(4, 23); this.tabServerDetails.Name = "tabServerDetails"; @@ -904,36 +900,6 @@ private void InitializeComponent() this.txtServerName.TextChanged += new System.EventHandler(this.txtServerName_TextChanged); this.txtServerName.DoubleClick += new System.EventHandler(this.txtServerName_DoubleClick); // - // shapeContainer1 - // - this.shapeContainer1.Location = new System.Drawing.Point(3, 3); - this.shapeContainer1.Margin = new System.Windows.Forms.Padding(0); - this.shapeContainer1.Name = "shapeContainer1"; - this.shapeContainer1.Shapes.AddRange(new Microsoft.VisualBasic.PowerPacks.Shape[] { - this.autoInitShape2, - this.autoInitShape1}); - this.shapeContainer1.Size = new System.Drawing.Size(558, 366); - this.shapeContainer1.TabIndex = 70; - this.shapeContainer1.TabStop = false; - // - // autoInitShape2 - // - this.autoInitShape2.Enabled = false; - this.autoInitShape2.Name = "autoInitShape2"; - this.autoInitShape2.X1 = 389; - this.autoInitShape2.X2 = 397; - this.autoInitShape2.Y1 = 129; - this.autoInitShape2.Y2 = 129; - // - // autoInitShape1 - // - this.autoInitShape1.Enabled = false; - this.autoInitShape1.Name = "autoInitShape1"; - this.autoInitShape1.X1 = 388; - this.autoInitShape1.X2 = 388; - this.autoInitShape1.Y1 = 117; - this.autoInitShape1.Y2 = 129; - // // tabServerRules // this.tabServerRules.BackColor = System.Drawing.Color.LightSteelBlue; @@ -2742,7 +2708,7 @@ private void InitializeComponent() this.MaximizeBox = false; this.MinimumSize = new System.Drawing.Size(590, 572); this.Name = "MainForm"; - this.Text = "TADST v2.95 - Tophe\'s Arma Dedicated Server Tool"; + this.Text = "TADST v2.96 - Tophe\'s Arma Dedicated Server Tool"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.tabContainer.ResumeLayout(false); @@ -2996,9 +2962,6 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkAutoinit; private System.Windows.Forms.CheckBox chkPersistentBattlefield; private System.Windows.Forms.CheckBox chkBattlEye; - private Microsoft.VisualBasic.PowerPacks.ShapeContainer shapeContainer1; - private Microsoft.VisualBasic.PowerPacks.LineShape autoInitShape2; - private Microsoft.VisualBasic.PowerPacks.LineShape autoInitShape1; } } diff --git a/TADST/forms/MainForm.cs b/TADST/forms/MainForm.cs index 984d00b..e2dc880 100644 --- a/TADST/forms/MainForm.cs +++ b/TADST/forms/MainForm.cs @@ -340,7 +340,6 @@ private void GetDifficultyItems(IEnumerable diffItems) { clbDifficultyItems.Items.Add(item.ToString(), item.IsChecked); } - } private void btnProfileNew_Click(object sender, EventArgs e) @@ -2191,6 +2190,5 @@ private void chkAutoinit_CheckedChanged(object sender, EventArgs e) _activeProfile.AutoInit = chkAutoinit.Checked; UpdateGuiStartupParameters(); } - } } \ No newline at end of file diff --git a/TADST/forms/MainForm.resx b/TADST/forms/MainForm.resx index 25279e5..d2e6d48 100644 --- a/TADST/forms/MainForm.resx +++ b/TADST/forms/MainForm.resx @@ -117,16 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - While using the Dev version of Arma III, adding this option will force server into LAN mode. -This will allow multiple local instances of the game to connect to the server for testing purposes. -At the same time it will prevent all non-local instances from connecting. - -Default is disabled. - 114, 17 @@ -135,7 +125,7 @@ Default is disabled. AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADy - HwAAAk1TRnQBSQFMAgEBFQEAAaABAQGgAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + HwAAAk1TRnQBSQFMAgEBFQEAAagBAQGoAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAWADAAEBAQABCAYAARgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -273,6 +263,19 @@ Default is disabled. AQMBwAEDAcABAwHwAUcBAAEDAcABAwHAAQMB8AEHAQABBwHAAQMB4AEDAfgBDwEAAQcBwAEDAfgBHwH8 AR8BwQGPAcABAwH+AT8B/gE/Af8Bzws= + + + 17, 17 + + + 17, 17 + + + While using the Dev version of Arma III, adding this option will force server into LAN mode. +This will allow multiple local instances of the game to connect to the server for testing purposes. +At the same time it will prevent all non-local instances from connecting. + +Default is disabled. Rotate netlog file. @@ -317,24 +320,6 @@ Then TADST will open the RTP file connected to the chosen server file. - - 389, 129, 8, 0 - - - 389, 129 - - - 8, 0 - - - 388, 117, 0, 12 - - - 388, 117 - - - 0, 12 - requiredSecureId = 1, all playes are requested to provide a validated ID.