diff --git a/TequilaPC/Classes/WorkThread.cs b/TequilaPC/Classes/WorkThread.cs index af2c5f0..4778893 100644 --- a/TequilaPC/Classes/WorkThread.cs +++ b/TequilaPC/Classes/WorkThread.cs @@ -362,7 +362,7 @@ namespace Tequila ManifestDownloadComplete(null, null); } - m_Status = "Fetching manifest..."; + m_Status = "Fetching manifest"; LocalManifest = MyToolkit.ValidPath(Path.Combine(PathRoot, "tequila.xml")); client.StartDownload(new AsyncCompletedEventHandler(ManifestDownloadComplete), new DownloadProgressChangedEventHandler(dlProgress), @@ -418,7 +418,7 @@ namespace Tequila SelfPatch(); - m_Status = "Reading Manifest"; + m_Status = "Reading manifest"; IEnumerable files = m_manifest.Descendants("file"); foreach (XElement file in files) @@ -488,7 +488,7 @@ namespace Tequila // OK now thats out of the way, lets determine if we need to self patch or not!! IEnumerable launchers = m_manifest.Descendants("launcher"); - m_Status = "Self Patching"; + m_Status = "Self patching"; foreach (XElement launcher in launchers) { if (launcher.Attribute("id").Value == "tequila") diff --git a/TequilaPC/Properties/AssemblyInfo.cs b/TequilaPC/Properties/AssemblyInfo.cs index d2f3066..b499521 100644 --- a/TequilaPC/Properties/AssemblyInfo.cs +++ b/TequilaPC/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.0.0.14")] -[assembly: AssemblyFileVersion("1.0.0.14")] +[assembly: AssemblyVersion("1.0.0.15")] +[assembly: AssemblyFileVersion("1.0.0.15")] diff --git a/TequilaPC/Tequila.Designer.cs b/TequilaPC/Tequila.Designer.cs index 9358f6d..97d0807 100644 --- a/TequilaPC/Tequila.Designer.cs +++ b/TequilaPC/Tequila.Designer.cs @@ -36,13 +36,12 @@ this.pnlErrors = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); this.btnPlay = new System.Windows.Forms.Button(); - this.listBox1 = new System.Windows.Forms.ListBox(); + this.ListBox1 = new System.Windows.Forms.ListBox(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.webBrowser1 = new System.Windows.Forms.WebBrowser(); this.btnScreenshots = new System.Windows.Forms.Button(); this.btnOptions = new System.Windows.Forms.Button(); this.cbManifest = new System.Windows.Forms.ComboBox(); - this.lblManifest = new System.Windows.Forms.Label(); this.pnlErrors.SuspendLayout(); this.SuspendLayout(); // @@ -53,21 +52,21 @@ this.lblStatus.BackColor = System.Drawing.Color.Transparent; this.lblStatus.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); this.lblStatus.ForeColor = System.Drawing.SystemColors.ControlLightLight; - this.lblStatus.Location = new System.Drawing.Point(12, 421); + this.lblStatus.Location = new System.Drawing.Point(10, 414); this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(794, 23); - this.lblStatus.TabIndex = 0; - this.lblStatus.Text = "test"; + this.lblStatus.Size = new System.Drawing.Size(814, 21); + this.lblStatus.TabIndex = 7; + this.lblStatus.Text = "Starting..."; this.lblStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // Progress // this.Progress.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.Progress.Location = new System.Drawing.Point(12, 395); + this.Progress.Location = new System.Drawing.Point(10, 390); this.Progress.Name = "Progress"; - this.Progress.Size = new System.Drawing.Size(794, 23); - this.Progress.TabIndex = 1; + this.Progress.Size = new System.Drawing.Size(814, 21); + this.Progress.TabIndex = 6; // // txtErrors // @@ -77,7 +76,7 @@ this.txtErrors.Location = new System.Drawing.Point(3, 35); this.txtErrors.Multiline = true; this.txtErrors.Name = "txtErrors"; - this.txtErrors.Size = new System.Drawing.Size(547, 339); + this.txtErrors.Size = new System.Drawing.Size(563, 332); this.txtErrors.TabIndex = 2; // // pnlErrors @@ -90,7 +89,7 @@ this.pnlErrors.Controls.Add(this.txtErrors); this.pnlErrors.Location = new System.Drawing.Point(256, 12); this.pnlErrors.Name = "pnlErrors"; - this.pnlErrors.Size = new System.Drawing.Size(566, 377); + this.pnlErrors.Size = new System.Drawing.Size(582, 370); this.pnlErrors.TabIndex = 3; this.pnlErrors.Visible = false; // @@ -109,30 +108,30 @@ // this.btnPlay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnPlay.Enabled = false; - this.btnPlay.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.btnPlay.Location = new System.Drawing.Point(12, 305); + this.btnPlay.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnPlay.Location = new System.Drawing.Point(9, 280); this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(238, 41); - this.btnPlay.TabIndex = 4; + this.btnPlay.Size = new System.Drawing.Size(246, 40); + this.btnPlay.TabIndex = 1; this.btnPlay.Text = "Play"; this.btnPlay.UseVisualStyleBackColor = true; this.btnPlay.Click += new System.EventHandler(this.btnPlay_Click); // - // listBox1 + // ListBox1 // - this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.ListBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left))); - this.listBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(57)))), ((int)(((byte)(94)))), ((int)(((byte)(112))))); - this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.listBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.listBox1.ForeColor = System.Drawing.SystemColors.Info; - this.listBox1.FormattingEnabled = true; - this.listBox1.ItemHeight = 25; - this.listBox1.Location = new System.Drawing.Point(12, 15); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(238, 225); - this.listBox1.TabIndex = 5; - this.listBox1.DoubleClick += new System.EventHandler(this.btnPlay_Click); + this.ListBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(94)))), ((int)(((byte)(119))))); + this.ListBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ListBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); + this.ListBox1.ForeColor = System.Drawing.SystemColors.Info; + this.ListBox1.FormattingEnabled = true; + this.ListBox1.ItemHeight = 25; + this.ListBox1.Location = new System.Drawing.Point(10, 10); + this.ListBox1.Name = "ListBox1"; + this.ListBox1.Size = new System.Drawing.Size(244, 250); + this.ListBox1.TabIndex = 0; + this.ListBox1.DoubleClick += new System.EventHandler(this.btnPlay_Click); // // timer1 // @@ -144,21 +143,21 @@ this.webBrowser1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.webBrowser1.Location = new System.Drawing.Point(259, 15); + this.webBrowser1.Location = new System.Drawing.Point(264, 10); this.webBrowser1.MinimumSize = new System.Drawing.Size(20, 20); this.webBrowser1.Name = "webBrowser1"; - this.webBrowser1.Size = new System.Drawing.Size(547, 374); - this.webBrowser1.TabIndex = 6; + this.webBrowser1.Size = new System.Drawing.Size(560, 370); + this.webBrowser1.TabIndex = 5; this.webBrowser1.Url = new System.Uri("", System.UriKind.Relative); // // btnScreenshots // this.btnScreenshots.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnScreenshots.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.btnScreenshots.Location = new System.Drawing.Point(12, 348); + this.btnScreenshots.Location = new System.Drawing.Point(9, 351); this.btnScreenshots.Name = "btnScreenshots"; - this.btnScreenshots.Size = new System.Drawing.Size(118, 34); - this.btnScreenshots.TabIndex = 8; + this.btnScreenshots.Size = new System.Drawing.Size(121, 30); + this.btnScreenshots.TabIndex = 3; this.btnScreenshots.Text = "Screenshots"; this.btnScreenshots.UseVisualStyleBackColor = true; this.btnScreenshots.Click += new System.EventHandler(this.btnScreenshots_Click); @@ -167,10 +166,10 @@ // this.btnOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnOptions.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Pixel, ((byte)(0))); - this.btnOptions.Location = new System.Drawing.Point(132, 348); + this.btnOptions.Location = new System.Drawing.Point(134, 351); this.btnOptions.Name = "btnOptions"; - this.btnOptions.Size = new System.Drawing.Size(118, 34); - this.btnOptions.TabIndex = 9; + this.btnOptions.Size = new System.Drawing.Size(121, 30); + this.btnOptions.TabIndex = 4; this.btnOptions.Text = "Options"; this.btnOptions.UseVisualStyleBackColor = true; this.btnOptions.Click += new System.EventHandler(this.button1_Click); @@ -180,43 +179,30 @@ this.cbManifest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.cbManifest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbManifest.FormattingEnabled = true; - this.cbManifest.Location = new System.Drawing.Point(12, 271); + this.cbManifest.Location = new System.Drawing.Point(10, 325); this.cbManifest.Name = "cbManifest"; - this.cbManifest.Size = new System.Drawing.Size(238, 21); - this.cbManifest.TabIndex = 10; + this.cbManifest.Size = new System.Drawing.Size(244, 21); + this.cbManifest.TabIndex = 2; this.cbManifest.SelectedIndexChanged += new System.EventHandler(this.cbManifest_SelectedIndexChanged); // - // lblManifest - // - this.lblManifest.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.lblManifest.AutoSize = true; - this.lblManifest.Font = new System.Drawing.Font("Microsoft Sans Serif", 20F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Pixel); - this.lblManifest.ForeColor = System.Drawing.Color.White; - this.lblManifest.Location = new System.Drawing.Point(7, 243); - this.lblManifest.Name = "lblManifest"; - this.lblManifest.Size = new System.Drawing.Size(160, 25); - this.lblManifest.TabIndex = 11; - this.lblManifest.Text = "Active Manifest"; - // // Tequila // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(57)))), ((int)(((byte)(94)))), ((int)(((byte)(112))))); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(94)))), ((int)(((byte)(119))))); this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.ClientSize = new System.Drawing.Size(818, 448); - this.Controls.Add(this.lblManifest); + this.ClientSize = new System.Drawing.Size(834, 442); this.Controls.Add(this.cbManifest); this.Controls.Add(this.btnOptions); this.Controls.Add(this.btnScreenshots); this.Controls.Add(this.btnPlay); this.Controls.Add(this.webBrowser1); - this.Controls.Add(this.listBox1); + this.Controls.Add(this.ListBox1); this.Controls.Add(this.pnlErrors); this.Controls.Add(this.Progress); this.Controls.Add(this.lblStatus); this.DoubleBuffered = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MinimumSize = new System.Drawing.Size(834, 487); + this.MinimumSize = new System.Drawing.Size(850, 480); this.Name = "Tequila"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Tequila"; @@ -225,7 +211,6 @@ this.pnlErrors.ResumeLayout(false); this.pnlErrors.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -237,13 +222,12 @@ private System.Windows.Forms.Panel pnlErrors; private System.Windows.Forms.Label label1; private System.Windows.Forms.Button btnPlay; - private System.Windows.Forms.ListBox listBox1; + private System.Windows.Forms.ListBox ListBox1; private System.Windows.Forms.Timer timer1; private System.Windows.Forms.WebBrowser webBrowser1; private System.Windows.Forms.Button btnScreenshots; private System.Windows.Forms.Button btnOptions; private System.Windows.Forms.ComboBox cbManifest; - private System.Windows.Forms.Label lblManifest; } } diff --git a/TequilaPC/Tequila.cs b/TequilaPC/Tequila.cs index 9089cea..1858bd6 100644 --- a/TequilaPC/Tequila.cs +++ b/TequilaPC/Tequila.cs @@ -107,10 +107,8 @@ namespace Tequila BackColor = Settings.BGColor; label1.ForeColor = Settings.TextColor; lblStatus.ForeColor = Settings.TextColor; - lblManifest.ForeColor = Settings.TextColor; - lblManifest.BackColor = Settings.BGColor; - listBox1.BackColor = Settings.BGColor; - listBox1.ForeColor = Settings.TextColor; + ListBox1.BackColor = Settings.BGColor; + ListBox1.ForeColor = Settings.TextColor; } @@ -346,7 +344,7 @@ namespace Tequila if (myWorker.Manifest != null) - if (listBox1.Items.Count <= 1) + if (ListBox1.Items.Count <= 1) { IEnumerable Profiles = myWorker.Manifest.Descendants("launch"); List items = new List(); @@ -369,9 +367,9 @@ namespace Tequila } } - listBox1.DisplayMember = "Text"; - listBox1.DataSource = items; - listBox1.SelectedIndex = 0; + ListBox1.DisplayMember = "Text"; + ListBox1.DataSource = items; + ListBox1.SelectedIndex = 0; } Progress.Value = MyToolkit.MinMax(myWorker.CurProgress, 0, 100); @@ -388,8 +386,8 @@ namespace Tequila try { var startInfo = new ProcessStartInfo(); startInfo.WorkingDirectory = Settings.GamePath; - startInfo.FileName = ((LaunchProfile)listBox1.SelectedItem).Exec; - startInfo.Arguments = ((LaunchProfile)listBox1.SelectedItem).Params; + startInfo.FileName = ((LaunchProfile)ListBox1.SelectedItem).Exec; + startInfo.Arguments = ((LaunchProfile)ListBox1.SelectedItem).Params; startInfo.Arguments += " " + Settings.GameParams; Process.Start(startInfo); @@ -438,7 +436,7 @@ namespace Tequila private void ReValidate() { try { - listBox1.DataSource = null; + ListBox1.DataSource = null; File.Delete(Path.Combine(Settings.GamePath, "tequilalog.xml")); timer1.Enabled = Setup(); StartUp();