Updates for issues 20 and 24

2015-12-08 10:10:44 -06:00
parent f22bcb91a9
commit 87326981dd
11 changed files with 69 additions and 114 deletions
@@ -32,7 +32,7 @@
    ReadOnly Property CroppedName As String
        Get
            If Name.Length > 40 Then
-                Return sName.Substring(0, 41) & "..."
+                Return sName.Substring(0, 41).Trim & "..."
            Else
                Return sName
            End If
@@ -60,7 +60,6 @@ Partial Class frmGameManager
        Me.lblHours = New System.Windows.Forms.Label()
        Me.btnTags = New System.Windows.Forms.Button()
        Me.grpStats = New System.Windows.Forms.GroupBox()
-        Me.btnRestorePathLock = New System.Windows.Forms.Button()
        Me.lblRestorePath = New System.Windows.Forms.Label()
        Me.txtRestorePath = New System.Windows.Forms.TextBox()
        Me.btnOpenRestorePath = New System.Windows.Forms.Button()
@@ -460,7 +459,6 @@ Partial Class frmGameManager
        'grpStats
        '
        Me.grpStats.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.grpStats.Controls.Add(Me.btnRestorePathLock)
        Me.grpStats.Controls.Add(Me.lblRestorePath)
        Me.grpStats.Controls.Add(Me.txtRestorePath)
        Me.grpStats.Controls.Add(Me.btnOpenRestorePath)
@@ -480,15 +478,6 @@ Partial Class frmGameManager
        Me.grpStats.TabStop = False
        Me.grpStats.Text = "Backup Information"
        '
-        'btnRestorePathLock
-        '
-        Me.btnRestorePathLock.Image = Global.GBM.My.Resources.Resources.Lock
-        Me.btnRestorePathLock.Location = New System.Drawing.Point(495, 97)
-        Me.btnRestorePathLock.Name = "btnRestorePathLock"
-        Me.btnRestorePathLock.Size = New System.Drawing.Size(33, 23)
-        Me.btnRestorePathLock.TabIndex = 9
-        Me.btnRestorePathLock.UseVisualStyleBackColor = True
-        '
        'lblRestorePath
        '
        Me.lblRestorePath.AutoSize = True
@@ -503,7 +492,7 @@ Partial Class frmGameManager
        Me.txtRestorePath.Location = New System.Drawing.Point(96, 99)
        Me.txtRestorePath.Name = "txtRestorePath"
        Me.txtRestorePath.ReadOnly = True
-        Me.txtRestorePath.Size = New System.Drawing.Size(396, 20)
+        Me.txtRestorePath.Size = New System.Drawing.Size(432, 20)
        Me.txtRestorePath.TabIndex = 8
        '
        'btnOpenRestorePath
@@ -817,5 +806,4 @@ Partial Class frmGameManager
    Friend WithEvents btnExclude As System.Windows.Forms.Button
    Friend WithEvents lblRestorePath As Label
    Friend WithEvents txtRestorePath As TextBox
-    Friend WithEvents btnRestorePathLock As Button
 End Class
@@ -539,7 +539,6 @@ Public Class frmGameManager
                txtFileSize.Text = "Backup file was not found!"
            End If
            txtRestorePath.Text = CurrentBackupItem.RestorePath            
-            btnRestorePathLock.Enabled = True
        Else
            txtCurrentBackup.Text = "Never"
            txtFileSize.Text = String.Empty
@@ -548,7 +547,6 @@ Public Class frmGameManager
            btnOpenRestorePath.Enabled = False
            btnRestore.Enabled = False
            btnDeleteBackup.Enabled = False            
-            btnRestorePathLock.Enabled = False
        End If

        If oLocalBackupData.Contains(oApp.Name) Then
@@ -763,9 +761,6 @@ Public Class frmGameManager
                lblTags.Visible = False
                btnInclude.Text = "In&clude Items..."
                btnExclude.Text = "E&xclude Items..."                
