From d1e292d4bf0a1e74a048024e4bc1b3afb3809e7b Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Sun, 13 Mar 2016 14:26:31 -0600 Subject: [PATCH] Cosmetic updates --- GBM/Forms/frmAdvancedImport.Designer.vb | 9 ++-- GBM/Forms/frmAdvancedImport.vb | 2 +- GBM/Forms/frmGameManager.vb | 60 +++++++++++++++++++++---- GBM/Forms/frmMain.vb | 29 ++++++------ GBM/My Project/Resources.Designer.vb | 19 +++++--- GBM/My Project/Resources.resx | 13 +++--- 6 files changed, 94 insertions(+), 38 deletions(-) diff --git a/GBM/Forms/frmAdvancedImport.Designer.vb b/GBM/Forms/frmAdvancedImport.Designer.vb index d606450..21aae4c 100644 --- a/GBM/Forms/frmAdvancedImport.Designer.vb +++ b/GBM/Forms/frmAdvancedImport.Designer.vb @@ -44,10 +44,11 @@ Partial Class frmAdvancedImport 'chkSelectAll ' Me.chkSelectAll.AutoSize = True - Me.chkSelectAll.Location = New System.Drawing.Point(18, 12) + Me.chkSelectAll.Location = New System.Drawing.Point(12, 12) Me.chkSelectAll.Name = "chkSelectAll" - Me.chkSelectAll.Size = New System.Drawing.Size(15, 14) + Me.chkSelectAll.Size = New System.Drawing.Size(70, 17) Me.chkSelectAll.TabIndex = 0 + Me.chkSelectAll.Text = "Select All" Me.chkSelectAll.UseVisualStyleBackColor = True ' 'lblGames @@ -81,9 +82,9 @@ Partial Class frmAdvancedImport ' Me.lstGames.CheckBoxes = True Me.lstGames.FullRowSelect = True - Me.lstGames.Location = New System.Drawing.Point(12, 32) + Me.lstGames.Location = New System.Drawing.Point(12, 35) Me.lstGames.Name = "lstGames" - Me.lstGames.Size = New System.Drawing.Size(560, 332) + Me.lstGames.Size = New System.Drawing.Size(560, 329) Me.lstGames.TabIndex = 2 Me.lstGames.UseCompatibleStateImageBehavior = False Me.lstGames.View = System.Windows.Forms.View.Details diff --git a/GBM/Forms/frmAdvancedImport.vb b/GBM/Forms/frmAdvancedImport.vb index 94d5905..ee374f9 100644 --- a/GBM/Forms/frmAdvancedImport.vb +++ b/GBM/Forms/frmAdvancedImport.vb @@ -24,7 +24,6 @@ Public Class frmAdvancedImport End Get End Property - Private Sub SelectToggle() Cursor.Current = Cursors.WaitCursor lstGames.BeginUpdate() @@ -126,6 +125,7 @@ Public Class frmAdvancedImport lblFilter.Text = frmAdvancedImport_lblFilter btnCancel.Text = frmAdvancedImport_btnCancel btnImport.Text = frmAdvancedImport_btnImport + chkSelectAll.Text = frmAdvancedImport_chkSelectAll chkSelectAll.Checked = True diff --git a/GBM/Forms/frmGameManager.vb b/GBM/Forms/frmGameManager.vb index 7262207..65a866b 100644 --- a/GBM/Forms/frmGameManager.vb +++ b/GBM/Forms/frmGameManager.vb @@ -895,6 +895,51 @@ Public Class frmGameManager IsLoading = False End Sub + Private Sub FolderSaveModeChange() + If chkFolderSave.Checked Then + btnInclude.Enabled = False + If txtFileType.Text <> String.Empty Then + txtFileType.Text = String.Empty + UpdateBuilderButtonLabel(txtFileType.Text, frmGameManager_IncludeShortcut, btnInclude, False) + End If + Else + btnInclude.Enabled = True + End If + End Sub + + Private Sub MonitorOnlyModeChange() + If chkMonitorOnly.Checked Then + txtSavePath.Text = String.Empty + chkFolderSave.Checked = True + chkTimeStamp.Checked = False + + If txtFileType.Text <> String.Empty Then + txtFileType.Text = String.Empty + UpdateBuilderButtonLabel(txtFileType.Text, frmGameManager_IncludeShortcut, btnInclude, False) + End If + If txtExclude.Text <> String.Empty Then + txtExclude.Text = String.Empty + UpdateBuilderButtonLabel(txtExclude.Text, frmGameManager_ExcludeShortcut, btnExclude, False) + End If + + lblSavePath.Enabled = False + btnSavePathBrowse.Enabled = False + txtSavePath.Enabled = False + chkFolderSave.Enabled = False + chkTimeStamp.Enabled = False + btnInclude.Enabled = False + btnExclude.Enabled = False + Else + lblSavePath.Enabled = True + btnSavePathBrowse.Enabled = True + txtSavePath.Enabled = True + chkFolderSave.Enabled = True + chkTimeStamp.Enabled = True + btnInclude.Enabled = True + btnExclude.Enabled = True + End If + End Sub + Private Sub EditApp() eCurrentMode = eModes.Edit ModeChange() @@ -1421,15 +1466,11 @@ Public Class frmGameManager End Sub Private Sub chkFolderSave_CheckedChanged(sender As Object, e As EventArgs) Handles chkFolderSave.CheckedChanged - If chkFolderSave.Checked Then - btnInclude.Enabled = False - If txtFileType.Text <> String.Empty Then - txtFileType.Text = String.Empty - UpdateBuilderButtonLabel(txtFileType.Text, frmGameManager_IncludeShortcut, btnInclude, False) - End If - Else - btnInclude.Enabled = True - End If + FolderSaveModeChange() + End Sub + + Private Sub chkMonitorOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkMonitorOnly.CheckedChanged + MonitorOnlyModeChange() End Sub Private Sub btnImport_Click(sender As Object, e As EventArgs) Handles btnImport.Click @@ -1447,4 +1488,5 @@ Public Class frmGameManager Private Sub btnExport_Click(sender As Object, e As EventArgs) Handles btnExport.Click ExportGameList() End Sub + End Class diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 9d3289b..b366861 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -65,7 +65,8 @@ Public Class frmMain Else Dim sPattern As String = "h:mm tt" lblLastActionTitle.Visible = True - lblLastAction.Text = sMessage & " at " & TimeOfDay.ToString(sPattern) + lblLastActionTitle.Text = frmMain_lblLastActionTitle & " [" & TimeOfDay.ToString(sPattern) & "]" + lblLastAction.Text = sMessage End If End Sub @@ -272,13 +273,13 @@ Public Class frmMain eCurrentOperation = eOperation.Backup OperationStarted(False) - If SupressBackup() Then - bDoBackup = False - UpdateLog(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.Name), False) - SetLastAction(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.CroppedName)) - OperationEnded() - Else - If oProcess.GameInfo.MonitorOnly = False Then + If oProcess.GameInfo.MonitorOnly = False Then + If SupressBackup() Then + bDoBackup = False + UpdateLog(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.Name), False) + SetLastAction(mgrCommon.FormatString(frmMain_ErrorBackupSessionLength, oProcess.GameInfo.CroppedName)) + OperationEnded() + Else If oSettings.DisableConfirmation Then bDoBackup = True Else @@ -290,13 +291,13 @@ Public Class frmMain SetLastAction(mgrCommon.FormatString(frmMain_ErrorBackupCancel, oProcess.GameInfo.CroppedName)) OperationEnded() End If - End If - Else - bDoBackup = False - UpdateLog(mgrCommon.FormatString(frmMain_MonitorEnded, oProcess.GameInfo.Name), False) - SetLastAction(mgrCommon.FormatString(frmMain_MonitorEnded, oProcess.GameInfo.CroppedName)) - OperationEnded() + End If End If + Else + bDoBackup = False + UpdateLog(mgrCommon.FormatString(frmMain_MonitorEnded, oProcess.GameInfo.Name), False) + SetLastAction(mgrCommon.FormatString(frmMain_MonitorEnded, oProcess.GameInfo.CroppedName)) + OperationEnded() End If If bDoBackup Then diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 67711e5..24be02f 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -726,6 +726,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Select All. + ''' + Friend ReadOnly Property frmAdvancedImport_chkSelectAll() As String + Get + Return ResourceManager.GetString("frmAdvancedImport_chkSelectAll", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Name. ''' @@ -2329,7 +2338,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] backup was cancelled due to session length. + ''' Looks up a localized string similar to [PARAM] backup was cancelled due to session length.. ''' Friend ReadOnly Property frmMain_ErrorBackupSessionLength() As String Get @@ -3935,7 +3944,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] backup completed. + ''' Looks up a localized string similar to [PARAM] backup completed.. ''' Friend ReadOnly Property mgrBackup_ActionComplete() As String Get @@ -3944,7 +3953,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] backup failed. + ''' Looks up a localized string similar to [PARAM] backup failed.. ''' Friend ReadOnly Property mgrBackup_ActionFailed() As String Get @@ -4259,7 +4268,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] backup restored. + ''' Looks up a localized string similar to [PARAM] backup restored.. ''' Friend ReadOnly Property mgrRestore_ActionComplete() As String Get @@ -4268,7 +4277,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to [PARAM] restore failed. + ''' Looks up a localized string similar to [PARAM] restore failed.. ''' Friend ReadOnly Property mgrRestore_ActionFailed() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index ac7abb7..b58419f 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -212,7 +212,7 @@ [PARAM] backup was cancelled. - [PARAM] backup was cancelled due to session length + [PARAM] backup was cancelled due to session length. [PARAM] backup was cancelled due to unknown path. @@ -1307,10 +1307,10 @@ Do you wish to manually set the game path? (Path will be saved) - [PARAM] backup completed + [PARAM] backup completed. - [PARAM] backup failed + [PARAM] backup failed. [PARAM] backup ([PARAM]) completed. @@ -1412,10 +1412,10 @@ [PARAM] was located in the following folder:[BR][BR][PARAM][BR][BR]Is this correct? - [PARAM] backup restored + [PARAM] backup restored. - [PARAM] restore failed + [PARAM] restore failed. The restore path [PARAM] does not exist.[BR][BR]Do you want to create the folder and continue? @@ -1585,4 +1585,7 @@ [Filtered] + + Select All + \ No newline at end of file