From e288c77ba851956b51a46d43670227fc4232cc97 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Fri, 10 Jun 2016 12:06:01 -0600 Subject: [PATCH] Changes for issue #52 --- GBM/Forms/frmSettings.Designer.vb | 481 ++++++++++++++++----------- GBM/Forms/frmSettings.resx | 3 - GBM/Forms/frmSettings.vb | 112 +++++-- GBM/Game Backup Monitor.vbproj | 3 - GBM/My Project/Resources.Designer.vb | 116 +++---- GBM/My Project/Resources.resx | 55 ++- GBM/Resources/custom_7z.png | Bin 1777 -> 0 bytes GBM/Resources/valid_7z.png | Bin 1944 -> 0 bytes GBM/Resources/warning_7z.png | Bin 1601 -> 0 bytes 9 files changed, 438 insertions(+), 332 deletions(-) delete mode 100644 GBM/Resources/custom_7z.png delete mode 100644 GBM/Resources/valid_7z.png delete mode 100644 GBM/Resources/warning_7z.png diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index a733900..21a36c3 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -22,21 +22,21 @@ Partial Class frmSettings 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.components = New System.ComponentModel.Container() Me.chkMonitorOnStartup = New System.Windows.Forms.CheckBox() Me.chkBackupConfirm = New System.Windows.Forms.CheckBox() - Me.grpGeneral = New System.Windows.Forms.GroupBox() + Me.grpStartup = New System.Windows.Forms.GroupBox() + Me.chkStartWindows = New System.Windows.Forms.CheckBox() + Me.chkStartToTray = New System.Windows.Forms.CheckBox() Me.chkAutoSaveLog = New System.Windows.Forms.CheckBox() Me.btnOptionalFields = New System.Windows.Forms.Button() Me.chkTimeTracking = New System.Windows.Forms.CheckBox() Me.chkSync = New System.Windows.Forms.CheckBox() - Me.chkStartWindows = New System.Windows.Forms.CheckBox() Me.chkShowDetectionTips = New System.Windows.Forms.CheckBox() - Me.chkStartToTray = New System.Windows.Forms.CheckBox() Me.grpPaths = New System.Windows.Forms.GroupBox() Me.btnBackupFolder = New System.Windows.Forms.Button() Me.lblBackupFolder = New System.Windows.Forms.Label() Me.txtBackupFolder = New System.Windows.Forms.TextBox() + Me.chkCreateFolder = New System.Windows.Forms.CheckBox() Me.btnSave = New System.Windows.Forms.Button() Me.btnCancel = New System.Windows.Forms.Button() Me.grpBackup = New System.Windows.Forms.GroupBox() @@ -46,26 +46,35 @@ Partial Class frmSettings Me.chkCheckSum = New System.Windows.Forms.CheckBox() Me.chkRestoreOnLaunch = New System.Windows.Forms.CheckBox() Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox() - Me.chkCreateFolder = New System.Windows.Forms.CheckBox() - Me.grp7z = New System.Windows.Forms.GroupBox() - Me.pbUtilityStatus = New System.Windows.Forms.PictureBox() + Me.grp7zGeneral = New System.Windows.Forms.GroupBox() + Me.cboCompression = New System.Windows.Forms.ComboBox() + Me.lblCompression = New System.Windows.Forms.Label() Me.btn7zLocation = New System.Windows.Forms.Button() Me.txt7zLocation = New System.Windows.Forms.TextBox() Me.lblLocation = New System.Windows.Forms.Label() Me.txt7zArguments = New System.Windows.Forms.TextBox() Me.lblArguments = New System.Windows.Forms.Label() Me.lbl7zCopyright = New System.Windows.Forms.Label() - Me.cboCompression = New System.Windows.Forms.ComboBox() - Me.lblCompression = New System.Windows.Forms.Label() Me.lbl7zProduct = New System.Windows.Forms.Label() Me.btnDefaults = New System.Windows.Forms.Button() - Me.ttUtilityStatus = New System.Windows.Forms.ToolTip(Me.components) - Me.grpGeneral.SuspendLayout() + Me.pnlBackup = New System.Windows.Forms.Panel() + Me.pnl7z = New System.Windows.Forms.Panel() + Me.grp7zAdvanced = New System.Windows.Forms.GroupBox() + Me.grp7zInformation = New System.Windows.Forms.GroupBox() + Me.pnlGeneral = New System.Windows.Forms.Panel() + Me.grpGameData = New System.Windows.Forms.GroupBox() + Me.lstSettings = New System.Windows.Forms.ListBox() + Me.grpStartup.SuspendLayout() Me.grpPaths.SuspendLayout() Me.grpBackup.SuspendLayout() CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() - Me.grp7z.SuspendLayout() - CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).BeginInit() + Me.grp7zGeneral.SuspendLayout() + Me.pnlBackup.SuspendLayout() + Me.pnl7z.SuspendLayout() + Me.grp7zAdvanced.SuspendLayout() + Me.grp7zInformation.SuspendLayout() + Me.pnlGeneral.SuspendLayout() + Me.grpGameData.SuspendLayout() Me.SuspendLayout() ' 'chkMonitorOnStartup @@ -81,69 +90,24 @@ Partial Class frmSettings 'chkBackupConfirm ' Me.chkBackupConfirm.AutoSize = True - Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 42) + Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 19) Me.chkBackupConfirm.Name = "chkBackupConfirm" Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17) Me.chkBackupConfirm.TabIndex = 1 Me.chkBackupConfirm.Text = "Disable backup confirmation" Me.chkBackupConfirm.UseVisualStyleBackColor = True ' - 'grpGeneral + 'grpStartup ' - Me.grpGeneral.Controls.Add(Me.chkAutoSaveLog) - Me.grpGeneral.Controls.Add(Me.btnOptionalFields) - Me.grpGeneral.Controls.Add(Me.chkTimeTracking) - Me.grpGeneral.Controls.Add(Me.chkSync) - Me.grpGeneral.Controls.Add(Me.chkStartWindows) - Me.grpGeneral.Controls.Add(Me.chkShowDetectionTips) - Me.grpGeneral.Controls.Add(Me.chkStartToTray) - Me.grpGeneral.Controls.Add(Me.chkMonitorOnStartup) - Me.grpGeneral.Location = New System.Drawing.Point(12, 12) - Me.grpGeneral.Name = "grpGeneral" - Me.grpGeneral.Size = New System.Drawing.Size(360, 187) - Me.grpGeneral.TabIndex = 0 - Me.grpGeneral.TabStop = False - Me.grpGeneral.Text = "General" - ' - 'chkAutoSaveLog - ' - Me.chkAutoSaveLog.AutoSize = True - Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 111) - Me.chkAutoSaveLog.Name = "chkAutoSaveLog" - Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17) - Me.chkAutoSaveLog.TabIndex = 7 - Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded" - Me.chkAutoSaveLog.UseVisualStyleBackColor = True - ' - 'btnOptionalFields - ' - Me.btnOptionalFields.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnOptionalFields.Location = New System.Drawing.Point(110, 153) - Me.btnOptionalFields.Name = "btnOptionalFields" - Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23) - Me.btnOptionalFields.TabIndex = 6 - Me.btnOptionalFields.Text = "Choose &Optional Fields..." - Me.btnOptionalFields.UseVisualStyleBackColor = True - ' - 'chkTimeTracking - ' - Me.chkTimeTracking.AutoSize = True - Me.chkTimeTracking.Location = New System.Drawing.Point(6, 134) - Me.chkTimeTracking.Name = "chkTimeTracking" - Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17) - Me.chkTimeTracking.TabIndex = 4 - Me.chkTimeTracking.Text = "Enable time tracking" - Me.chkTimeTracking.UseVisualStyleBackColor = True - ' - 'chkSync - ' - Me.chkSync.AutoSize = True - Me.chkSync.Location = New System.Drawing.Point(6, 157) - Me.chkSync.Name = "chkSync" - Me.chkSync.Size = New System.Drawing.Size(98, 17) - Me.chkSync.TabIndex = 5 - Me.chkSync.Text = "Enable syncing" - Me.chkSync.UseVisualStyleBackColor = True + Me.grpStartup.Controls.Add(Me.chkStartWindows) + Me.grpStartup.Controls.Add(Me.chkStartToTray) + Me.grpStartup.Controls.Add(Me.chkMonitorOnStartup) + Me.grpStartup.Location = New System.Drawing.Point(6, 12) + Me.grpStartup.Name = "grpStartup" + Me.grpStartup.Size = New System.Drawing.Size(354, 90) + Me.grpStartup.TabIndex = 0 + Me.grpStartup.TabStop = False + Me.grpStartup.Text = "Startup" ' 'chkStartWindows ' @@ -155,16 +119,6 @@ Partial Class frmSettings Me.chkStartWindows.Text = "Start with Windows" Me.chkStartWindows.UseVisualStyleBackColor = True ' - 'chkShowDetectionTips - ' - Me.chkShowDetectionTips.AutoSize = True - Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 88) - Me.chkShowDetectionTips.Name = "chkShowDetectionTips" - Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17) - Me.chkShowDetectionTips.TabIndex = 3 - Me.chkShowDetectionTips.Text = "Show detection notifications" - Me.chkShowDetectionTips.UseVisualStyleBackColor = True - ' 'chkStartToTray ' Me.chkStartToTray.AutoSize = True @@ -175,21 +129,72 @@ Partial Class frmSettings Me.chkStartToTray.Text = "Start to system tray" Me.chkStartToTray.UseVisualStyleBackColor = True ' + 'chkAutoSaveLog + ' + Me.chkAutoSaveLog.AutoSize = True + Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204) + Me.chkAutoSaveLog.Name = "chkAutoSaveLog" + Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17) + Me.chkAutoSaveLog.TabIndex = 7 + Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded" + Me.chkAutoSaveLog.UseVisualStyleBackColor = True + ' + 'btnOptionalFields + ' + Me.btnOptionalFields.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38) + Me.btnOptionalFields.Name = "btnOptionalFields" + Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23) + Me.btnOptionalFields.TabIndex = 6 + Me.btnOptionalFields.Text = "Choose &Optional Fields..." + Me.btnOptionalFields.UseVisualStyleBackColor = True + ' + 'chkTimeTracking + ' + Me.chkTimeTracking.AutoSize = True + Me.chkTimeTracking.Location = New System.Drawing.Point(6, 19) + Me.chkTimeTracking.Name = "chkTimeTracking" + Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17) + Me.chkTimeTracking.TabIndex = 4 + Me.chkTimeTracking.Text = "Enable time tracking" + Me.chkTimeTracking.UseVisualStyleBackColor = True + ' + 'chkSync + ' + Me.chkSync.AutoSize = True + Me.chkSync.Location = New System.Drawing.Point(6, 42) + Me.chkSync.Name = "chkSync" + Me.chkSync.Size = New System.Drawing.Size(98, 17) + Me.chkSync.TabIndex = 5 + Me.chkSync.Text = "Enable syncing" + Me.chkSync.UseVisualStyleBackColor = True + ' + 'chkShowDetectionTips + ' + Me.chkShowDetectionTips.AutoSize = True + Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181) + Me.chkShowDetectionTips.Name = "chkShowDetectionTips" + Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17) + Me.chkShowDetectionTips.TabIndex = 3 + Me.chkShowDetectionTips.Text = "Show detection notifications" + Me.chkShowDetectionTips.UseVisualStyleBackColor = True + ' 'grpPaths ' Me.grpPaths.Controls.Add(Me.btnBackupFolder) Me.grpPaths.Controls.Add(Me.lblBackupFolder) Me.grpPaths.Controls.Add(Me.txtBackupFolder) - Me.grpPaths.Location = New System.Drawing.Point(12, 205) + Me.grpPaths.Controls.Add(Me.chkCreateFolder) + Me.grpPaths.Location = New System.Drawing.Point(6, 158) Me.grpPaths.Name = "grpPaths" - Me.grpPaths.Size = New System.Drawing.Size(360, 60) - Me.grpPaths.TabIndex = 3 + Me.grpPaths.Size = New System.Drawing.Size(354, 70) + Me.grpPaths.TabIndex = 1 Me.grpPaths.TabStop = False Me.grpPaths.Text = "Paths" ' 'btnBackupFolder ' - Me.btnBackupFolder.Location = New System.Drawing.Point(327, 24) + Me.btnBackupFolder.Location = New System.Drawing.Point(313, 17) Me.btnBackupFolder.Name = "btnBackupFolder" Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20) Me.btnBackupFolder.TabIndex = 2 @@ -199,7 +204,7 @@ Partial Class frmSettings 'lblBackupFolder ' Me.lblBackupFolder.AutoSize = True - Me.lblBackupFolder.Location = New System.Drawing.Point(6, 27) + Me.lblBackupFolder.Location = New System.Drawing.Point(6, 20) Me.lblBackupFolder.Name = "lblBackupFolder" Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13) Me.lblBackupFolder.TabIndex = 0 @@ -207,15 +212,25 @@ Partial Class frmSettings ' 'txtBackupFolder ' - Me.txtBackupFolder.Location = New System.Drawing.Point(91, 24) + Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17) Me.txtBackupFolder.Name = "txtBackupFolder" - Me.txtBackupFolder.Size = New System.Drawing.Size(230, 20) + Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20) Me.txtBackupFolder.TabIndex = 1 ' + 'chkCreateFolder + ' + Me.chkCreateFolder.AutoSize = True + Me.chkCreateFolder.Location = New System.Drawing.Point(9, 43) + Me.chkCreateFolder.Name = "chkCreateFolder" + Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17) + Me.chkCreateFolder.TabIndex = 3 + Me.chkCreateFolder.Text = "Create a sub-folder for each game" + Me.chkCreateFolder.UseVisualStyleBackColor = True + ' 'btnSave ' Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSave.Location = New System.Drawing.Point(586, 326) + Me.btnSave.Location = New System.Drawing.Point(384, 321) Me.btnSave.Name = "btnSave" Me.btnSave.Size = New System.Drawing.Size(75, 23) Me.btnSave.TabIndex = 5 @@ -225,7 +240,7 @@ Partial Class frmSettings 'btnCancel ' Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(667, 326) + Me.btnCancel.Location = New System.Drawing.Point(465, 321) Me.btnCancel.Name = "btnCancel" Me.btnCancel.Size = New System.Drawing.Size(75, 23) Me.btnCancel.TabIndex = 6 @@ -240,19 +255,18 @@ Partial Class frmSettings Me.grpBackup.Controls.Add(Me.chkCheckSum) Me.grpBackup.Controls.Add(Me.chkRestoreOnLaunch) Me.grpBackup.Controls.Add(Me.chkOverwriteWarning) - Me.grpBackup.Controls.Add(Me.chkCreateFolder) Me.grpBackup.Controls.Add(Me.chkBackupConfirm) - Me.grpBackup.Location = New System.Drawing.Point(378, 12) + Me.grpBackup.Location = New System.Drawing.Point(6, 12) Me.grpBackup.Name = "grpBackup" - Me.grpBackup.Size = New System.Drawing.Size(360, 165) - Me.grpBackup.TabIndex = 2 + Me.grpBackup.Size = New System.Drawing.Size(354, 140) + Me.grpBackup.TabIndex = 0 Me.grpBackup.TabStop = False Me.grpBackup.Text = "Backup and Restore" ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(286, 135) + Me.lblMinutes.Location = New System.Drawing.Point(286, 112) Me.lblMinutes.Name = "lblMinutes" Me.lblMinutes.Size = New System.Drawing.Size(43, 13) Me.lblMinutes.TabIndex = 7 @@ -260,7 +274,7 @@ Partial Class frmSettings ' 'nudSupressBackupThreshold ' - Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 133) + Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 110) Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold" Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20) @@ -269,7 +283,7 @@ Partial Class frmSettings 'chkSupressBackup ' Me.chkSupressBackup.AutoSize = True - Me.chkSupressBackup.Location = New System.Drawing.Point(6, 134) + Me.chkSupressBackup.Location = New System.Drawing.Point(6, 111) Me.chkSupressBackup.Name = "chkSupressBackup" Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17) Me.chkSupressBackup.TabIndex = 5 @@ -279,7 +293,7 @@ Partial Class frmSettings 'chkCheckSum ' Me.chkCheckSum.AutoSize = True - Me.chkCheckSum.Location = New System.Drawing.Point(6, 88) + Me.chkCheckSum.Location = New System.Drawing.Point(6, 65) Me.chkCheckSum.Name = "chkCheckSum" Me.chkCheckSum.Size = New System.Drawing.Size(195, 17) Me.chkCheckSum.TabIndex = 3 @@ -289,7 +303,7 @@ Partial Class frmSettings 'chkRestoreOnLaunch ' Me.chkRestoreOnLaunch.AutoSize = True - Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 111) + Me.chkRestoreOnLaunch.Location = New System.Drawing.Point(6, 88) Me.chkRestoreOnLaunch.Name = "chkRestoreOnLaunch" Me.chkRestoreOnLaunch.Size = New System.Drawing.Size(257, 17) Me.chkRestoreOnLaunch.TabIndex = 4 @@ -299,100 +313,23 @@ Partial Class frmSettings 'chkOverwriteWarning ' Me.chkOverwriteWarning.AutoSize = True - Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 65) + Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 42) Me.chkOverwriteWarning.Name = "chkOverwriteWarning" Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17) Me.chkOverwriteWarning.TabIndex = 2 Me.chkOverwriteWarning.Text = "Show overwrite warning" Me.chkOverwriteWarning.UseVisualStyleBackColor = True ' - 'chkCreateFolder + 'grp7zGeneral ' - Me.chkCreateFolder.AutoSize = True - Me.chkCreateFolder.Location = New System.Drawing.Point(6, 19) - Me.chkCreateFolder.Name = "chkCreateFolder" - Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17) - Me.chkCreateFolder.TabIndex = 0 - Me.chkCreateFolder.Text = "Create a sub-folder for each game" - Me.chkCreateFolder.UseVisualStyleBackColor = True - ' - 'grp7z - ' - Me.grp7z.Controls.Add(Me.pbUtilityStatus) - Me.grp7z.Controls.Add(Me.btn7zLocation) - Me.grp7z.Controls.Add(Me.txt7zLocation) - Me.grp7z.Controls.Add(Me.lblLocation) - Me.grp7z.Controls.Add(Me.txt7zArguments) - Me.grp7z.Controls.Add(Me.lblArguments) - Me.grp7z.Controls.Add(Me.lbl7zCopyright) - Me.grp7z.Controls.Add(Me.cboCompression) - Me.grp7z.Controls.Add(Me.lblCompression) - Me.grp7z.Controls.Add(Me.lbl7zProduct) - Me.grp7z.Location = New System.Drawing.Point(378, 183) - Me.grp7z.Name = "grp7z" - Me.grp7z.Size = New System.Drawing.Size(360, 137) - Me.grp7z.TabIndex = 1 - Me.grp7z.TabStop = False - Me.grp7z.Text = "7z Options" - ' - 'pbUtilityStatus - ' - Me.pbUtilityStatus.Location = New System.Drawing.Point(319, 93) - Me.pbUtilityStatus.Name = "pbUtilityStatus" - Me.pbUtilityStatus.Size = New System.Drawing.Size(35, 35) - Me.pbUtilityStatus.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom - Me.pbUtilityStatus.TabIndex = 7 - Me.pbUtilityStatus.TabStop = False - ' - 'btn7zLocation - ' - Me.btn7zLocation.Location = New System.Drawing.Point(327, 70) - Me.btn7zLocation.Name = "btn7zLocation" - Me.btn7zLocation.Size = New System.Drawing.Size(27, 20) - Me.btn7zLocation.TabIndex = 5 - Me.btn7zLocation.Text = "..." - Me.btn7zLocation.UseVisualStyleBackColor = True - ' - 'txt7zLocation - ' - Me.txt7zLocation.Location = New System.Drawing.Point(110, 70) - Me.txt7zLocation.Name = "txt7zLocation" - Me.txt7zLocation.Size = New System.Drawing.Size(211, 20) - Me.txt7zLocation.TabIndex = 4 - ' - 'lblLocation - ' - Me.lblLocation.AutoSize = True - Me.lblLocation.Location = New System.Drawing.Point(6, 73) - Me.lblLocation.Name = "lblLocation" - Me.lblLocation.Size = New System.Drawing.Size(89, 13) - Me.lblLocation.TabIndex = 4 - Me.lblLocation.Text = "Custom Location:" - ' - 'txt7zArguments - ' - Me.txt7zArguments.Location = New System.Drawing.Point(110, 44) - Me.txt7zArguments.Name = "txt7zArguments" - Me.txt7zArguments.Size = New System.Drawing.Size(244, 20) - Me.txt7zArguments.TabIndex = 3 - ' - 'lblArguments - ' - Me.lblArguments.AutoSize = True - Me.lblArguments.Location = New System.Drawing.Point(6, 47) - Me.lblArguments.Name = "lblArguments" - Me.lblArguments.Size = New System.Drawing.Size(98, 13) - Me.lblArguments.TabIndex = 2 - Me.lblArguments.Text = "Custom Arguments:" - ' - 'lbl7zCopyright - ' - Me.lbl7zCopyright.AutoEllipsis = True - Me.lbl7zCopyright.Location = New System.Drawing.Point(9, 110) - Me.lbl7zCopyright.Name = "lbl7zCopyright" - Me.lbl7zCopyright.Size = New System.Drawing.Size(301, 17) - Me.lbl7zCopyright.TabIndex = 8 - Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.grp7zGeneral.Controls.Add(Me.cboCompression) + Me.grp7zGeneral.Controls.Add(Me.lblCompression) + Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12) + Me.grp7zGeneral.Name = "grp7zGeneral" + Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50) + Me.grp7zGeneral.TabIndex = 0 + Me.grp7zGeneral.TabStop = False + Me.grp7zGeneral.Text = "General" ' 'cboCompression ' @@ -400,7 +337,7 @@ Partial Class frmSettings Me.cboCompression.FormattingEnabled = True Me.cboCompression.Location = New System.Drawing.Point(110, 17) Me.cboCompression.Name = "cboCompression" - Me.cboCompression.Size = New System.Drawing.Size(244, 21) + Me.cboCompression.Size = New System.Drawing.Size(238, 21) Me.cboCompression.TabIndex = 1 ' 'lblCompression @@ -412,36 +349,161 @@ Partial Class frmSettings Me.lblCompression.TabIndex = 0 Me.lblCompression.Text = "Compression:" ' + 'btn7zLocation + ' + Me.btn7zLocation.Location = New System.Drawing.Point(313, 41) + Me.btn7zLocation.Name = "btn7zLocation" + Me.btn7zLocation.Size = New System.Drawing.Size(27, 20) + Me.btn7zLocation.TabIndex = 5 + Me.btn7zLocation.Text = "..." + Me.btn7zLocation.UseVisualStyleBackColor = True + ' + 'txt7zLocation + ' + Me.txt7zLocation.Location = New System.Drawing.Point(110, 41) + Me.txt7zLocation.Name = "txt7zLocation" + Me.txt7zLocation.Size = New System.Drawing.Size(197, 20) + Me.txt7zLocation.TabIndex = 4 + ' + 'lblLocation + ' + Me.lblLocation.AutoSize = True + Me.lblLocation.Location = New System.Drawing.Point(6, 44) + Me.lblLocation.Name = "lblLocation" + Me.lblLocation.Size = New System.Drawing.Size(89, 13) + Me.lblLocation.TabIndex = 4 + Me.lblLocation.Text = "Custom Location:" + ' + 'txt7zArguments + ' + Me.txt7zArguments.Location = New System.Drawing.Point(110, 15) + Me.txt7zArguments.Name = "txt7zArguments" + Me.txt7zArguments.Size = New System.Drawing.Size(238, 20) + Me.txt7zArguments.TabIndex = 3 + ' + 'lblArguments + ' + Me.lblArguments.AutoSize = True + Me.lblArguments.Location = New System.Drawing.Point(6, 20) + Me.lblArguments.Name = "lblArguments" + Me.lblArguments.Size = New System.Drawing.Size(98, 13) + Me.lblArguments.TabIndex = 2 + Me.lblArguments.Text = "Custom Arguments:" + ' + 'lbl7zCopyright + ' + Me.lbl7zCopyright.AutoEllipsis = True + Me.lbl7zCopyright.Location = New System.Drawing.Point(9, 34) + Me.lbl7zCopyright.Name = "lbl7zCopyright" + Me.lbl7zCopyright.Size = New System.Drawing.Size(339, 17) + Me.lbl7zCopyright.TabIndex = 8 + Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft + ' 'lbl7zProduct ' Me.lbl7zProduct.AutoEllipsis = True - Me.lbl7zProduct.Location = New System.Drawing.Point(6, 93) + Me.lbl7zProduct.Location = New System.Drawing.Point(9, 17) Me.lbl7zProduct.Name = "lbl7zProduct" - Me.lbl7zProduct.Size = New System.Drawing.Size(304, 17) + Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17) Me.lbl7zProduct.TabIndex = 7 - Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleRight + Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'btnDefaults ' - Me.btnDefaults.Location = New System.Drawing.Point(12, 326) + Me.btnDefaults.Location = New System.Drawing.Point(12, 321) Me.btnDefaults.Name = "btnDefaults" Me.btnDefaults.Size = New System.Drawing.Size(110, 23) Me.btnDefaults.TabIndex = 4 Me.btnDefaults.Text = "Set &Defaults" Me.btnDefaults.UseVisualStyleBackColor = True ' + 'pnlBackup + ' + Me.pnlBackup.Controls.Add(Me.grpBackup) + Me.pnlBackup.Controls.Add(Me.grpPaths) + Me.pnlBackup.Location = New System.Drawing.Point(180, 0) + Me.pnlBackup.Name = "pnlBackup" + Me.pnlBackup.Size = New System.Drawing.Size(367, 314) + Me.pnlBackup.TabIndex = 3 + ' + 'pnl7z + ' + Me.pnl7z.Controls.Add(Me.grp7zAdvanced) + Me.pnl7z.Controls.Add(Me.grp7zInformation) + Me.pnl7z.Controls.Add(Me.grp7zGeneral) + Me.pnl7z.Location = New System.Drawing.Point(180, 0) + Me.pnl7z.Name = "pnl7z" + Me.pnl7z.Size = New System.Drawing.Size(367, 314) + Me.pnl7z.TabIndex = 2 + ' + 'grp7zAdvanced + ' + Me.grp7zAdvanced.Controls.Add(Me.btn7zLocation) + Me.grp7zAdvanced.Controls.Add(Me.lblArguments) + Me.grp7zAdvanced.Controls.Add(Me.txt7zLocation) + Me.grp7zAdvanced.Controls.Add(Me.txt7zArguments) + Me.grp7zAdvanced.Controls.Add(Me.lblLocation) + Me.grp7zAdvanced.Location = New System.Drawing.Point(6, 68) + Me.grp7zAdvanced.Name = "grp7zAdvanced" + Me.grp7zAdvanced.Size = New System.Drawing.Size(354, 73) + Me.grp7zAdvanced.TabIndex = 2 + Me.grp7zAdvanced.TabStop = False + Me.grp7zAdvanced.Text = "Advanced" + ' + 'grp7zInformation + ' + Me.grp7zInformation.Controls.Add(Me.lbl7zProduct) + Me.grp7zInformation.Controls.Add(Me.lbl7zCopyright) + Me.grp7zInformation.Location = New System.Drawing.Point(6, 146) + Me.grp7zInformation.Name = "grp7zInformation" + Me.grp7zInformation.Size = New System.Drawing.Size(354, 63) + Me.grp7zInformation.TabIndex = 1 + Me.grp7zInformation.TabStop = False + Me.grp7zInformation.Text = "Utility Information" + ' + 'pnlGeneral + ' + Me.pnlGeneral.Controls.Add(Me.chkAutoSaveLog) + Me.pnlGeneral.Controls.Add(Me.grpGameData) + Me.pnlGeneral.Controls.Add(Me.chkShowDetectionTips) + Me.pnlGeneral.Controls.Add(Me.grpStartup) + Me.pnlGeneral.Location = New System.Drawing.Point(180, 0) + Me.pnlGeneral.Name = "pnlGeneral" + Me.pnlGeneral.Size = New System.Drawing.Size(367, 314) + Me.pnlGeneral.TabIndex = 1 + ' + 'grpGameData + ' + Me.grpGameData.Controls.Add(Me.chkTimeTracking) + Me.grpGameData.Controls.Add(Me.chkSync) + Me.grpGameData.Controls.Add(Me.btnOptionalFields) + Me.grpGameData.Location = New System.Drawing.Point(6, 106) + Me.grpGameData.Name = "grpGameData" + Me.grpGameData.Size = New System.Drawing.Size(354, 69) + Me.grpGameData.TabIndex = 1 + Me.grpGameData.TabStop = False + Me.grpGameData.Text = "Game Data" + ' + 'lstSettings + ' + Me.lstSettings.FormattingEnabled = True + Me.lstSettings.Location = New System.Drawing.Point(12, 12) + Me.lstSettings.Name = "lstSettings" + Me.lstSettings.Size = New System.Drawing.Size(162, 303) + Me.lstSettings.TabIndex = 7 + ' 'frmSettings ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(749, 361) + Me.ClientSize = New System.Drawing.Size(554, 361) + Me.Controls.Add(Me.lstSettings) Me.Controls.Add(Me.btnDefaults) - Me.Controls.Add(Me.grp7z) - Me.Controls.Add(Me.grpBackup) - Me.Controls.Add(Me.grpPaths) Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnSave) - Me.Controls.Add(Me.grpGeneral) + Me.Controls.Add(Me.pnl7z) + Me.Controls.Add(Me.pnlBackup) + Me.Controls.Add(Me.pnlGeneral) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.MaximizeBox = False Me.MinimizeBox = False @@ -450,22 +512,30 @@ Partial Class frmSettings Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Settings" - Me.grpGeneral.ResumeLayout(False) - Me.grpGeneral.PerformLayout() + Me.grpStartup.ResumeLayout(False) + Me.grpStartup.PerformLayout() Me.grpPaths.ResumeLayout(False) Me.grpPaths.PerformLayout() Me.grpBackup.ResumeLayout(False) Me.grpBackup.PerformLayout() CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() - Me.grp7z.ResumeLayout(False) - Me.grp7z.PerformLayout() - CType(Me.pbUtilityStatus, System.ComponentModel.ISupportInitialize).EndInit() + Me.grp7zGeneral.ResumeLayout(False) + Me.grp7zGeneral.PerformLayout() + Me.pnlBackup.ResumeLayout(False) + Me.pnl7z.ResumeLayout(False) + Me.grp7zAdvanced.ResumeLayout(False) + Me.grp7zAdvanced.PerformLayout() + Me.grp7zInformation.ResumeLayout(False) + Me.pnlGeneral.ResumeLayout(False) + Me.pnlGeneral.PerformLayout() + Me.grpGameData.ResumeLayout(False) + Me.grpGameData.PerformLayout() Me.ResumeLayout(False) End Sub Friend WithEvents chkMonitorOnStartup As System.Windows.Forms.CheckBox Friend WithEvents chkBackupConfirm As System.Windows.Forms.CheckBox - Friend WithEvents grpGeneral As System.Windows.Forms.GroupBox + Friend WithEvents grpStartup As System.Windows.Forms.GroupBox Friend WithEvents grpPaths As System.Windows.Forms.GroupBox Friend WithEvents txtBackupFolder As System.Windows.Forms.TextBox Friend WithEvents btnSave As System.Windows.Forms.Button @@ -485,7 +555,7 @@ Partial Class frmSettings Friend WithEvents lblMinutes As Label Friend WithEvents nudSupressBackupThreshold As NumericUpDown Friend WithEvents chkSupressBackup As CheckBox - Friend WithEvents grp7z As GroupBox + Friend WithEvents grp7zGeneral As GroupBox Friend WithEvents cboCompression As ComboBox Friend WithEvents lblCompression As Label Friend WithEvents lbl7zProduct As Label @@ -496,8 +566,13 @@ Partial Class frmSettings Friend WithEvents txt7zArguments As TextBox Friend WithEvents lblArguments As Label Friend WithEvents btnDefaults As Button - Friend WithEvents pbUtilityStatus As PictureBox - Friend WithEvents ttUtilityStatus As ToolTip Friend WithEvents btnOptionalFields As Button Friend WithEvents chkAutoSaveLog As CheckBox + Friend WithEvents pnlBackup As Panel + Friend WithEvents pnl7z As Panel + Friend WithEvents pnlGeneral As Panel + Friend WithEvents grpGameData As GroupBox + Friend WithEvents lstSettings As ListBox + Friend WithEvents grp7zAdvanced As GroupBox + Friend WithEvents grp7zInformation As GroupBox End Class diff --git a/GBM/Forms/frmSettings.resx b/GBM/Forms/frmSettings.resx index fdbc665..c4a320a 100644 --- a/GBM/Forms/frmSettings.resx +++ b/GBM/Forms/frmSettings.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - 32 diff --git a/GBM/Forms/frmSettings.vb b/GBM/Forms/frmSettings.vb index 8b67139..f58191b 100644 --- a/GBM/Forms/frmSettings.vb +++ b/GBM/Forms/frmSettings.vb @@ -86,7 +86,7 @@ Public Class frmSettings If oSettings.Custom7zLocation <> String.Empty Then If File.Exists(oSettings.Custom7zLocation) Then If Path.GetFileNameWithoutExtension(oSettings.Custom7zLocation) <> "7za" Then - mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Exclamation) + mgrCommon.ShowMessage(frmSettings_WarningLocation, MsgBoxStyle.Critical) End If Else mgrCommon.ShowMessage(frmSettings_ErrorLocation, oSettings.Custom7zLocation, MsgBoxStyle.Critical) @@ -113,12 +113,19 @@ Public Class frmSettings End If End Function - Private Sub Get7zInfo(ByVal sLocation As String) + Private Sub GetUtilityInfo(ByVal sLocation As String) Dim bDefault As Boolean = False + Dim sFileDescription As String + Dim sVersion As String + Dim sCopyright As String - 'Ignore this function when on Unix - If Not mgrCommon.IsUnix Then + 'Ignore this function when on Unix and hide the information data + If mgrCommon.IsUnix Then + grp7zInformation.Visible = False + Else Try + grp7zInformation.Visible = True + 'Use default when no custom location is set If sLocation = String.Empty Then sLocation = mgrPath.Default7zLocation @@ -127,31 +134,29 @@ Public Class frmSettings 'Get info Dim oFileInfo As FileVersionInfo = FileVersionInfo.GetVersionInfo(sLocation) - lbl7zProduct.Text = oFileInfo.FileDescription & " " & oFileInfo.ProductVersion - lbl7zCopyright.Text = oFileInfo.LegalCopyright - 'Set Status - If bDefault Then - If oSettings.Is7zUtilityValid Then - pbUtilityStatus.Image = Utility_Valid - ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title - ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Valid7z) - Else - pbUtilityStatus.Image = Utility_Invalid - ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title - ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Invalid7z) - End If + If oFileInfo.FileDescription = String.Empty Then + sFileDescription = App_NotAvailable Else - pbUtilityStatus.Image = Utility_Custom - ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title - ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Custom7z) + sFileDescription = oFileInfo.FileDescription End If + + If oFileInfo.ProductVersion = String.Empty Then + sVersion = App_NotAvailable + Else + sVersion = oFileInfo.ProductVersion + End If + + If oFileInfo.LegalCopyright = String.Empty Then + sCopyright = App_NotAvailable + Else + sCopyright = oFileInfo.LegalCopyright + End If + + lbl7zProduct.Text = sFileDescription & " - " & sVersion + lbl7zCopyright.Text = sCopyright Catch ex As Exception - lbl7zProduct.Text = String.Empty - lbl7zCopyright.Text = String.Empty - pbUtilityStatus.Image = Utility_Invalid - ttUtilityStatus.ToolTipTitle = frmSettings_ttUtilityStatus_Title - ttUtilityStatus.SetToolTip(pbUtilityStatus, frmSettings_ttUtilityStatus_Failure7z) + grp7zInformation.Visible = False End Try End If End Sub @@ -192,7 +197,7 @@ Public Class frmSettings End If 'Retrieve 7z Info - Get7zInfo(oSettings.Custom7zLocation) + GetUtilityInfo(oSettings.Custom7zLocation) 'Toggle Sync Button ToggleSyncButton() @@ -200,6 +205,7 @@ Public Class frmSettings Private Sub LoadCombos() Dim oComboItems As New List(Of KeyValuePair(Of Integer, String)) + Dim oSettingsItems As New List(Of KeyValuePair(Of Integer, String)) 'cboCompression cboCompression.ValueMember = "Key" @@ -213,6 +219,19 @@ Public Class frmSettings oComboItems.Add(New KeyValuePair(Of Integer, String)(9, frmSettings_cboCompression_Ultra)) cboCompression.DataSource = oComboItems + + 'lstSettings + lstSettings.ValueMember = "Key" + lstSettings.DisplayMember = "Value" + + oSettingsItems.Add(New KeyValuePair(Of Integer, String)(0, frmSettings_lstSettings_General)) + oSettingsItems.Add(New KeyValuePair(Of Integer, String)(1, frmSettings_lstSettings_BackupRestore)) + oSettingsItems.Add(New KeyValuePair(Of Integer, String)(2, frmSettings_lstSettings_7z)) + + lstSettings.DataSource = oSettingsItems + + 'Select Default + lstSettings.SelectedIndex = 0 End Sub Private Sub ToggleSyncButton() @@ -232,6 +251,27 @@ Public Class frmSettings End If End Sub + Private Sub ChangePanel() + If lstSettings.SelectedItems.Count > 0 Then + Dim oSettingsItem As KeyValuePair(Of Integer, String) = lstSettings.SelectedItems(0) + + Select Case oSettingsItem.Key + Case 0 + pnlGeneral.Visible = True + pnlBackup.Visible = False + pnl7z.Visible = False + Case 1 + pnlGeneral.Visible = False + pnlBackup.Visible = True + pnl7z.Visible = False + Case 2 + pnlGeneral.Visible = False + pnlBackup.Visible = False + pnl7z.Visible = True + End Select + End If + End Sub + Private Sub SetForm() 'Set Form Name Me.Text = frmSettings_FormName @@ -250,7 +290,8 @@ Public Class frmSettings grpPaths.Text = frmSettings_grpPaths btnBackupFolder.Text = frmSettings_btnBackupFolder lblBackupFolder.Text = frmSettings_lblBackupFolder - grpGeneral.Text = frmSettings_grpGeneral + grpStartup.Text = frmSettings_grpStartup + grpGameData.Text = frmSettings_grpGameData chkTimeTracking.Text = frmSettings_chkTimeTracking chkStartWindows.Text = frmSettings_chkStartWindows chkSync.Text = frmSettings_chkSync @@ -258,7 +299,9 @@ Public Class frmSettings chkAutoSaveLog.Text = frmSettings_chkAutoSaveLog chkStartToTray.Text = frmSettings_chkStartToTray chkMonitorOnStartup.Text = frmSettings_chkMonitorOnStartup - grp7z.Text = frmSettings_grp7z + grp7zGeneral.Text = frmSettings_grp7zGeneral + grp7zAdvanced.Text = frmSettings_grp7zAdvanced + grp7zInformation.Text = frmSettings_grp7zInformation lblCompression.Text = frmSettings_lblCompression btnDefaults.Text = frmSettings_btnDefaults lblArguments.Text = frmSettings_lblArguments @@ -270,6 +313,11 @@ Public Class frmSettings chkStartToTray.Enabled = False chkStartWindows.Enabled = False End If + + 'Handle Panels + pnlGeneral.Visible = False + pnlBackup.Visible = False + pnl7z.Visible = False End Sub Private Sub btnSave_Click(sender As System.Object, e As System.EventArgs) Handles btnSave.Click @@ -307,7 +355,7 @@ Public Class frmSettings sNewLocation = mgrCommon.OpenFileBrowser(frmSettings_Browse7za, "exe", frmSettings_7zaFileType, Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), False) If sNewLocation <> String.Empty Then txt7zLocation.Text = sNewLocation - Get7zInfo(txt7zLocation.Text) + GetUtilityInfo(txt7zLocation.Text) End If End Sub @@ -316,7 +364,7 @@ Public Class frmSettings End Sub Private Sub txt7zLocation_Leave(sender As Object, e As EventArgs) Handles txt7zLocation.Leave - Get7zInfo(txt7zLocation.Text.Trim) + GetUtilityInfo(txt7zLocation.Text.Trim) End Sub Private Sub btnDefaults_Click(sender As Object, e As EventArgs) Handles btnDefaults.Click @@ -330,4 +378,8 @@ Public Class frmSettings Private Sub chkSync_CheckedChanged(sender As Object, e As EventArgs) Handles chkSync.CheckedChanged ToggleSyncButton() End Sub + + Private Sub lstSettings_SelectedValueChanged(sender As Object, e As EventArgs) Handles lstSettings.SelectedValueChanged + ChangePanel() + End Sub End Class \ No newline at end of file diff --git a/GBM/Game Backup Monitor.vbproj b/GBM/Game Backup Monitor.vbproj index d76079d..b4ace13 100644 --- a/GBM/Game Backup Monitor.vbproj +++ b/GBM/Game Backup Monitor.vbproj @@ -338,9 +338,6 @@ PreserveNewest - - - PreserveNewest diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 06a9a03..246f655 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -132,6 +132,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to N/A. + ''' + Friend ReadOnly Property App_NotAvailable() As String + Get + Return ResourceManager.GetString("App_NotAvailable", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to http://mikemaximus.github.io/gbm-web/GBM_Official.xml. ''' @@ -3382,11 +3391,29 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to 7-Zip Options. + ''' Looks up a localized string similar to Advanced. ''' - Friend ReadOnly Property frmSettings_grp7z() As String + Friend ReadOnly Property frmSettings_grp7zAdvanced() As String Get - Return ResourceManager.GetString("frmSettings_grp7z", resourceCulture) + Return ResourceManager.GetString("frmSettings_grp7zAdvanced", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to General. + ''' + Friend ReadOnly Property frmSettings_grp7zGeneral() As String + Get + Return ResourceManager.GetString("frmSettings_grp7zGeneral", resourceCulture) + End Get + End Property + + ''' + ''' Looks up a localized string similar to Utility Information. + ''' + Friend ReadOnly Property frmSettings_grp7zInformation() As String + Get + Return ResourceManager.GetString("frmSettings_grp7zInformation", resourceCulture) End Get End Property @@ -3400,11 +3427,11 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to General. + ''' Looks up a localized string similar to Game Data. ''' - Friend ReadOnly Property frmSettings_grpGeneral() As String + Friend ReadOnly Property frmSettings_grpGameData() As String Get - Return ResourceManager.GetString("frmSettings_grpGeneral", resourceCulture) + Return ResourceManager.GetString("frmSettings_grpGameData", resourceCulture) End Get End Property @@ -3417,6 +3444,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Looks up a localized string similar to Startup. + ''' + Friend ReadOnly Property frmSettings_grpStartup() As String + Get + Return ResourceManager.GetString("frmSettings_grpStartup", resourceCulture) + End Get + End Property + ''' ''' Looks up a localized string similar to Custom Arguments:. ''' @@ -3463,47 +3499,29 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to GBM is using a custom 7-Zip utility, it cannot be verified.. + ''' Looks up a localized string similar to 7-Zip. ''' - Friend ReadOnly Property frmSettings_ttUtilityStatus_Custom7z() As String + Friend ReadOnly Property frmSettings_lstSettings_7z() As String Get - Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Custom7z", resourceCulture) + Return ResourceManager.GetString("frmSettings_lstSettings_7z", resourceCulture) End Get End Property ''' - ''' Looks up a localized string similar to GBM could not verify the custom 7-Zip utility.. + ''' Looks up a localized string similar to Backup and Restore. ''' - Friend ReadOnly Property frmSettings_ttUtilityStatus_Failure7z() As String + Friend ReadOnly Property frmSettings_lstSettings_BackupRestore() As String Get - Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Failure7z", resourceCulture) + Return ResourceManager.GetString("frmSettings_lstSettings_BackupRestore", resourceCulture) End Get End Property ''' - ''' Looks up a localized string similar to GBM's default 7-Zip utility has failed verification, it cannot be used.. + ''' Looks up a localized string similar to General. ''' - Friend ReadOnly Property frmSettings_ttUtilityStatus_Invalid7z() As String + Friend ReadOnly Property frmSettings_lstSettings_General() As String Get - Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Invalid7z", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to 7-Zip Status. - ''' - Friend ReadOnly Property frmSettings_ttUtilityStatus_Title() As String - Get - Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Title", resourceCulture) - End Get - End Property - - ''' - ''' Looks up a localized string similar to GBM is using the default 7-Zip utility, it has been verified.. - ''' - Friend ReadOnly Property frmSettings_ttUtilityStatus_Valid7z() As String - Get - Return ResourceManager.GetString("frmSettings_ttUtilityStatus_Valid7z", resourceCulture) + Return ResourceManager.GetString("frmSettings_lstSettings_General", resourceCulture) End Get End Property @@ -3517,7 +3535,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to You have chosen a custom utility that does not appear to be 7-Zip Console (7za). GBM only supports the use of 7-Zip.. + ''' Looks up a localized string similar to You have chosen a custom utility that does not appear to be 7-Zip. [BR][BR]GBM only supports the use of 7-Zip Console (7za).. ''' Friend ReadOnly Property frmSettings_WarningLocation() As String Get @@ -4788,35 +4806,5 @@ Namespace My.Resources Return ResourceManager.GetString("mgrXML_ErrorImportFailure", resourceCulture) End Get End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Utility_Custom() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Utility_Custom", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Utility_Invalid() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Utility_Invalid", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property Utility_Valid() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("Utility_Valid", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property End Module End Namespace diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index 707e639..b9a07e6 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1120,8 +1120,8 @@ Backup and Restore - - General + + Startup Paths @@ -1525,8 +1525,8 @@ Ultra - - 7-Zip Options + + General Compression: @@ -1625,35 +1625,11 @@ The custom 7-Zip location [PARAM] does not exist. - You have chosen a custom utility that does not appear to be 7-Zip Console (7za). GBM only supports the use of 7-Zip. + You have chosen a custom utility that does not appear to be 7-Zip. [BR][BR]GBM only supports the use of 7-Zip Console (7za). 7-Zip (7za.exe) is invalid and has been prevented from running. - - ..\Resources\custom_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\valid_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\warning_7z.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - GBM is using a custom 7-Zip utility, it cannot be verified. - - - GBM could not verify the custom 7-Zip utility. - - - GBM's default 7-Zip utility has failed verification, it cannot be used. - - - 7-Zip Status - - - GBM is using the default 7-Zip utility, it has been verified. - Quick Filter: @@ -1699,4 +1675,25 @@ Autosave log when max length is exceeded + + Game Data + + + 7-Zip + + + Backup and Restore + + + General + + + Advanced + + + Utility Information + + + N/A + \ No newline at end of file diff --git a/GBM/Resources/custom_7z.png b/GBM/Resources/custom_7z.png deleted file mode 100644 index 9ab0479a246a9244264a1f6fac80243d0d32f74c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1777 zcmVH#w;Q^iqh?vztFg~FVMj{Ve@WDilMvXkFt3n6_ zlLZMVh_s4aN=tXQ-JPA8bMZgZme9JTGt&Yga*~tIp6;IWfB*Mi&k!L5+{#0NTYTIG za2voRhgNNo5E6Q$ZTpUBu4FyLbsfsM)ny7$qyoxJ03Gui1GhC0S3OQsQ0OfV!rA;_mtCo(w=BJ{ z^M(M}@b&&wZDM+6cCx`*(42r63Vy)@=y3%&AyNvO6U0D3lfs~$g6>uye`)Z2bOMYi(_9Rtj$u z4NjF9up}?;NH;@p8?myt^ zB*2oV9`QdPIC>oR{#k&A)ZIZK0H`{sHSt8Ot|5a9%OYpuwO<`-Z>q1g8si2W>34u) zEDtj0^8tAD{sllO^{0H6Yr%dmfJ-aT4XHd!$`CpeUoj;$mVRhvBmC0mLWT0cwoG6s zvWyJ*EZ3xff&Bq>tD3byDsCD-c7|qP%@>E-Q_1?4ix}K5WA+THeL4F)GRlt>Me*0d z?7=vilA;5N87*tR9G``884yJ2n3br5qj?u-$Y^q5+8p@kyMtieGspj&J$V+_QecE& zV2A}&f+o|Q(lH(jRin_VkF%*eX3XeXIJ+5+ApnR_-1(8HaM}NBHYB4bIrJfSun6V; zOD%g=THS#d;6$~WYEAe(UqL#_P-F-ybn!9@-al$hnuIwm896ryMMaBHt!gY(2LPl^ zQ#B}-(fLU5mcc%E23E`hSkyNEiVw)YXU_M)&fiW$&8&G503Zv3$k`Sc06I`x5gnIt z6rO~LK8YEyyLSMdrDx!o#jRJ?A6$@tIj8o+Mb0BpK+&P4Oo5%4A?00p8#JRPoc*K2 z>C+ma4|+jW)hnS?YH?O$0{)@V05B$enF0f#d?=KGoDm#YRPh)!MFZLQw#4zaaD|&jknIv7CZG5*Rfi$Un6J{C3krncOe{ z+$?cj5Sj^?1R<;^S1V6MBqzqwT52B~9PH4tfveF28(-|kzBDV_J4#uoDpJmB{>F!W zAk@UOy-Ee!OecHj%@y6Ds!`8%GrU~3G;AXYHt{#Zgak#?LG3e-W6eyG>Q(}qi4IlKb1EnaMUP!GB4HN`dr$Vlw`hSP$ z(5uHmy;f0&LUPXmRxafko;_g&9OPo_?l(Sb1>MLhW-Wp+M!q!lw_3x(^GYc%yoz;t z+w#d@Y>kYT*FSA1T5N{|;YTHz;id|NFFb}{in+%|;ib2og_3aXwZ zW*k8n=#VNzDp$uA-{|;4YTha53G=MK-+g83FLy`A%(XjHVAf@bZd$~M59J7=hG#>b zi_R*f)?FKCB}=&X!nqwCg&XpMqj}x#cI?2?M31$A&xS59fRGO|hLo!=1;lW(!)2xG z%9~uN`7U5I-Sgh+8}ou=>}XuKr(ND5`HaXI@3T>@eiB1C(AH&)7gTDTXZqe>b#q=Z zjU5fI?Mew%wU7a9zHyS#vJXGx@Vp%1G+X%a)$8|??^YVOUv%FF@P7yJuK)u8f=u0t T0Lr@X00000NkvXXu0mjfnY2RJ diff --git a/GBM/Resources/valid_7z.png b/GBM/Resources/valid_7z.png deleted file mode 100644 index d48b3a5aeeffa4321a961f750394f55771c35e73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1944 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