-                txtRestorePath.ReadOnly = True
-                btnRestorePathLock.Image = My.Resources.Lock
-                btnRestorePathLock.Enabled = False
            Case eModes.Edit
                grpFilter.Enabled = False
                lstGames.Enabled = False
@@ -801,8 +796,6 @@ Public Class frmGameManager
                btnBackup.Enabled = True
                btnTags.Enabled = True
                lblTags.Visible = True                
-                txtRestorePath.ReadOnly = True
-                btnRestorePathLock.Image = My.Resources.Lock
            Case eModes.ViewTemp
                grpFilter.Enabled = True
                lstGames.Enabled = True
@@ -820,8 +813,6 @@ Public Class frmGameManager
                lblTags.Visible = False
                btnInclude.Text = "In&clude Items..."
                btnExclude.Text = "E&xclude Items..."                
-                txtRestorePath.ReadOnly = True
-                btnRestorePathLock.Image = My.Resources.Lock
            Case eModes.Disabled
                grpFilter.Enabled = True
                lstGames.Enabled = True
@@ -847,8 +838,6 @@ Public Class frmGameManager
                btnInclude.Text = "In&clude Items..."
                btnExclude.Text = "E&xclude Items..."
                txtRestorePath.ReadOnly = True                
-                btnRestorePathLock.Image = My.Resources.Lock
-                btnRestorePathLock.Enabled = False
            Case eModes.MultiSelect
                lstGames.Enabled = True
                WipeControls(grpConfig.Controls)
@@ -873,10 +862,10 @@ Public Class frmGameManager
                btnTags.Enabled = True
                lblTags.Visible = False
                txtRestorePath.ReadOnly = True                
-                btnRestorePathLock.Image = My.Resources.Lock
-                btnRestorePathLock.Enabled = False
        End Select

+        lstGames.Focus()
+
        IsLoading = False
    End Sub

@@ -1181,40 +1170,6 @@ Public Class frmGameManager
        End If
    End Sub

-    Private Sub HandleRestorePathOverride()
-        Dim bUnlock As Boolean = False
-
-        If txtRestorePath.ReadOnly Then
-            If CurrentBackupItem.RestorePath = txtSavePath.Text Then
-                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?",
-                          MsgBoxStyle.YesNo, "Game Backup Monitor") = MsgBoxResult.Yes Then
-                    bUnlock = True
-                End If
-            Else
-                bUnlock = True
-            End If
-
-            If bUnlock Then
-                txtRestorePath.ReadOnly = False
-                btnRestorePathLock.Image = My.Resources.Unlock
-                MsgBox("You may now edit the Restore Path." & vbCrLf & vbCrLf & "Click the Lock button to save any changes.", MsgBoxStyle.Information, "Game Backup Monitor")
-            End If
-        Else
-            txtRestorePath.ReadOnly = True
-            btnRestorePathLock.Image = My.Resources.Lock
-            If CurrentBackupItem.RestorePath <> txtRestorePath.Text Then
-                If Path.IsPathRooted(txtRestorePath.Text) Then
-                    CurrentBackupItem.AbsolutePath = True
-                    CurrentBackupItem.RestorePath = txtRestorePath.Text
-                Else
-                    CurrentBackupItem.RestorePath = txtRestorePath.Text
-                End If
-                mgrManifest.DoManifestUpdate(CurrentBackupItem, mgrSQLite.Database.Remote)
-            End If
-        End If
-    End Sub
-
    Private Sub frmGameManager_Load(sender As Object, e As EventArgs) Handles MyBase.Load

        If DisableExternalFunctions Then
@@ -1352,8 +1307,4 @@ Public Class frmGameManager
            btnInclude.Enabled = True
        End If
    End Sub
-
-    Private Sub btnTogglePathLock_Click(sender As Object, e As EventArgs) Handles btnRestorePathLock.Click
-        HandleRestorePathOverride()
-    End Sub
 End Class
@@ -73,6 +73,7 @@ Partial Class frmMain
        Me.gMonHelpManual = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonHelpCheckforUpdates = New System.Windows.Forms.ToolStripMenuItem()
        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()
