diff --git a/GBM/Forms/frmMain.vb b/GBM/Forms/frmMain.vb index 95b698d..bd87007 100644 --- a/GBM/Forms/frmMain.vb +++ b/GBM/Forms/frmMain.vb @@ -715,14 +715,18 @@ Public Class frmMain End Sub Private Sub HandleSession() - Dim oSession As New clsSession + Dim oSession As clsSession + Dim iSession As Integer = Math.Ceiling(oProcess.TimeSpent.TotalMinutes) - 'Record Session - oSession.MonitorID = oProcess.GameInfo.ID - oSession.SessionStart = oProcess.StartTime - oSession.SessionEnd = oProcess.EndTime + If iSession > oSettings.SupressBackupThreshold Then + 'Record Session + oSession = New clsSession + oSession.MonitorID = oProcess.GameInfo.ID + oSession.SessionStart = oProcess.StartTime + oSession.SessionEnd = oProcess.EndTime - mgrSessions.AddSession(oSession) + mgrSessions.AddSession(oSession) + End If End Sub Private Function SupressBackup() As Boolean diff --git a/GBM/Forms/frmSettings.Designer.vb b/GBM/Forms/frmSettings.Designer.vb index 4234be1..870ddfb 100644 --- a/GBM/Forms/frmSettings.Designer.vb +++ b/GBM/Forms/frmSettings.Designer.vb @@ -50,9 +50,6 @@ Partial Class frmSettings Me.lbl7zProduct = New System.Windows.Forms.Label() Me.btnDefaults = New System.Windows.Forms.Button() Me.pnlBackup = New System.Windows.Forms.Panel() - Me.lblMinutes = New System.Windows.Forms.Label() - Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown() - Me.chkSupressBackup = New System.Windows.Forms.CheckBox() Me.chkBackupConfirm = New System.Windows.Forms.CheckBox() Me.chkOverwriteWarning = New System.Windows.Forms.CheckBox() Me.grpBackupHandling = New System.Windows.Forms.GroupBox() @@ -64,27 +61,31 @@ Partial Class frmSettings 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.chkSessionTracking = New System.Windows.Forms.CheckBox() + Me.lstSettings = New System.Windows.Forms.ListBox() + Me.lblMinutes = New System.Windows.Forms.Label() + Me.nudSupressBackupThreshold = New System.Windows.Forms.NumericUpDown() + Me.chkSupressBackup = New System.Windows.Forms.CheckBox() Me.grpStartup.SuspendLayout() Me.grpFolderOptions.SuspendLayout() Me.grp7zGeneral.SuspendLayout() Me.pnlBackup.SuspendLayout() - CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.grpBackupHandling.SuspendLayout() Me.pnl7z.SuspendLayout() Me.grp7zAdvanced.SuspendLayout() Me.grp7zInformation.SuspendLayout() Me.pnlGeneral.SuspendLayout() Me.grpGameData.SuspendLayout() + CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'chkMonitorOnStartup ' Me.chkMonitorOnStartup.AutoSize = True - Me.chkMonitorOnStartup.Location = New System.Drawing.Point(6, 65) + Me.chkMonitorOnStartup.Location = New System.Drawing.Point(8, 80) + Me.chkMonitorOnStartup.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkMonitorOnStartup.Name = "chkMonitorOnStartup" - Me.chkMonitorOnStartup.Size = New System.Drawing.Size(146, 17) + Me.chkMonitorOnStartup.Size = New System.Drawing.Size(192, 21) Me.chkMonitorOnStartup.TabIndex = 2 Me.chkMonitorOnStartup.Text = "Start monitoring at launch" Me.chkMonitorOnStartup.UseVisualStyleBackColor = True @@ -94,9 +95,11 @@ 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(6, 12) + Me.grpStartup.Location = New System.Drawing.Point(8, 15) + Me.grpStartup.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpStartup.Name = "grpStartup" - Me.grpStartup.Size = New System.Drawing.Size(354, 90) + Me.grpStartup.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpStartup.Size = New System.Drawing.Size(472, 111) Me.grpStartup.TabIndex = 0 Me.grpStartup.TabStop = False Me.grpStartup.Text = "Startup" @@ -104,9 +107,10 @@ Partial Class frmSettings 'chkStartWindows ' Me.chkStartWindows.AutoSize = True - Me.chkStartWindows.Location = New System.Drawing.Point(6, 19) + Me.chkStartWindows.Location = New System.Drawing.Point(8, 23) + Me.chkStartWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkStartWindows.Name = "chkStartWindows" - Me.chkStartWindows.Size = New System.Drawing.Size(117, 17) + Me.chkStartWindows.Size = New System.Drawing.Size(148, 21) Me.chkStartWindows.TabIndex = 0 Me.chkStartWindows.Text = "Start with Windows" Me.chkStartWindows.UseVisualStyleBackColor = True @@ -114,9 +118,10 @@ Partial Class frmSettings 'chkStartToTray ' Me.chkStartToTray.AutoSize = True - Me.chkStartToTray.Location = New System.Drawing.Point(6, 42) + Me.chkStartToTray.Location = New System.Drawing.Point(8, 52) + Me.chkStartToTray.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkStartToTray.Name = "chkStartToTray" - Me.chkStartToTray.Size = New System.Drawing.Size(115, 17) + Me.chkStartToTray.Size = New System.Drawing.Size(152, 21) Me.chkStartToTray.TabIndex = 1 Me.chkStartToTray.Text = "Start to system tray" Me.chkStartToTray.UseVisualStyleBackColor = True @@ -124,28 +129,31 @@ Partial Class frmSettings 'chkAutoSaveLog ' Me.chkAutoSaveLog.AutoSize = True - Me.chkAutoSaveLog.Location = New System.Drawing.Point(12, 228) + Me.chkAutoSaveLog.Location = New System.Drawing.Point(16, 309) + Me.chkAutoSaveLog.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkAutoSaveLog.Name = "chkAutoSaveLog" - Me.chkAutoSaveLog.Size = New System.Drawing.Size(231, 17) - Me.chkAutoSaveLog.TabIndex = 3 + Me.chkAutoSaveLog.Size = New System.Drawing.Size(300, 21) + Me.chkAutoSaveLog.TabIndex = 5 Me.chkAutoSaveLog.Text = "Autosave log when max length is exceeded" Me.chkAutoSaveLog.UseVisualStyleBackColor = True ' 'btnOptionalFields ' - Me.btnOptionalFields.Location = New System.Drawing.Point(103, 61) + Me.btnOptionalFields.Location = New System.Drawing.Point(137, 75) + Me.btnOptionalFields.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnOptionalFields.Name = "btnOptionalFields" - Me.btnOptionalFields.Size = New System.Drawing.Size(134, 23) - Me.btnOptionalFields.TabIndex = 2 + Me.btnOptionalFields.Size = New System.Drawing.Size(179, 28) + Me.btnOptionalFields.TabIndex = 3 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.Location = New System.Drawing.Point(8, 23) + Me.chkTimeTracking.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkTimeTracking.Name = "chkTimeTracking" - Me.chkTimeTracking.Size = New System.Drawing.Size(122, 17) + Me.chkTimeTracking.Size = New System.Drawing.Size(158, 21) Me.chkTimeTracking.TabIndex = 0 Me.chkTimeTracking.Text = "Enable time tracking" Me.chkTimeTracking.UseVisualStyleBackColor = True @@ -153,20 +161,22 @@ Partial Class frmSettings 'chkSync ' Me.chkSync.AutoSize = True - Me.chkSync.Location = New System.Drawing.Point(6, 65) + Me.chkSync.Location = New System.Drawing.Point(8, 80) + Me.chkSync.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkSync.Name = "chkSync" - Me.chkSync.Size = New System.Drawing.Size(98, 17) - Me.chkSync.TabIndex = 1 + Me.chkSync.Size = New System.Drawing.Size(126, 21) + Me.chkSync.TabIndex = 2 Me.chkSync.Text = "Enable syncing" Me.chkSync.UseVisualStyleBackColor = True ' 'chkShowDetectionTips ' Me.chkShowDetectionTips.AutoSize = True - Me.chkShowDetectionTips.Location = New System.Drawing.Point(12, 205) + Me.chkShowDetectionTips.Location = New System.Drawing.Point(16, 280) + Me.chkShowDetectionTips.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkShowDetectionTips.Name = "chkShowDetectionTips" - Me.chkShowDetectionTips.Size = New System.Drawing.Size(159, 17) - Me.chkShowDetectionTips.TabIndex = 2 + Me.chkShowDetectionTips.Size = New System.Drawing.Size(205, 21) + Me.chkShowDetectionTips.TabIndex = 4 Me.chkShowDetectionTips.Text = "Show detection notifications" Me.chkShowDetectionTips.UseVisualStyleBackColor = True ' @@ -176,18 +186,21 @@ 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(6, 12) + Me.grpFolderOptions.Location = New System.Drawing.Point(8, 15) + Me.grpFolderOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpFolderOptions.Name = "grpFolderOptions" - Me.grpFolderOptions.Size = New System.Drawing.Size(354, 70) + Me.grpFolderOptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpFolderOptions.Size = New System.Drawing.Size(472, 86) Me.grpFolderOptions.TabIndex = 0 Me.grpFolderOptions.TabStop = False Me.grpFolderOptions.Text = "Folders" ' 'btnBackupFolder ' - Me.btnBackupFolder.Location = New System.Drawing.Point(313, 17) + Me.btnBackupFolder.Location = New System.Drawing.Point(417, 21) + Me.btnBackupFolder.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnBackupFolder.Name = "btnBackupFolder" - Me.btnBackupFolder.Size = New System.Drawing.Size(27, 20) + Me.btnBackupFolder.Size = New System.Drawing.Size(36, 25) Me.btnBackupFolder.TabIndex = 1 Me.btnBackupFolder.Text = "..." Me.btnBackupFolder.UseVisualStyleBackColor = True @@ -195,25 +208,28 @@ Partial Class frmSettings 'lblBackupFolder ' Me.lblBackupFolder.AutoSize = True - Me.lblBackupFolder.Location = New System.Drawing.Point(6, 20) + Me.lblBackupFolder.Location = New System.Drawing.Point(8, 25) + Me.lblBackupFolder.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBackupFolder.Name = "lblBackupFolder" - Me.lblBackupFolder.Size = New System.Drawing.Size(79, 13) + Me.lblBackupFolder.Size = New System.Drawing.Size(103, 17) Me.lblBackupFolder.TabIndex = 0 Me.lblBackupFolder.Text = "Backup Folder:" ' 'txtBackupFolder ' - Me.txtBackupFolder.Location = New System.Drawing.Point(91, 17) + Me.txtBackupFolder.Location = New System.Drawing.Point(121, 21) + Me.txtBackupFolder.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.txtBackupFolder.Name = "txtBackupFolder" - Me.txtBackupFolder.Size = New System.Drawing.Size(216, 20) + Me.txtBackupFolder.Size = New System.Drawing.Size(287, 22) Me.txtBackupFolder.TabIndex = 0 ' 'chkCreateFolder ' Me.chkCreateFolder.AutoSize = True - Me.chkCreateFolder.Location = New System.Drawing.Point(9, 43) + Me.chkCreateFolder.Location = New System.Drawing.Point(12, 53) + Me.chkCreateFolder.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkCreateFolder.Name = "chkCreateFolder" - Me.chkCreateFolder.Size = New System.Drawing.Size(186, 17) + Me.chkCreateFolder.Size = New System.Drawing.Size(247, 21) Me.chkCreateFolder.TabIndex = 2 Me.chkCreateFolder.Text = "Create a sub-folder for each game" Me.chkCreateFolder.UseVisualStyleBackColor = True @@ -221,9 +237,10 @@ Partial Class frmSettings 'btnSave ' Me.btnSave.DialogResult = System.Windows.Forms.DialogResult.OK - Me.btnSave.Location = New System.Drawing.Point(384, 321) + Me.btnSave.Location = New System.Drawing.Point(512, 395) + Me.btnSave.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnSave.Name = "btnSave" - Me.btnSave.Size = New System.Drawing.Size(75, 23) + Me.btnSave.Size = New System.Drawing.Size(100, 28) Me.btnSave.TabIndex = 5 Me.btnSave.Text = "&Save" Me.btnSave.UseVisualStyleBackColor = True @@ -231,9 +248,10 @@ Partial Class frmSettings 'btnCancel ' Me.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.btnCancel.Location = New System.Drawing.Point(465, 321) + Me.btnCancel.Location = New System.Drawing.Point(620, 395) + Me.btnCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnCancel.Name = "btnCancel" - Me.btnCancel.Size = New System.Drawing.Size(75, 23) + Me.btnCancel.Size = New System.Drawing.Size(100, 28) Me.btnCancel.TabIndex = 6 Me.btnCancel.Text = "&Cancel" Me.btnCancel.UseVisualStyleBackColor = True @@ -242,9 +260,11 @@ Partial Class frmSettings ' Me.grp7zGeneral.Controls.Add(Me.cboCompression) Me.grp7zGeneral.Controls.Add(Me.lblCompression) - Me.grp7zGeneral.Location = New System.Drawing.Point(6, 12) + Me.grp7zGeneral.Location = New System.Drawing.Point(8, 15) + Me.grp7zGeneral.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grp7zGeneral.Name = "grp7zGeneral" - Me.grp7zGeneral.Size = New System.Drawing.Size(354, 50) + Me.grp7zGeneral.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grp7zGeneral.Size = New System.Drawing.Size(472, 62) Me.grp7zGeneral.TabIndex = 0 Me.grp7zGeneral.TabStop = False Me.grp7zGeneral.Text = "General" @@ -253,135 +273,117 @@ Partial Class frmSettings ' Me.cboCompression.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboCompression.FormattingEnabled = True - Me.cboCompression.Location = New System.Drawing.Point(110, 17) + Me.cboCompression.Location = New System.Drawing.Point(147, 21) + Me.cboCompression.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cboCompression.Name = "cboCompression" - Me.cboCompression.Size = New System.Drawing.Size(238, 21) + Me.cboCompression.Size = New System.Drawing.Size(316, 24) Me.cboCompression.TabIndex = 0 ' 'lblCompression ' Me.lblCompression.AutoSize = True - Me.lblCompression.Location = New System.Drawing.Point(6, 20) + Me.lblCompression.Location = New System.Drawing.Point(8, 25) + Me.lblCompression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCompression.Name = "lblCompression" - Me.lblCompression.Size = New System.Drawing.Size(70, 13) + Me.lblCompression.Size = New System.Drawing.Size(94, 17) Me.lblCompression.TabIndex = 0 Me.lblCompression.Text = "Compression:" ' 'btn7zLocation ' - Me.btn7zLocation.Location = New System.Drawing.Point(313, 41) + Me.btn7zLocation.Location = New System.Drawing.Point(417, 50) + Me.btn7zLocation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btn7zLocation.Name = "btn7zLocation" - Me.btn7zLocation.Size = New System.Drawing.Size(27, 20) + Me.btn7zLocation.Size = New System.Drawing.Size(36, 25) Me.btn7zLocation.TabIndex = 2 Me.btn7zLocation.Text = "..." Me.btn7zLocation.UseVisualStyleBackColor = True ' 'txt7zLocation ' - Me.txt7zLocation.Location = New System.Drawing.Point(110, 41) + Me.txt7zLocation.Location = New System.Drawing.Point(147, 50) + Me.txt7zLocation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.txt7zLocation.Name = "txt7zLocation" - Me.txt7zLocation.Size = New System.Drawing.Size(197, 20) + Me.txt7zLocation.Size = New System.Drawing.Size(261, 22) Me.txt7zLocation.TabIndex = 1 ' 'lblLocation ' Me.lblLocation.AutoSize = True - Me.lblLocation.Location = New System.Drawing.Point(6, 44) + Me.lblLocation.Location = New System.Drawing.Point(8, 54) + Me.lblLocation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLocation.Name = "lblLocation" - Me.lblLocation.Size = New System.Drawing.Size(89, 13) + Me.lblLocation.Size = New System.Drawing.Size(117, 17) Me.lblLocation.TabIndex = 4 Me.lblLocation.Text = "Custom Location:" ' 'txt7zArguments ' - Me.txt7zArguments.Location = New System.Drawing.Point(110, 15) + Me.txt7zArguments.Location = New System.Drawing.Point(147, 18) + Me.txt7zArguments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.txt7zArguments.Name = "txt7zArguments" - Me.txt7zArguments.Size = New System.Drawing.Size(238, 20) + Me.txt7zArguments.Size = New System.Drawing.Size(316, 22) Me.txt7zArguments.TabIndex = 0 ' 'lblArguments ' Me.lblArguments.AutoSize = True - Me.lblArguments.Location = New System.Drawing.Point(6, 20) + Me.lblArguments.Location = New System.Drawing.Point(8, 25) + Me.lblArguments.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblArguments.Name = "lblArguments" - Me.lblArguments.Size = New System.Drawing.Size(98, 13) + Me.lblArguments.Size = New System.Drawing.Size(131, 17) 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.Location = New System.Drawing.Point(12, 42) + Me.lbl7zCopyright.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbl7zCopyright.Name = "lbl7zCopyright" - Me.lbl7zCopyright.Size = New System.Drawing.Size(339, 17) + Me.lbl7zCopyright.Size = New System.Drawing.Size(452, 21) Me.lbl7zCopyright.TabIndex = 8 Me.lbl7zCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'lbl7zProduct ' Me.lbl7zProduct.AutoEllipsis = True - Me.lbl7zProduct.Location = New System.Drawing.Point(9, 17) + Me.lbl7zProduct.Location = New System.Drawing.Point(12, 21) + Me.lbl7zProduct.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbl7zProduct.Name = "lbl7zProduct" - Me.lbl7zProduct.Size = New System.Drawing.Size(339, 17) + Me.lbl7zProduct.Size = New System.Drawing.Size(452, 21) Me.lbl7zProduct.TabIndex = 7 Me.lbl7zProduct.TextAlign = System.Drawing.ContentAlignment.MiddleLeft ' 'btnDefaults ' - Me.btnDefaults.Location = New System.Drawing.Point(12, 321) + Me.btnDefaults.Location = New System.Drawing.Point(16, 395) + Me.btnDefaults.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.btnDefaults.Name = "btnDefaults" - Me.btnDefaults.Size = New System.Drawing.Size(110, 23) + Me.btnDefaults.Size = New System.Drawing.Size(147, 28) Me.btnDefaults.TabIndex = 4 Me.btnDefaults.Text = "Set &Defaults" Me.btnDefaults.UseVisualStyleBackColor = True ' 'pnlBackup ' - Me.pnlBackup.Controls.Add(Me.lblMinutes) - Me.pnlBackup.Controls.Add(Me.nudSupressBackupThreshold) - Me.pnlBackup.Controls.Add(Me.chkSupressBackup) Me.pnlBackup.Controls.Add(Me.chkBackupConfirm) 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(180, 0) + Me.pnlBackup.Location = New System.Drawing.Point(240, 0) + Me.pnlBackup.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnlBackup.Name = "pnlBackup" - Me.pnlBackup.Size = New System.Drawing.Size(367, 314) + Me.pnlBackup.Size = New System.Drawing.Size(489, 386) Me.pnlBackup.TabIndex = 3 ' - 'lblMinutes - ' - Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(286, 228) - Me.lblMinutes.Name = "lblMinutes" - 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(229, 226) - Me.nudSupressBackupThreshold.Maximum = New Decimal(New Integer() {999, 0, 0, 0}) - Me.nudSupressBackupThreshold.Name = "nudSupressBackupThreshold" - Me.nudSupressBackupThreshold.Size = New System.Drawing.Size(51, 20) - Me.nudSupressBackupThreshold.TabIndex = 5 - ' - 'chkSupressBackup - ' - Me.chkSupressBackup.AutoSize = True - Me.chkSupressBackup.Location = New System.Drawing.Point(6, 228) - Me.chkSupressBackup.Name = "chkSupressBackup" - Me.chkSupressBackup.Size = New System.Drawing.Size(217, 17) - Me.chkSupressBackup.TabIndex = 4 - Me.chkSupressBackup.Text = "Backup only when session time exceeds" - Me.chkSupressBackup.UseVisualStyleBackColor = True - ' 'chkBackupConfirm ' Me.chkBackupConfirm.AutoSize = True - Me.chkBackupConfirm.Location = New System.Drawing.Point(6, 180) + Me.chkBackupConfirm.Location = New System.Drawing.Point(18, 221) + Me.chkBackupConfirm.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkBackupConfirm.Name = "chkBackupConfirm" - Me.chkBackupConfirm.Size = New System.Drawing.Size(160, 17) + Me.chkBackupConfirm.Size = New System.Drawing.Size(208, 21) Me.chkBackupConfirm.TabIndex = 2 Me.chkBackupConfirm.Text = "Disable backup confirmation" Me.chkBackupConfirm.UseVisualStyleBackColor = True @@ -389,9 +391,10 @@ Partial Class frmSettings 'chkOverwriteWarning ' Me.chkOverwriteWarning.AutoSize = True - Me.chkOverwriteWarning.Location = New System.Drawing.Point(6, 204) + Me.chkOverwriteWarning.Location = New System.Drawing.Point(19, 250) + Me.chkOverwriteWarning.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkOverwriteWarning.Name = "chkOverwriteWarning" - Me.chkOverwriteWarning.Size = New System.Drawing.Size(139, 17) + Me.chkOverwriteWarning.Size = New System.Drawing.Size(178, 21) Me.chkOverwriteWarning.TabIndex = 3 Me.chkOverwriteWarning.Text = "Show overwrite warning" Me.chkOverwriteWarning.UseVisualStyleBackColor = True @@ -401,11 +404,11 @@ 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(6, 88) - Me.grpBackupHandling.Margin = New System.Windows.Forms.Padding(2) + Me.grpBackupHandling.Location = New System.Drawing.Point(8, 108) + Me.grpBackupHandling.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.grpBackupHandling.Name = "grpBackupHandling" - Me.grpBackupHandling.Padding = New System.Windows.Forms.Padding(2) - Me.grpBackupHandling.Size = New System.Drawing.Size(354, 87) + Me.grpBackupHandling.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.grpBackupHandling.Size = New System.Drawing.Size(472, 107) Me.grpBackupHandling.TabIndex = 1 Me.grpBackupHandling.TabStop = False Me.grpBackupHandling.Text = "Backup Handling" @@ -413,10 +416,10 @@ Partial Class frmSettings 'chkAutoRestore ' Me.chkAutoRestore.AutoSize = True - Me.chkAutoRestore.Location = New System.Drawing.Point(8, 41) - Me.chkAutoRestore.Margin = New System.Windows.Forms.Padding(2) + Me.chkAutoRestore.Location = New System.Drawing.Point(11, 50) + Me.chkAutoRestore.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.chkAutoRestore.Name = "chkAutoRestore" - Me.chkAutoRestore.Size = New System.Drawing.Size(190, 17) + Me.chkAutoRestore.Size = New System.Drawing.Size(248, 21) Me.chkAutoRestore.TabIndex = 1 Me.chkAutoRestore.Text = "Automatically restore new backups" Me.chkAutoRestore.UseVisualStyleBackColor = True @@ -424,10 +427,10 @@ Partial Class frmSettings 'chkRestoreNotify ' Me.chkRestoreNotify.AutoSize = True - Me.chkRestoreNotify.Location = New System.Drawing.Point(8, 19) - Me.chkRestoreNotify.Margin = New System.Windows.Forms.Padding(2) + Me.chkRestoreNotify.Location = New System.Drawing.Point(11, 23) + Me.chkRestoreNotify.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.chkRestoreNotify.Name = "chkRestoreNotify" - Me.chkRestoreNotify.Size = New System.Drawing.Size(216, 17) + Me.chkRestoreNotify.Size = New System.Drawing.Size(281, 21) Me.chkRestoreNotify.TabIndex = 0 Me.chkRestoreNotify.Text = "Display notifications about new backups" Me.chkRestoreNotify.UseVisualStyleBackColor = True @@ -435,9 +438,10 @@ Partial Class frmSettings 'chkAutoMark ' Me.chkAutoMark.AutoSize = True - Me.chkAutoMark.Location = New System.Drawing.Point(8, 63) + Me.chkAutoMark.Location = New System.Drawing.Point(11, 78) + Me.chkAutoMark.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkAutoMark.Name = "chkAutoMark" - Me.chkAutoMark.Size = New System.Drawing.Size(321, 17) + Me.chkAutoMark.Size = New System.Drawing.Size(424, 21) Me.chkAutoMark.TabIndex = 2 Me.chkAutoMark.Text = "Automatically mark new backups as restored when appropriate" Me.chkAutoMark.UseVisualStyleBackColor = True @@ -447,9 +451,10 @@ 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(180, 0) + Me.pnl7z.Location = New System.Drawing.Point(240, 0) + Me.pnl7z.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnl7z.Name = "pnl7z" - Me.pnl7z.Size = New System.Drawing.Size(367, 314) + Me.pnl7z.Size = New System.Drawing.Size(489, 386) Me.pnl7z.TabIndex = 2 ' 'grp7zAdvanced @@ -459,9 +464,11 @@ 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(6, 68) + Me.grp7zAdvanced.Location = New System.Drawing.Point(8, 84) + Me.grp7zAdvanced.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grp7zAdvanced.Name = "grp7zAdvanced" - Me.grp7zAdvanced.Size = New System.Drawing.Size(354, 73) + Me.grp7zAdvanced.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grp7zAdvanced.Size = New System.Drawing.Size(472, 90) Me.grp7zAdvanced.TabIndex = 1 Me.grp7zAdvanced.TabStop = False Me.grp7zAdvanced.Text = "Advanced" @@ -470,22 +477,28 @@ Partial Class frmSettings ' Me.grp7zInformation.Controls.Add(Me.lbl7zProduct) Me.grp7zInformation.Controls.Add(Me.lbl7zCopyright) - Me.grp7zInformation.Location = New System.Drawing.Point(6, 146) + Me.grp7zInformation.Location = New System.Drawing.Point(8, 180) + Me.grp7zInformation.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grp7zInformation.Name = "grp7zInformation" - Me.grp7zInformation.Size = New System.Drawing.Size(354, 63) + Me.grp7zInformation.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grp7zInformation.Size = New System.Drawing.Size(472, 78) Me.grp7zInformation.TabIndex = 2 Me.grp7zInformation.TabStop = False Me.grp7zInformation.Text = "Utility Information" ' 'pnlGeneral ' + Me.pnlGeneral.Controls.Add(Me.lblMinutes) + Me.pnlGeneral.Controls.Add(Me.nudSupressBackupThreshold) + Me.pnlGeneral.Controls.Add(Me.chkSupressBackup) 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.Location = New System.Drawing.Point(240, 0) + Me.pnlGeneral.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnlGeneral.Name = "pnlGeneral" - Me.pnlGeneral.Size = New System.Drawing.Size(367, 314) + Me.pnlGeneral.Size = New System.Drawing.Size(489, 386) Me.pnlGeneral.TabIndex = 1 ' 'grpGameData @@ -494,44 +507,80 @@ 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(6, 106) + Me.grpGameData.Location = New System.Drawing.Point(8, 130) + Me.grpGameData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpGameData.Name = "grpGameData" - Me.grpGameData.Size = New System.Drawing.Size(354, 92) + Me.grpGameData.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpGameData.Size = New System.Drawing.Size(472, 113) 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 = 0 - ' 'chkSessionTracking ' Me.chkSessionTracking.AutoSize = True - Me.chkSessionTracking.Location = New System.Drawing.Point(6, 42) + Me.chkSessionTracking.Location = New System.Drawing.Point(8, 52) + Me.chkSessionTracking.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.chkSessionTracking.Name = "chkSessionTracking" - Me.chkSessionTracking.Size = New System.Drawing.Size(138, 17) - Me.chkSessionTracking.TabIndex = 3 + Me.chkSessionTracking.Size = New System.Drawing.Size(180, 21) + Me.chkSessionTracking.TabIndex = 1 Me.chkSessionTracking.Text = "Enable session tracking" Me.chkSessionTracking.UseVisualStyleBackColor = True ' + '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, 4, 4, 4) + Me.lstSettings.Name = "lstSettings" + Me.lstSettings.Size = New System.Drawing.Size(215, 372) + Me.lstSettings.TabIndex = 0 + ' + 'lblMinutes + ' + Me.lblMinutes.AutoSize = True + Me.lblMinutes.Location = New System.Drawing.Point(310, 252) + Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMinutes.Name = "lblMinutes" + Me.lblMinutes.Size = New System.Drawing.Size(57, 17) + Me.lblMinutes.TabIndex = 17 + Me.lblMinutes.Text = "minutes" + ' + 'nudSupressBackupThreshold + ' + Me.nudSupressBackupThreshold.Location = New System.Drawing.Point(234, 250) + Me.nudSupressBackupThreshold.Margin = New System.Windows.Forms.Padding(4) + 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.TabIndex = 3 + ' + 'chkSupressBackup + ' + Me.chkSupressBackup.AutoSize = True + Me.chkSupressBackup.Location = New System.Drawing.Point(16, 251) + Me.chkSupressBackup.Margin = New System.Windows.Forms.Padding(4) + Me.chkSupressBackup.Name = "chkSupressBackup" + Me.chkSupressBackup.Size = New System.Drawing.Size(210, 21) + Me.chkSupressBackup.TabIndex = 2 + Me.chkSupressBackup.Text = "Ignore sessions shorter than" + Me.chkSupressBackup.UseVisualStyleBackColor = True + ' 'frmSettings ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(554, 361) - Me.Controls.Add(Me.pnlGeneral) + Me.ClientSize = New System.Drawing.Size(739, 444) Me.Controls.Add(Me.pnlBackup) + Me.Controls.Add(Me.pnlGeneral) Me.Controls.Add(Me.pnl7z) Me.Controls.Add(Me.lstSettings) Me.Controls.Add(Me.btnDefaults) Me.Controls.Add(Me.btnCancel) Me.Controls.Add(Me.btnSave) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "frmSettings" @@ -547,7 +596,6 @@ Partial Class frmSettings Me.grp7zGeneral.PerformLayout() Me.pnlBackup.ResumeLayout(False) Me.pnlBackup.PerformLayout() - CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() Me.grpBackupHandling.ResumeLayout(False) Me.grpBackupHandling.PerformLayout() Me.pnl7z.ResumeLayout(False) @@ -558,6 +606,7 @@ Partial Class frmSettings Me.pnlGeneral.PerformLayout() Me.grpGameData.ResumeLayout(False) Me.grpGameData.PerformLayout() + CType(Me.nudSupressBackupThreshold, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -595,9 +644,6 @@ Partial Class frmSettings Friend WithEvents lstSettings As ListBox Friend WithEvents grp7zAdvanced As GroupBox Friend WithEvents grp7zInformation As GroupBox - Friend WithEvents lblMinutes As Label - Friend WithEvents nudSupressBackupThreshold As NumericUpDown - Friend WithEvents chkSupressBackup As CheckBox Friend WithEvents chkBackupConfirm As CheckBox Friend WithEvents chkOverwriteWarning As CheckBox Friend WithEvents grpBackupHandling As GroupBox @@ -605,4 +651,7 @@ Partial Class frmSettings Friend WithEvents chkAutoRestore As CheckBox Friend WithEvents chkRestoreNotify As CheckBox Friend WithEvents chkSessionTracking As CheckBox + Friend WithEvents lblMinutes As Label + Friend WithEvents nudSupressBackupThreshold As NumericUpDown + Friend WithEvents chkSupressBackup As CheckBox End Class diff --git a/GBM/My Project/Resources.Designer.vb b/GBM/My Project/Resources.Designer.vb index 05b6ea4..a6354b6 100644 --- a/GBM/My Project/Resources.Designer.vb +++ b/GBM/My Project/Resources.Designer.vb @@ -3958,7 +3958,7 @@ Namespace My.Resources End Property ''' - ''' Looks up a localized string similar to Backup only when session time exceeds. + ''' Looks up a localized string similar to Ignore sessions shorter than. ''' Friend ReadOnly Property frmSettings_chkSupressBackup() As String Get diff --git a/GBM/My Project/Resources.resx b/GBM/My Project/Resources.resx index b68b8d0..900923c 100644 --- a/GBM/My Project/Resources.resx +++ b/GBM/My Project/Resources.resx @@ -1082,7 +1082,7 @@ Start with Windows - Backup only when session time exceeds + Ignore sessions shorter than Enable syncing