From d5bd3441b925c2f9991e6c16936b5855278c0d5d Mon Sep 17 00:00:00 2001 From: Eris Loona Date: Sun, 3 Sep 2023 17:16:41 +0300 Subject: [PATCH] Clarified tooltips. Added notice while auto-filling. --- MainMenu.Designer.cs | 25 +++++++++++++++++++++---- MainMenu.cs | 9 +++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/MainMenu.Designer.cs b/MainMenu.Designer.cs index 992ecde..4919b69 100644 --- a/MainMenu.Designer.cs +++ b/MainMenu.Designer.cs @@ -119,6 +119,7 @@ private void InitializeComponent() this.timer = new System.Windows.Forms.Timer(this.components); this.modeCheck = new System.Windows.Forms.CheckBox(); this.infoLabel = new System.Windows.Forms.Label(); + this.noTouchyLabel = new System.Windows.Forms.Label(); this.normalModePanel.SuspendLayout(); this.farmingModePanel.SuspendLayout(); this.SuspendLayout(); @@ -1717,11 +1718,25 @@ private void InitializeComponent() this.infoLabel.ForeColor = System.Drawing.Color.White; this.infoLabel.Location = new System.Drawing.Point(299, 228); this.infoLabel.Name = "infoLabel"; - this.infoLabel.Size = new System.Drawing.Size(176, 45); + this.infoLabel.Size = new System.Drawing.Size(164, 45); this.infoLabel.TabIndex = 69; - this.infoLabel.Text = "Select your grinding location\r\nand click the Analyze button\r\nto start a new grind" + - "ing session"; - this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.infoLabel.Text = "Select your grinding location\r\nand Analyze to start a new \r\ngrinding session."; + this.infoLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // noTouchyLabel + // + this.noTouchyLabel.AutoSize = true; + this.noTouchyLabel.BackColor = System.Drawing.Color.Black; + this.noTouchyLabel.Enabled = false; + this.noTouchyLabel.Font = new System.Drawing.Font("Calibri", 54.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.noTouchyLabel.ForeColor = System.Drawing.Color.White; + this.noTouchyLabel.Location = new System.Drawing.Point(66, 167); + this.noTouchyLabel.Name = "noTouchyLabel"; + this.noTouchyLabel.Size = new System.Drawing.Size(785, 180); + this.noTouchyLabel.TabIndex = 76; + this.noTouchyLabel.Text = "Auto-filling! Don\'t use \r\nyour keyboard or mouse!"; + this.noTouchyLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.noTouchyLabel.Visible = false; // // MainMenu // @@ -1729,6 +1744,7 @@ private void InitializeComponent() this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage"))); this.ClientSize = new System.Drawing.Size(916, 514); + this.Controls.Add(this.noTouchyLabel); this.Controls.Add(this.modeCheck); this.Controls.Add(this.farmingModePanel); this.Controls.Add(this.normalModePanel); @@ -1907,6 +1923,7 @@ private void InitializeComponent() private System.Windows.Forms.Button clearSessionButton; private System.Windows.Forms.Button playPauseButton; private System.Windows.Forms.Label infoLabel; + private System.Windows.Forms.Label noTouchyLabel; } } diff --git a/MainMenu.cs b/MainMenu.cs index 488f971..ff2925e 100644 --- a/MainMenu.cs +++ b/MainMenu.cs @@ -875,7 +875,7 @@ public void startSession() if (sessionActive == false) { timerReset(); - infoLabel.Visible = false; + infoLabel.Text = "Analyze again to check the\r\nnumber of items you've\r\nobtained so far and/or end\r\nthe session."; modeCheck.Enabled = false; locationBox.Enabled = false; sessionActive = true; @@ -926,6 +926,7 @@ private void clearSessionButton_Click(object sender, EventArgs e) rememberIndex = 0; clearTrigger = false; rememborDecision = true; + infoLabel.Text = "Select your grinding location\r\nand Analyze to start a new \r\ngrinding session."; GC.Collect(); } else @@ -1004,6 +1005,8 @@ private void endSessionButton_Click(object sender, EventArgs e) { if (MessageBox.Show("You are about to end your current session and push it to garmoth.\nAre you sure you want to end the session?", "End session", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) { + noTouchyLabel.Enabled = true; + noTouchyLabel.Visible = true; string userID; string[] timer = new string[3]; int hours = 0, minutes = 0; @@ -1020,7 +1023,7 @@ private void endSessionButton_Click(object sender, EventArgs e) return; } clearTrigger = true; - infoLabel.Visible = true; + infoLabel.Text = "Select your grinding location\r\nand Analyze to start a new \r\ngrinding session."; playPauseButton.Enabled = false; playPauseButton.Visible = false; modeCheck.Enabled = true; @@ -1076,6 +1079,8 @@ private void endSessionButton_Click(object sender, EventArgs e) .KeyPress(VirtualKeyCode.TAB) .KeyPress(VirtualKeyCode.RETURN); Thread.Sleep(1200); + noTouchyLabel.Enabled = false; + noTouchyLabel.Visible = false; new InputSimulator().Keyboard.KeyPress(VirtualKeyCode.TAB) .TextEntry(Convert.ToString(hours)) .KeyPress(VirtualKeyCode.TAB)