Update for issues 23 and 24

This commit is contained in:
Michael J. Seiferling
2015-12-07 16:31:28 -06:00
parent fa27c3c389
commit f22bcb91a9
9 changed files with 47 additions and 17 deletions
+1 -1
View File
@@ -1186,7 +1186,7 @@ Public Class frmGameManager
If txtRestorePath.ReadOnly Then If txtRestorePath.ReadOnly Then
If CurrentBackupItem.RestorePath = txtSavePath.Text Then If CurrentBackupItem.RestorePath = txtSavePath.Text Then
If MsgBox("No problems were detected with the current backup's Restore Path, it's highly recommend you do NOT change it." & If MsgBox("No problems were detected with the current backup's Restore Path, it's highly recommended you do NOT change it." &
vbCrLf & vbCrLf & "Do you still want to unlock the field for editing?", vbCrLf & vbCrLf & "Do you still want to unlock the field for editing?",
MsgBoxStyle.YesNo, "Game Backup Monitor") = MsgBoxResult.Yes Then MsgBoxStyle.YesNo, "Game Backup Monitor") = MsgBoxResult.Yes Then
bUnlock = True bUnlock = True
+12 -2
View File
@@ -84,6 +84,7 @@ Partial Class frmMain
Me.lblStatus1 = New System.Windows.Forms.Label() Me.lblStatus1 = New System.Windows.Forms.Label()
Me.lblStatus2 = New System.Windows.Forms.Label() Me.lblStatus2 = New System.Windows.Forms.Label()
Me.lblStatus3 = New System.Windows.Forms.Label() Me.lblStatus3 = New System.Windows.Forms.Label()
Me.gMonNotification = New System.Windows.Forms.ToolStripMenuItem()
Me.gMonTrayMenu.SuspendLayout() Me.gMonTrayMenu.SuspendLayout()
Me.gMonStatusStrip.SuspendLayout() Me.gMonStatusStrip.SuspendLayout()
Me.gMonMainMenu.SuspendLayout() Me.gMonMainMenu.SuspendLayout()
@@ -103,7 +104,7 @@ Partial Class frmMain
' '
Me.gMonTrayMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit}) Me.gMonTrayMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit})
Me.gMonTrayMenu.Name = "gMonTrayMenu" Me.gMonTrayMenu.Name = "gMonTrayMenu"
Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 170) Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 148)
' '
'gMonTrayShow 'gMonTrayShow
' '
@@ -274,7 +275,7 @@ Partial Class frmMain
' '
'gMonMainMenu 'gMonMainMenu
' '
Me.gMonMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonFile, Me.gMonSetup, Me.gMonTools, Me.gMonHelp}) Me.gMonMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonFile, Me.gMonSetup, Me.gMonTools, Me.gMonHelp, Me.gMonNotification})
Me.gMonMainMenu.Location = New System.Drawing.Point(0, 0) Me.gMonMainMenu.Location = New System.Drawing.Point(0, 0)
Me.gMonMainMenu.Name = "gMonMainMenu" Me.gMonMainMenu.Name = "gMonMainMenu"
Me.gMonMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.gMonMainMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System
@@ -517,6 +518,14 @@ Partial Class frmMain
Me.lblStatus3.Size = New System.Drawing.Size(365, 13) Me.lblStatus3.Size = New System.Drawing.Size(365, 13)
Me.lblStatus3.TabIndex = 17 Me.lblStatus3.TabIndex = 17
' '
'gMonNotification
'
Me.gMonNotification.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
Me.gMonNotification.Name = "gMonNotification"
Me.gMonNotification.Size = New System.Drawing.Size(82, 20)
Me.gMonNotification.Text = "Notification"
Me.gMonNotification.Visible = False
'
'frmMain 'frmMain
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -616,4 +625,5 @@ Partial Class frmMain
Friend WithEvents lblStatus1 As Label Friend WithEvents lblStatus1 As Label
Friend WithEvents lblStatus2 As Label Friend WithEvents lblStatus2 As Label
Friend WithEvents lblStatus3 As Label Friend WithEvents lblStatus3 As Label
Friend WithEvents gMonNotification As System.Windows.Forms.ToolStripMenuItem
End Class End Class
+11 -5
View File
@@ -173,13 +173,15 @@ Public Class frmMain
oRestoreInfo = oBackupData(oGame.Name) oRestoreInfo = oBackupData(oGame.Name)
If mgrRestore.CheckPath(oRestoreInfo, oGame, bTriggerReload) Then If mgrRestore.CheckPath(oRestoreInfo, oGame, bTriggerReload) Then
If bTriggerReload Then LoadGameSettings()
oReadyList.Add(oRestoreInfo) oReadyList.Add(oRestoreInfo)
Else Else
UpdateLog(oRestoreInfo.Name & " restore was cancelled due to unknown restore path.", False, ToolTipIcon.Error, True) UpdateLog(oRestoreInfo.Name & " restore was cancelled due to unknown restore path.", False, ToolTipIcon.Error, True)
End If End If
Next Next
'Reload the monitor list if any game data was changed during the path checks
If bTriggerReload Then LoadGameSettings()
'Run restores 'Run restores
If oReadyList.Count > 0 Then If oReadyList.Count > 0 Then
Dim oThread As New System.Threading.Thread(AddressOf ExecuteRestore) Dim oThread As New System.Threading.Thread(AddressOf ExecuteRestore)
@@ -309,10 +311,9 @@ Public Class frmMain
Dim slRestoreData As SortedList = mgrRestore.CompareManifests() Dim slRestoreData As SortedList = mgrRestore.CompareManifests()
If slRestoreData.Count > 0 Then If slRestoreData.Count > 0 Then
If MsgBox("You have " & slRestoreData.Count & " new backup(s) to restore on this computer." & vbCrLf & vbCrLf & "Do you want to review them in the Game Manager now?", gMonNotification.Image = My.Resources.Inbox
MsgBoxStyle.YesNo, "Game Backup Monitor") = MsgBoxResult.Yes Then gMonNotification.Text = slRestoreData.Count & " pending restore(s)"
OpenGameManager(True) gMonNotification.Visible = True
End If
End If End If
End Sub End Sub
@@ -1293,6 +1294,11 @@ Public Class frmMain
OpenCheckforUpdates() OpenCheckforUpdates()
End Sub End Sub
Private Sub gMonNotification_Click(sender As Object, e As EventArgs) Handles gMonNotification.Click
gMonNotification.Visible = False
OpenGameManager(True)
End Sub
Private Sub btnLogToggle_Click(sender As Object, e As EventArgs) Handles btnLogToggle.Click Private Sub btnLogToggle_Click(sender As Object, e As EventArgs) Handles btnLogToggle.Click
ToggleLog() ToggleLog()
End Sub End Sub
+6 -6
View File
@@ -240,21 +240,21 @@ Partial Class frmSettings
'chkCheckSum 'chkCheckSum
' '
Me.chkCheckSum.AutoSize = True Me.chkCheckSum.AutoSize = True
Me.chkCheckSum.Location = New System.Drawing.Point(6, 111) Me.chkCheckSum.Location = New System.Drawing.Point(6, 88)
Me.chkCheckSum.Name = "chkCheckSum" Me.chkCheckSum.Name = "chkCheckSum"
Me.chkCheckSum.Size = New System.Drawing.Size(195, 17) Me.chkCheckSum.Size = New System.Drawing.Size(195, 17)
Me.chkCheckSum.TabIndex = 4 Me.chkCheckSum.TabIndex = 3
Me.chkCheckSum.Text = "Verify backup files with a checksum" Me.chkCheckSum.Text = "Verify backup files with a checksum"
Me.chkCheckSum.UseVisualStyleBackColor = True Me.chkCheckSum.UseVisualStyleBackColor = True
' '
'chkRestoreOnLaunch 'chkRestoreOnLaunch
' '
Me.chkRestoreOnLaunch.AutoSize = True Me.chkRestoreOnLaunch.AutoSize = True
Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 88) Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 111)
Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch" Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch"
Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(249, 17) Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17)
Me.chkRestoreOnLaunch.TabIndex = 3 Me.chkRestoreOnLaunch.TabIndex = 4
Me.chkRestoreOnLaunch.Text = "Check for new backup files to restore at launch" Me.chkRestoreOnLaunch.Text = "Notify when there are new backup files to restore"
Me.chkRestoreOnLaunch.UseVisualStyleBackColor = True Me.chkRestoreOnLaunch.UseVisualStyleBackColor = True
' '
'chkOverwriteWarning 'chkOverwriteWarning
+1
View File
@@ -328,6 +328,7 @@
<Content Include="Resources\GBM_Tray_Detected.ico" /> <Content Include="Resources\GBM_Tray_Detected.ico" />
<Content Include="Resources\GBM_Tray_Ready.ico" /> <Content Include="Resources\GBM_Tray_Ready.ico" />
<Content Include="Resources\GBM_Tray_Stopped.ico" /> <Content Include="Resources\GBM_Tray_Stopped.ico" />
<Content Include="Resources\Inbox.png" />
<Content Include="Resources\Lock.png" /> <Content Include="Resources\Lock.png" />
<Content Include="Resources\type.ico" /> <Content Include="Resources\type.ico" />
<Content Include="Resources\Unlock.png" /> <Content Include="Resources\Unlock.png" />
+1 -1
View File
@@ -27,7 +27,7 @@ Public Class mgrRestore
Public Event UpdateRestoreInfo(oRestoreInfo As clsBackup) Public Event UpdateRestoreInfo(oRestoreInfo As clsBackup)
Public Event SetLastAction(sMessage As String) Public Event SetLastAction(sMessage As String)
Public Shared Function CheckPath(ByRef oRestoreInfo As clsBackup, ByVal oGame As clsGame, Optional ByRef bTriggerReload As Boolean = False) As Boolean Public Shared Function CheckPath(ByRef oRestoreInfo As clsBackup, ByVal oGame As clsGame, ByRef bTriggerReload As Boolean) As Boolean
Dim sProcess As String Dim sProcess As String
Dim sRestorePath As String Dim sRestorePath As String
Dim bNoAuto As Boolean Dim bNoAuto As Boolean
+10
View File
@@ -110,6 +110,16 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary>
Friend ReadOnly Property Inbox() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Inbox", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary> '''<summary>
''' Looks up a localized resource of type System.Drawing.Bitmap. ''' Looks up a localized resource of type System.Drawing.Bitmap.
'''</summary> '''</summary>
+3
View File
@@ -133,6 +133,9 @@
<data name="GBM_Tray_Stopped" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="GBM_Tray_Stopped" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\GBM_Tray_Stopped.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\GBM_Tray_Stopped.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Inbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Inbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Lock" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB