Enhancement for issue #79
This commit is contained in:
Generated
+24
-2
@@ -96,6 +96,8 @@ Partial Class frmGameManager
|
||||
Me.cmsDeleteBackup = New System.Windows.Forms.ContextMenuStrip(Me.components)
|
||||
Me.cmsDeleteOne = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem()
|
||||
Me.lblParameter = New System.Windows.Forms.Label()
|
||||
Me.txtParameter = New System.Windows.Forms.TextBox()
|
||||
Me.grpConfig.SuspendLayout()
|
||||
CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||
Me.grpExtra.SuspendLayout()
|
||||
@@ -152,6 +154,8 @@ Partial Class frmGameManager
|
||||
'grpConfig
|
||||
'
|
||||
Me.grpConfig.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.grpConfig.Controls.Add(Me.txtParameter)
|
||||
Me.grpConfig.Controls.Add(Me.lblParameter)
|
||||
Me.grpConfig.Controls.Add(Me.chkCleanFolder)
|
||||
Me.grpConfig.Controls.Add(Me.lblLimit)
|
||||
Me.grpConfig.Controls.Add(Me.nudLimit)
|
||||
@@ -247,7 +251,7 @@ Partial Class frmGameManager
|
||||
'
|
||||
'btnProcessBrowse
|
||||
'
|
||||
Me.btnProcessBrowse.Location = New System.Drawing.Point(489, 45)
|
||||
Me.btnProcessBrowse.Location = New System.Drawing.Point(225, 44)
|
||||
Me.btnProcessBrowse.Name = "btnProcessBrowse"
|
||||
Me.btnProcessBrowse.Size = New System.Drawing.Size(30, 20)
|
||||
Me.btnProcessBrowse.TabIndex = 5
|
||||
@@ -330,7 +334,7 @@ Partial Class frmGameManager
|
||||
'
|
||||
Me.txtProcess.Location = New System.Drawing.Point(69, 45)
|
||||
Me.txtProcess.Name = "txtProcess"
|
||||
Me.txtProcess.Size = New System.Drawing.Size(414, 20)
|
||||
Me.txtProcess.Size = New System.Drawing.Size(150, 20)
|
||||
Me.txtProcess.TabIndex = 4
|
||||
'
|
||||
'txtName
|
||||
@@ -819,6 +823,22 @@ Partial Class frmGameManager
|
||||
Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22)
|
||||
Me.cmsDeleteAll.Text = "&All Files"
|
||||
'
|
||||
'lblParameter
|
||||
'
|
||||
Me.lblParameter.AutoSize = True
|
||||
Me.lblParameter.Location = New System.Drawing.Point(269, 48)
|
||||
Me.lblParameter.Name = "lblParameter"
|
||||
Me.lblParameter.Size = New System.Drawing.Size(58, 13)
|
||||
Me.lblParameter.TabIndex = 15
|
||||
Me.lblParameter.Text = "Parameter:"
|
||||
'
|
||||
'txtParameter
|
||||
'
|
||||
Me.txtParameter.Location = New System.Drawing.Point(333, 45)
|
||||
Me.txtParameter.Name = "txtParameter"
|
||||
Me.txtParameter.Size = New System.Drawing.Size(150, 20)
|
||||
Me.txtParameter.TabIndex = 16
|
||||
'
|
||||
'frmGameManager
|
||||
'
|
||||
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
|
||||
@@ -941,4 +961,6 @@ Partial Class frmGameManager
|
||||
Friend WithEvents cmsDeleteOne As ToolStripMenuItem
|
||||
Friend WithEvents cmsDeleteAll As ToolStripMenuItem
|
||||
Friend WithEvents chkCleanFolder As CheckBox
|
||||
Friend WithEvents txtParameter As TextBox
|
||||
Friend WithEvents lblParameter As Label
|
||||
End Class
|
||||
|
||||
@@ -737,6 +737,7 @@ Public Class frmGameManager
|
||||
txtID.Text = oApp.ID
|
||||
txtName.Text = oApp.Name
|
||||
txtProcess.Text = oApp.TrueProcess
|
||||
txtParameter.Text = oApp.Parameter
|
||||
txtSavePath.Text = oApp.Path
|
||||
txtFileType.Text = oApp.FileType
|
||||
txtExclude.Text = oApp.ExcludeList
|
||||
@@ -1126,6 +1127,7 @@ Public Class frmGameManager
|
||||
Else
|
||||
oApp.ProcessName = txtProcess.Text
|
||||
End If
|
||||
oApp.Parameter = txtParameter.Text
|
||||
oApp.Path = txtSavePath.Text
|
||||
'Only do a simple root check here in case the user doesn't really understand creating a proper configuration
|
||||
oApp.AbsolutePath = Path.IsPathRooted(txtSavePath.Text)
|
||||
@@ -1489,6 +1491,7 @@ Public Class frmGameManager
|
||||
btnProcessBrowse.Text = frmGameManager_btnProcessBrowse
|
||||
lblSavePath.Text = frmGameManager_lblSavePath
|
||||
lblProcess.Text = frmGameManager_lblProcess
|
||||
lblParameter.Text = frmGameManager_lblParameter
|
||||
lblName.Text = frmGameManager_lblName
|
||||
chkTimeStamp.Text = frmGameManager_chkTimeStamp
|
||||
chkFolderSave.Text = frmGameManager_chkFolderSave
|
||||
|
||||
Generated
+11
@@ -434,6 +434,9 @@ Partial Class frmMain
|
||||
'
|
||||
'lblGameTitle
|
||||
'
|
||||
Me.lblGameTitle.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
|
||||
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.lblGameTitle.AutoEllipsis = True
|
||||
Me.lblGameTitle.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.lblGameTitle.Location = New System.Drawing.Point(66, 36)
|
||||
Me.lblGameTitle.Name = "lblGameTitle"
|
||||
@@ -443,6 +446,8 @@ Partial Class frmMain
|
||||
'
|
||||
'lblLastAction
|
||||
'
|
||||
Me.lblLastAction.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
|
||||
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.lblLastAction.AutoEllipsis = True
|
||||
Me.lblLastAction.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
|
||||
Me.lblLastAction.Location = New System.Drawing.Point(12, 165)
|
||||
@@ -483,6 +488,8 @@ Partial Class frmMain
|
||||
'
|
||||
'lblStatus1
|
||||
'
|
||||
Me.lblStatus1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
|
||||
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.lblStatus1.AutoEllipsis = True
|
||||
Me.lblStatus1.Location = New System.Drawing.Point(66, 58)
|
||||
Me.lblStatus1.Name = "lblStatus1"
|
||||
@@ -491,6 +498,8 @@ Partial Class frmMain
|
||||
'
|
||||
'lblStatus2
|
||||
'
|
||||
Me.lblStatus2.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
|
||||
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.lblStatus2.AutoEllipsis = True
|
||||
Me.lblStatus2.Location = New System.Drawing.Point(66, 74)
|
||||
Me.lblStatus2.Name = "lblStatus2"
|
||||
@@ -499,6 +508,8 @@ Partial Class frmMain
|
||||
'
|
||||
'lblStatus3
|
||||
'
|
||||
Me.lblStatus3.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
|
||||
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
|
||||
Me.lblStatus3.AutoEllipsis = True
|
||||
Me.lblStatus3.Location = New System.Drawing.Point(66, 90)
|
||||
Me.lblStatus3.Name = "lblStatus3"
|
||||
|
||||
+26
-15
@@ -532,7 +532,7 @@ Public Class frmMain
|
||||
|
||||
Private Sub ResetGameInfo(Optional ByVal bKeepInfo As Boolean = False)
|
||||
If bKeepInfo And Not oProcess.GameInfo Is Nothing Then
|
||||
lblGameTitle.Text = mgrCommon.FormatString(frmMain_LastGame, oProcess.GameInfo.CroppedName)
|
||||
lblGameTitle.Text = mgrCommon.FormatString(frmMain_LastGame, oProcess.GameInfo.Name)
|
||||
pbIcon.Image = oPriorImage
|
||||
lblStatus1.Text = sPriorPath
|
||||
lblStatus2.Text = sPriorCompany
|
||||
@@ -597,7 +597,7 @@ Public Class frmMain
|
||||
Else
|
||||
bAllowIcon = True
|
||||
bAllowDetails = True
|
||||
lblGameTitle.Text = oProcess.GameInfo.CroppedName
|
||||
lblGameTitle.Text = oProcess.GameInfo.Name
|
||||
|
||||
Try
|
||||
Dim ic As Icon = System.Drawing.Icon.ExtractAssociatedIcon(oProcess.FoundProcess.MainModule.FileName)
|
||||
@@ -1448,6 +1448,17 @@ Public Class frmMain
|
||||
|
||||
End Function
|
||||
|
||||
Private Function CheckForParametersDuplicate() As Boolean
|
||||
For Each o As clsGame In oProcess.DuplicateList
|
||||
If o.Parameter <> String.Empty And oProcess.FullCommand.Contains(o.Parameter) Then
|
||||
oProcess.GameInfo = o
|
||||
oProcess.Duplicate = False
|
||||
Return True
|
||||
End If
|
||||
Next
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Private Sub CheckForSavedDuplicate()
|
||||
For Each o As clsGame In oProcess.DuplicateList
|
||||
If o.ProcessPath.ToLower = oProcess.GameInfo.ProcessPath.ToLower Then
|
||||
@@ -1699,20 +1710,20 @@ Public Class frmMain
|
||||
End If
|
||||
|
||||
If bContinue = True Then
|
||||
CheckForSavedDuplicate()
|
||||
If Not CheckForParametersDuplicate() Then CheckForSavedDuplicate()
|
||||
If oProcess.Duplicate Then
|
||||
UpdateLog(frmMain_MultipleGamesDetected, oSettings.ShowDetectionToolTips)
|
||||
UpdateStatus(frmMain_MultipleGamesDetected)
|
||||
SetGameInfo(True)
|
||||
UpdateLog(frmMain_MultipleGamesDetected, oSettings.ShowDetectionToolTips)
|
||||
UpdateStatus(frmMain_MultipleGamesDetected)
|
||||
SetGameInfo(True)
|
||||
Else
|
||||
UpdateLog(mgrCommon.FormatString(frmMain_GameDetected, oProcess.GameInfo.Name), oSettings.ShowDetectionToolTips)
|
||||
UpdateStatus(mgrCommon.FormatString(frmMain_GameDetected, oProcess.GameInfo.CroppedName))
|
||||
SetGameInfo()
|
||||
End If
|
||||
oProcess.StartTime = Now
|
||||
bwMonitor.RunWorkerAsync()
|
||||
Else
|
||||
UpdateLog(mgrCommon.FormatString(frmMain_GameDetected, oProcess.GameInfo.Name), oSettings.ShowDetectionToolTips)
|
||||
UpdateStatus(mgrCommon.FormatString(frmMain_GameDetected, oProcess.GameInfo.CroppedName))
|
||||
SetGameInfo()
|
||||
End If
|
||||
oProcess.StartTime = Now
|
||||
bwMonitor.RunWorkerAsync()
|
||||
Else
|
||||
StopScan()
|
||||
StopScan()
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
@@ -1831,7 +1842,7 @@ Public Class frmMain
|
||||
End Sub
|
||||
|
||||
'This event handler lets the user clear focus from the log by clicking anywhere on the form.
|
||||
'Due to txtLog being the only focusable control in most cases, it's impossible for it to lose focus unless force a focus change.
|
||||
'Due to txtLog being the only focusable control in most cases, it's impossible for it to lose focus unless a change is forced.
|
||||
Private Sub ClearLogFocus(sender As Object, e As EventArgs) Handles MyBase.Click, lblGameTitle.Click, lblStatus1.Click, lblStatus2.Click,
|
||||
lblStatus3.Click, pbTime.Click, lblTimeSpent.Click, lblLastActionTitle.Click, lblLastAction.Click, gMonMainMenu.Click, gMonStatusStrip.Click
|
||||
'Move focus to first label
|
||||
|
||||
Reference in New Issue
Block a user