diff --git a/GBM/Forms/frmAddWizard.Designer.vb b/GBM/Forms/frmAddWizard.Designer.vb index 56bfb1d..6712453 100644 --- a/GBM/Forms/frmAddWizard.Designer.vb +++ b/GBM/Forms/frmAddWizard.Designer.vb @@ -46,6 +46,7 @@ Partial Class frmAddWizard Me.txtSavePath = New System.Windows.Forms.TextBox() Me.lblStep3Intro = New System.Windows.Forms.Label() Me.tbPage3a = New System.Windows.Forms.TabPage() + Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox() Me.lblIncludePathTitle = New System.Windows.Forms.Label() Me.lblIncludePath = New System.Windows.Forms.Label() Me.lblFileTypes = New System.Windows.Forms.Label() @@ -68,7 +69,6 @@ Partial Class frmAddWizard Me.btnCancel = New System.Windows.Forms.Button() Me.btnNext = New System.Windows.Forms.Button() Me.btnBack = New System.Windows.Forms.Button() - Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox() Me.tabWizard.SuspendLayout() Me.tbPage1.SuspendLayout() Me.tbPage2.SuspendLayout() @@ -325,6 +325,17 @@ Partial Class frmAddWizard Me.tbPage3a.TabIndex = 3 Me.tbPage3a.Text = "TabPage4" ' + 'chkRecurseSubFolders + ' + Me.chkRecurseSubFolders.AutoSize = True + Me.chkRecurseSubFolders.Location = New System.Drawing.Point(218, 40) + Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders" + Me.chkRecurseSubFolders.Size = New System.Drawing.Size(15, 14) + Me.chkRecurseSubFolders.TabIndex = 0 + Me.chkRecurseSubFolders.TabStop = False + Me.chkRecurseSubFolders.UseVisualStyleBackColor = True + Me.chkRecurseSubFolders.Visible = False + ' 'lblIncludePathTitle ' Me.lblIncludePathTitle.AutoSize = True @@ -542,17 +553,6 @@ Partial Class frmAddWizard Me.btnBack.Text = "&Back" Me.btnBack.UseVisualStyleBackColor = True ' - 'chkRecurseSubFolders - ' - Me.chkRecurseSubFolders.AutoSize = True - Me.chkRecurseSubFolders.Location = New System.Drawing.Point(218, 40) - Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders" - Me.chkRecurseSubFolders.Size = New System.Drawing.Size(15, 14) - Me.chkRecurseSubFolders.TabIndex = 0 - Me.chkRecurseSubFolders.TabStop = False - Me.chkRecurseSubFolders.UseVisualStyleBackColor = True - Me.chkRecurseSubFolders.Visible = False - ' 'frmAddWizard ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -566,7 +566,6 @@ Partial Class frmAddWizard Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmAddWizard" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Add Game Wizard" Me.tabWizard.ResumeLayout(False) diff --git a/GBM/Forms/frmAddWizard.vb b/GBM/Forms/frmAddWizard.vb index d504a48..29bac02 100644 --- a/GBM/Forms/frmAddWizard.vb +++ b/GBM/Forms/frmAddWizard.vb @@ -30,6 +30,7 @@ Public Class frmAddWizard Private Sub SetForm() 'Set Form Name Me.Text = frmAddWizard_FormName + Me.Icon = GBM_Icon 'Set Form Text btnCancel.Text = frmAddWizard_btnCancel diff --git a/GBM/Forms/frmAdvancedImport.Designer.vb b/GBM/Forms/frmAdvancedImport.Designer.vb index d081c55..c6e7216 100644 --- a/GBM/Forms/frmAdvancedImport.Designer.vb +++ b/GBM/Forms/frmAdvancedImport.Designer.vb @@ -123,6 +123,7 @@ Partial Class frmAdvancedImport Me.MinimizeBox = False Me.Name = "frmAdvancedImport" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Import Game Configurations" Me.ResumeLayout(False) diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb index ba42877..b614321 100644 --- a/GBM/Forms/frmAdvancedImport.vb +++ b/GBM/Forms/frmAdvancedImport.vb @@ -6,7 +6,6 @@ Public Class frmAdvancedImport Private oImportData As ExportData Private hshImportData As Hashtable Private hshFinalData As New Hashtable - Private bModWinConfigsForLinux As Boolean Private bSelectAll As Boolean = True Private bIsLoading As Boolean = False Private iCurrentSort As Integer = 0 @@ -31,15 +30,6 @@ Public Class frmAdvancedImport End Get End Property - Public Property ModWinConfigsForLinux As Boolean - Set(value As Boolean) - bModWinConfigsForLinux = value - End Set - Get - Return bModWinConfigsForLinux - End Get - End Property - Public ReadOnly Property FinalData As Hashtable Get Return hshFinalData @@ -147,7 +137,7 @@ Public Class frmAdvancedImport End If 'Check for hardcoded ignore tags - If bAddItem And ModWinConfigsForLinux Then + If bAddItem And (mgrCommon.IsUnix And oApp.OS = clsGame.eOS.Windows) Then bAddItem = CheckIgnoreTags(oApp.ImportTags) End If @@ -184,6 +174,7 @@ Public Class frmAdvancedImport Private Sub SetForm() 'Set Form Name Me.Text = frmAdvancedImport_FormName + Me.Icon = GBM_Icon 'Add configuration date to title if applicable If ImportInfo.Exported <> 0 Then diff --git a/GBM/Forms/frmChooseGame.Designer.vb b/GBM/Forms/frmChooseGame.Designer.vb index 0ac5c72..291fda8 100644 --- a/GBM/Forms/frmChooseGame.Designer.vb +++ b/GBM/Forms/frmChooseGame.Designer.vb @@ -24,8 +24,8 @@ Partial Class frmChooseGame Private Sub InitializeComponent() Me.lblChoose = New System.Windows.Forms.Label() Me.btnChoose = New System.Windows.Forms.Button() - Me.lstGameBox = New System.Windows.Forms.ListBox() Me.btnCancel = New System.Windows.Forms.Button() + Me.lstGameBox = New System.Windows.Forms.ListView() Me.SuspendLayout() ' 'lblChoose @@ -39,39 +39,40 @@ Partial Class frmChooseGame ' 'btnChoose ' - Me.btnChoose.Location = New System.Drawing.Point(72, 135) + Me.btnChoose.Location = New System.Drawing.Point(201, 176) Me.btnChoose.Name = "btnChoose" Me.btnChoose.Size = New System.Drawing.Size(90, 23) - Me.btnChoose.TabIndex = 2 + Me.btnChoose.TabIndex = 1 Me.btnChoose.Text = "C&hoose Game" Me.btnChoose.UseVisualStyleBackColor = True ' - 'lstGameBox - ' - Me.lstGameBox.FormattingEnabled = True - Me.lstGameBox.HorizontalScrollbar = True - Me.lstGameBox.Location = New System.Drawing.Point(15, 34) - Me.lstGameBox.Name = "lstGameBox" - Me.lstGameBox.Size = New System.Drawing.Size(228, 95) - Me.lstGameBox.Sorted = True - Me.lstGameBox.TabIndex = 1 - ' 'btnCancel ' - Me.btnCancel.Location = New System.Drawing.Point(168, 135) + Me.btnCancel.Location = New System.Drawing.Point(297, 176) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(75, 23) - Me.btnCancel.TabIndex = 3 + Me.btnCancel.TabIndex = 2 Me.btnCancel.Text = "&Cancel" Me.btnCancel.UseVisualStyleBackColor = True ' + 'lstGameBox + ' + Me.lstGameBox.FullRowSelect = True + Me.lstGameBox.Location = New System.Drawing.Point(12, 25) + Me.lstGameBox.MultiSelect = False + Me.lstGameBox.Name = "lstGameBox" + Me.lstGameBox.Size = New System.Drawing.Size(360, 145) + Me.lstGameBox.TabIndex = 0 + Me.lstGameBox.UseCompatibleStateImageBehavior = False + Me.lstGameBox.View = System.Windows.Forms.View.Details + ' 'frmChooseGame ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(255, 166) - Me.Controls.Add(Me.btnCancel) + Me.ClientSize = New System.Drawing.Size(384, 211) Me.Controls.Add(Me.lstGameBox) + Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnChoose) Me.Controls.Add(Me.lblChoose) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle @@ -79,6 +80,7 @@ Partial Class frmChooseGame Me.MinimizeBox = False Me.Name = "frmChooseGame" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Choose Game" Me.ResumeLayout(False) @@ -87,6 +89,6 @@ Partial Class frmChooseGame End Sub Friend WithEvents lblChoose As System.Windows.Forms.Label Friend WithEvents btnChoose As System.Windows.Forms.Button - Friend WithEvents lstGameBox As System.Windows.Forms.ListBox Friend WithEvents btnCancel As Button + Friend WithEvents lstGameBox As ListView End Class diff --git a/GBM/Forms/frmChooseGame.vb b/GBM/Forms/frmChooseGame.vb index a19fac0..3a5de83 100644 --- a/GBM/Forms/frmChooseGame.vb +++ b/GBM/Forms/frmChooseGame.vb @@ -25,24 +25,25 @@ Public Class frmChooseGame End Set End Property - Private Sub FillComboBox() + Private Sub FillList() Dim sTags As String - Dim sName As String - lstGameBox.ValueMember = "Key" - lstGameBox.DisplayMember = "Value" + Dim oListViewItem As ListViewItem + + lstGameBox.BeginUpdate() + + lstGameBox.Columns.Add(frmChooseGame_ColumnName, 180) + lstGameBox.Columns.Add(frmChooseGame_ColumnTags, 175) For Each o As clsGame In Process.DuplicateList sTags = mgrGameTags.PrintTagsbyID(o.ID) - If sTags <> String.Empty Then - sName = o.Name & " (" & sTags & ")" - Else - sName = o.Name - End If - lstGameBox.Items.Add(New KeyValuePair(Of String, String)(o.ID, sName)) + oListViewItem = New ListViewItem(New String() {o.Name, sTags}) + oListViewItem.Tag = o.ID + If lstGameBox.Items.Count = 0 Then oListViewItem.Selected = True + lstGameBox.Items.Add(oListViewItem) oGamesHash.Add(o.ID, o) Next - lstGameBox.SelectedIndex = 0 + lstGameBox.EndUpdate() End Sub Private Sub SaveSelection() @@ -51,8 +52,8 @@ Public Class frmChooseGame End Sub Private Sub GetSelection() - Dim oSelected As KeyValuePair(Of String, String) = lstGameBox.SelectedItem - oGame = DirectCast(oGamesHash.Item(oSelected.Key), clsGame) + Dim oSelected As String = lstGameBox.SelectedItems(0).Tag + oGame = DirectCast(oGamesHash.Item(oSelected), clsGame) SaveSelection() bGameSelected = True Me.DialogResult = DialogResult.OK @@ -62,6 +63,7 @@ Public Class frmChooseGame Private Sub SetForm() 'Set Form Name Me.Text = frmChooseGame_FormName + Me.Icon = GBM_Icon 'Set Form Text btnCancel.Text = frmChooseGame_btnCancel @@ -71,12 +73,14 @@ Public Class frmChooseGame Private Sub frmChooseGame_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load SetForm() - FillComboBox() + FillList() Me.Focus() End Sub Private Sub btnChoose_Click(sender As System.Object, e As System.EventArgs) Handles btnChoose.Click - GetSelection() + If lstGameBox.SelectedItems.Count > 0 Then + GetSelection() + End If End Sub Private Sub frmChooseGame_FormClosing(sender As System.Object, e As System.Windows.Forms.FormClosingEventArgs) Handles MyBase.FormClosing diff --git a/GBM/Forms/frmFileFolderSearch.Designer.vb b/GBM/Forms/frmFileFolderSearch.Designer.vb index 83e796f..334b5fc 100644 --- a/GBM/Forms/frmFileFolderSearch.Designer.vb +++ b/GBM/Forms/frmFileFolderSearch.Designer.vb @@ -104,6 +104,7 @@ Partial Class frmFileFolderSearch Me.MinimizeBox = False Me.Name = "frmFileFolderSearch" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Search" Me.ResumeLayout(False) diff --git a/GBM/Forms/frmFileFolderSearch.vb b/GBM/Forms/frmFileFolderSearch.vb index e7d476c..b3b965d 100644 --- a/GBM/Forms/frmFileFolderSearch.vb +++ b/GBM/Forms/frmFileFolderSearch.vb @@ -220,6 +220,7 @@ Public Class frmFileFolderSearch Private Sub SetForm() 'Set Form Name Me.Text = frmFileFolderSearch_FormName + Me.Icon = GBM_Icon 'Set Form Text lblResults.Text = frmFileFolderSearch_lblResults diff --git a/GBM/Forms/frmFilter.Designer.vb b/GBM/Forms/frmFilter.Designer.vb index 48bf60c..064f169 100644 --- a/GBM/Forms/frmFilter.Designer.vb +++ b/GBM/Forms/frmFilter.Designer.vb @@ -501,6 +501,7 @@ Partial Class frmFilter Me.MinimizeBox = False Me.Name = "frmFilter" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Custom Filter" Me.grpTagFilter.ResumeLayout(False) diff --git a/GBM/Forms/frmFilter.vb b/GBM/Forms/frmFilter.vb index 62469bf..dd27bca 100644 --- a/GBM/Forms/frmFilter.vb +++ b/GBM/Forms/frmFilter.vb @@ -625,6 +625,7 @@ Public Class frmFilter Private Sub SetForm() 'Set Form Name Me.Text = frmFilter_FormName + Me.Icon = GBM_Icon 'Set Form Text optOr.Text = frmFilter_optOr diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index 29d7e7b..f19700e 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -1002,7 +1002,6 @@ Partial Class frmGameManager Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmGameManager" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Game Manager" Me.grpConfig.ResumeLayout(False) diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index a9f87a2..5e823b3 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -1763,7 +1763,7 @@ Public Class frmGameManager sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False) If sLocation <> String.Empty Then - If mgrMonitorList.DoImport(sLocation, False, Settings) Then + If mgrMonitorList.DoImport(sLocation, False) Then mgrMonitorList.SyncMonitorLists(Settings) LoadData() LoadBackupData() @@ -1783,9 +1783,9 @@ Public Class frmGameManager End Sub - Private Sub ImportOfficialGameList(ByVal sImportUrl As String, ByVal bWinConfigsInLinux As Boolean) + Private Sub ImportOfficialGameList(ByVal sImportUrl As String) If mgrCommon.ShowMessage(frmGameManager_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(sImportUrl, True, Settings,, bWinConfigsInLinux) Then + If mgrMonitorList.DoImport(sImportUrl, True) Then mgrMonitorList.SyncMonitorLists(Settings) LoadData() LoadBackupData() @@ -1796,6 +1796,7 @@ Public Class frmGameManager Private Sub SetForm() 'Set Form Name Me.Name = frmGameManager_FormName + Me.Icon = GBM_Icon 'Set Form text grpFilter.Text = frmGameManager_grpFilter @@ -2079,7 +2080,6 @@ Public Class frmGameManager End Sub Private Sub cmsOfficialWindows_Click(sender As Object, e As EventArgs) Handles cmsOfficialWindows.Click, cmsOfficial.Click - Dim bWinConfigsinLinux As Boolean = False 'Show one time warning about Windows configs in Linux If mgrCommon.IsUnix Then If Not (oSettings.SuppressMessages And mgrSettings.eSuppressMessages.WinConfigsInLinux) = mgrSettings.eSuppressMessages.WinConfigsInLinux Then @@ -2087,14 +2087,13 @@ Public Class frmGameManager oSettings.SuppressMessages = oSettings.SetMessageField(oSettings.SuppressMessages, mgrSettings.eSuppressMessages.WinConfigsInLinux) oSettings.SaveSettings() End If - bWinConfigsinLinux = True End If - ImportOfficialGameList(App_URLImport, bWinConfigsinLinux) + ImportOfficialGameList(App_URLImport) End Sub Private Sub cmsOfficialLinux_Click(sender As Object, e As EventArgs) Handles cmsOfficialLinux.Click - ImportOfficialGameList(App_URLImportLinux, False) + ImportOfficialGameList(App_URLImportLinux) End Sub Private Sub cmsFile_Click(sender As Object, e As EventArgs) Handles cmsFile.Click diff --git a/GBM/Forms/frmGameProcesses.Designer.vb b/GBM/Forms/frmGameProcesses.Designer.vb index d34356f..87bf89c 100644 --- a/GBM/Forms/frmGameProcesses.Designer.vb +++ b/GBM/Forms/frmGameProcesses.Designer.vb @@ -124,6 +124,7 @@ Partial Class frmGameProcesses Me.MinimizeBox = False Me.Name = "frmGameProcesses" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Edit Processes" Me.ResumeLayout(False) diff --git a/GBM/Forms/frmGameProcesses.vb b/GBM/Forms/frmGameProcesses.vb index b621990..44e5670 100644 --- a/GBM/Forms/frmGameProcesses.vb +++ b/GBM/Forms/frmGameProcesses.vb @@ -211,6 +211,7 @@ Public Class frmGameProcesses Else Me.Text = mgrCommon.FormatString(frmGameProcesses_FormNameSingle, GameName) End If + Me.Icon = GBM_Icon 'Set Form Text btnOpenProcesses.Text = frmGameProcesses_btnOpenProcesses diff --git a/GBM/Forms/frmGameTags.Designer.vb b/GBM/Forms/frmGameTags.Designer.vb index e15f1af..4a018b4 100644 --- a/GBM/Forms/frmGameTags.Designer.vb +++ b/GBM/Forms/frmGameTags.Designer.vb @@ -124,6 +124,7 @@ Partial Class frmGameTags Me.MinimizeBox = False Me.Name = "frmGameTags" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Edit Tags" Me.ResumeLayout(False) diff --git a/GBM/Forms/frmGameTags.vb b/GBM/Forms/frmGameTags.vb index c74f3a5..905512a 100644 --- a/GBM/Forms/frmGameTags.vb +++ b/GBM/Forms/frmGameTags.vb @@ -213,6 +213,7 @@ Public Class frmGameTags Else Me.Text = mgrCommon.FormatString(frmGameTags_FormNameSingle, GameName) End If + Me.Icon = GBM_Icon 'Set Form Text btnOpenTags.Text = frmGameTags_btnOpenTags diff --git a/GBM/Forms/frmIncludeExclude.Designer.vb b/GBM/Forms/frmIncludeExclude.Designer.vb index 6a538bd..e89273d 100644 --- a/GBM/Forms/frmIncludeExclude.Designer.vb +++ b/GBM/Forms/frmIncludeExclude.Designer.vb @@ -38,13 +38,13 @@ Partial Class frmIncludeExclude Me.btnRemove = New System.Windows.Forms.Button() Me.btnAdd = New System.Windows.Forms.Button() Me.grpOptions = New System.Windows.Forms.GroupBox() + Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox() Me.optFileTypes = New System.Windows.Forms.RadioButton() Me.optIndividualFiles = New System.Windows.Forms.RadioButton() Me.lblItems = New System.Windows.Forms.Label() Me.btnRawEdit = New System.Windows.Forms.Button() Me.lblSaveFolder = New System.Windows.Forms.Label() Me.ttWarning = New System.Windows.Forms.ToolTip(Me.components) - Me.chkRecurseSubFolders = New System.Windows.Forms.CheckBox() Me.cmsItems.SuspendLayout() Me.grpOptions.SuspendLayout() Me.SuspendLayout() @@ -170,6 +170,16 @@ Partial Class frmIncludeExclude Me.grpOptions.TabStop = False Me.grpOptions.Text = "Options" ' + 'chkRecurseSubFolders + ' + Me.chkRecurseSubFolders.AutoSize = True + Me.chkRecurseSubFolders.Location = New System.Drawing.Point(185, 20) + Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders" + Me.chkRecurseSubFolders.Size = New System.Drawing.Size(120, 17) + Me.chkRecurseSubFolders.TabIndex = 2 + Me.chkRecurseSubFolders.Text = "Recurse sub-folders" + Me.chkRecurseSubFolders.UseVisualStyleBackColor = True + ' 'optFileTypes ' Me.optFileTypes.Location = New System.Drawing.Point(6, 19) @@ -224,16 +234,6 @@ Partial Class frmIncludeExclude Me.ttWarning.ReshowDelay = 50 Me.ttWarning.ToolTipIcon = System.Windows.Forms.ToolTipIcon.Warning ' - 'chkRecurseSubFolders - ' - Me.chkRecurseSubFolders.AutoSize = True - Me.chkRecurseSubFolders.Location = New System.Drawing.Point(185, 20) - Me.chkRecurseSubFolders.Name = "chkRecurseSubFolders" - Me.chkRecurseSubFolders.Size = New System.Drawing.Size(120, 17) - Me.chkRecurseSubFolders.TabIndex = 2 - Me.chkRecurseSubFolders.Text = "Recurse sub-folders" - Me.chkRecurseSubFolders.UseVisualStyleBackColor = True - ' 'frmIncludeExclude ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -256,6 +256,7 @@ Partial Class frmIncludeExclude Me.MinimizeBox = False Me.Name = "frmIncludeExclude" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Include / Exclude Builder" Me.cmsItems.ResumeLayout(False) diff --git a/GBM/Forms/frmIncludeExclude.resx b/GBM/Forms/frmIncludeExclude.resx index aa98d69..fc706ac 100644 --- a/GBM/Forms/frmIncludeExclude.resx +++ b/GBM/Forms/frmIncludeExclude.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB6 - CQAAAk1TRnQBSQFMAgEBAwEAAcABAAHAAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAAcgBAAHIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/GBM/Forms/frmIncludeExclude.vb b/GBM/Forms/frmIncludeExclude.vb index 877dbe4..cb3bd5c 100644 --- a/GBM/Forms/frmIncludeExclude.vb +++ b/GBM/Forms/frmIncludeExclude.vb @@ -244,6 +244,7 @@ Public Class frmIncludeExclude Private Sub SetForm() 'Set Form Name Me.Text = mgrCommon.FormatString(frmIncludeExclude_FormName, FormName) + Me.Icon = GBM_Icon 'Set Form Text lblSaveFolder.Text = frmIncludeExclude_lblSaveFolder diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb index 7a297f1..e25f168 100644 --- a/GBM/Forms/frmMain.Designer.vb +++ b/GBM/Forms/frmMain.Designer.vb @@ -106,6 +106,7 @@ Partial Class frmMain Me.gMonTray.ContextMenuStrip = Me.gMonTrayMenu Me.gMonTray.Icon = CType(resources.GetObject("gMonTray.Icon"), System.Drawing.Icon) Me.gMonTray.Text = "GBM" + Me.gMonTray.Visible = True ' 'gMonTrayMenu ' @@ -602,7 +603,6 @@ Partial Class frmMain Me.Controls.Add(Me.gMonStatusStrip) Me.Controls.Add(Me.gMonMainMenu) Me.Controls.Add(Me.txtLog) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True Me.MainMenuStrip = Me.gMonMainMenu Me.MinimizeBox = False diff --git a/GBM/Forms/frmMain.resx b/GBM/Forms/frmMain.resx index 22c66e6..192b528 100644 --- a/GBM/Forms/frmMain.resx +++ b/GBM/Forms/frmMain.resx @@ -3245,4 +3245,13 @@ /AA= + + 256, 19 + + + 368, 19 + + + 510, 19 + \ No newline at end of file diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 155290d..1b98398 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -467,7 +467,7 @@ Public Class frmMain sExtractPath = oBackup.RelativeRestorePath End If - If Not Directory.Exists(sExtractPath) Then + If Not Directory.Exists(sExtractPath) And Not mgrPath.IsSupportedRegistryPath(oBackup.RestorePath) Then If oSettings.AutoMark Then If mgrManifest.DoManifestCheck(de.Key, mgrSQLite.Database.Local) Then mgrManifest.DoManifestUpdateByMonitorID(de.Value, mgrSQLite.Database.Local) @@ -1105,12 +1105,12 @@ Public Class frmMain End If If bOfficial Then - mgrMonitorList.SyncGameIDs(sLocation, oSettings, True) + mgrMonitorList.SyncGameIDs(sLocation, True) Else sLocation = mgrCommon.OpenFileBrowser("XML_Import", frmGameManager_ChooseImportXML, "xml", frmGameManager_XML, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False) If sLocation <> String.Empty Then - mgrMonitorList.SyncGameIDs(sLocation, oSettings, False) + mgrMonitorList.SyncGameIDs(sLocation, False) End If End If @@ -1496,6 +1496,7 @@ Public Class frmMain 'Set Form Name Me.Name = App_NameLong + Me.Icon = GBM_Icon 'Set Menu Text gMonFile.Text = frmMain_gMonFile @@ -2017,11 +2018,6 @@ Public Class frmMain End Sub Private Sub Main_FormClosing(sender As System.Object, e As System.Windows.Forms.FormClosingEventArgs) Handles MyBase.FormClosing - 'Unix Handler - If mgrCommon.IsUnix And Not bShutdown Then - ShutdownApp() - End If - Select Case e.CloseReason Case CloseReason.UserClosing If bShutdown = False Then @@ -2032,12 +2028,13 @@ Public Class frmMain Me.WindowState = FormWindowState.Minimized Me.ShowInTaskbar = False Me.Visible = False + Else + ShutdownApp() End If End If - Case CloseReason.TaskManagerClosing, CloseReason.WindowsShutDown - 'Do nothing and let the app close without warning + Case Else + ShutdownApp(False) End Select - End Sub Private Sub AutoRestoreEventProcessor(myObject As Object, ByVal myEventArgs As EventArgs) Handles tmRestoreCheck.Elapsed @@ -2226,12 +2223,12 @@ Public Class frmMain 'Windows and Linux require different settings for the system tray If mgrCommon.IsUnix Then + Me.gMonTray.Visible = False Me.MinimizeBox = True If oSettings.StartToTray Then Me.WindowState = FormWindowState.Minimized End If Else - Me.gMonTray.Visible = True If oSettings.StartToTray Then bShowToggle = False Me.Visible = False diff --git a/GBM/Forms/frmProcessManager.Designer.vb b/GBM/Forms/frmProcessManager.Designer.vb index 0d7acc6..bc8b69f 100644 --- a/GBM/Forms/frmProcessManager.Designer.vb +++ b/GBM/Forms/frmProcessManager.Designer.vb @@ -213,7 +213,6 @@ Partial Class frmProcessManager Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmProcessManager" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Process Manager" Me.grpProcess.ResumeLayout(False) diff --git a/GBM/Forms/frmProcessManager.vb b/GBM/Forms/frmProcessManager.vb index 60a6d75..706a471 100644 --- a/GBM/Forms/frmProcessManager.vb +++ b/GBM/Forms/frmProcessManager.vb @@ -307,6 +307,7 @@ Public Class frmProcessManager Private Sub SetForm() 'Set Form Name Me.Text = frmProcessManager_FormName + Me.Icon = GBM_Icon 'Set Form Text btnCancel.Text = frmProcessManager_btnCancel diff --git a/GBM/Forms/frmSessionExport.Designer.vb b/GBM/Forms/frmSessionExport.Designer.vb index 6007e42..6b47b3d 100644 --- a/GBM/Forms/frmSessionExport.Designer.vb +++ b/GBM/Forms/frmSessionExport.Designer.vb @@ -25,11 +25,11 @@ Partial Class frmSessionExport Me.btnExport = New System.Windows.Forms.Button() Me.btnCancel = New System.Windows.Forms.Button() Me.grpExportType = New System.Windows.Forms.GroupBox() - Me.grpDateType = New System.Windows.Forms.GroupBox() - Me.optCSV = New System.Windows.Forms.RadioButton() Me.optXML = New System.Windows.Forms.RadioButton() - Me.optCurrentLocale = New System.Windows.Forms.RadioButton() + Me.optCSV = New System.Windows.Forms.RadioButton() + Me.grpDateType = New System.Windows.Forms.GroupBox() Me.optUnix = New System.Windows.Forms.RadioButton() + Me.optCurrentLocale = New System.Windows.Forms.RadioButton() Me.grpOptions = New System.Windows.Forms.GroupBox() Me.chkCSVHeaders = New System.Windows.Forms.CheckBox() Me.grpExportType.SuspendLayout() @@ -66,16 +66,16 @@ Partial Class frmSessionExport Me.grpExportType.TabStop = False Me.grpExportType.Text = "Export Type" ' - 'grpDateType + 'optXML ' - Me.grpDateType.Controls.Add(Me.optUnix) - Me.grpDateType.Controls.Add(Me.optCurrentLocale) - Me.grpDateType.Location = New System.Drawing.Point(12, 88) - Me.grpDateType.Name = "grpDateType" - Me.grpDateType.Size = New System.Drawing.Size(260, 70) - Me.grpDateType.TabIndex = 1 - Me.grpDateType.TabStop = False - Me.grpDateType.Text = "Date Type" + Me.optXML.AutoSize = True + Me.optXML.Location = New System.Drawing.Point(6, 42) + Me.optXML.Name = "optXML" + Me.optXML.Size = New System.Drawing.Size(47, 17) + Me.optXML.TabIndex = 1 + Me.optXML.TabStop = True + Me.optXML.Text = "XML" + Me.optXML.UseVisualStyleBackColor = True ' 'optCSV ' @@ -88,27 +88,16 @@ Partial Class frmSessionExport Me.optCSV.Text = "CSV" Me.optCSV.UseVisualStyleBackColor = True ' - 'optXML + 'grpDateType ' - Me.optXML.AutoSize = True - Me.optXML.Location = New System.Drawing.Point(6, 42) - Me.optXML.Name = "optXML" - Me.optXML.Size = New System.Drawing.Size(47, 17) - Me.optXML.TabIndex = 1 - Me.optXML.TabStop = True - Me.optXML.Text = "XML" - Me.optXML.UseVisualStyleBackColor = True - ' - 'optCurrentLocale - ' - Me.optCurrentLocale.AutoEllipsis = True - Me.optCurrentLocale.Location = New System.Drawing.Point(6, 19) - Me.optCurrentLocale.Name = "optCurrentLocale" - Me.optCurrentLocale.Size = New System.Drawing.Size(248, 17) - Me.optCurrentLocale.TabIndex = 0 - Me.optCurrentLocale.TabStop = True - Me.optCurrentLocale.Text = "Current Locale" - Me.optCurrentLocale.UseVisualStyleBackColor = True + Me.grpDateType.Controls.Add(Me.optUnix) + Me.grpDateType.Controls.Add(Me.optCurrentLocale) + Me.grpDateType.Location = New System.Drawing.Point(12, 88) + Me.grpDateType.Name = "grpDateType" + Me.grpDateType.Size = New System.Drawing.Size(260, 70) + Me.grpDateType.TabIndex = 1 + Me.grpDateType.TabStop = False + Me.grpDateType.Text = "Date Type" ' 'optUnix ' @@ -121,6 +110,17 @@ Partial Class frmSessionExport Me.optUnix.Text = "Unix Timestamp" Me.optUnix.UseVisualStyleBackColor = True ' + 'optCurrentLocale + ' + Me.optCurrentLocale.AutoEllipsis = True + Me.optCurrentLocale.Location = New System.Drawing.Point(6, 19) + Me.optCurrentLocale.Name = "optCurrentLocale" + Me.optCurrentLocale.Size = New System.Drawing.Size(248, 17) + Me.optCurrentLocale.TabIndex = 0 + Me.optCurrentLocale.TabStop = True + Me.optCurrentLocale.Text = "Current Locale" + Me.optCurrentLocale.UseVisualStyleBackColor = True + ' 'grpOptions ' Me.grpOptions.Controls.Add(Me.chkCSVHeaders) @@ -155,6 +155,7 @@ Partial Class frmSessionExport Me.MinimizeBox = False Me.Name = "frmSessionExport" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Session Export Options" diff --git a/GBM/Forms/frmSessionExport.vb b/GBM/Forms/frmSessionExport.vb index 0a4bc9b..2fa8acb 100644 --- a/GBM/Forms/frmSessionExport.vb +++ b/GBM/Forms/frmSessionExport.vb @@ -46,6 +46,7 @@ Public Class frmSessionExport Private Sub SetForm() Me.Text = frmSessionExport_FormName + Me.Icon = GBM_Icon grpExportType.Text = frmSessionExport_grpExportType grpDateType.Text = frmSessionExport_grpDateType diff --git a/GBM/Forms/frmSessions.Designer.vb b/GBM/Forms/frmSessions.Designer.vb index 0c96253..bca5a54 100644 --- a/GBM/Forms/frmSessions.Designer.vb +++ b/GBM/Forms/frmSessions.Designer.vb @@ -175,7 +175,6 @@ Partial Class frmSessions Me.Controls.Add(Me.lblFilter) Me.Controls.Add(Me.txtFilter) Me.Name = "frmSessions" - Me.ShowIcon = False Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Session Viewer" diff --git a/GBM/Forms/frmSessions.vb b/GBM/Forms/frmSessions.vb index b329c60..388a2c1 100644 --- a/GBM/Forms/frmSessions.vb +++ b/GBM/Forms/frmSessions.vb @@ -75,6 +75,7 @@ Public Class frmSessions Private Sub SetForm() Me.Text = frmSessions_Name + Me.Icon = GBM_Icon 'Init Labels lblFilter.Text = frmSessions_lblFilter diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index 7046c27..52d8dcc 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -1,9 +1,9 @@ - + _ Partial Class frmSettings Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - + _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmSettings 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - + _ Private Sub InitializeComponent() Me.chkAutoSaveLog = New System.Windows.Forms.CheckBox() Me.btnOptionalFields = New System.Windows.Forms.Button() @@ -744,8 +744,6 @@ Partial Class frmSettings Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmSettings" - Me.ShowIcon = False - Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Settings" Me.grpFolderOptions.ResumeLayout(False) diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index fec8539..0d341da 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -340,6 +340,7 @@ Public Class frmSettings Private Sub SetForm() 'Set Form Name Me.Text = frmSettings_FormName + Me.Icon = GBM_Icon 'Set Form Text lblMinutes.Text = frmSettings_lblMinutes diff --git a/GBM/Forms/frmStartUpWizard.Designer.vb b/GBM/Forms/frmStartUpWizard.Designer.vb index 11f7c8c..94dbc46 100644 --- a/GBM/Forms/frmStartUpWizard.Designer.vb +++ b/GBM/Forms/frmStartUpWizard.Designer.vb @@ -331,7 +331,6 @@ Partial Class frmStartUpWizard Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmStartUpWizard" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "GBM Setup" Me.tabWizard.ResumeLayout(False) diff --git a/GBM/Forms/frmStartUpWizard.vb b/GBM/Forms/frmStartUpWizard.vb index 5aecfa3..633b305 100644 --- a/GBM/Forms/frmStartUpWizard.vb +++ b/GBM/Forms/frmStartUpWizard.vb @@ -30,6 +30,7 @@ Public Class frmStartUpWizard Private Sub SetForm() 'Set Form Name Me.Text = frmStartUpWizard_FormName + Me.Icon = GBM_Icon 'Set Form Text btnNext.Text = frmStartUpWizard_btnNext @@ -105,7 +106,7 @@ Public Class frmStartUpWizard End If If mgrCommon.ShowMessage(frmStartUpWizard_ConfirmOfficialImport, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - If mgrMonitorList.DoImport(sImportURL, True, Settings, True) Then + If mgrMonitorList.DoImport(sImportURL, True) Then oGameData = mgrMonitorList.ReadList(mgrMonitorList.eListTypes.FullList) mgrMonitorList.SyncMonitorLists(oSettings) End If diff --git a/GBM/Forms/frmSyncFields.vb b/GBM/Forms/frmSyncFields.vb index dbaa507..5f1df8e 100644 --- a/GBM/Forms/frmSyncFields.vb +++ b/GBM/Forms/frmSyncFields.vb @@ -34,6 +34,7 @@ Public Class frmSyncFields Private Sub SetForm() 'Set Form Name Me.Text = frmSyncFields_FormName + Me.Icon = GBM_Icon 'Set Form Text btnCancel.Text = frmSyncFields_btnCancel diff --git a/GBM/Forms/frmTags.Designer.vb b/GBM/Forms/frmTags.Designer.vb index 4d6c6ff..0e1bef7 100644 --- a/GBM/Forms/frmTags.Designer.vb +++ b/GBM/Forms/frmTags.Designer.vb @@ -150,7 +150,6 @@ Partial Class frmTags Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmTags" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Tags" Me.grpTag.ResumeLayout(False) diff --git a/GBM/Forms/frmTags.vb b/GBM/Forms/frmTags.vb index f09ffa7..5e785e1 100644 --- a/GBM/Forms/frmTags.vb +++ b/GBM/Forms/frmTags.vb @@ -267,6 +267,7 @@ Public Class frmTags Private Sub SetForm() 'Set Form Name Me.Text = frmTags_FormName + Me.Icon = GBM_Icon 'Set Form Text grpTag.Text = frmTags_grpTag diff --git a/GBM/Forms/frmVariableManager.Designer.vb b/GBM/Forms/frmVariableManager.Designer.vb index 697b8be..ee69bd5 100644 --- a/GBM/Forms/frmVariableManager.Designer.vb +++ b/GBM/Forms/frmVariableManager.Designer.vb @@ -181,7 +181,6 @@ Partial Class frmVariableManager Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmVariableManager" - Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Custom Variable Manager" Me.grpVariable.ResumeLayout(False) diff --git a/GBM/Forms/frmVariableManager.vb b/GBM/Forms/frmVariableManager.vb index c0ad926..2db70ab 100644 --- a/GBM/Forms/frmVariableManager.vb +++ b/GBM/Forms/frmVariableManager.vb @@ -301,6 +301,7 @@ Public Class frmVariableManager Private Sub SetForm() 'Set Form Name Me.Text = frmVariableManager_FormName + Me.Icon = GBM_Icon 'Set Form Text btnCancel.Text = frmVariableManager_btnCancel diff --git a/GBM/Forms/frmWineConfiguration.Designer.vb b/GBM/Forms/frmWineConfiguration.Designer.vb index 9962f6d..2ff3138 100644 --- a/GBM/Forms/frmWineConfiguration.Designer.vb +++ b/GBM/Forms/frmWineConfiguration.Designer.vb @@ -128,6 +128,7 @@ Partial Class frmWineConfiguration Me.MinimizeBox = False Me.Name = "frmWineConfiguration" Me.ShowIcon = False + Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Wine Configuration" Me.grpWineConfig.ResumeLayout(False) diff --git a/GBM/Forms/frmWineConfiguration.vb b/GBM/Forms/frmWineConfiguration.vb index 8838a01..b583226 100644 --- a/GBM/Forms/frmWineConfiguration.vb +++ b/GBM/Forms/frmWineConfiguration.vb @@ -25,6 +25,7 @@ Public Class frmWineConfiguration Private Sub SetForm() 'Set Form Name Me.Text = frmWineConfiguration_FormName + Me.Icon = GBM_Icon 'Set Form Text grpWineConfig.Text = frmWineConfiguration_grpWineConfig diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 4a6231b..f4e3736 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -794,19 +794,13 @@ Public Class mgrMonitorList Return oList End Function - Public Shared Function SyncGameIDs(ByVal sPath As String, ByRef oSettings As mgrSettings, ByVal bOfficial As Boolean) As Boolean + Public Shared Function SyncGameIDs(ByVal sPath As String, ByVal bOfficial As Boolean) As Boolean Dim sWarning As String If bOfficial Then - If (oSettings.SuppressMessages And mgrSettings.eSuppressMessages.GameIDSync) = mgrSettings.eSuppressMessages.GameIDSync Then - sWarning = mgrMonitorList_ConfirmOfficialGameIDSync - Else - sWarning = mgrMonitorList_ConfirmInitialOfficialGameIDSync - oSettings.SuppressMessages = oSettings.SetMessageField(oSettings.SuppressMessages, mgrSettings.eSuppressMessages.GameIDSync) - oSettings.SaveSettings() - End If + sWarning = mgrMonitorList_ConfirmOfficialGameIDSync Else - sWarning = mgrMonitorList_ConfirmFileGameIDSync + sWarning = mgrMonitorList_ConfirmFileGameIDSync End If If mgrCommon.ShowMessage(sWarning, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then @@ -830,13 +824,10 @@ Public Class mgrMonitorList Return True End Function - Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean, ByRef oSettings As mgrSettings, Optional ByVal bStartUpWizard As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) As Boolean + Public Shared Function DoImport(ByVal sPath As String, ByVal bOfficial As Boolean) As Boolean If mgrCommon.IsAddress(sPath) Then If mgrCommon.CheckAddress(sPath) Then - If bOfficial And Not bStartUpWizard And Not ((oSettings.SuppressMessages And mgrSettings.eSuppressMessages.GameIDSync) = mgrSettings.eSuppressMessages.GameIDSync) Then - SyncGameIDs(sPath, oSettings, True) - End If - ImportMonitorList(sPath, True, bWinConfigsInLinux) + ImportMonitorList(sPath, True) Return True Else mgrCommon.ShowMessage(mgrMonitorList_WebNoReponse, sPath, MsgBoxStyle.Exclamation) @@ -844,7 +835,7 @@ Public Class mgrMonitorList End If Else If File.Exists(sPath) Then - ImportMonitorList(sPath,, bWinConfigsInLinux) + ImportMonitorList(sPath) Return True Else mgrCommon.ShowMessage(mgrMonitorList_FileNotFound, sPath, MsgBoxStyle.Exclamation) @@ -854,7 +845,7 @@ Public Class mgrMonitorList Return True End Function - Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) + Private Shared Sub ImportMonitorList(ByVal sLocation As String, Optional ByVal bWebRead As Boolean = False) Dim hshCompareFrom As New Hashtable Dim hshCompareTo As Hashtable Dim hshSyncItems As Hashtable @@ -864,7 +855,7 @@ Public Class mgrMonitorList Cursor.Current = Cursors.WaitCursor - If Not mgrXML.ReadMonitorList(sLocation, oExportInfo, hshCompareFrom, bWebRead, bWinConfigsInLinux) Then + If Not mgrXML.ReadMonitorList(sLocation, oExportInfo, hshCompareFrom, bWebRead) Then Exit Sub End If @@ -901,7 +892,6 @@ Public Class mgrMonitorList Dim frm As New frmAdvancedImport frm.ImportInfo = oExportInfo frm.ImportData = hshSyncItems - frm.ModWinConfigsForLinux = bWinConfigsInLinux If frm.ShowDialog() = DialogResult.OK Then Cursor.Current = Cursors.WaitCursor diff --git a/GBM/Managers/mgrPath.vb b/GBM/Managers/mgrPath.vb index 8dbee84..b80d245 100644 --- a/GBM/Managers/mgrPath.vb +++ b/GBM/Managers/mgrPath.vb @@ -486,9 +486,9 @@ Public Class mgrPath End Function Public Shared Function IsSupportedRegistryPath(ByVal sPath As String) As Boolean - If sPath.StartsWith("HKEY_CURRENT_USER") Then + If sPath.ToUpper.StartsWith("HKEY_CURRENT_USER\") Or sPath.ToUpper.StartsWith("HKCU\") Then Return True - ElseIf sPath.StartsWith("HKEY_LOCAL_MACHINE") Then + ElseIf sPath.ToUpper.StartsWith("HKEY_LOCAL_MACHINE\") Or sPath.ToUpper.StartsWith("HKLM\") Then Return True End If diff --git a/GBM/Managers/mgrXML.vb b/GBM/Managers/mgrXML.vb index 6920e8d..fdd21a1 100644 --- a/GBM/Managers/mgrXML.vb +++ b/GBM/Managers/mgrXML.vb @@ -6,7 +6,7 @@ Imports System.Net Public Class mgrXML - Public Shared Function ReadMonitorList(ByVal sLocation As String, ByRef oExportInfo As ExportData, ByRef hshList As Hashtable, Optional ByVal bWebRead As Boolean = False, Optional ByVal bWinConfigsInLinux As Boolean = False) As Boolean + Public Shared Function ReadMonitorList(ByVal sLocation As String, ByRef oExportInfo As ExportData, ByRef hshList As Hashtable, Optional ByVal bWebRead As Boolean = False) As Boolean Dim oList As List(Of Game) Dim hshDupeList As New Hashtable Dim oExportData As New ExportData @@ -45,12 +45,9 @@ Public Class mgrXML oGame.OS = g.OS 'Retain compatability when the OS value is not set If oGame.OS = 0 Then - If bWinConfigsInLinux Then - oGame.OS = clsGame.eOS.Windows - Else - oGame.OS = mgrCommon.GetCurrentOS - End If + oGame.OS = mgrCommon.GetCurrentOS End If + For Each t As Tag In g.Tags oGame.ImportTags.Add(t) Next diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 9aa21cd..365f4da 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -888,6 +888,24 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Name. + ''' + Friend ReadOnly Property frmChooseGame_ColumnName() As String + Get + Return ResourceManager.GetString("frmChooseGame_ColumnName", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Tags. + ''' + Friend ReadOnly Property frmChooseGame_ColumnTags() As String + Get + Return ResourceManager.GetString("frmChooseGame_ColumnTags", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Choose Game. ''' @@ -5802,6 +5820,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + ''' + Friend ReadOnly Property GBM_Icon() As System.Drawing.Icon + Get + Dim obj As Object = ResourceManager.GetObject("GBM_Icon", resourceCulture) + Return CType(obj,System.Drawing.Icon) + End Get + End Property + ''' ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). ''' @@ -6367,7 +6395,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Do you want to sync your game identifiers with this export file?[BR][BR]You should only do this if you're managing your own game configurations. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. + ''' Looks up a localized string similar to Do you want to sync your game identifiers with this export file?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature.. ''' Friend ReadOnly Property mgrMonitorList_ConfirmFileGameIDSync() As String Get @@ -6376,16 +6404,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to GBM now uses a unique identifier for each game. For the import feature to recognize game configurations from a prior version, they need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers with the official list?[BR][BR]This feature is available anytime from the "Tools" menu. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. - ''' - Friend ReadOnly Property mgrMonitorList_ConfirmInitialOfficialGameIDSync() As String - Get - Return ResourceManager.GetString("mgrMonitorList_ConfirmInitialOfficialGameIDSync", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to Do you want to sync your game identifiers with the official game list?[BR][BR]This allows the import feature to recognize game configurations from a prior version. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature.. + ''' Looks up a localized string similar to Do you want to sync your game identifiers with the official game list?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature.. ''' Friend ReadOnly Property mgrMonitorList_ConfirmOfficialGameIDSync() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 319f823..5800dac 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -2020,9 +2020,6 @@ Game ID - - GBM now uses a unique identifier for each game. For the import feature to recognize game configurations from a prior version, they need to use the same identifiers.[BR][BR]Do you want to sync your game identifiers with the official list?[BR][BR]This feature is available anytime from the "Tools" menu. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. - This file cannot be used to sync game indentifiers. It was created with an older version of GBM. @@ -2030,7 +2027,7 @@ This export file was created with a version of GBM prior to 1.1.5 and may contain incompatible configuration data.[BR][BR]Do you still want to import configurations from this file? (Not Recommended) - Do you want to sync your game identifiers with this export file?[BR][BR]You should only do this if you're managing your own game configurations. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. + Do you want to sync your game identifiers with this export file?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature. S&ync Game IDs @@ -2042,7 +2039,7 @@ &Official List... - Do you want to sync your game identifiers with the official game list?[BR][BR]This allows the import feature to recognize game configurations from a prior version. If you use GBM on multiple PCs, please see "Tools" section of the online manual before using this feature. + Do you want to sync your game identifiers with the official game list?[BR][BR]This tool is provided for very specific situations, please read the "Tools" section of the online manual before using this feature. &Reset Warnings @@ -2374,9 +2371,15 @@ Current Folder + + Name + 0,0,0 + + Tags + 0,131,255 @@ -2407,4 +2410,7 @@ Light + + ..\resources\gbm.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/GBM/readme.txt b/GBM/readme.txt index 1c2c57d..80a3a5b 100644 --- a/GBM/readme.txt +++ b/GBM/readme.txt @@ -2,7 +2,7 @@ Game Backup Monitor v1.1.8 Readme http://mikemaximus.github.io/gbm-web/ gamebackupmonitor@gmail.com -March 10, 2019 +March 22, 2019 New in 1.1.8 @@ -24,8 +24,12 @@ All Platforms: - The disk space check prior to backups can now be disabled in the "Backup and Restore" settings. - Added "Operating System" field to game configurations: - "Windows" and "Linux" are the only valid choices at this time and only Linux users are allowed to change this field. -- Re-designed how GBM initilizes on startup. - +- Changed how GBM initilizes on startup to fix some long standing issues. +- Fixed some inconsistencies with form icons and when forms are shown in the task bar. +- GBM no longer provides a warning about "Syncing Game IDs" when importing configurations in the Game Manager. + - The warning was very confusing and is no longer relevant to most users. + - The "Sync Game IDs" Tool will continue to be available for now, but the messaging has been changed warning not to use it without reading the manual first. + Windows: - Updated SQLite to 3.27.2 @@ -42,6 +46,7 @@ Linux: - This data can be viewed and manually modified on the Game Manager. - Fixed the handling of Wine/Proton games when multiple configurations are detected. - Fixed a crash when using "Backup Only" and "New Backups Pending" filters on the Game Manager. -- The Mono and GBM process will now exit cleanly if a critical failure occurs during startup. +- The Mono and GBM process will now exit cleanly if a critical error occurs during startup. +- GBM will no longer show the exit dialog when a critical error occurs. The entire version history of GBM releases is available at http://mikemaximus.github.io/gbm-web/versionhistory.html \ No newline at end of file