From 4e7eb5846390fd33561d767b504a0fe4f60ff085 Mon Sep 17 00:00:00 2001 From: "Michael J. Seiferling" Date: Tue, 28 Feb 2017 15:41:57 -0600 Subject: [PATCH] More label updates --- GBM/Forms/frmGameManager.Designer.vb | 26 +-- GBM/Forms/frmSettings.Designer.vb | 271 +++++++++++---------------- GBM/My Project/Resources.Designer.vb | 4 +- GBM/My Project/Resources.resx | 4 +- 4 files changed, 130 insertions(+), 175 deletions(-) diff --git a/GBM/Forms/frmGameManager.Designer.vb b/GBM/Forms/frmGameManager.Designer.vb index 856fcac..8ed79ed 100644 --- a/GBM/Forms/frmGameManager.Designer.vb +++ b/GBM/Forms/frmGameManager.Designer.vb @@ -28,6 +28,7 @@ Partial Class frmGameManager Me.btnBackup = New System.Windows.Forms.Button() Me.btnClose = New System.Windows.Forms.Button() Me.grpConfig = New System.Windows.Forms.GroupBox() + Me.chkCleanFolder = New System.Windows.Forms.CheckBox() Me.lblLimit = New System.Windows.Forms.Label() Me.nudLimit = New System.Windows.Forms.NumericUpDown() Me.btnExclude = New System.Windows.Forms.Button() @@ -95,7 +96,6 @@ Partial Class frmGameManager Me.cmsDeleteBackup = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cmsDeleteOne = New System.Windows.Forms.ToolStripMenuItem() Me.cmsDeleteAll = New System.Windows.Forms.ToolStripMenuItem() - Me.chkCleanFolder = New System.Windows.Forms.CheckBox() Me.grpConfig.SuspendLayout() CType(Me.nudLimit, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpExtra.SuspendLayout() @@ -178,6 +178,16 @@ Partial Class frmGameManager Me.grpConfig.TabStop = False Me.grpConfig.Text = "Configuration" ' + 'chkCleanFolder + ' + Me.chkCleanFolder.AutoSize = True + Me.chkCleanFolder.Location = New System.Drawing.Point(329, 101) + Me.chkCleanFolder.Name = "chkCleanFolder" + Me.chkCleanFolder.Size = New System.Drawing.Size(136, 17) + Me.chkCleanFolder.TabIndex = 11 + Me.chkCleanFolder.Text = "Delete folder on restore" + Me.chkCleanFolder.UseVisualStyleBackColor = True + ' 'lblLimit ' Me.lblLimit.AutoSize = True @@ -720,10 +730,10 @@ Partial Class frmGameManager Me.optPendingRestores.AutoSize = True Me.optPendingRestores.Location = New System.Drawing.Point(6, 64) Me.optPendingRestores.Name = "optPendingRestores" - Me.optPendingRestores.Size = New System.Drawing.Size(122, 17) + Me.optPendingRestores.Size = New System.Drawing.Size(134, 17) Me.optPendingRestores.TabIndex = 2 Me.optPendingRestores.TabStop = True - Me.optPendingRestores.Text = "New Saves Pending" + Me.optPendingRestores.Text = "New Backups Pending" Me.optPendingRestores.UseVisualStyleBackColor = True ' 'optAllGames @@ -809,16 +819,6 @@ Partial Class frmGameManager Me.cmsDeleteAll.Size = New System.Drawing.Size(114, 22) Me.cmsDeleteAll.Text = "&All Files" ' - 'chkCleanFolder - ' - Me.chkCleanFolder.AutoSize = True - Me.chkCleanFolder.Location = New System.Drawing.Point(329, 101) - Me.chkCleanFolder.Name = "chkCleanFolder" - Me.chkCleanFolder.Size = New System.Drawing.Size(132, 17) - Me.chkCleanFolder.TabIndex = 11 - Me.chkCleanFolder.Text = "Clean folder on restore" - Me.chkCleanFolder.UseVisualStyleBackColor = True - ' 'frmGameManager ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index c2ae984..70c342a 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -57,6 +57,8 @@ Partial Class frmSettings Me.chkCheckSum = New System.Windows.Forms.CheckBox() Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox() Me.grpBackupHandling = New System.Windows.Forms.GroupBox() + Me.chkAutoRestore = New System.Windows.Forms.CheckBox() + Me.chkRestoreNotify = New System.Windows.Forms.CheckBox() Me.chkAutoMark = New System.Windows.Forms.CheckBox() Me.pnl7z = New System.Windows.Forms.Panel() Me.grp7zAdvanced = New System.Windows.Forms.GroupBox() @@ -64,8 +66,6 @@ Partial Class frmSettings Me.pnlGeneral = New System.Windows.Forms.Panel() Me.grpGameData = New System.Windows.Forms.GroupBox() Me.lstSettings = New System.Windows.Forms.ListBox() - Me.chkRestoreNotify = New System.Windows.Forms.CheckBox() - Me.chkAutoRestore = New System.Windows.Forms.CheckBox() Me.grpStartup.SuspendLayout() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() @@ -82,10 +82,9 @@ Partial Class frmSettings 'chkMonitorOnStartup ' Me.chkMonitorOnStartup.AutoSize = True - Me.chkMonitorOnStartup.Location = New System.Drawing.Point(8, 80) - Me.chkMonitorOnStartup.Margin = New System.Windows.Forms.Padding(4) + Me.chkMonitorOnStartup.Location = New System.Drawing.Point(6, 65) Me.chkMonitorOnStartup.Name = "chkMonitorOnStartup" - Me.chkMonitorOnStartup.Size = New System.Drawing.Size(192, 21) + Me.chkMonitorOnStartup.Size = New System.Drawing.Size(146, 17) Me.chkMonitorOnStartup.TabIndex = 2 Me.chkMonitorOnStartup.Text = "Start monitoring at launch" Me.chkMonitorOnStartup.UseVisualStyleBackColor = True @@ -95,11 +94,9 @@ Partial Class frmSettings 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(8, 15) - Me.grpStartup.Margin = New System.Windows.Forms.Padding(4) + Me.grpStartup.Location = New System.Drawing.Point(6, 12) Me.grpStartup.Name = "grpStartup" - Me.grpStartup.Padding = New System.Windows.Forms.Padding(4) - Me.grpStartup.Size = New System.Drawing.Size(472, 111) + Me.grpStartup.Size = New System.Drawing.Size(354, 90) Me.grpStartup.TabIndex = 0 Me.grpStartup.TabStop = False Me.grpStartup.Text = "Startup" @@ -107,10 +104,9 @@ Partial Class frmSettings 'chkStartWindows ' Me.chkStartWindows.AutoSize = True - Me.chkStartWindows.Location = New System.Drawing.Point(8, 23) - Me.chkStartWindows.Margin = New System.Windows.Forms.Padding(4) + Me.chkStartWindows.Location = New System.Drawing.Point(6, 19) Me.chkStartWindows.Name = "chkStartWindows" - Me.chkStartWindows.Size = New System.Drawing.Size(148, 21) + Me.chkStartWindows.Size = New System.Drawing.Size(117, 17) Me.chkStartWindows.TabIndex = 0 Me.chkStartWindows.Text = "Start with Windows" Me.chkStartWindows.UseVisualStyleBackColor = True @@ -118,10 +114,9 @@ Partial Class frmSettings 'chkStartToTray ' Me.chkStartToTray.AutoSize = True - Me.chkStartToTray.Location = New System.Drawing.Point(8, 52) - Me.chkStartToTray.Margin = New System.Windows.Forms.Padding(4) + Me.chkStartToTray.Location = New System.Drawing.Point(6, 42) Me.chkStartToTray.Name = "chkStartToTray" - Me.chkStartToTray.Size = New System.Drawing.Size(152, 21) + Me.chkStartToTray.Size = New System.Drawing.Size(115, 17) Me.chkStartToTray.TabIndex = 1 Me.chkStartToTray.Text = "Start to system tray" Me.chkStartToTray.UseVisualStyleBackColor = True @@ -129,20 +124,18 @@ Partial Class frmSettings 'chkAutoSaveLog ' Me.chkAutoSaveLog.AutoSize = True - Me.chkAutoSaveLog.Location = New System.Drawing.Point(8, 251) - Me.chkAutoSaveLog.Margin = New System.Windows.Forms.Padding(4) + Me.chkAutoSaveLog.Location = New System.Drawing.Point(6, 204) Me.chkAutoSaveLog.Name = "chkAutoSaveLog" - Me.chkAutoSaveLog.Size = New System.Drawing.Size(300, 21) + 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.Location = New System.Drawing.Point(147, 47) - Me.btnOptionalFields.Margin = New System.Windows.Forms.Padding(4) + Me.btnOptionalFields.Location = New System.Drawing.Point(110, 38) Me.btnOptionalFields.Name = "btnOptionalFields" - Me.btnOptionalFields.Size = New System.Drawing.Size(179, 28) + Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23) Me.btnOptionalFields.TabIndex = 6 Me.btnOptionalFields.Text = "Choose &Optional Fields..." Me.btnOptionalFields.UseVisualStyleBackColor = True @@ -150,10 +143,9 @@ Partial Class frmSettings 'chkTimeTracking ' Me.chkTimeTracking.AutoSize = True - Me.chkTimeTracking.Location = New System.Drawing.Point(8, 23) - Me.chkTimeTracking.Margin = New System.Windows.Forms.Padding(4) + Me.chkTimeTracking.Location = New System.Drawing.Point(6, 19) Me.chkTimeTracking.Name = "chkTimeTracking" - Me.chkTimeTracking.Size = New System.Drawing.Size(158, 21) + Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17) Me.chkTimeTracking.TabIndex = 4 Me.chkTimeTracking.Text = "Enable time tracking" Me.chkTimeTracking.UseVisualStyleBackColor = True @@ -161,10 +153,9 @@ Partial Class frmSettings 'chkSync ' Me.chkSync.AutoSize = True - Me.chkSync.Location = New System.Drawing.Point(8, 52) - Me.chkSync.Margin = New System.Windows.Forms.Padding(4) + Me.chkSync.Location = New System.Drawing.Point(6, 42) Me.chkSync.Name = "chkSync" - Me.chkSync.Size = New System.Drawing.Size(126, 21) + Me.chkSync.Size = New System.Drawing.Size(98, 17) Me.chkSync.TabIndex = 5 Me.chkSync.Text = "Enable syncing" Me.chkSync.UseVisualStyleBackColor = True @@ -172,10 +163,9 @@ Partial Class frmSettings 'chkShowDetectionTips ' Me.chkShowDetectionTips.AutoSize = True - Me.chkShowDetectionTips.Location = New System.Drawing.Point(8, 223) - Me.chkShowDetectionTips.Margin = New System.Windows.Forms.Padding(4) + Me.chkShowDetectionTips.Location = New System.Drawing.Point(6, 181) Me.chkShowDetectionTips.Name = "chkShowDetectionTips" - Me.chkShowDetectionTips.Size = New System.Drawing.Size(205, 21) + Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17) Me.chkShowDetectionTips.TabIndex = 3 Me.chkShowDetectionTips.Text = "Show detection notifications" Me.chkShowDetectionTips.UseVisualStyleBackColor = True @@ -186,21 +176,18 @@ Partial Class frmSettings Me.grpFolderOptions.Controls.Add(Me.lblBackupFolder) Me.grpFolderOptions.Controls.Add(Me.txtBackupFolder) Me.grpFolderOptions.Controls.Add(Me.chkCreateFolder) - Me.grpFolderOptions.Location = New System.Drawing.Point(8, 15) - Me.grpFolderOptions.Margin = New System.Windows.Forms.Padding(4) + Me.grpFolderOptions.Location = New System.Drawing.Point(6, 12) Me.grpFolderOptions.Name = "grpFolderOptions" - Me.grpFolderOptions.Padding = New System.Windows.Forms.Padding(4) - Me.grpFolderOptions.Size = New System.Drawing.Size(472, 86) + Me.grpFolderOptions.Size = New System.Drawing.Size(354, 70) Me.grpFolderOptions.TabIndex = 1 Me.grpFolderOptions.TabStop = False Me.grpFolderOptions.Text = "Folders" ' 'btnBackupFolder ' - Me.btnBackupFolder.Location = New System.Drawing.Point(417, 21) - Me.btnBackupFolder.Margin = New System.Windows.Forms.Padding(4) + Me.btnBackupFolder.Location = New System.Drawing.Point(313, 17) Me.btnBackupFolder.Name = "btnBackupFolder" - Me.btnBackupFolder.Size = New System.Drawing.Size(36, 25) + Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20) Me.btnBackupFolder.TabIndex = 2 Me.btnBackupFolder.Text = "..." Me.btnBackupFolder.UseVisualStyleBackColor = True @@ -208,28 +195,25 @@ Partial Class frmSettings 'lblBackupFolder ' Me.lblBackupFolder.AutoSize = True - Me.lblBackupFolder.Location = New System.Drawing.Point(8, 25) - Me.lblBackupFolder.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblBackupFolder.Location = New System.Drawing.Point(6, 20) Me.lblBackupFolder.Name = "lblBackupFolder" - Me.lblBackupFolder.Size = New System.Drawing.Size(103, 17) + Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13) Me.lblBackupFolder.TabIndex = 0 Me.lblBackupFolder.Text = "Backup Folder:" ' 'txtBackupFolder ' - Me.txtBackupFolder.Location = New System.Drawing.Point(121, 21) - Me.txtBackupFolder.Margin = New System.Windows.Forms.Padding(4) + Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17) Me.txtBackupFolder.Name = "txtBackupFolder" - Me.txtBackupFolder.Size = New System.Drawing.Size(287, 22) + 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(12, 53) - Me.chkCreateFolder.Margin = New System.Windows.Forms.Padding(4) + Me.chkCreateFolder.Location = New System.Drawing.Point(9, 43) Me.chkCreateFolder.Name = "chkCreateFolder" - Me.chkCreateFolder.Size = New System.Drawing.Size(247, 21) + 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 @@ -237,10 +221,9 @@ Partial Class frmSettings 'btnSave ' Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSave.Location = New System.Drawing.Point(512, 395) - Me.btnSave.Margin = New System.Windows.Forms.Padding(4) + Me.btnSave.Location = New System.Drawing.Point(384, 321) Me.btnSave.Name = "btnSave" - Me.btnSave.Size = New System.Drawing.Size(100, 28) + Me.btnSave.Size = New System.Drawing.Size(75, 23) Me.btnSave.TabIndex = 5 Me.btnSave.Text = "&Save" Me.btnSave.UseVisualStyleBackColor = True @@ -248,10 +231,9 @@ Partial Class frmSettings 'btnCancel ' Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(620, 395) - Me.btnCancel.Margin = New System.Windows.Forms.Padding(4) + Me.btnCancel.Location = New System.Drawing.Point(465, 321) Me.btnCancel.Name = "btnCancel" - Me.btnCancel.Size = New System.Drawing.Size(100, 28) + Me.btnCancel.Size = New System.Drawing.Size(75, 23) Me.btnCancel.TabIndex = 6 Me.btnCancel.Text = "&Cancel" Me.btnCancel.UseVisualStyleBackColor = True @@ -260,11 +242,9 @@ Partial Class frmSettings ' Me.grp7zGeneral.Controls.Add(Me.cboCompression) Me.grp7zGeneral.Controls.Add(Me.lblCompression) - Me.grp7zGeneral.Location = New System.Drawing.Point(8, 15) - Me.grp7zGeneral.Margin = New System.Windows.Forms.Padding(4) + Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12) Me.grp7zGeneral.Name = "grp7zGeneral" - Me.grp7zGeneral.Padding = New System.Windows.Forms.Padding(4) - Me.grp7zGeneral.Size = New System.Drawing.Size(472, 62) + Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50) Me.grp7zGeneral.TabIndex = 0 Me.grp7zGeneral.TabStop = False Me.grp7zGeneral.Text = "General" @@ -273,94 +253,84 @@ Partial Class frmSettings ' Me.cboCompression.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboCompression.FormattingEnabled = True - Me.cboCompression.Location = New System.Drawing.Point(147, 21) - Me.cboCompression.Margin = New System.Windows.Forms.Padding(4) + Me.cboCompression.Location = New System.Drawing.Point(110, 17) Me.cboCompression.Name = "cboCompression" - Me.cboCompression.Size = New System.Drawing.Size(316, 24) + Me.cboCompression.Size = New System.Drawing.Size(238, 21) Me.cboCompression.TabIndex = 1 ' 'lblCompression ' Me.lblCompression.AutoSize = True - Me.lblCompression.Location = New System.Drawing.Point(8, 25) - Me.lblCompression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCompression.Location = New System.Drawing.Point(6, 20) Me.lblCompression.Name = "lblCompression" - Me.lblCompression.Size = New System.Drawing.Size(94, 17) + Me.lblCompression.Size = New System.Drawing.Size(70, 13) Me.lblCompression.TabIndex = 0 Me.lblCompression.Text = "Compression:" ' 'btn7zLocation ' - Me.btn7zLocation.Location = New System.Drawing.Point(417, 50) - Me.btn7zLocation.Margin = New System.Windows.Forms.Padding(4) + Me.btn7zLocation.Location = New System.Drawing.Point(313, 41) Me.btn7zLocation.Name = "btn7zLocation" - Me.btn7zLocation.Size = New System.Drawing.Size(36, 25) + 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(147, 50) - Me.txt7zLocation.Margin = New System.Windows.Forms.Padding(4) + Me.txt7zLocation.Location = New System.Drawing.Point(110, 41) Me.txt7zLocation.Name = "txt7zLocation" - Me.txt7zLocation.Size = New System.Drawing.Size(261, 22) + 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(8, 54) - Me.lblLocation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblLocation.Location = New System.Drawing.Point(6, 44) Me.lblLocation.Name = "lblLocation" - Me.lblLocation.Size = New System.Drawing.Size(117, 17) + 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(147, 18) - Me.txt7zArguments.Margin = New System.Windows.Forms.Padding(4) + Me.txt7zArguments.Location = New System.Drawing.Point(110, 15) Me.txt7zArguments.Name = "txt7zArguments" - Me.txt7zArguments.Size = New System.Drawing.Size(316, 22) + 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(8, 25) - Me.lblArguments.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblArguments.Location = New System.Drawing.Point(6, 20) Me.lblArguments.Name = "lblArguments" - Me.lblArguments.Size = New System.Drawing.Size(131, 17) + 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(12, 42) - Me.lbl7zCopyright.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lbl7zCopyright.Location = New System.Drawing.Point(9, 34) Me.lbl7zCopyright.Name = "lbl7zCopyright" - Me.lbl7zCopyright.Size = New System.Drawing.Size(452, 21) + 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(12, 21) - Me.lbl7zProduct.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lbl7zProduct.Location = New System.Drawing.Point(9, 17) Me.lbl7zProduct.Name = "lbl7zProduct" - Me.lbl7zProduct.Size = New System.Drawing.Size(452, 21) + Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17) Me.lbl7zProduct.TabIndex = 7 Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'btnDefaults ' - Me.btnDefaults.Location = New System.Drawing.Point(16, 395) - Me.btnDefaults.Margin = New System.Windows.Forms.Padding(4) + Me.btnDefaults.Location = New System.Drawing.Point(12, 321) Me.btnDefaults.Name = "btnDefaults" - Me.btnDefaults.Size = New System.Drawing.Size(147, 28) + Me.btnDefaults.Size = New System.Drawing.Size(110, 23) Me.btnDefaults.TabIndex = 4 Me.btnDefaults.Text = "Set &Defaults" Me.btnDefaults.UseVisualStyleBackColor = True @@ -375,38 +345,34 @@ Partial Class frmSettings Me.pnlBackup.Controls.Add(Me.chkOverwriteWarning) Me.pnlBackup.Controls.Add(Me.grpBackupHandling) Me.pnlBackup.Controls.Add(Me.grpFolderOptions) - Me.pnlBackup.Location = New System.Drawing.Point(240, 0) - Me.pnlBackup.Margin = New System.Windows.Forms.Padding(4) + Me.pnlBackup.Location = New System.Drawing.Point(180, 0) Me.pnlBackup.Name = "pnlBackup" - Me.pnlBackup.Size = New System.Drawing.Size(489, 386) + Me.pnlBackup.Size = New System.Drawing.Size(367, 314) Me.pnlBackup.TabIndex = 3 ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(381, 309) - Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinutes.Location = New System.Drawing.Point(286, 251) Me.lblMinutes.Name = "lblMinutes" - Me.lblMinutes.Size = New System.Drawing.Size(57, 17) + Me.lblMinutes.Size = New System.Drawing.Size(43, 13) Me.lblMinutes.TabIndex = 14 Me.lblMinutes.Text = "minutes" ' 'nudSupressBackupThreshold ' - Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(305, 306) - Me.nudSupressBackupThreshold.Margin = New System.Windows.Forms.Padding(4) + Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(229, 249) Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold" - Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(68, 22) + Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20) Me.nudSupressBackupThreshold.TabIndex = 13 ' 'chkSupressBackup ' Me.chkSupressBackup.AutoSize = True - Me.chkSupressBackup.Location = New System.Drawing.Point(8, 308) - Me.chkSupressBackup.Margin = New System.Windows.Forms.Padding(4) + Me.chkSupressBackup.Location = New System.Drawing.Point(6, 250) Me.chkSupressBackup.Name = "chkSupressBackup" - Me.chkSupressBackup.Size = New System.Drawing.Size(282, 21) + Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17) Me.chkSupressBackup.TabIndex = 12 Me.chkSupressBackup.Text = "Backup only when session time exceeds" Me.chkSupressBackup.UseVisualStyleBackColor = True @@ -414,10 +380,9 @@ Partial Class frmSettings 'chkBackupConfirm ' Me.chkBackupConfirm.AutoSize = True - Me.chkBackupConfirm.Location = New System.Drawing.Point(8, 222) - Me.chkBackupConfirm.Margin = New System.Windows.Forms.Padding(4) + Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 180) Me.chkBackupConfirm.Name = "chkBackupConfirm" - Me.chkBackupConfirm.Size = New System.Drawing.Size(208, 21) + Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17) Me.chkBackupConfirm.TabIndex = 9 Me.chkBackupConfirm.Text = "Disable backup confirmation" Me.chkBackupConfirm.UseVisualStyleBackColor = True @@ -425,10 +390,9 @@ Partial Class frmSettings 'chkCheckSum ' Me.chkCheckSum.AutoSize = True - Me.chkCheckSum.Location = New System.Drawing.Point(8, 279) - Me.chkCheckSum.Margin = New System.Windows.Forms.Padding(4) + Me.chkCheckSum.Location = New System.Drawing.Point(6, 227) Me.chkCheckSum.Name = "chkCheckSum" - Me.chkCheckSum.Size = New System.Drawing.Size(252, 21) + Me.chkCheckSum.Size = New System.Drawing.Size(195, 17) Me.chkCheckSum.TabIndex = 11 Me.chkCheckSum.Text = "Verify backup files with a checksum" Me.chkCheckSum.UseVisualStyleBackColor = True @@ -436,10 +400,9 @@ Partial Class frmSettings 'chkOverwriteWarning ' Me.chkOverwriteWarning.AutoSize = True - Me.chkOverwriteWarning.Location = New System.Drawing.Point(8, 251) - Me.chkOverwriteWarning.Margin = New System.Windows.Forms.Padding(4) + Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 204) Me.chkOverwriteWarning.Name = "chkOverwriteWarning" - Me.chkOverwriteWarning.Size = New System.Drawing.Size(178, 21) + Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17) Me.chkOverwriteWarning.TabIndex = 10 Me.chkOverwriteWarning.Text = "Show overwrite warning" Me.chkOverwriteWarning.UseVisualStyleBackColor = True @@ -449,22 +412,45 @@ Partial Class frmSettings Me.grpBackupHandling.Controls.Add(Me.chkAutoRestore) Me.grpBackupHandling.Controls.Add(Me.chkRestoreNotify) Me.grpBackupHandling.Controls.Add(Me.chkAutoMark) - Me.grpBackupHandling.Location = New System.Drawing.Point(8, 108) + Me.grpBackupHandling.Location = New System.Drawing.Point(6, 88) + Me.grpBackupHandling.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.grpBackupHandling.Name = "grpBackupHandling" - Me.grpBackupHandling.Size = New System.Drawing.Size(472, 107) + Me.grpBackupHandling.Padding = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.grpBackupHandling.Size = New System.Drawing.Size(354, 87) Me.grpBackupHandling.TabIndex = 8 Me.grpBackupHandling.TabStop = False Me.grpBackupHandling.Text = "Backup Handling" ' + 'chkAutoRestore + ' + Me.chkAutoRestore.AutoSize = True + Me.chkAutoRestore.Location = New System.Drawing.Point(8, 41) + Me.chkAutoRestore.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.chkAutoRestore.Name = "chkAutoRestore" + Me.chkAutoRestore.Size = New System.Drawing.Size(190, 17) + Me.chkAutoRestore.TabIndex = 9 + Me.chkAutoRestore.Text = "Automatically restore new backups" + Me.chkAutoRestore.UseVisualStyleBackColor = True + ' + 'chkRestoreNotify + ' + Me.chkRestoreNotify.AutoSize = True + Me.chkRestoreNotify.Location = New System.Drawing.Point(8, 19) + Me.chkRestoreNotify.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.chkRestoreNotify.Name = "chkRestoreNotify" + Me.chkRestoreNotify.Size = New System.Drawing.Size(216, 17) + Me.chkRestoreNotify.TabIndex = 8 + Me.chkRestoreNotify.Text = "Display notifications about new backups" + Me.chkRestoreNotify.UseVisualStyleBackColor = True + ' 'chkAutoMark ' Me.chkAutoMark.AutoSize = True - Me.chkAutoMark.Location = New System.Drawing.Point(11, 78) - Me.chkAutoMark.Margin = New System.Windows.Forms.Padding(4) + Me.chkAutoMark.Location = New System.Drawing.Point(8, 63) Me.chkAutoMark.Name = "chkAutoMark" - Me.chkAutoMark.Size = New System.Drawing.Size(395, 21) + Me.chkAutoMark.Size = New System.Drawing.Size(321, 17) Me.chkAutoMark.TabIndex = 5 - Me.chkAutoMark.Text = "Automatically mark backups as restored when appropriate" + Me.chkAutoMark.Text = "Automatically mark new backups as restored when appropriate" Me.chkAutoMark.UseVisualStyleBackColor = True ' 'pnl7z @@ -472,10 +458,9 @@ Partial Class frmSettings 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(240, 0) - Me.pnl7z.Margin = New System.Windows.Forms.Padding(4) + Me.pnl7z.Location = New System.Drawing.Point(180, 0) Me.pnl7z.Name = "pnl7z" - Me.pnl7z.Size = New System.Drawing.Size(489, 386) + Me.pnl7z.Size = New System.Drawing.Size(367, 314) Me.pnl7z.TabIndex = 2 ' 'grp7zAdvanced @@ -485,11 +470,9 @@ Partial Class frmSettings 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(8, 84) - Me.grp7zAdvanced.Margin = New System.Windows.Forms.Padding(4) + Me.grp7zAdvanced.Location = New System.Drawing.Point(6, 68) Me.grp7zAdvanced.Name = "grp7zAdvanced" - Me.grp7zAdvanced.Padding = New System.Windows.Forms.Padding(4) - Me.grp7zAdvanced.Size = New System.Drawing.Size(472, 90) + Me.grp7zAdvanced.Size = New System.Drawing.Size(354, 73) Me.grp7zAdvanced.TabIndex = 2 Me.grp7zAdvanced.TabStop = False Me.grp7zAdvanced.Text = "Advanced" @@ -498,11 +481,9 @@ Partial Class frmSettings ' Me.grp7zInformation.Controls.Add(Me.lbl7zProduct) Me.grp7zInformation.Controls.Add(Me.lbl7zCopyright) - Me.grp7zInformation.Location = New System.Drawing.Point(8, 180) - Me.grp7zInformation.Margin = New System.Windows.Forms.Padding(4) + Me.grp7zInformation.Location = New System.Drawing.Point(6, 146) Me.grp7zInformation.Name = "grp7zInformation" - Me.grp7zInformation.Padding = New System.Windows.Forms.Padding(4) - Me.grp7zInformation.Size = New System.Drawing.Size(472, 78) + Me.grp7zInformation.Size = New System.Drawing.Size(354, 63) Me.grp7zInformation.TabIndex = 1 Me.grp7zInformation.TabStop = False Me.grp7zInformation.Text = "Utility Information" @@ -513,10 +494,9 @@ Partial Class frmSettings 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(240, 0) - Me.pnlGeneral.Margin = New System.Windows.Forms.Padding(4) + Me.pnlGeneral.Location = New System.Drawing.Point(180, 0) Me.pnlGeneral.Name = "pnlGeneral" - Me.pnlGeneral.Size = New System.Drawing.Size(489, 386) + Me.pnlGeneral.Size = New System.Drawing.Size(367, 314) Me.pnlGeneral.TabIndex = 1 ' 'grpGameData @@ -524,11 +504,9 @@ Partial Class frmSettings 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(8, 130) - Me.grpGameData.Margin = New System.Windows.Forms.Padding(4) + Me.grpGameData.Location = New System.Drawing.Point(6, 106) Me.grpGameData.Name = "grpGameData" - Me.grpGameData.Padding = New System.Windows.Forms.Padding(4) - Me.grpGameData.Size = New System.Drawing.Size(472, 85) + Me.grpGameData.Size = New System.Drawing.Size(354, 69) Me.grpGameData.TabIndex = 1 Me.grpGameData.TabStop = False Me.grpGameData.Text = "Game Data" @@ -536,38 +514,16 @@ Partial Class frmSettings 'lstSettings ' Me.lstSettings.FormattingEnabled = True - Me.lstSettings.ItemHeight = 16 - Me.lstSettings.Location = New System.Drawing.Point(16, 15) - Me.lstSettings.Margin = New System.Windows.Forms.Padding(4) + Me.lstSettings.Location = New System.Drawing.Point(12, 12) Me.lstSettings.Name = "lstSettings" - Me.lstSettings.Size = New System.Drawing.Size(215, 372) + Me.lstSettings.Size = New System.Drawing.Size(162, 303) Me.lstSettings.TabIndex = 0 ' - 'chkRestoreNotify - ' - Me.chkRestoreNotify.AutoSize = True - Me.chkRestoreNotify.Location = New System.Drawing.Point(11, 23) - Me.chkRestoreNotify.Name = "chkRestoreNotify" - Me.chkRestoreNotify.Size = New System.Drawing.Size(257, 21) - Me.chkRestoreNotify.TabIndex = 8 - Me.chkRestoreNotify.Text = "Notify about new backups to restore" - Me.chkRestoreNotify.UseVisualStyleBackColor = True - ' - 'chkAutoRestore - ' - Me.chkAutoRestore.AutoSize = True - Me.chkAutoRestore.Location = New System.Drawing.Point(11, 50) - Me.chkAutoRestore.Name = "chkAutoRestore" - Me.chkAutoRestore.Size = New System.Drawing.Size(248, 21) - Me.chkAutoRestore.TabIndex = 9 - Me.chkAutoRestore.Text = "Automatically restore new backups" - Me.chkAutoRestore.UseVisualStyleBackColor = True - ' 'frmSettings ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(739, 444) + Me.ClientSize = New System.Drawing.Size(554, 361) Me.Controls.Add(Me.pnlBackup) Me.Controls.Add(Me.lstSettings) Me.Controls.Add(Me.btnDefaults) @@ -576,7 +532,6 @@ Partial Class frmSettings Me.Controls.Add(Me.pnlGeneral) Me.Controls.Add(Me.pnl7z) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmSettings" diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 55456e9..571a768 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -3418,7 +3418,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Automatically mark backups as restored when appropriate. + ''' Looks up a localized string similar to Automatically mark new backups as restored when appropriate. ''' Friend ReadOnly Property frmSettings_chkAutoMark() As String Get @@ -3490,7 +3490,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Notify about new backups to restore. + ''' Looks up a localized string similar to Display notifications about new backups. ''' Friend ReadOnly Property frmSettings_chkRestoreNotify() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index ea8ef15..4d31c70 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1088,7 +1088,7 @@ Show overwrite warning - Notify about new backups to restore + Display notifications about new backups Show detection notifications @@ -1742,7 +1742,7 @@ The backup file for [PARAM] is not ready to restore. - Automatically mark backups as restored when appropriate + Automatically mark new backups as restored when appropriate Backup Handling