@@ -84,7 +85,7 @@ Partial Class frmMain
        Me.lblStatus1 = New System.Windows.Forms.Label()
        Me.lblStatus2 = New System.Windows.Forms.Label()
        Me.lblStatus3 = New System.Windows.Forms.Label()
-        Me.gMonNotification = New System.Windows.Forms.ToolStripMenuItem()
+        Me.gMonTrayNotification = New System.Windows.Forms.ToolStripMenuItem()
        Me.gMonTrayMenu.SuspendLayout()
        Me.gMonStatusStrip.SuspendLayout()
        Me.gMonMainMenu.SuspendLayout()
@@ -102,9 +103,9 @@ Partial Class frmMain
        '
        'gMonTrayMenu
        '
-        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.gMonTrayNotification, Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit})
        Me.gMonTrayMenu.Name = "gMonTrayMenu"
-        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 148)
+        Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 192)
        '
        'gMonTrayShow
        '
@@ -418,6 +419,14 @@ Partial Class frmMain
        Me.gMonHelpAbout.Size = New System.Drawing.Size(171, 22)
        Me.gMonHelpAbout.Text = "&About"
        '
+        '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
+        '
        'pbIcon
        '
        Me.pbIcon.Location = New System.Drawing.Point(12, 36)
@@ -518,13 +527,12 @@ Partial Class frmMain
        Me.lblStatus3.Size = New System.Drawing.Size(365, 13)
        Me.lblStatus3.TabIndex = 17
        '
-        'gMonNotification
+        'gMonTrayNotification
        '
-        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
+        Me.gMonTrayNotification.Name = "gMonTrayNotification"
+        Me.gMonTrayNotification.Size = New System.Drawing.Size(161, 22)
+        Me.gMonTrayNotification.Text = "Notification"
+        Me.gMonTrayNotification.Visible = False
        '
        'frmMain
        '
@@ -626,4 +634,5 @@ Partial Class frmMain
    Friend WithEvents lblStatus2 As Label
    Friend WithEvents lblStatus3 As Label
    Friend WithEvents gMonNotification As System.Windows.Forms.ToolStripMenuItem
+    Friend WithEvents gMonTrayNotification As System.Windows.Forms.ToolStripMenuItem
 End Class
@@ -175,7 +175,7 @@ Public Class frmMain
            If mgrRestore.CheckPath(oRestoreInfo, oGame, bTriggerReload) Then                
                oReadyList.Add(oRestoreInfo)
            Else
-                UpdateLog(oRestoreInfo.Name & " restore was cancelled due to unknown restore path.", False, ToolTipIcon.Error, True)
+                UpdateLog(oRestoreInfo.Name & " restore was cancelled due to a restore path issue.", False, ToolTipIcon.Error, True)
            End If
        Next

@@ -309,13 +309,21 @@ Public Class frmMain

    Private Sub CheckRestore()
        Dim slRestoreData As SortedList = mgrRestore.CompareManifests()
+        Dim sNotification As String

        If slRestoreData.Count > 0 Then
-            gMonNotification.Image = My.Resources.Inbox
-            gMonNotification.Text = slRestoreData.Count & " pending restore(s)"
-            gMonNotification.Visible = True
+            If slRestoreData.Count > 1 Then
+                sNotification = slRestoreData.Count & " Games Pending Restore"
+            Else
+                sNotification = slRestoreData.Count & " Game Pending Restore"
+            End If
+            gMonNotification.Image = My.Resources.Inbox
+            gMonTrayNotification.Image = My.Resources.Inbox
+            gMonNotification.Text = sNotification
+            gMonTrayNotification.Text = sNotification
+            gMonNotification.Visible = True
+            gMonTrayNotification.Visible = True
        End If
-
    End Sub

    'Functions to handle monitor list features
@@ -1294,8 +1302,9 @@ Public Class frmMain
        OpenCheckforUpdates()
    End Sub

