diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index a437865..8bdc418 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -70,6 +70,7 @@ 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.btnImportBackup = New System.Windows.Forms.Button() Me.cboRemoteBackup = New System.Windows.Forms.ComboBox() Me.lblRestorePathData = New System.Windows.Forms.Label() Me.lblBackupFileData = New System.Windows.Forms.Label() @@ -104,7 +105,6 @@ Partial Class frmGameManager Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem() Me.btnProcesses = New System.Windows.Forms.Button() Me.ttFullPath = New System.Windows.Forms.ToolTip(Me.components) - Me.btnImportBackup = New System.Windows.Forms.Button() Me.grpConfig.SuspendLayout() CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpExtra.SuspendLayout() @@ -144,7 +144,7 @@ Partial Class frmGameManager Me.btnBackup.Location = New System.Drawing.Point(616, 626) Me.btnBackup.Name = "btnBackup" Me.btnBackup.Size = New System.Drawing.Size(75, 23) - Me.btnBackup.TabIndex = 18 + Me.btnBackup.TabIndex = 19 Me.btnBackup.Text = "&Backup" Me.btnBackup.UseVisualStyleBackColor = True ' @@ -154,7 +154,7 @@ Partial Class frmGameManager Me.btnClose.Location = New System.Drawing.Point(697, 626) Me.btnClose.Name = "btnClose" Me.btnClose.Size = New System.Drawing.Size(75, 23) - Me.btnClose.TabIndex = 19 + Me.btnClose.TabIndex = 20 Me.btnClose.Text = "C&lose" Me.btnClose.UseVisualStyleBackColor = True ' @@ -289,7 +289,7 @@ Partial Class frmGameManager Me.btnInclude.Name = "btnInclude" Me.btnInclude.Size = New System.Drawing.Size(175, 23) Me.btnInclude.TabIndex = 12 - Me.btnInclude.Text = "In&clude Items..." + Me.btnInclude.Text = "Incl&ude Items..." Me.btnInclude.UseVisualStyleBackColor = True ' 'txtID @@ -567,8 +567,8 @@ Partial Class frmGameManager Me.btnTags.Location = New System.Drawing.Point(535, 437) Me.btnTags.Name = "btnTags" Me.btnTags.Size = New System.Drawing.Size(75, 23) - Me.btnTags.TabIndex = 12 - Me.btnTags.Text = "Tags..." + Me.btnTags.TabIndex = 13 + Me.btnTags.Text = "&Tags..." Me.btnTags.UseVisualStyleBackColor = True ' 'grpStats @@ -589,10 +589,19 @@ Partial Class frmGameManager Me.grpStats.Location = New System.Drawing.Point(248, 466) Me.grpStats.Name = "grpStats" Me.grpStats.Size = New System.Drawing.Size(525, 154) - Me.grpStats.TabIndex = 15 + Me.grpStats.TabIndex = 16 Me.grpStats.TabStop = False Me.grpStats.Text = "Backup Information" ' + 'btnImportBackup + ' + Me.btnImportBackup.Location = New System.Drawing.Point(9, 125) + Me.btnImportBackup.Name = "btnImportBackup" + Me.btnImportBackup.Size = New System.Drawing.Size(114, 23) + Me.btnImportBackup.TabIndex = 8 + Me.btnImportBackup.Text = "Import B&ackup Files" + Me.btnImportBackup.UseVisualStyleBackColor = True + ' 'cboRemoteBackup ' Me.cboRemoteBackup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList @@ -704,7 +713,7 @@ Partial Class frmGameManager Me.btnMarkAsRestored.Location = New System.Drawing.Point(429, 626) Me.btnMarkAsRestored.Name = "btnMarkAsRestored" Me.btnMarkAsRestored.Size = New System.Drawing.Size(100, 23) - Me.btnMarkAsRestored.TabIndex = 16 + Me.btnMarkAsRestored.TabIndex = 17 Me.btnMarkAsRestored.Text = "&Mark as Restored" Me.btnMarkAsRestored.UseVisualStyleBackColor = True ' @@ -714,7 +723,7 @@ Partial Class frmGameManager Me.btnRestore.Location = New System.Drawing.Point(535, 626) Me.btnRestore.Name = "btnRestore" Me.btnRestore.Size = New System.Drawing.Size(75, 23) - Me.btnRestore.TabIndex = 17 + Me.btnRestore.TabIndex = 18 Me.btnRestore.Text = "&Restore" Me.btnRestore.UseVisualStyleBackColor = True ' @@ -724,7 +733,7 @@ Partial Class frmGameManager Me.btnSave.Location = New System.Drawing.Point(616, 437) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) - Me.btnSave.TabIndex = 13 + Me.btnSave.TabIndex = 14 Me.btnSave.Text = "&Save" Me.btnSave.UseVisualStyleBackColor = True ' @@ -743,8 +752,8 @@ Partial Class frmGameManager Me.btnCancel.Location = New System.Drawing.Point(697, 437) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(75, 23) - Me.btnCancel.TabIndex = 14 - Me.btnCancel.Text = "&Cancel" + Me.btnCancel.TabIndex = 15 + Me.btnCancel.Text = "Ca&ncel" Me.btnCancel.UseVisualStyleBackColor = True ' 'chkEnabled @@ -891,8 +900,8 @@ Partial Class frmGameManager Me.btnProcesses.Location = New System.Drawing.Point(454, 437) Me.btnProcesses.Name = "btnProcesses" Me.btnProcesses.Size = New System.Drawing.Size(75, 23) - Me.btnProcesses.TabIndex = 20 - Me.btnProcesses.Text = "Processes..." + Me.btnProcesses.TabIndex = 12 + Me.btnProcesses.Text = "Pro&cesses..." Me.btnProcesses.UseVisualStyleBackColor = True ' 'ttFullPath @@ -901,15 +910,6 @@ Partial Class frmGameManager Me.ttFullPath.InitialDelay = 300 Me.ttFullPath.ReshowDelay = 60 ' - 'btnImportBackup - ' - Me.btnImportBackup.Location = New System.Drawing.Point(9, 125) - Me.btnImportBackup.Name = "btnImportBackup" - Me.btnImportBackup.Size = New System.Drawing.Size(114, 23) - Me.btnImportBackup.TabIndex = 8 - Me.btnImportBackup.Text = "Import B&ackup Files" - Me.btnImportBackup.UseVisualStyleBackColor = True - ' 'frmGameManager ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index dea6062..6bb27ba 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1048,6 +1048,7 @@ Public Class frmGameManager btnBackup.Enabled = False btnMarkAsRestored.Enabled = False btnRestore.Enabled = False + btnImportBackup.Enabled = False btnDeleteBackup.Enabled = False btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False @@ -1078,6 +1079,7 @@ Public Class frmGameManager btnBackup.Enabled = False btnMarkAsRestored.Enabled = False btnRestore.Enabled = False + btnImportBackup.Enabled = False btnDeleteBackup.Enabled = False btnOpenBackupFile.Enabled = False btnOpenRestorePath.Enabled = False @@ -1106,6 +1108,7 @@ Public Class frmGameManager lblTags.Visible = True btnImport.Enabled = True btnExport.Enabled = True + btnImportBackup.Enabled = True Case eModes.Disabled grpFilter.Enabled = True lstGames.Enabled = True @@ -1768,6 +1771,7 @@ Public Class frmGameManager chkRegEx.Text = frmGameManager_chkRegEx btnGameID.Text = frmGameManager_btnGameID btnImportBackup.Text = frmGameManager_btnImportBackup + btnProcesses.Text = frmGameManager_btnProcesses 'Init Filter Timer tmFilterTimer = New Timer() diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index fba3c43..1b21cb5 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -64,6 +64,7 @@ Partial Class frmSettings Me.grpLogOptions = New System.Windows.Forms.GroupBox() Me.chkDisableSyncMessages = New System.Windows.Forms.CheckBox() Me.grpGameData = New System.Windows.Forms.GroupBox() + Me.chkShowResolvedPaths = New System.Windows.Forms.CheckBox() Me.chkSessionTracking = New System.Windows.Forms.CheckBox() Me.lstSettings = New System.Windows.Forms.ListBox() Me.btnResetMessages = New System.Windows.Forms.Button() @@ -73,7 +74,6 @@ Partial Class frmSettings Me.chkStartWindows = New System.Windows.Forms.CheckBox() Me.chkStartToTray = New System.Windows.Forms.CheckBox() Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() - Me.chkShowResolvedPaths = New System.Windows.Forms.CheckBox() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() Me.pnlBackup.SuspendLayout() @@ -512,6 +512,16 @@ Partial Class frmSettings Me.grpGameData.TabStop = False Me.grpGameData.Text = "Game Data Options" ' + 'chkShowResolvedPaths + ' + Me.chkShowResolvedPaths.AutoSize = True + Me.chkShowResolvedPaths.Location = New System.Drawing.Point(6, 65) + Me.chkShowResolvedPaths.Name = "chkShowResolvedPaths" + Me.chkShowResolvedPaths.Size = New System.Drawing.Size(154, 17) + Me.chkShowResolvedPaths.TabIndex = 2 + Me.chkShowResolvedPaths.Text = "Show resolved save paths " + Me.chkShowResolvedPaths.UseVisualStyleBackColor = True + ' 'chkSessionTracking ' Me.chkSessionTracking.AutoSize = True @@ -600,16 +610,6 @@ Partial Class frmSettings Me.chkMonitorOnStartup.Text = "Start monitoring on launch" Me.chkMonitorOnStartup.UseVisualStyleBackColor = True ' - 'chkShowResolvedPaths - ' - Me.chkShowResolvedPaths.AutoSize = True - Me.chkShowResolvedPaths.Location = New System.Drawing.Point(6, 65) - Me.chkShowResolvedPaths.Name = "chkShowResolvedPaths" - Me.chkShowResolvedPaths.Size = New System.Drawing.Size(154, 17) - Me.chkShowResolvedPaths.TabIndex = 3 - Me.chkShowResolvedPaths.Text = "Show resolved save paths " - Me.chkShowResolvedPaths.UseVisualStyleBackColor = True - ' 'frmSettings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 3fa755c..6be4b02 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -1474,7 +1474,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to &Cancel. + ''' Looks up a localized string similar to Ca&ncel. ''' Friend ReadOnly Property frmGameManager_btnCancel() As String Get @@ -1573,7 +1573,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to In&clude Items.... + ''' Looks up a localized string similar to Incl&ude Items.... ''' Friend ReadOnly Property frmGameManager_btnInclude() As String Get @@ -1617,6 +1617,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Pro&cesses.... + ''' + Friend ReadOnly Property frmGameManager_btnProcesses() As String + Get + Return ResourceManager.GetString("frmGameManager_btnProcesses", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to &Restore. ''' @@ -1645,7 +1654,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Tags.... + ''' Looks up a localized string similar to &Tags.... ''' Friend ReadOnly Property frmGameManager_btnTags() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 9eaed84..a85b237 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -431,7 +431,7 @@ &Backup - &Cancel + Ca&ncel C&lose @@ -455,7 +455,7 @@ &Import - In&clude Items... + Incl&ude Items... &Mark as Restored @@ -479,7 +479,7 @@ ... - Tags... + &Tags... Monitor this game @@ -2245,4 +2245,7 @@ Imported backup file [PARAM] for [PARAM]. + + Pro&cesses... + \ No newline at end of file