From 1e6872893026258fa1e86bd6d418ad2d91bfad42 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Fri, 4 Dec 2015 11:57:54 -0600 Subject: [PATCH] Changes for issue 20 and tooltip changes --- GBM/Forms/frmGameManager.Designer.vb | 40 ++++++++++++++++++++----- GBM/Forms/frmGameManager.vb | 2 ++ GBM/Forms/frmIncludeExclude.Designer.vb | 3 ++ GBM/Forms/frmIncludeExclude.resx | 2 +- GBM/Forms/frmIncludeExclude.vb | 11 +++++-- 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index 8bd552c..0654670 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -81,6 +81,8 @@ 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() @@ -457,6 +459,8 @@ 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.Label2) + Me.grpStats.Controls.Add(Me.txtRestorePath) Me.grpStats.Controls.Add(Me.btnOpenRestorePath) Me.grpStats.Controls.Add(Me.btnOpenBackupFile) Me.grpStats.Controls.Add(Me.txtFileSize) @@ -469,14 +473,14 @@ Partial Class frmGameManager Me.grpStats.Controls.Add(Me.lblLastBackup) Me.grpStats.Location = New System.Drawing.Point(238, 365) Me.grpStats.Name = "grpStats" - Me.grpStats.Size = New System.Drawing.Size(534, 137) + Me.grpStats.Size = New System.Drawing.Size(534, 154) Me.grpStats.TabIndex = 11 Me.grpStats.TabStop = False Me.grpStats.Text = "Backup Information" ' 'btnOpenRestorePath ' - Me.btnOpenRestorePath.Location = New System.Drawing.Point(339, 105) + 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 @@ -485,7 +489,7 @@ Partial Class frmGameManager ' 'btnOpenBackupFile ' - Me.btnOpenBackupFile.Location = New System.Drawing.Point(216, 105) + 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 @@ -497,13 +501,13 @@ Partial Class frmGameManager Me.txtFileSize.Location = New System.Drawing.Point(96, 74) Me.txtFileSize.Name = "txtFileSize" Me.txtFileSize.ReadOnly = True - Me.txtFileSize.Size = New System.Drawing.Size(275, 20) + Me.txtFileSize.Size = New System.Drawing.Size(432, 20) Me.txtFileSize.TabIndex = 6 Me.txtFileSize.TabStop = False ' 'btnDeleteBackup ' - Me.btnDeleteBackup.Location = New System.Drawing.Point(96, 105) + 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 @@ -522,7 +526,7 @@ Partial Class frmGameManager 'lblSync ' Me.lblSync.AutoSize = True - Me.lblSync.Location = New System.Drawing.Point(6, 105) + 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 @@ -534,7 +538,7 @@ Partial Class frmGameManager Me.txtCurrentBackup.Location = New System.Drawing.Point(96, 24) Me.txtCurrentBackup.Name = "txtCurrentBackup" Me.txtCurrentBackup.ReadOnly = True - Me.txtCurrentBackup.Size = New System.Drawing.Size(275, 20) + Me.txtCurrentBackup.Size = New System.Drawing.Size(432, 20) Me.txtCurrentBackup.TabIndex = 4 Me.txtCurrentBackup.TabStop = False ' @@ -552,7 +556,7 @@ Partial Class frmGameManager Me.txtLocalBackup.Location = New System.Drawing.Point(96, 50) Me.txtLocalBackup.Name = "txtLocalBackup" Me.txtLocalBackup.ReadOnly = True - Me.txtLocalBackup.Size = New System.Drawing.Size(275, 20) + Me.txtLocalBackup.Size = New System.Drawing.Size(432, 20) Me.txtLocalBackup.TabIndex = 5 Me.txtLocalBackup.TabStop = False ' @@ -682,6 +686,24 @@ 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!) @@ -783,4 +805,6 @@ Partial Class frmGameManager Friend WithEvents optTag As System.Windows.Forms.RadioButton Friend WithEvents btnInclude As System.Windows.Forms.Button Friend WithEvents btnExclude As System.Windows.Forms.Button + Friend WithEvents Label2 As Label + Friend WithEvents txtRestorePath As TextBox End Class diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 7504ca9..93a1a70 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -522,9 +522,11 @@ Public Class frmGameManager Else txtFileSize.Text = "Backup file was not found!" End If + txtRestorePath.Text = CurrentBackupItem.RestorePath Else txtCurrentBackup.Text = "Never" txtFileSize.Text = String.Empty + txtRestorePath.Text = String.Empty btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False btnRestore.Enabled = False diff --git a/GBM/Forms/frmIncludeExclude.Designer.vb b/GBM/Forms/frmIncludeExclude.Designer.vb index 2d52f55..fb70520 100644 --- a/GBM/Forms/frmIncludeExclude.Designer.vb +++ b/GBM/Forms/frmIncludeExclude.Designer.vb @@ -219,6 +219,9 @@ Partial Class frmIncludeExclude ' 'ttWarning ' + Me.ttWarning.AutoPopDelay = 5000 + Me.ttWarning.InitialDelay = 200 + Me.ttWarning.ReshowDelay = 50 Me.ttWarning.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Warning ' 'frmIncludeExclude diff --git a/GBM/Forms/frmIncludeExclude.resx b/GBM/Forms/frmIncludeExclude.resx index 0f14aeb..487828b 100644 --- a/GBM/Forms/frmIncludeExclude.resx +++ b/GBM/Forms/frmIncludeExclude.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB6 - CQAAAk1TRnQBSQFMAgEBAwEAAagBAAGoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAbABAAGwAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/GBM/Forms/frmIncludeExclude.vb b/GBM/Forms/frmIncludeExclude.vb index d7e27b0..1fa13df 100644 --- a/GBM/Forms/frmIncludeExclude.vb +++ b/GBM/Forms/frmIncludeExclude.vb @@ -242,14 +242,19 @@ Public Class frmIncludeExclude treFiles.Select() If Not treFiles.SelectedNode Is Nothing Then treFiles.SelectedNode.Expand() If txtRootFolder.Text = String.Empty Then - ttWarning.ToolTipTitle = "Notice" - ttWarning.Show("The saved game folder could not be determined or does not exist.", txtRootFolder, 6000) + ttWarning.ToolTipTitle = "Saved Game Explorer" + ttWarning.SetToolTip(treFiles, "Set the saved game folder using the button above.") + ttWarning.SetToolTip(txtRootFolder, "The saved game folder could not be determined or does not exist.") + ttWarning.SetToolTip(btnBrowse, "Click here to set the saved game folder.") End If End Sub Private Sub btnBrowse_Click(sender As Object, e As EventArgs) Handles btnBrowse.Click RootPathBrowse() - If txtRootFolder.Text <> String.Empty Then BuildTrunk() + If txtRootFolder.Text <> String.Empty Then + BuildTrunk() + ttWarning.RemoveAll() + End If treFiles.Select() If Not treFiles.SelectedNode Is Nothing Then treFiles.SelectedNode.Expand() End Sub