dunestorm/GBM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for issue #36

Browse Source
This commit is contained in:
Michael J. Seiferling
2016-02-24 11:01:43 -06:00
parent 8222f518f6
commit a7b97912f2
4 changed files with 183 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GBM/Forms/frmMain.Designer.vb
Generated
+26 -25
View File
@@ -39,6 +39,9 @@ Partial Class frmMain
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.gMonTraySep1 = New System.Windows.Forms.ToolStripSeparator()
Me.gMonTrayExit = New System.Windows.Forms.ToolStripMenuItem()
Me.bwMonitor = New System.ComponentModel.BackgroundWorker()
@@ -82,9 +85,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.gMonTrayToolsLog = New System.Windows.Forms.ToolStripMenuItem()
Me.gMonTrayLogClear = New System.Windows.Forms.ToolStripMenuItem()
Me.gMonTrayLogSave = New System.Windows.Forms.ToolStripMenuItem()
Me.gMonTrayMenu.SuspendLayout()
Me.gMonStatusStrip.SuspendLayout()
Me.gMonMainMenu.SuspendLayout()
@@ -105,7 +105,7 @@ Partial Class frmMain
'
Me.gMonTrayMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.gMonTrayNotification, Me.gMonTrayShow, Me.gMonTraySep2, Me.gMonTrayMon, Me.gMonTraySettings, Me.gMonTraySetup, Me.gMonTrayTools, Me.gMonTraySep1, Me.gMonTrayExit})
Me.gMonTrayMenu.Name = "gMonTrayMenu"
Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 192)
Me.gMonTrayMenu.Size = New System.Drawing.Size(162, 170)
'
'gMonTrayNotification
'
@@ -187,6 +187,25 @@ Partial Class frmMain
Me.gMonTrayToolsCompact.Size = New System.Drawing.Size(184, 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.Text = "&Log"
'
'gMonTrayLogClear
'
Me.gMonTrayLogClear.Name = "gMonTrayLogClear"
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(101, 22)
Me.gMonTrayLogSave.Text = "&Save"
'
'gMonTraySep1
'
Me.gMonTraySep1.Name = "gMonTraySep1"
@@ -362,13 +381,13 @@ Partial Class frmMain
'gMonLogClear
'
Me.gMonLogClear.Name = "gMonLogClear"
Me.gMonLogClear.Size = New System.Drawing.Size(152, 22)
Me.gMonLogClear.Size = New System.Drawing.Size(101, 22)
Me.gMonLogClear.Text = "&Clear"
'
'gMonLogSave
'
Me.gMonLogSave.Name = "gMonLogSave"
Me.gMonLogSave.Size = New System.Drawing.Size(152, 22)
Me.gMonLogSave.Size = New System.Drawing.Size(101, 22)
Me.gMonLogSave.Text = "&Save"
'
'gMonHelp
@@ -508,25 +527,6 @@ Partial Class frmMain
Me.pbTime.TabIndex = 18
Me.pbTime.TabStop = False
'
'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.Text = "&Log"
'
'gMonTrayLogClear
'
Me.gMonTrayLogClear.Name = "gMonTrayLogClear"
Me.gMonTrayLogClear.Size = New System.Drawing.Size(152, 22)
Me.gMonTrayLogClear.Text = "&Clear"
'
'gMonTrayLogSave
'
Me.gMonTrayLogSave.Name = "gMonTrayLogSave"
Me.gMonTrayLogSave.Size = New System.Drawing.Size(152, 22)
Me.gMonTrayLogSave.Text = "&Save"
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -549,6 +549,7 @@ Partial Class frmMain
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
Me.MainMenuStrip = Me.gMonMainMenu
Me.MaximizeBox = False
Me.MinimizeBox = False
GBM/Forms/frmMain.vb
+52
View File
@@ -545,6 +545,51 @@ Public Class frmMain
End Function
'Functions handling the opening of other windows
Private Sub OpenDevConsole()
Dim sFullCommand As String
Dim sCommand As String()
sFullCommand = InputBox(frmMain_EnterCommand, frmMain_DeveloperConsole)
If sFullCommand <> String.Empty Then
sCommand = sFullCommand.Split(":")
'Parse Command
Select Case sCommand(0)
Case "SQL"
Dim oDatabase As mgrSQLite
Dim bSuccess As Boolean
'Check Paramters
If sCommand.Length < 3 Then
mgrCommon.ShowMessage(frmMain_ErrorMissingParams, sCommand(0), MsgBoxStyle.Exclamation)
Exit Select
End If
If sCommand(1) = "Local" Then
oDatabase = New mgrSQLite(mgrSQLite.Database.Local)
ElseIf sCommand(1) = "Remote" Then
oDatabase = New mgrSQLite(mgrSQLite.Database.Remote)
Else
mgrCommon.ShowMessage(frmMain_ErrorCommandBadParam, New String() {sCommand(1), sCommand(0)}, MsgBoxStyle.Exclamation)
Exit Select
End If
bSuccess = oDatabase.RunParamQuery(sCommand(2), New Hashtable)
If bSuccess Then
mgrCommon.ShowMessage(frmMain_CommandSucess, MsgBoxStyle.Exclamation)
Else
mgrCommon.ShowMessage(frmMain_CommandFail, MsgBoxStyle.Exclamation)
End If
Case Else
mgrCommon.ShowMessage(frmMain_ErrorCommandInvalid, sCommand(0), MsgBoxStyle.Exclamation)
End Select
End If
End Sub
Private Sub OpenAbout()
Dim iProcessType As System.Reflection.ProcessorArchitecture = System.Reflection.AssemblyName.GetAssemblyName(Application.ExecutablePath()).ProcessorArchitecture
Dim sVersion As String = My.Application.Info.Version.Major & "." & My.Application.Info.Version.Minor
@@ -1518,4 +1563,11 @@ Public Class frmMain
Private Sub txtGameInfo_Enter(sender As Object, e As EventArgs)
btnLogToggle.Focus()
End Sub
Private Sub frmMain_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
If e.KeyCode = Keys.Oemtilde AndAlso e.Modifiers = Keys.Control Then
OpenDevConsole()
End If
End Sub
End Class
GBM/My Project/Resources.Designer.vb
Generated
+84 -21
View File
@@ -2103,6 +2103,24 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The command has failed..
'''</summary>
Friend ReadOnly Property frmMain_CommandFail() As String
Get
Return ResourceManager.GetString("frmMain_CommandFail", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The command was executed successfully..
'''</summary>
Friend ReadOnly Property frmMain_CommandSucess() As String
Get
Return ResourceManager.GetString("frmMain_CommandSucess", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Do you wish to backup data from [PARAM]?.
'''</summary>
@@ -2111,7 +2129,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmBackup", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Are you sure you want to clear the log?.
'''</summary>
@@ -2120,7 +2138,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmLogClear", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to This tool removes orphaned backup information from the local manifest based on the current backup folder. Data can become orphaned when backups are deleted by various computers that share the same backup folder on a cloud or network.[BR][BR]When alternating between different backup folders you should NOT use this tool.[BR][BR]Do you wish to proceed?.
'''</summary>
@@ -2129,7 +2147,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmManifestClean", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Do you wish to cancel the monitoring of [PARAM]?[BR][BR]Warning: When monitoring is cancelled, session time is NOT saved..
'''</summary>
@@ -2138,7 +2156,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmMonitorCancel", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to This will rebuild all databases and shrink them to an optimal size.[BR]This should only be used if your gbm.s3db files are becoming very large.[BR][BR]Do you wish to continue?.
'''</summary>
@@ -2147,7 +2165,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmRebuild", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Do you want to restart Game Backup Monitor as Administrator?.
'''</summary>
@@ -2156,7 +2174,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ConfirmRunAsAdmin", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Game Backup Monitor Log.
'''</summary>
@@ -2165,7 +2183,25 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_DefaultLogFileName", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Developer Console.
'''</summary>
Friend ReadOnly Property frmMain_DeveloperConsole() As String
Get
Return ResourceManager.GetString("frmMain_DeveloperConsole", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Enter Command.
'''</summary>
Friend ReadOnly Property frmMain_EnterCommand() As String
Get
Return ResourceManager.GetString("frmMain_EnterCommand", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] is a 64-bit game, GBM cannot detect the required information to save your backup..
'''</summary>
@@ -2174,7 +2210,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_Error64Backup", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to 7-Zip was not found in the Game Backup Monitor utilities folder. The application cannot continue..
'''</summary>
@@ -2183,7 +2219,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_Error7zip", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] is running as Administrator and GBM is not, GBM cannot detect the required information to save your backup..
'''</summary>
@@ -2192,7 +2228,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorAdminBackup", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] is running as Administrator and GBM is not.[BR]You cannot cancel monitoring at this time.[BR][BR]Run GBM as Administrator to prevent this issue..
'''</summary>
@@ -2201,7 +2237,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorAdminDetect", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Game Backup Monitor is already running as Administrator..
'''</summary>
@@ -2210,7 +2246,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorAlreadyAdmin", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to GBM is running from a new location, the Windows startup entry has been updated..
'''</summary>
@@ -2219,7 +2255,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorAppLocationChanged", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] backup was cancelled..
'''</summary>
@@ -2228,7 +2264,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorBackupCancel", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] backup was cancelled due to session length..
'''</summary>
@@ -2237,7 +2273,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorBackupSessionLength", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] backup was cancelled due to unknown path..
'''</summary>
@@ -2246,7 +2282,25 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorBackupUnknownPath", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Bad parameter ([PARAM]) for command [PARAM]..
'''</summary>
Friend ReadOnly Property frmMain_ErrorCommandBadParam() As String
Get
Return ResourceManager.GetString("frmMain_ErrorCommandBadParam", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The command [PARAM] was not recognized..
'''</summary>
Friend ReadOnly Property frmMain_ErrorCommandInvalid() As String
Get
Return ResourceManager.GetString("frmMain_ErrorCommandInvalid", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The following monitored game(s) contain a custom path variable that is not set.[BR][PARAM][BR][BR]You will encounter backup/restore errors with these games until the variables are set..
'''</summary>
@@ -2255,7 +2309,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorCustomVariable", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Your local GBM data (Version [PARAM]) is too new for your version of GBM (Version [PARAM]).[BR][BR]Please upgrade GBM or restore the database file appropriate for your version. The application cannot proceed..
'''</summary>
@@ -2264,7 +2318,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorDBVerLocal", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The GBM data (Version [PARAM]) in your backup folder is too new for your version of GBM (Version [PARAM])[BR][BR]All computers sharing a backup folder must use the same version of GBM. The application cannot proceed..
'''</summary>
@@ -2273,7 +2327,16 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorDBVerRemote", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to The command [PARAM] requires more parameters..
'''</summary>
Friend ReadOnly Property frmMain_ErrorMissingParams() As String
Get
Return ResourceManager.GetString("frmMain_ErrorMissingParams", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Multiple possible 64-bit games have been detected, GBM cannot detect the path to identify your game or save your backup.[BR][BR]Please install the 64-bit version of GBM to detect and backup this game properly..
'''</summary>
@@ -2282,7 +2345,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorMulti64", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to Multiple possible games have been detected running as Administrator and GBM is not, GBM cannot detect the path to identify your game or save your backup.[BR][BR]Please run GBM as Administrator to properly detect and backup this game..
'''</summary>
@@ -2291,7 +2354,7 @@ Namespace My.Resources
Return ResourceManager.GetString("frmMain_ErrorMultiAdmin", resourceCulture)
End Get
End Property
'''<summary>
''' Looks up a localized string similar to [PARAM] uses a relative path and has never been detected on this computer..
'''</summary>
GBM/My Project/Resources.resx
+21
View File
@@ -1537,4 +1537,25 @@
<data name="frmSettings_lblCompression" xml:space="preserve">
<value>Compression:</value>
</data>
<data name="frmMain_CommandFail" xml:space="preserve">
<value>The command has failed.</value>
</data>
<data name="frmMain_CommandSucess" xml:space="preserve">
<value>The command was executed successfully.</value>
</data>
<data name="frmMain_DeveloperConsole" xml:space="preserve">
<value>Developer Console</value>
</data>
<data name="frmMain_EnterCommand" xml:space="preserve">
<value>Enter Command</value>
</data>
<data name="frmMain_ErrorCommandBadParam" xml:space="preserve">
<value>Bad parameter ([PARAM]) for command [PARAM].</value>
</data>
<data name="frmMain_ErrorCommandInvalid" xml:space="preserve">
<value>The command [PARAM] was not recognized.</value>
</data>
<data name="frmMain_ErrorMissingParams" xml:space="preserve">
<value>The command [PARAM] requires more parameters.</value>
</data>
</root>