diff --git a/GBM/Classes/clsRestoreCache.vb b/GBM/Classes/clsRestoreCache.vb deleted file mode 100644 index 07b0033..0000000 --- a/GBM/Classes/clsRestoreCache.vb +++ /dev/null @@ -1,23 +0,0 @@ -Public Class clsRestoreCache - Private sName As String - Private sPath As String - - Property Name As String - Get - Return sName - End Get - Set(value As String) - sName = value - End Set - End Property - - Property Path As String - Get - Return sPath - End Get - Set(value As String) - sPath = value - End Set - End Property - -End Class diff --git a/GBM/Forms/frmMain.Designer.vb b/GBM/Forms/frmMain.Designer.vb index 469e726..0f8a26c 100644 --- a/GBM/Forms/frmMain.Designer.vb +++ b/GBM/Forms/frmMain.Designer.vb @@ -229,7 +229,7 @@ Partial Class frmMain Me.txtLog.Name = "txtLog" Me.txtLog.ReadOnly = True Me.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.txtLog.Size = New System.Drawing.Size(500, 177) + Me.txtLog.Size = New System.Drawing.Size(500, 186) Me.txtLog.TabIndex = 10 Me.txtLog.TabStop = False ' @@ -538,7 +538,6 @@ Partial Class frmMain Me.Controls.Add(Me.gMonStatusStrip) Me.Controls.Add(Me.gMonMainMenu) Me.Controls.Add(Me.txtLog) - Me.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.KeyPreview = True diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index b414acc..a956d7e 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -38,6 +38,8 @@ Public Class frmMain Private sPriorPath As String Private sPriorCompany As String Private sPriorVersion As String + Private iFormHeight As Integer + Private iLogSpacer As Integer 'Developer Debug Flags Private bProcessDebugMode As Boolean = False @@ -870,21 +872,14 @@ Public Class frmMain Private Sub ToggleLog() If bLogToggle = False Then txtLog.Visible = True - - 'Unix Handler - If mgrCommon.IsUnix Then - Me.Size = New System.Drawing.Size(Me.Size.Width, 440) - Else - Me.Size = New System.Drawing.Size(Me.Size.Width, 425) - End If - + Me.Size = New System.Drawing.Size(Me.Size.Width, iFormHeight) bLogToggle = True btnLogToggle.Text = frmMain_btnToggleLog_Hide txtLog.Select(txtLog.TextLength, 0) txtLog.ScrollToCaret() Else txtLog.Visible = False - Me.Size = New System.Drawing.Size(Me.Size.Width, 245) + Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer)) bLogToggle = False btnLogToggle.Text = frmMain_btnToggleLog_Show End If @@ -1166,7 +1161,9 @@ Public Class frmMain lblLastAction.Text = String.Empty pbTime.SizeMode = PictureBoxSizeMode.AutoSize pbTime.Image = Icon_Clock - Me.Size = New System.Drawing.Size(Me.Size.Width, 245) + iFormHeight = Me.Size.Height + iLogSpacer = gMonStatusStrip.Location.Y - (txtLog.Location.Y + txtLog.Height) + Me.Size = New System.Drawing.Size(Me.Size.Width, Me.Size.Height - (txtLog.Height + iLogSpacer)) AddHandler mgrMonitorList.UpdateLog, AddressOf UpdateLog ResetGameInfo() End Sub diff --git a/GBM/Forms/frmManifestViewer.Designer.vb b/GBM/Forms/frmManifestViewer.Designer.vb deleted file mode 100644 index 6377612..0000000 --- a/GBM/Forms/frmManifestViewer.Designer.vb +++ /dev/null @@ -1,105 +0,0 @@ - _ -Partial Class frmManifestViewer - 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 - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - '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.dgView = New System.Windows.Forms.DataGridView() - Me.btnCancel = New System.Windows.Forms.Button() - Me.lblError = New System.Windows.Forms.Label() - Me.fbBrowser = New System.Windows.Forms.FolderBrowserDialog() - Me.cboManifest = New System.Windows.Forms.ComboBox() - CType(Me.dgView, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'dgView - ' - Me.dgView.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dgView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill - Me.dgView.BackgroundColor = System.Drawing.SystemColors.Window - Me.dgView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dgView.Location = New System.Drawing.Point(12, 12) - Me.dgView.Name = "dgView" - Me.dgView.RowHeadersVisible = False - Me.dgView.Size = New System.Drawing.Size(960, 338) - Me.dgView.TabIndex = 0 - ' - 'btnCancel - ' - Me.btnCancel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnCancel.Location = New System.Drawing.Point(897, 356) - Me.btnCancel.Name = "btnCancel" - Me.btnCancel.Size = New System.Drawing.Size(75, 23) - Me.btnCancel.TabIndex = 2 - Me.btnCancel.Text = "C&lose" - Me.btnCancel.UseVisualStyleBackColor = True - ' - 'lblError - ' - Me.lblError.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.lblError.AutoSize = True - Me.lblError.Location = New System.Drawing.Point(139, 362) - Me.lblError.Name = "lblError" - Me.lblError.Size = New System.Drawing.Size(54, 13) - Me.lblError.TabIndex = 5 - Me.lblError.Text = "Info Label" - ' - 'fbBrowser - ' - Me.fbBrowser.ShowNewFolderButton = False - ' - 'cboManifest - ' - Me.cboManifest.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.cboManifest.FormattingEnabled = True - Me.cboManifest.Location = New System.Drawing.Point(12, 359) - Me.cboManifest.Name = "cboManifest" - Me.cboManifest.Size = New System.Drawing.Size(121, 21) - Me.cboManifest.TabIndex = 6 - ' - 'frmManifestViewer - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(984, 392) - Me.Controls.Add(Me.cboManifest) - Me.Controls.Add(Me.lblError) - Me.Controls.Add(Me.btnCancel) - Me.Controls.Add(Me.dgView) - Me.MinimizeBox = False - Me.Name = "frmManifestViewer" - Me.ShowIcon = False - Me.ShowInTaskbar = False - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Manifest Viewer" - CType(Me.dgView, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents dgView As System.Windows.Forms.DataGridView - Friend WithEvents btnCancel As System.Windows.Forms.Button - Friend WithEvents lblError As System.Windows.Forms.Label - Friend WithEvents fbBrowser As System.Windows.Forms.FolderBrowserDialog - Friend WithEvents cboManifest As System.Windows.Forms.ComboBox -End Class diff --git a/GBM/Forms/frmManifestViewer.resx b/GBM/Forms/frmManifestViewer.resx deleted file mode 100644 index 460c378..0000000 --- a/GBM/Forms/frmManifestViewer.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - \ No newline at end of file diff --git a/GBM/Forms/frmManifestViewer.vb b/GBM/Forms/frmManifestViewer.vb deleted file mode 100644 index c7685c4..0000000 --- a/GBM/Forms/frmManifestViewer.vb +++ /dev/null @@ -1,149 +0,0 @@ -Public Class frmManifestViewer - - Private bShutdown As Boolean = False - Private oLocalManifest As SortedList - Private oRemoteManfiest As SortedList - Private oRestoreInfo As clsBackup - Private oDataTable As DataTable - - Property RestoreInfo As clsBackup - Get - Return oRestoreInfo - End Get - Set(value As clsBackup) - oRestoreInfo = value - End Set - End Property - - Property LocalManifestData As SortedList - Get - Return oLocalManifest - End Get - Set(value As SortedList) - oLocalManifest = value - End Set - End Property - - Property RemoteManifestData As SortedList - Get - Return oRemoteManfiest - End Get - Set(value As SortedList) - oRemoteManfiest = value - End Set - End Property - - Private Sub FormatManifest(ByVal iManifest As Integer) - Dim oRow As Object() - Dim oLoadData As SortedList - - If iManifest = 1 Then - oLoadData = LocalManifestData - Else - oLoadData = RemoteManifestData - End If - - oDataTable = New DataTable - - 'Setup Columns - oDataTable.Columns.Add("Name") - oDataTable.Columns.Add("Backup Path") - oDataTable.Columns.Add("Restore Path") - oDataTable.Columns.Add("Absolute Path") - oDataTable.Columns.Add("Date Updated") - oDataTable.Columns.Add("Updated By") - - - 'Setup Data Types - oDataTable.Columns(0).DataType = GetType(String) - oDataTable.Columns(1).DataType = GetType(String) - oDataTable.Columns(2).DataType = GetType(String) - oDataTable.Columns(3).DataType = GetType(Boolean) - oDataTable.Columns(4).DataType = GetType(DateTime) - oDataTable.Columns(5).DataType = GetType(String) - - - - For Each o As clsBackup In oLoadData.Values - oRow = New Object() {o.Name, o.FileName, o.RestorePath, o.AbsolutePath, o.DateUpdated, o.UpdatedBy} - oDataTable.Rows.Add(oRow) - Next - - 'Sort - oDataTable.DefaultView.Sort = "Name asc" - dgView.DataSource = oDataTable - - 'Setup Column Widths - dgView.Columns(0).MinimumWidth = 100 - dgView.Columns(1).MinimumWidth = 175 - dgView.Columns(2).MinimumWidth = 175 - dgView.Columns(3).MinimumWidth = 60 - dgView.Columns(4).MinimumWidth = 125 - dgView.Columns(5).MinimumWidth = 100 - - dgView.Columns(0).FillWeight = 100 - dgView.Columns(1).FillWeight = 100 - dgView.Columns(2).FillWeight = 100 - dgView.Columns(3).FillWeight = 25 - dgView.Columns(4).FillWeight = 50 - dgView.Columns(5).FillWeight = 50 - - End Sub - - Private Sub LoadCombo() - Dim oCombo As New List(Of KeyValuePair(Of Integer, String)) - oCombo.Add(New KeyValuePair(Of Integer, String)(1, "Local Manifest")) - oCombo.Add(New KeyValuePair(Of Integer, String)(2, "Remote Manifest")) - cboManifest.DataSource = oCombo - cboManifest.ValueMember = "key" - cboManifest.DisplayMember = "value" - End Sub - - Private Sub frmManifestInfo_Load(sender As System.Object, e As System.EventArgs) Handles MyBase.Load - dgView.ReadOnly = True - dgView.AllowUserToAddRows = False - lblError.Text = String.Empty - LoadCombo() - FormatManifest(CInt(cboManifest.SelectedValue)) - End Sub - - Private Sub dgView_CellStateChanged(sender As Object, e As DataGridViewCellStateChangedEventArgs) Handles dgView.CellStateChanged - lblError.ForeColor = Color.Black - - Select Case dgView.Columns(e.Cell.ColumnIndex).Index - Case 0 - lblError.Text = "The name of the application." - Case 1 - lblError.Text = "The location of the backup file to restore." - Case 2 - lblError.Text = "When the backup file was updated from this computer." - Case 3 - lblError.Text = "The name of this computer." - Case 4 - lblError.Text = "When the local backup file was last updated." - Case 5 - lblError.Text = "The name of the computer that performed the last backup." - End Select - End Sub - - Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click - Me.Close() - End Sub - - Private Sub frmGameInfo_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing - - If Not bShutdown Then - If MsgBox("Are you sure you want to close?", MsgBoxStyle.YesNo, "ABM") = MsgBoxResult.Yes Then - bShutdown = True - End If - End If - - If Not bShutdown Then - e.Cancel = True - End If - End Sub - - Private Sub cboManifest_SelectionChangeCommitted(sender As Object, e As EventArgs) Handles cboManifest.SelectionChangeCommitted - FormatManifest(CInt(cboManifest.SelectedValue)) - End Sub -End Class \ No newline at end of file diff --git a/GBM/Managers/mgrGlobals.vb b/GBM/Managers/mgrGlobals.vb deleted file mode 100644 index 6fc46c8..0000000 --- a/GBM/Managers/mgrGlobals.vb +++ /dev/null @@ -1,4 +0,0 @@ -Public Class mgrGlobals - Public Shared LocalDatabaseHash As String = String.Empty - Public Shared RemoteDatabaseHash As String = String.Empty -End Class diff --git a/GBM/My Project/AssemblyInfo.vb b/GBM/My Project/AssemblyInfo.vb index 26f8cf2..bc0a8d4 100644 --- a/GBM/My Project/AssemblyInfo.vb +++ b/GBM/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + \ No newline at end of file diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index bcd5682..3d98856 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -2275,7 +2275,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Game Backup Monitor[BR]Version: [PARAM] Beta ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details.. + ''' Looks up a localized string similar to Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details.. ''' Friend ReadOnly Property frmMain_About() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 3a20f38..f86cdc1 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -122,7 +122,7 @@ ..\Resources\Admin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Game Backup Monitor[BR]Version: [PARAM] Beta ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details. + Game Backup Monitor[BR]Version: [PARAM] ([PARAM])[BR]Build: [PARAM][BR][PARAM][BR][BR]This program comes with ABSOLUTELY NO WARRANTY.[BR]This is free software, and you are welcome to redistribute it under certain conditions.[BR][BR]See gpl-3.0.html in the program folder for details. The local manifest is clean.