Updates for issue 20 and minor UI fixes

2015-12-06 20:41:24 -06:00
parent d26c78c093
commit 7871b6e012
10 changed files with 134 additions and 34 deletions
@@ -37,7 +37,7 @@
    ReadOnly Property CroppedName As String
        Get
            If Name.Length > 40 Then
-                Return sGameName.Substring(0, 41) & "..."
+                Return sGameName.Substring(0, 41).Trim & "..."
            Else
                Return sGameName
            End If
@@ -60,6 +60,9 @@ 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.Label2 = New System.Windows.Forms.Label()
+        Me.txtRestorePath = New System.Windows.Forms.TextBox()
        Me.btnOpenRestorePath = New System.Windows.Forms.Button()
        Me.btnOpenBackupFile = New System.Windows.Forms.Button()
        Me.txtFileSize = New System.Windows.Forms.TextBox()
@@ -81,8 +84,6 @@ Partial Class frmGameManager
        Me.optBackupData = New System.Windows.Forms.RadioButton()
        Me.optPendingRestores = New System.Windows.Forms.RadioButton()
        Me.optAllGames = New System.Windows.Forms.RadioButton()
-        Me.txtRestorePath = New System.Windows.Forms.TextBox()
-        Me.Label2 = New System.Windows.Forms.Label()
        Me.grpConfig.SuspendLayout()
        Me.grpExtra.SuspendLayout()
        CType(Me.pbIcon, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -459,6 +460,7 @@ 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.Label2)
        Me.grpStats.Controls.Add(Me.txtRestorePath)
        Me.grpStats.Controls.Add(Me.btnOpenRestorePath)
@@ -478,12 +480,38 @@ 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
+        '
+        'Label2
+        '
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(6, 102)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(72, 13)
+        Me.Label2.TabIndex = 3
+        Me.Label2.Text = "Restore Path:"
+        '
+        'txtRestorePath
+        '
+        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.TabIndex = 8
+        '
        'btnOpenRestorePath
        '
        Me.btnOpenRestorePath.Location = New System.Drawing.Point(339, 125)
        Me.btnOpenRestorePath.Name = "btnOpenRestorePath"
        Me.btnOpenRestorePath.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenRestorePath.TabIndex = 9
+        Me.btnOpenRestorePath.TabIndex = 12
        Me.btnOpenRestorePath.Text = "O&pen Restore Path"
        Me.btnOpenRestorePath.UseVisualStyleBackColor = True
        '
@@ -492,7 +520,7 @@ Partial Class frmGameManager
        Me.btnOpenBackupFile.Location = New System.Drawing.Point(216, 125)
        Me.btnOpenBackupFile.Name = "btnOpenBackupFile"
        Me.btnOpenBackupFile.Size = New System.Drawing.Size(114, 23)
-        Me.btnOpenBackupFile.TabIndex = 8
+        Me.btnOpenBackupFile.TabIndex = 11
        Me.btnOpenBackupFile.Text = "&Open Backup File"
        Me.btnOpenBackupFile.UseVisualStyleBackColor = True
        '
@@ -502,7 +530,7 @@ Partial Class frmGameManager
        Me.txtFileSize.Name = "txtFileSize"
        Me.txtFileSize.ReadOnly = True
        Me.txtFileSize.Size = New System.Drawing.Size(432, 20)
-        Me.txtFileSize.TabIndex = 6
+        Me.txtFileSize.TabIndex = 7
        Me.txtFileSize.TabStop = False
        '
        'btnDeleteBackup
@@ -510,7 +538,7 @@ Partial Class frmGameManager
        Me.btnDeleteBackup.Location = New System.Drawing.Point(96, 125)
        Me.btnDeleteBackup.Name = "btnDeleteBackup"
        Me.btnDeleteBackup.Size = New System.Drawing.Size(114, 23)
-        Me.btnDeleteBackup.TabIndex = 7
+        Me.btnDeleteBackup.TabIndex = 10
        Me.btnDeleteBackup.Text = "&Delete Backup"
        Me.btnDeleteBackup.UseVisualStyleBackColor = True
        '
@@ -529,7 +557,7 @@ Partial Class frmGameManager
        Me.lblSync.Location = New System.Drawing.Point(6, 130)
        Me.lblSync.Name = "lblSync"
        Me.lblSync.Size = New System.Drawing.Size(62, 13)
-        Me.lblSync.TabIndex = 3
+        Me.lblSync.TabIndex = 4
        Me.lblSync.Text = "Up to Date!"
        Me.lblSync.Visible = False
        '
@@ -539,7 +567,7 @@ Partial Class frmGameManager
        Me.txtCurrentBackup.Name = "txtCurrentBackup"
        Me.txtCurrentBackup.ReadOnly = True
        Me.txtCurrentBackup.Size = New System.Drawing.Size(432, 20)
-        Me.txtCurrentBackup.TabIndex = 4
+        Me.txtCurrentBackup.TabIndex = 5
        Me.txtCurrentBackup.TabStop = False
        '
        'lblCurrentBackup
@@ -557,7 +585,7 @@ Partial Class frmGameManager
        Me.txtLocalBackup.Name = "txtLocalBackup"
        Me.txtLocalBackup.ReadOnly = True
        Me.txtLocalBackup.Size = New System.Drawing.Size(432, 20)
-        Me.txtLocalBackup.TabIndex = 5
+        Me.txtLocalBackup.TabIndex = 6
        Me.txtLocalBackup.TabStop = False
        '
        'lblLastBackup