-    Private Sub gMonNotification_Click(sender As Object, e As EventArgs) Handles gMonNotification.Click
+    Private Sub gMonNotification_Click(sender As Object, e As EventArgs) Handles gMonNotification.Click, gMonTrayNotification.Click
        gMonNotification.Visible = False
+        gMonTrayNotification.Visible = False
        OpenGameManager(True)
    End Sub

@@ -273,9 +273,9 @@
    </EmbeddedResource>
    <EmbeddedResource Include="My Project\Resources.resx">
      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
      <CustomToolNamespace>My.Resources</CustomToolNamespace>
      <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
    </EmbeddedResource>
  </ItemGroup>
  <ItemGroup>
@@ -329,9 +329,7 @@
    <Content Include="Resources\GBM_Tray_Ready.ico" />
    <Content Include="Resources\GBM_Tray_Stopped.ico" />
    <Content Include="Resources\Inbox.png" />
-    <Content Include="Resources\Lock.png" />
    <Content Include="Resources\type.ico" />
-    <Content Include="Resources\Unlock.png" />
    <Content Include="Resources\User.png" />
    <Content Include="Utilities\x64\7za.dll">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -27,11 +27,37 @@ Public Class mgrRestore
    Public Event UpdateRestoreInfo(oRestoreInfo As clsBackup)
    Public Event SetLastAction(sMessage As String)

+    Private Shared Function CheckForPathOverride(ByRef oCheckBackup As clsBackup, ByVal oCheckGame As clsGame) As Boolean
+        Dim oResult As MsgBoxResult
+
+        If oCheckBackup.RestorePath <> oCheckGame.Path Then
+            oResult = MsgBox("The restore path for " & oCheckBackup.CroppedName & " does not match it's current save path." & vbCrLf & vbCrLf & _
+                      "Do you want to restore to the current save path instead? (Recommended)", MsgBoxStyle.YesNoCancel, "Game Backup Monitor")
+            If oResult = MsgBoxResult.Yes Then
+                If Path.IsPathRooted(oCheckGame.Path) Then
+                    oCheckBackup.AbsolutePath = True
+                    oCheckBackup.RestorePath = oCheckGame.Path
+                Else
+                    oCheckBackup.RestorePath = oCheckGame.Path
+                End If                
+            ElseIf oResult = MsgBoxResult.Cancel Then
+                Return False
+            End If
+        End If
+
+        Return True
+    End Function
+
    Public Shared Function CheckPath(ByRef oRestoreInfo As clsBackup, ByVal oGame As clsGame, ByRef bTriggerReload As Boolean) As Boolean
        Dim sProcess As String
        Dim sRestorePath As String
        Dim bNoAuto As Boolean

+        'Before we do anything check if we need to override the current path
+        If Not CheckForPathOverride(oRestoreInfo, oGame) Then
+            Return False
+        End If
+
        If Not oRestoreInfo.AbsolutePath Then
            If oGame.ProcessPath <> String.Empty Then
                oRestoreInfo.RelativeRestorePath = oGame.ProcessPath & "\" & oRestoreInfo.RestorePath
@@ -120,16 +120,6 @@ Namespace My.Resources
            End Get
        End Property
        
-        '''<summary>
-        '''  Looks up a localized resource of type System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property Lock() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("Lock", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@@ -170,16 +160,6 @@ Namespace My.Resources
            End Get
        End Property
        
-        '''<summary>
-        '''  Looks up a localized resource of type System.Drawing.Bitmap.
-        '''</summary>
-        Friend ReadOnly Property Unlock() As System.Drawing.Bitmap
-            Get
-                Dim obj As Object = ResourceManager.GetObject("Unlock", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
-            End Get
-        End Property
-        
        '''<summary>
        '''  Looks up a localized resource of type System.Drawing.Bitmap.
        '''</summary>
@@ -136,9 +136,6 @@
  <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">
-    <value>..\Resources\Lock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="Ready" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Ready.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -151,9 +148,6 @@
  <data name="Unknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Unknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Unlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Unlock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="User" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\User.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>