diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb index 4ecf822..5bc1b43 100644 --- a/GBM/Forms/frmMain.Designer.vb +++ b/GBM/Forms/frmMain.Designer.vb @@ -37,11 +37,11 @@ Partial Class frmMain Me.gMonTraySetupCustomVariables = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTraySetupTags = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayTools = New System.Windows.Forms.ToolStripMenuItem() - Me.gMonTrayToolsCleanMan = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayToolsCompact = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayToolsLog = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayLogClear = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayLogSave = New System.Windows.Forms.ToolStripMenuItem() + Me.gMonTrayToolsSessions = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTraySep1 = New System.Windows.Forms.ToolStripSeparator() Me.gMonTrayExit = New System.Windows.Forms.ToolStripMenuItem() Me.bwMonitor = New System.ComponentModel.BackgroundWorker() @@ -63,7 +63,6 @@ Partial Class frmMain Me.gMonSetupCustomVariables = New System.Windows.Forms.ToolStripMenuItem() Me.gMonSetupTags = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTools = New System.Windows.Forms.ToolStripMenuItem() - Me.gMonToolsCleanMan = New System.Windows.Forms.ToolStripMenuItem() Me.gMonToolsCompact = New System.Windows.Forms.ToolStripMenuItem() Me.gMonToolsLog = New System.Windows.Forms.ToolStripMenuItem() Me.gMonLogClear = New System.Windows.Forms.ToolStripMenuItem() @@ -85,7 +84,6 @@ Partial Class frmMain Me.lblStatus2 = New System.Windows.Forms.Label() Me.lblStatus3 = New System.Windows.Forms.Label() Me.pbTime = New System.Windows.Forms.PictureBox() - Me.gMonTrayToolsSessions = New System.Windows.Forms.ToolStripMenuItem() Me.gMonTrayMenu.SuspendLayout() Me.gMonStatusStrip.SuspendLayout() Me.gMonMainMenu.SuspendLayout() @@ -170,42 +168,42 @@ Partial Class frmMain ' 'gMonTrayTools ' - Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCleanMan, Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog, Me.gMonTrayToolsSessions}) + Me.gMonTrayTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayToolsCompact, Me.gMonTrayToolsLog, Me.gMonTrayToolsSessions}) Me.gMonTrayTools.Name = "gMonTrayTools" Me.gMonTrayTools.Size = New System.Drawing.Size(161, 22) Me.gMonTrayTools.Text = "&Tools" ' - 'gMonTrayToolsCleanMan - ' - Me.gMonTrayToolsCleanMan.Name = "gMonTrayToolsCleanMan" - Me.gMonTrayToolsCleanMan.Size = New System.Drawing.Size(184, 22) - Me.gMonTrayToolsCleanMan.Text = "Clean Local Ma&nifest" - ' 'gMonTrayToolsCompact ' Me.gMonTrayToolsCompact.Name = "gMonTrayToolsCompact" - Me.gMonTrayToolsCompact.Size = New System.Drawing.Size(184, 22) + Me.gMonTrayToolsCompact.Size = New System.Drawing.Size(179, 22) Me.gMonTrayToolsCompact.Text = "&Compact Databases" ' 'gMonTrayToolsLog ' Me.gMonTrayToolsLog.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayLogClear, Me.gMonTrayLogSave}) Me.gMonTrayToolsLog.Name = "gMonTrayToolsLog" - Me.gMonTrayToolsLog.Size = New System.Drawing.Size(184, 22) + Me.gMonTrayToolsLog.Size = New System.Drawing.Size(179, 22) Me.gMonTrayToolsLog.Text = "&Log" ' 'gMonTrayLogClear ' Me.gMonTrayLogClear.Name = "gMonTrayLogClear" - Me.gMonTrayLogClear.Size = New System.Drawing.Size(152, 22) + Me.gMonTrayLogClear.Size = New System.Drawing.Size(101, 22) Me.gMonTrayLogClear.Text = "&Clear" ' 'gMonTrayLogSave ' Me.gMonTrayLogSave.Name = "gMonTrayLogSave" - Me.gMonTrayLogSave.Size = New System.Drawing.Size(152, 22) + Me.gMonTrayLogSave.Size = New System.Drawing.Size(101, 22) Me.gMonTrayLogSave.Text = "&Save" ' + 'gMonTrayToolsSessions + ' + Me.gMonTrayToolsSessions.Name = "gMonTrayToolsSessions" + Me.gMonTrayToolsSessions.Size = New System.Drawing.Size(179, 22) + Me.gMonTrayToolsSessions.Text = "&Session Viewer..." + ' 'gMonTraySep1 ' Me.gMonTraySep1.Name = "gMonTraySep1" @@ -350,28 +348,22 @@ Partial Class frmMain ' 'gMonTools ' - Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCleanMan, Me.gMonToolsCompact, Me.gMonToolsLog, Me.gMonToolsSessions}) + Me.gMonTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonToolsCompact, Me.gMonToolsLog, Me.gMonToolsSessions}) Me.gMonTools.Name = "gMonTools" Me.gMonTools.Size = New System.Drawing.Size(47, 20) Me.gMonTools.Text = "&Tools" ' - 'gMonToolsCleanMan - ' - Me.gMonToolsCleanMan.Name = "gMonToolsCleanMan" - Me.gMonToolsCleanMan.Size = New System.Drawing.Size(184, 22) - Me.gMonToolsCleanMan.Text = "Clean Local Ma&nifest" - ' 'gMonToolsCompact ' Me.gMonToolsCompact.Name = "gMonToolsCompact" - Me.gMonToolsCompact.Size = New System.Drawing.Size(184, 22) + Me.gMonToolsCompact.Size = New System.Drawing.Size(179, 22) Me.gMonToolsCompact.Text = "&Compact Databases" ' 'gMonToolsLog ' Me.gMonToolsLog.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonLogClear, Me.gMonLogSave}) Me.gMonToolsLog.Name = "gMonToolsLog" - Me.gMonToolsLog.Size = New System.Drawing.Size(184, 22) + Me.gMonToolsLog.Size = New System.Drawing.Size(179, 22) Me.gMonToolsLog.Text = "&Log" ' 'gMonLogClear @@ -389,7 +381,7 @@ Partial Class frmMain 'gMonToolsSessions ' Me.gMonToolsSessions.Name = "gMonToolsSessions" - Me.gMonToolsSessions.Size = New System.Drawing.Size(184, 22) + Me.gMonToolsSessions.Size = New System.Drawing.Size(179, 22) Me.gMonToolsSessions.Text = "&Session Viewer..." ' 'gMonHelp @@ -532,12 +524,6 @@ Partial Class frmMain Me.pbTime.TabIndex = 18 Me.pbTime.TabStop = False ' - 'gMonTrayToolsSessions - ' - Me.gMonTrayToolsSessions.Name = "gMonTrayToolsSessions" - Me.gMonTrayToolsSessions.Size = New System.Drawing.Size(184, 22) - Me.gMonTrayToolsSessions.Text = "&Session Viewer..." - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -625,8 +611,6 @@ Partial Class frmMain Friend WithEvents gMonTrayNotification As System.Windows.Forms.ToolStripMenuItem Friend WithEvents gMonHelpWebSite As System.Windows.Forms.ToolStripMenuItem Friend WithEvents pbTime As System.Windows.Forms.PictureBox - Friend WithEvents gMonTrayToolsCleanMan As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents gMonToolsCleanMan As System.Windows.Forms.ToolStripMenuItem Friend WithEvents gMonToolsLog As ToolStripMenuItem Friend WithEvents gMonLogClear As ToolStripMenuItem Friend WithEvents gMonLogSave As ToolStripMenuItem diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 520cd31..59b1a89 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -1346,7 +1346,6 @@ Public Class frmMain gMonSetupCustomVariables.Text = frmMain_gMonSetupCustomVariables gMonSetupTags.Text = frmMain_gMonSetupTags gMonTools.Text = frmMain_gMonTools - gMonToolsCleanMan.Text = frmMain_gMonToolsCleanMan gMonToolsCompact.Text = frmMain_gMonToolsCompact gMonToolsLog.Text = frmMain_gMonToolsLog gMonToolsSessions.Text = frmMain_gMonToolsSessions @@ -1368,7 +1367,6 @@ Public Class frmMain gMonTraySetupCustomVariables.Text = frmMain_gMonSetupCustomVariables gMonTraySetupTags.Text = frmMain_gMonSetupTags gMonTrayTools.Text = frmMain_gMonTools - gMonTrayToolsCleanMan.Text = frmMain_gMonToolsCleanMan gMonTrayToolsCompact.Text = frmMain_gMonToolsCompact gMonTrayToolsLog.Text = frmMain_gMonToolsLog gMonTrayToolsSessions.Text = frmMain_gMonToolsSessions @@ -1575,29 +1573,6 @@ Public Class frmMain End If End Sub - Private Sub CleanLocalManifest() - Dim slItems As SortedList - - PauseScan() - - If mgrCommon.ShowMessage(frmMain_ConfirmManifestClean, MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then - - slItems = mgrRestore.SyncLocalManifest() - - If slItems.Count > 0 Then - For Each oItem As clsBackup In slItems.Values - UpdateLog(mgrCommon.FormatString(frmMain_ManifestRemovedEntry, oItem.Name), False) - Next - mgrCommon.ShowMessage(frmMain_ManifestTotalRemoved, slItems.Count, MsgBoxStyle.Information) - Else - mgrCommon.ShowMessage(frmMain_ManifestAreadyClean, MsgBoxStyle.Information) - End If - End If - - ResumeScan() - - End Sub - Private Sub CompactDatabases() Dim oLocalDatabase As mgrSQLite Dim oRemoteDatabase As mgrSQLite @@ -1651,10 +1626,6 @@ Public Class frmMain OpenGameManager() End Sub - Private Sub gMonToolsSync_Click(sender As Object, e As EventArgs) Handles gMonTrayToolsCleanMan.Click, gMonToolsCleanMan.Click - CleanLocalManifest() - End Sub - Private Sub gMonToolsCompact_Click(sender As Object, e As EventArgs) Handles gMonToolsCompact.Click, gMonTrayToolsCompact.Click CompactDatabases() End Sub diff --git a/GBM/Managers/mgrMonitorList.vb b/GBM/Managers/mgrMonitorList.vb index 100db25..e1ad955 100644 --- a/GBM/Managers/mgrMonitorList.vb +++ b/GBM/Managers/mgrMonitorList.vb @@ -475,7 +475,9 @@ Public Class mgrMonitorList Dim hshParams As Hashtable Dim oParamList As New List(Of Hashtable) - sSQL = "DELETE FROM gametags " + sSQL = "DELETE FROM manifest " + sSQL &= "WHERE MonitorID = @MonitorID;" + sSQL &= "DELETE FROM gametags " sSQL &= "WHERE MonitorID = @MonitorID;" If iSelectDB = mgrSQLite.Database.Local Then sSQL &= "DELETE FROM sessions " diff --git a/GBM/Managers/mgrRestore.vb b/GBM/Managers/mgrRestore.vb index 1484ef5..91dd280 100644 --- a/GBM/Managers/mgrRestore.vb +++ b/GBM/Managers/mgrRestore.vb @@ -119,24 +119,6 @@ Public Class mgrRestore Return slRestoreItems End Function - Public Shared Function SyncLocalManifest() As SortedList - Dim slLocalManifest As SortedList - Dim slRemoteManifest As SortedList - Dim slRemovedItems As New SortedList - - slLocalManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Local) - slRemoteManifest = mgrManifest.ReadLatestManifest(mgrSQLite.Database.Remote) - - For Each oItem As clsBackup In slLocalManifest.Values - If Not slRemoteManifest.Contains(oItem.MonitorID) Then - slRemovedItems.Add(oItem.MonitorID, oItem) - mgrManifest.DoManifestDeleteByMonitorID(oItem, mgrSQLite.Database.Local) - End If - Next - - Return slRemovedItems - End Function - Public Function CheckRestorePrereq(ByVal oBackupInfo As clsBackup, ByVal bCleanFolder As Boolean) As Boolean Dim sHash As String Dim sExtractPath As String diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 0e1b0ab..07e0e5b 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -3291,15 +3291,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized string similar to Clea&n Local Manifest. - ''' - Friend ReadOnly Property frmMain_gMonToolsCleanMan() As String - Get - Return ResourceManager.GetString("frmMain_gMonToolsCleanMan", resourceCulture) - End Get - End Property - ''' ''' Looks up a localized string similar to &Compact Databases. ''' diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 44e2fa4..4283a3e 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -406,9 +406,6 @@ &Tools - - Clea&n Local Manifest - &Compact Databases