From 15c33ca039bdded4ef3ca2b5080a1d99de49250e Mon Sep 17 00:00:00 2001 From: MikeMaximus Date: Wed, 21 Jun 2017 10:53:05 -0600 Subject: [PATCH] Changes for issue #77 --- GBM/Forms/frmMain.Designer.vb | 21 +++++---------------- GBM/Forms/frmMain.vb | 34 ++-------------------------------- 2 files changed, 7 insertions(+), 48 deletions(-) diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb index 29ee4b0..cb9ff57 100644 --- a/GBM/Forms/frmMain.Designer.vb +++ b/GBM/Forms/frmMain.Designer.vb @@ -75,7 +75,6 @@ Partial Class frmMain Me.gMonHelpAbout = New System.Windows.Forms.ToolStripMenuItem() Me.gMonNotification = New System.Windows.Forms.ToolStripMenuItem() Me.pbIcon = New System.Windows.Forms.PictureBox() - Me.btnLogToggle = New System.Windows.Forms.Button() Me.lblGameTitle = New System.Windows.Forms.Label() Me.lblLastAction = New System.Windows.Forms.Label() Me.lblLastActionTitle = New System.Windows.Forms.Label() @@ -222,6 +221,9 @@ Partial Class frmMain ' 'txtLog ' + Me.txtLog.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.txtLog.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtLog.Location = New System.Drawing.Point(12, 184) Me.txtLog.MaxLength = 524288 @@ -430,15 +432,6 @@ Partial Class frmMain Me.pbIcon.TabIndex = 9 Me.pbIcon.TabStop = False ' - 'btnLogToggle - ' - Me.btnLogToggle.Location = New System.Drawing.Point(437, 155) - Me.btnLogToggle.Name = "btnLogToggle" - Me.btnLogToggle.Size = New System.Drawing.Size(75, 23) - Me.btnLogToggle.TabIndex = 7 - Me.btnLogToggle.Text = "Show &Log" - Me.btnLogToggle.UseVisualStyleBackColor = True - ' 'lblGameTitle ' Me.lblGameTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -480,7 +473,8 @@ Partial Class frmMain ' 'btnCancelOperation ' - Me.btnCancelOperation.Location = New System.Drawing.Point(437, 126) + Me.btnCancelOperation.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnCancelOperation.Location = New System.Drawing.Point(437, 155) Me.btnCancelOperation.Name = "btnCancelOperation" Me.btnCancelOperation.Size = New System.Drawing.Size(75, 23) Me.btnCancelOperation.TabIndex = 6 @@ -523,7 +517,6 @@ Partial Class frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(524, 401) Me.Controls.Add(Me.pbTime) Me.Controls.Add(Me.lblStatus3) @@ -534,16 +527,13 @@ Partial Class frmMain Me.Controls.Add(Me.lblLastActionTitle) Me.Controls.Add(Me.lblLastAction) Me.Controls.Add(Me.lblGameTitle) - Me.Controls.Add(Me.btnLogToggle) Me.Controls.Add(Me.pbIcon) Me.Controls.Add(Me.gMonStatusStrip) Me.Controls.Add(Me.gMonMainMenu) Me.Controls.Add(Me.txtLog) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.MainMenuStrip = Me.gMonMainMenu - Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmMain" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide @@ -586,7 +576,6 @@ Partial Class frmMain Friend WithEvents gMonTraySetupGameManager As System.Windows.Forms.ToolStripMenuItem Friend WithEvents gMonTraySetupCustomVariables As System.Windows.Forms.ToolStripMenuItem Friend WithEvents pbIcon As System.Windows.Forms.PictureBox - Friend WithEvents btnLogToggle As System.Windows.Forms.Button Friend WithEvents lblGameTitle As System.Windows.Forms.Label Friend WithEvents lblLastAction As System.Windows.Forms.Label Friend WithEvents lblLastActionTitle As System.Windows.Forms.Label diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index b21e742..2ddcb40 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -39,8 +39,6 @@ Public Class frmMain Private sPriorPath As String Private sPriorCompany As String Private sPriorVersion As String - Private iFormHeight As Integer - Private iLogSpacer As Integer Private iRestoreTimeOut As Integer 'Developer Debug Flags @@ -1027,22 +1025,6 @@ Public Class frmMain End Sub 'Functions that handle buttons, menus and other GUI features on this form - Private Sub ToggleLog() - If bLogToggle = False Then - txtLog.Visible = True - Me.Size = New System.Drawing.Size(Me.Size.Width, iFormHeight) - bLogToggle = True - btnLogToggle.Text = frmMain_btnToggleLog_Hide - txtLog.Select(txtLog.TextLength, 0) - txtLog.ScrollToCaret() - Else - txtLog.Visible = False - Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer)) - bLogToggle = False - btnLogToggle.Text = frmMain_btnToggleLog_Show - End If - End Sub - Private Sub ToggleState() 'Toggle State with Tray Clicks If Not bShowToggle Then @@ -1257,8 +1239,8 @@ Public Class frmMain End Sub Private Sub SetForm() - 'Disable Autosize in Linux (Mono prevents manual resizing when this is enabled) - If mgrCommon.IsUnix Then Me.AutoSize = False + 'Set Minimum Size + Me.MinimumSize = New Size(Me.Size.Width, Me.Size.Height - txtLog.Size.Height) 'Set Form Name Me.Name = App_NameLong @@ -1317,14 +1299,10 @@ Public Class frmMain gMonStripAdminButton.ToolTipText = frmMain_RunningAsNormal End If btnCancelOperation.Visible = False - txtLog.Visible = False lblLastActionTitle.Visible = False lblLastAction.Text = String.Empty pbTime.SizeMode = PictureBoxSizeMode.AutoSize pbTime.Image = Icon_Clock - iFormHeight = Me.Size.Height - iLogSpacer = gMonStatusStrip.Location.Y - (txtLog.Location.Y + txtLog.Height) - Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer)) AddHandler mgrMonitorList.UpdateLog, AddressOf UpdateLog ResetGameInfo() End Sub @@ -1631,10 +1609,6 @@ Public Class frmMain OpenGameManager(True) End Sub - Private Sub btnLogToggle_Click(sender As Object, e As EventArgs) Handles btnLogToggle.Click - ToggleLog() - End Sub - Private Sub gMonStripSplitStatusButton_ButtonClick(sender As Object, e As EventArgs) Handles gMonStripStatusButton.Click ScanToggle() End Sub @@ -1850,10 +1824,6 @@ Public Class frmMain End If End Sub - Private Sub txtGameInfo_Enter(sender As Object, e As EventArgs) - btnLogToggle.Focus() - End Sub - Private Sub frmMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown If e.KeyCode = Keys.Oemtilde AndAlso e.Modifiers = Keys.Control Then OpenDevConsole()