@@ -686,24 +714,6 @@ Partial Class frmGameManager
        Me.optAllGames.Text = "All"
        Me.optAllGames.UseVisualStyleBackColor = True
        '
-        'txtRestorePath
-        '
-        Me.txtRestorePath.Location = New System.Drawing.Point(96, 99)
-        Me.txtRestorePath.Name = "txtRestorePath"
-        Me.txtRestorePath.ReadOnly = True
-        Me.txtRestorePath.Size = New System.Drawing.Size(432, 20)
-        Me.txtRestorePath.TabIndex = 10
-        Me.txtRestorePath.TabStop = False
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(6, 102)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(72, 13)
-        Me.Label2.TabIndex = 11
-        Me.Label2.Text = "Restore Path:"
-        '
        'frmGameManager
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -807,4 +817,5 @@ Partial Class frmGameManager
    Friend WithEvents btnExclude As System.Windows.Forms.Button
    Friend WithEvents Label2 As Label
    Friend WithEvents txtRestorePath As TextBox
+    Friend WithEvents btnRestorePathLock As Button
 End Class
@@ -539,6 +539,7 @@ 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
@@ -547,6 +548,7 @@ Public Class frmGameManager
            btnOpenRestorePath.Enabled = False
            btnRestore.Enabled = False
            btnDeleteBackup.Enabled = False
+            btnRestorePathLock.Enabled = False
        End If

        If oLocalBackupData.Contains(oApp.Name) Then
@@ -595,8 +597,8 @@ Public Class frmGameManager
                    oDir = New DirectoryInfo(sSubDir)
                    If oDir.GetDirectories.Length > 0 Or oDir.GetFiles.Length > 0 Then
                        'Confirm
-                        If MsgBox("The backup folder " & sSubDir & " still contains " & oDir.GetDirectories.Length & " directories and " & _
-                                  oDir.GetFiles.Length & " files." & vbCrLf & vbCrLf & "Do you want to delete the contents and remove the sub-folder for this game?", _
+                        If MsgBox("The backup folder " & sSubDir & " still contains " & oDir.GetDirectories.Length & " directories and " &
+                                  oDir.GetFiles.Length & " files." & vbCrLf & vbCrLf & "Do you want to delete the contents and remove the sub-folder for this game?",
                                  MsgBoxStyle.YesNo, "Game Backup Monitor") = MsgBoxResult.Yes Then
                            If Directory.Exists(sSubDir) Then Directory.Delete(sSubDir, True)
                        End If
@@ -705,6 +707,9 @@ Public Class frmGameManager
                AddHandler DirectCast(ctl, NumericUpDown).ValueChanged, AddressOf DirtyCheck_ValueChanged
            End If
        Next
+
+        'Exemptions
+        RemoveHandler txtRestorePath.TextChanged, AddressOf DirtyCheck_ValueChanged
    End Sub

    Private Sub AssignDirtyHandlersMisc()
@@ -758,6 +763,9 @@ 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
@@ -793,6 +801,8 @@ 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
@@ -810,6 +820,8 @@ 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
@@ -834,6 +846,9 @@ 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.MultiSelect
                lstGames.Enabled = True
                WipeControls(grpConfig.Controls)
@@ -857,6 +872,9 @@ Public Class frmGameManager
                btnMarkAsRestored.Enabled = True
                btnTags.Enabled = True
                lblTags.Visible = False
+                txtRestorePath.ReadOnly = True
+                btnRestorePathLock.Image = My.Resources.Lock
+                btnRestorePathLock.Enabled = False
        End Select

        IsLoading = False
@@ -1163,6 +1181,40 @@ 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 Restore Path, it's highly recommend 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 your 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
@@ -1300,4 +1352,8 @@ 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
@@ -493,19 +493,19 @@ Public Class frmMain

            'Set Details
            If sFileName = String.Empty Then
-                lblStatus1.Text = "Path Not Available"
+                lblStatus1.Text = "N/A"
            Else
                lblStatus1.Text = sFileName
            End If

            If sCompanyName = String.Empty Then
-                lblStatus2.Text = "No Company Set"
+                lblStatus2.Text = "N/A"
            Else
                lblStatus2.Text = sCompanyName
            End If

            If sFileVersion = String.Empty Then
-                lblStatus3.Text = "No Version Set"
+                lblStatus3.Text = "N/A"
            Else
                lblStatus3.Text = sFileVersion
            End If
@@ -108,6 +108,8 @@
        chkTimeTracking.Checked = oSettings.TimeTracking
        chkSupressBackup.Checked = oSettings.SupressBackup
        nudSupressBackupThreshold.Value = oSettings.SupressBackupThreshold
+
+        nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
    End Sub

    Private Sub btnSave_Click(sender As System.Object, e As System.EventArgs) Handles btnSave.Click
@@ -139,4 +141,7 @@
        End If
    End Sub

+    Private Sub chkSupressBackup_CheckedChanged(sender As Object, e As EventArgs) Handles chkSupressBackup.CheckedChanged
+        nudSupressBackupThreshold.Enabled = chkSupressBackup.Checked
+    End Sub
 End Class
@@ -328,7 +328,9 @@
    <Content Include="Resources\GBM_Tray_Detected.ico" />
    <Content Include="Resources\GBM_Tray_Ready.ico" />
    <Content Include="Resources\GBM_Tray_Stopped.ico" />
+    <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>
@@ -110,6 +110,16 @@ 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>
@@ -150,6 +160,16 @@ 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>
@@ -133,6 +133,9 @@
  <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>
  </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>
@@ -145,6 +148,9 @@
  <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>