From e6adc37229ddd1786262f6cdec0913d086fd0d85 Mon Sep 17 00:00:00 2001 From: Smurf-iv Date: Sun, 4 Apr 2021 09:04:30 +0100 Subject: [PATCH 1/2] - Change minimum to be 32 for `BlockSize` - Update Nuget Packages - Update copyright notice(s) - Update installer to include system dll's #74 --- .../Elucidate Windows Installer/Elucidate.wxs | 44 +- .../KryptonLicense.txt | 2 +- Elucidate/Elucidate/CmdLine/DupVerb.cs | 2 +- .../DataGridViewTripleValueBarColumn.cs | 5 +- Elucidate/Elucidate/Controls/ListBoxLog.cs | 40 +- .../Elucidate/Controls/LogsViewerControl.cs | 2 +- .../ProtectedDrivesDisplay.Designer.cs | 16 +- .../Controls/ProtectedDrivesDisplay.cs | 32 +- .../Elucidate/Controls/RunControl.Designer.cs | 70 +-- Elucidate/Elucidate/Controls/RunControl.cs | 14 +- Elucidate/Elucidate/Elucidate.csproj | 22 +- .../ExtendedToolkit/CommandLinkTextValues.cs | 3 +- .../Elucidate/ExtendedToolkit/ImageValue.cs | 2 +- .../KryptonCommandLinkButtonActionList.cs | 4 +- .../KryptonCommandLinkVersion1.cs | 4 +- .../ViewDrawCommandLinkButton.cs | 5 +- .../Forms/CalculateBlockSize.Designer.cs | 97 ++-- .../Elucidate/Forms/CalculateBlockSize.cs | 17 +- .../Elucidate/Forms/CalculateBlockSize.resx | 4 +- .../Elucidate/Forms/ElucidateForm.Designer.cs | 74 +-- Elucidate/Elucidate/Forms/ElucidateForm.cs | 12 +- Elucidate/Elucidate/Forms/LiveLog.cs | 6 +- .../Elucidate/Forms/Settings.Designer.cs | 178 ++++--- Elucidate/Elucidate/Forms/Settings.cs | 6 +- Elucidate/Elucidate/Forms/Settings.resx | 13 +- .../HelperClasses/AdvancedSettingsHelper.cs | 26 +- .../HelperClasses/ConfigFileHelper.cs | 2 +- .../HelperClasses/ErrorProviderExtensions.cs | 2 +- .../Elucidate/HelperClasses/StorageUtil.cs | 8 +- Elucidate/Elucidate/HelperClasses/Util.cs | 24 +- .../Elucidate/HelperClasses/WindowLocation.cs | 144 ++--- Elucidate/Elucidate/Objects/CoveragePath.cs | 2 +- Elucidate/Elucidate/Program.cs | 8 +- .../Elucidate/Properties/AssemblyInfo.cs | 12 +- .../Properties/Resources.Designer.cs | 2 +- .../Elucidate/Properties/Settings.Designer.cs | 2 +- .../Elucidate/Shared/BufferedTreeView.cs | 4 +- .../Shared/MessageBoxExtForm.Designer.cs | 492 +++++++++--------- .../Elucidate/Shared/MessageBoxExtForm.cs | 388 +++++++------- .../Elucidate/Shared/TextOverProgressBar.cs | 3 +- .../Elucidate/TabPages/CommonTab.Designer.cs | 364 ++++++------- Elucidate/Elucidate/TabPages/CommonTab.cs | 22 +- .../Elucidate/TabPages/Recover.Designer.cs | 4 +- Elucidate/Elucidate/TabPages/Recover.cs | 6 +- .../Elucidate/TabPages/Schedule.Designer.cs | 14 +- Elucidate/Elucidate/TabPages/Schedule.cs | 8 +- Elucidate/Elucidate/app.config | 40 +- .../wyDay.Controls/Windows7ProgressBar.cs | 1 + .../wyDay.Controls/Windows7Taskbar.cs | 1 + 49 files changed, 1146 insertions(+), 1107 deletions(-) diff --git a/Elucidate/Elucidate Windows Installer/Elucidate.wxs b/Elucidate/Elucidate Windows Installer/Elucidate.wxs index 856d90c..1a3f2e9 100644 --- a/Elucidate/Elucidate Windows Installer/Elucidate.wxs +++ b/Elucidate/Elucidate Windows Installer/Elucidate.wxs @@ -74,17 +74,12 @@ - - - - - - + - + @@ -93,6 +88,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Elucidate/Elucidate Windows Installer/KryptonLicense.txt b/Elucidate/Elucidate Windows Installer/KryptonLicense.txt index f9ffd6e..cd73a53 100644 --- a/Elucidate/Elucidate Windows Installer/KryptonLicense.txt +++ b/Elucidate/Elucidate Windows Installer/KryptonLicense.txt @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2018 - 2019, Peter Wagner & Simon Coghlan +Copyright (c) 2018 - 2021, Peter Wagner & Simon Coghlan All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Elucidate/Elucidate/CmdLine/DupVerb.cs b/Elucidate/Elucidate/CmdLine/DupVerb.cs index 4b75433..ce2786c 100644 --- a/Elucidate/Elucidate/CmdLine/DupVerb.cs +++ b/Elucidate/Elucidate/CmdLine/DupVerb.cs @@ -31,7 +31,7 @@ namespace Elucidate.CmdLine { [Verb("dup", HelpText = "Lists all the duplicate files. Two files are assumed equal if their hashes are matching. ")] - internal class DupVerb : StdOptions + internal class DupVerb : StdOptions { } } diff --git a/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs b/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs index 3e3ed5f..c7015ab 100644 --- a/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs +++ b/Elucidate/Elucidate/Controls/DataGridViewTripleValueBarColumn.cs @@ -1,5 +1,4 @@ -using System; -using System.ComponentModel; +using System.ComponentModel; using System.Drawing; using System.Windows.Forms; @@ -48,7 +47,7 @@ protected override void Paint(System.Drawing.Graphics g, System.Drawing.Rectangl { try { - string s = ((string) value); + string s = ((string)value); if (string.IsNullOrWhiteSpace(s)) { return; diff --git a/Elucidate/Elucidate/Controls/ListBoxLog.cs b/Elucidate/Elucidate/Controls/ListBoxLog.cs index 0330b48..a335a13 100644 --- a/Elucidate/Elucidate/Controls/ListBoxLog.cs +++ b/Elucidate/Elucidate/Controls/ListBoxLog.cs @@ -125,7 +125,7 @@ private void MeasureItem(object sender, MeasureItemEventArgs e) } Size sizeF = TextRenderer.MeasureText(e.Graphics, logEvent.Message, listBoxInt.Font); - + e.ItemHeight = sizeF.Height + 2; if (listBoxInt.HorizontalExtent < sizeF.Width) { @@ -233,30 +233,30 @@ private void timer1_Tick(object sender, EventArgs e) // Now lock in case the timer is overlapping ! alreadyDequing = true; - listBoxInt.BeginInvoke((MethodInvoker) delegate - { + listBoxInt.BeginInvoke((MethodInvoker)delegate + { //some stuffs for best performance listBoxInt.BeginUpdate(); // find the style to use while (pendingLogMessages.TryDequeue(out LogString log)) - { - listBoxInt.Items.Add(log); - } - - if (listBoxInt.Items.Count > maxEntriesInListBox) - { - listBoxInt.Items.RemoveAt(0); - } - - if (!Paused) - { - listBoxInt.TopIndex = listBoxInt.Items.Count - 1; - } - - listBoxInt.EndUpdate(); - alreadyDequing = false; - } + { + listBoxInt.Items.Add(log); + } + + if (listBoxInt.Items.Count > maxEntriesInListBox) + { + listBoxInt.Items.RemoveAt(0); + } + + if (!Paused) + { + listBoxInt.TopIndex = listBoxInt.Items.Count - 1; + } + + listBoxInt.EndUpdate(); + alreadyDequing = false; + } ); } catch (Exception ex) diff --git a/Elucidate/Elucidate/Controls/LogsViewerControl.cs b/Elucidate/Elucidate/Controls/LogsViewerControl.cs index c7c5f4a..934ecbe 100644 --- a/Elucidate/Elucidate/Controls/LogsViewerControl.cs +++ b/Elucidate/Elucidate/Controls/LogsViewerControl.cs @@ -2,7 +2,7 @@ // --------------------------------------------------------------------------------------------------------------- // // -// Copyright (C) 2018-2020 Simon Coghlan (Aka Smurf-IV) & BlueBlock 2018 +// Copyright (C) 2018-2021 Simon Coghlan (Aka Smurf-IV) & BlueBlock 2018 // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs index 4171773..93e2207 100644 --- a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs +++ b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.Designer.cs @@ -28,10 +28,10 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.kryptonPanel1 = new ComponentFactory.Krypton.Toolkit.KryptonPanel(); - this.driveGrid = new ComponentFactory.Krypton.Toolkit.KryptonDataGridView(); - this.colPath = new ComponentFactory.Krypton.Toolkit.KryptonDataGridViewTextBoxColumn(); - this.colName = new ComponentFactory.Krypton.Toolkit.KryptonDataGridViewTextBoxColumn(); + this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); + this.driveGrid = new Krypton.Toolkit.KryptonDataGridView(); + this.colPath = new Krypton.Toolkit.KryptonDataGridViewTextBoxColumn(); + this.colName = new Krypton.Toolkit.KryptonDataGridViewTextBoxColumn(); this.colDriveSpace = new Elucidate.Controls.DataGridViewTripleValueBarColumn(); this.colDetails = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.kryptonPanel1)).BeginInit(); @@ -127,10 +127,10 @@ private void InitializeComponent() #endregion - private ComponentFactory.Krypton.Toolkit.KryptonPanel kryptonPanel1; - internal ComponentFactory.Krypton.Toolkit.KryptonDataGridView driveGrid; - private ComponentFactory.Krypton.Toolkit.KryptonDataGridViewTextBoxColumn colPath; - private ComponentFactory.Krypton.Toolkit.KryptonDataGridViewTextBoxColumn colName; + private Krypton.Toolkit.KryptonPanel kryptonPanel1; + internal Krypton.Toolkit.KryptonDataGridView driveGrid; + private Krypton.Toolkit.KryptonDataGridViewTextBoxColumn colPath; + private Krypton.Toolkit.KryptonDataGridViewTextBoxColumn colName; private DataGridViewTripleValueBarColumn colDriveSpace; private System.Windows.Forms.DataGridViewTextBoxColumn colDetails; } diff --git a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs index f40974d..1e22a44 100644 --- a/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs +++ b/Elucidate/Elucidate/Controls/ProtectedDrivesDisplay.cs @@ -1,7 +1,7 @@ #region Copyright (C) // // -// Copyright (C) 2019-2020 Smurf-IV +// Copyright (C) 2019-2021 Smurf-IV // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ private void IncrementWaitCursor() { if (Interlocked.Increment(ref useWaitCursor) == 1) { - BeginInvoke((MethodInvoker) (() => UseWaitCursor = true)); + BeginInvoke((MethodInvoker)(() => UseWaitCursor = true)); } } @@ -70,7 +70,7 @@ private void DecrementWaitCursor() { if (Interlocked.Decrement(ref useWaitCursor) <= 0) { - BeginInvoke((MethodInvoker) (() => UseWaitCursor = false)); + BeginInvoke((MethodInvoker)(() => UseWaitCursor = false)); } } @@ -118,7 +118,7 @@ private void driveGrid_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e { if (!cancelTokenSrc.IsCancellationRequested) { - for (int index = e.RowIndex; index < e.RowIndex+ e.RowCount; index++) + for (int index = e.RowIndex; index < e.RowIndex + e.RowCount; index++) { // Get data to perform drive usage display DataGridViewRow row = driveGrid.Rows[index]; @@ -158,20 +158,20 @@ private void ProcessProtectedSpace(DataGridViewRow row, DriveInfo driveInfo, ulong protectedUse = DirSize(dirInfo, token); if (!token.IsCancellationRequested) { - BeginInvoke((MethodInvoker) delegate - { - try - { - row.Cells[2].Value = $@"{protectedUse}:{totalUsed}:{driveInfo.TotalSize}"; - row.Cells[3].Value = - $@"{new ByteSize(protectedUse)} : {new ByteSize(totalUsed)} : {new ByteSize(driveInfo.TotalSize)}"; - } - catch - { + BeginInvoke((MethodInvoker)delegate + { + try + { + row.Cells[2].Value = $@"{protectedUse}:{totalUsed}:{driveInfo.TotalSize}"; + row.Cells[3].Value = + $@"{new ByteSize(protectedUse)} : {new ByteSize(totalUsed)} : {new ByteSize(driveInfo.TotalSize)}"; + } + catch + { // Do nothing // Might be caused by fast closure } - }); + }); } DecrementWaitCursor(); @@ -192,7 +192,7 @@ private static ulong DirSize(DirectoryInfo dir, CancellationToken token) return 0UL; } - return dir.EnumerateFiles().AsParallel().Sum(fi => (ulong)fi.Length) + return dir.EnumerateFiles().AsParallel().Sum(fi => (ulong)fi.Length) + dir.EnumerateDirectories() .Where(d => (d.Attributes & System.IO.FileAttributes.System) == 0 && (d.Attributes & System.IO.FileAttributes.Hidden) == 0) .AsParallel() diff --git a/Elucidate/Elucidate/Controls/RunControl.Designer.cs b/Elucidate/Elucidate/Controls/RunControl.Designer.cs index 11c719c..bce6855 100644 --- a/Elucidate/Elucidate/Controls/RunControl.Designer.cs +++ b/Elucidate/Elucidate/Controls/RunControl.Designer.cs @@ -32,16 +32,16 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.tsStartTime = new ComponentFactory.Krypton.Toolkit.KryptonLabel(); + this.tsStartTime = new Krypton.Toolkit.KryptonLabel(); this.toolStripProgressBar1 = new Elucidate.Shared.TextOverProgressBar(); - this.runWithoutCaptureMenuItem = new ComponentFactory.Krypton.Toolkit.KryptonCheckBox(); - this.checkBoxDisplayOutput = new ComponentFactory.Krypton.Toolkit.KryptonCheckBox(); - this.comboBoxProcessStatus = new ComponentFactory.Krypton.Toolkit.KryptonComboBox(); - this.txtAddCommands = new ComponentFactory.Krypton.Toolkit.KryptonTextBox(); + this.runWithoutCaptureMenuItem = new Krypton.Toolkit.KryptonCheckBox(); + this.checkBoxDisplayOutput = new Krypton.Toolkit.KryptonCheckBox(); + this.comboBoxProcessStatus = new Krypton.Toolkit.KryptonComboBox(); + this.txtAddCommands = new Krypton.Toolkit.KryptonTextBox(); this.tableLayoutPanelAdditionalCommands = new System.Windows.Forms.TableLayoutPanel(); - this.checkBoxCommandLineOptions = new ComponentFactory.Krypton.Toolkit.KryptonCheckBox(); + this.checkBoxCommandLineOptions = new Krypton.Toolkit.KryptonCheckBox(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.kryptonPanel1 = new ComponentFactory.Krypton.Toolkit.KryptonPanel(); + this.kryptonPanel1 = new Krypton.Toolkit.KryptonPanel(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.comboBoxProcessStatus)).BeginInit(); this.tableLayoutPanelAdditionalCommands.SuspendLayout(); @@ -77,17 +77,17 @@ private void InitializeComponent() // tsStartTime // this.tsStartTime.Dock = System.Windows.Forms.DockStyle.Fill; - this.tsStartTime.LabelStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.NormalPanel; + this.tsStartTime.LabelStyle = Krypton.Toolkit.LabelStyle.NormalPanel; this.tsStartTime.Location = new System.Drawing.Point(0, 4); this.tsStartTime.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.tsStartTime.MinimumSize = new System.Drawing.Size(170, 22); this.tsStartTime.Name = "tsStartTime"; this.tsStartTime.Size = new System.Drawing.Size(205, 30); this.tsStartTime.StateCommon.ShortText.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tsStartTime.StateCommon.ShortText.ImageStyle = ComponentFactory.Krypton.Toolkit.PaletteImageStyle.Inherit; - this.tsStartTime.StateCommon.ShortText.TextH = ComponentFactory.Krypton.Toolkit.PaletteRelativeAlign.Near; - this.tsStartTime.StateCommon.ShortText.TextV = ComponentFactory.Krypton.Toolkit.PaletteRelativeAlign.Near; - this.tsStartTime.StateCommon.ShortText.Trim = ComponentFactory.Krypton.Toolkit.PaletteTextTrim.Inherit; + this.tsStartTime.StateCommon.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; + this.tsStartTime.StateCommon.ShortText.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; + this.tsStartTime.StateCommon.ShortText.TextV = Krypton.Toolkit.PaletteRelativeAlign.Near; + this.tsStartTime.StateCommon.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.tsStartTime.TabIndex = 0; this.tsStartTime.TabStop = false; this.tsStartTime.Values.Text = "2000-01-01 00:00:00Z"; @@ -111,15 +111,15 @@ private void InitializeComponent() // runWithoutCaptureMenuItem // this.runWithoutCaptureMenuItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.runWithoutCaptureMenuItem.LabelStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.NormalPanel; + this.runWithoutCaptureMenuItem.LabelStyle = Krypton.Toolkit.LabelStyle.NormalPanel; this.runWithoutCaptureMenuItem.Location = new System.Drawing.Point(497, 0); this.runWithoutCaptureMenuItem.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.runWithoutCaptureMenuItem.MinimumSize = new System.Drawing.Size(122, 22); this.runWithoutCaptureMenuItem.Name = "runWithoutCaptureMenuItem"; this.runWithoutCaptureMenuItem.Size = new System.Drawing.Size(199, 34); this.runWithoutCaptureMenuItem.StateCommon.ShortText.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.runWithoutCaptureMenuItem.StateCommon.ShortText.ImageStyle = ComponentFactory.Krypton.Toolkit.PaletteImageStyle.Inherit; - this.runWithoutCaptureMenuItem.StateCommon.ShortText.Trim = ComponentFactory.Krypton.Toolkit.PaletteTextTrim.Inherit; + this.runWithoutCaptureMenuItem.StateCommon.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; + this.runWithoutCaptureMenuItem.StateCommon.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.runWithoutCaptureMenuItem.TabIndex = 3; this.runWithoutCaptureMenuItem.Values.Text = "Run without capture"; this.runWithoutCaptureMenuItem.Visible = false; @@ -129,16 +129,16 @@ private void InitializeComponent() this.checkBoxDisplayOutput.Checked = true; this.checkBoxDisplayOutput.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDisplayOutput.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBoxDisplayOutput.LabelStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.NormalPanel; + this.checkBoxDisplayOutput.LabelStyle = Krypton.Toolkit.LabelStyle.NormalPanel; this.checkBoxDisplayOutput.Location = new System.Drawing.Point(337, 0); this.checkBoxDisplayOutput.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.checkBoxDisplayOutput.MinimumSize = new System.Drawing.Size(86, 22); this.checkBoxDisplayOutput.Name = "checkBoxDisplayOutput"; this.checkBoxDisplayOutput.Size = new System.Drawing.Size(152, 34); this.checkBoxDisplayOutput.StateCommon.ShortText.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxDisplayOutput.StateCommon.ShortText.ImageStyle = ComponentFactory.Krypton.Toolkit.PaletteImageStyle.Inherit; - this.checkBoxDisplayOutput.StateCommon.ShortText.TextH = ComponentFactory.Krypton.Toolkit.PaletteRelativeAlign.Near; - this.checkBoxDisplayOutput.StateCommon.ShortText.Trim = ComponentFactory.Krypton.Toolkit.PaletteTextTrim.Inherit; + this.checkBoxDisplayOutput.StateCommon.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; + this.checkBoxDisplayOutput.StateCommon.ShortText.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; + this.checkBoxDisplayOutput.StateCommon.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.checkBoxDisplayOutput.TabIndex = 2; this.checkBoxDisplayOutput.Values.Text = "Display Output"; this.checkBoxDisplayOutput.MouseLeave += new System.EventHandler(this.checkBoxDisplayOutput_MouseLeave); @@ -162,10 +162,10 @@ private void InitializeComponent() this.comboBoxProcessStatus.Name = "comboBoxProcessStatus"; this.comboBoxProcessStatus.Size = new System.Drawing.Size(120, 28); this.comboBoxProcessStatus.StateCommon.ComboBox.Content.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.comboBoxProcessStatus.StateCommon.ComboBox.Content.TextH = ComponentFactory.Krypton.Toolkit.PaletteRelativeAlign.Near; + this.comboBoxProcessStatus.StateCommon.ComboBox.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Near; this.comboBoxProcessStatus.StateCommon.Item.Content.ShortText.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.comboBoxProcessStatus.StateCommon.Item.Content.ShortText.ImageStyle = ComponentFactory.Krypton.Toolkit.PaletteImageStyle.Inherit; - this.comboBoxProcessStatus.StateCommon.Item.Content.ShortText.Trim = ComponentFactory.Krypton.Toolkit.PaletteTextTrim.Inherit; + this.comboBoxProcessStatus.StateCommon.Item.Content.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; + this.comboBoxProcessStatus.StateCommon.Item.Content.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.comboBoxProcessStatus.TabIndex = 1; this.comboBoxProcessStatus.Text = "Stopped"; this.comboBoxProcessStatus.SelectedIndexChanged += new System.EventHandler(this.comboBoxProcessStatus_SelectedIndexChanged); @@ -179,13 +179,13 @@ private void InitializeComponent() this.txtAddCommands.Name = "txtAddCommands"; this.txtAddCommands.Size = new System.Drawing.Size(502, 26); this.txtAddCommands.StateCommon.Content.Font = new System.Drawing.Font("Lucida Console", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtAddCommands.StateCommon.Content.TextH = ComponentFactory.Krypton.Toolkit.PaletteRelativeAlign.Inherit; + this.txtAddCommands.StateCommon.Content.TextH = Krypton.Toolkit.PaletteRelativeAlign.Inherit; this.txtAddCommands.TabIndex = 1; this.txtAddCommands.ToolTipValues.Description = "Start with a single + to remove the default"; this.txtAddCommands.ToolTipValues.EnableToolTips = true; this.txtAddCommands.ToolTipValues.Heading = "Command Line Options"; this.txtAddCommands.ToolTipValues.Image = null; - this.txtAddCommands.ToolTipValues.ToolTipStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.TitlePanel; + this.txtAddCommands.ToolTipValues.ToolTipStyle = Krypton.Toolkit.LabelStyle.TitlePanel; this.txtAddCommands.WordWrap = false; // // tableLayoutPanelAdditionalCommands @@ -212,21 +212,21 @@ private void InitializeComponent() // checkBoxCommandLineOptions // this.checkBoxCommandLineOptions.Dock = System.Windows.Forms.DockStyle.Fill; - this.checkBoxCommandLineOptions.LabelStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.NormalPanel; + this.checkBoxCommandLineOptions.LabelStyle = Krypton.Toolkit.LabelStyle.NormalPanel; this.checkBoxCommandLineOptions.Location = new System.Drawing.Point(5, 5); this.checkBoxCommandLineOptions.Margin = new System.Windows.Forms.Padding(4); this.checkBoxCommandLineOptions.Name = "checkBoxCommandLineOptions"; this.checkBoxCommandLineOptions.Size = new System.Drawing.Size(338, 27); this.checkBoxCommandLineOptions.StateCommon.ShortText.Font = new System.Drawing.Font("Tahoma", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.checkBoxCommandLineOptions.StateCommon.ShortText.ImageStyle = ComponentFactory.Krypton.Toolkit.PaletteImageStyle.Inherit; - this.checkBoxCommandLineOptions.StateCommon.ShortText.Trim = ComponentFactory.Krypton.Toolkit.PaletteTextTrim.Inherit; + this.checkBoxCommandLineOptions.StateCommon.ShortText.ImageStyle = Krypton.Toolkit.PaletteImageStyle.Inherit; + this.checkBoxCommandLineOptions.StateCommon.ShortText.Trim = Krypton.Toolkit.PaletteTextTrim.Inherit; this.checkBoxCommandLineOptions.TabIndex = 0; this.checkBoxCommandLineOptions.ToolTipValues.Description = "Will be unchecked after command, so the next command does not include this by acc" + "ident"; this.checkBoxCommandLineOptions.ToolTipValues.EnableToolTips = true; this.checkBoxCommandLineOptions.ToolTipValues.Heading = "Command Line Options"; this.checkBoxCommandLineOptions.ToolTipValues.Image = null; - this.checkBoxCommandLineOptions.ToolTipValues.ToolTipStyle = ComponentFactory.Krypton.Toolkit.LabelStyle.TitlePanel; + this.checkBoxCommandLineOptions.ToolTipValues.ToolTipStyle = Krypton.Toolkit.LabelStyle.TitlePanel; this.checkBoxCommandLineOptions.Values.Text = "Include Additional Command Line Options:"; // // toolTip1 @@ -269,15 +269,15 @@ private void InitializeComponent() #endregion private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private ComponentFactory.Krypton.Toolkit.KryptonComboBox comboBoxProcessStatus; + private Krypton.Toolkit.KryptonComboBox comboBoxProcessStatus; private Shared.TextOverProgressBar toolStripProgressBar1; - private ComponentFactory.Krypton.Toolkit.KryptonCheckBox runWithoutCaptureMenuItem; - private ComponentFactory.Krypton.Toolkit.KryptonLabel tsStartTime; + private Krypton.Toolkit.KryptonCheckBox runWithoutCaptureMenuItem; + private Krypton.Toolkit.KryptonLabel tsStartTime; private TableLayoutPanel tableLayoutPanelAdditionalCommands; - internal ComponentFactory.Krypton.Toolkit.KryptonTextBox txtAddCommands; - internal ComponentFactory.Krypton.Toolkit.KryptonCheckBox checkBoxCommandLineOptions; - internal ComponentFactory.Krypton.Toolkit.KryptonCheckBox checkBoxDisplayOutput; + internal Krypton.Toolkit.KryptonTextBox txtAddCommands; + internal Krypton.Toolkit.KryptonCheckBox checkBoxCommandLineOptions; + internal Krypton.Toolkit.KryptonCheckBox checkBoxDisplayOutput; private ToolTip toolTip1; - private ComponentFactory.Krypton.Toolkit.KryptonPanel kryptonPanel1; + private Krypton.Toolkit.KryptonPanel kryptonPanel1; } } diff --git a/Elucidate/Elucidate/Controls/RunControl.cs b/Elucidate/Elucidate/Controls/RunControl.cs index 054a686..c24a8bd 100644 --- a/Elucidate/Elucidate/Controls/RunControl.cs +++ b/Elucidate/Elucidate/Controls/RunControl.cs @@ -1,7 +1,7 @@ #region Copyright (C) // // -// Copyright (C) 2018-2020 Smurf-IV & BlueBlock 2018 +// Copyright (C) 2018-2021 Smurf-IV & BlueBlock 2018 // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -32,10 +32,10 @@ using System.Threading; using System.Windows.Forms; -using ComponentFactory.Krypton.Toolkit; - using Elucidate.wyDay.Controls; +using Krypton.Toolkit; + using NLog; namespace Elucidate.Controls @@ -317,7 +317,7 @@ private void RunSnapRaid(DoWorkEventArgs e, string args, string appPath, Backgro process.Start(); // Redirect the output stream of the child process. - ThreadObject threadObject = new ThreadObject {BgdWorker = worker, CmdProcess = process}; + ThreadObject threadObject = new ThreadObject { BgdWorker = worker, CmdProcess = process }; ThreadPool.QueueUserWorkItem(o => ReadStandardOutput(threadObject)); ThreadPool.QueueUserWorkItem(o => ReadStandardError(threadObject)); @@ -326,7 +326,7 @@ private void RunSnapRaid(DoWorkEventArgs e, string args, string appPath, Backgro mreProcessExit.Set(); } - while (!WaitHandle.WaitAll(new WaitHandle[] {mreErrorDone, mreOutputDone, mreProcessExit}, 250)) + while (!WaitHandle.WaitAll(new WaitHandle[] { mreErrorDone, mreOutputDone, mreProcessExit }, 250)) { if (process.HasExited) { @@ -349,7 +349,7 @@ private void RunSnapRaid(DoWorkEventArgs e, string args, string appPath, Backgro { process.Resume(); } - else if ( requested == ProcessPriorityClass.BelowNormal ) + else if (requested == ProcessPriorityClass.BelowNormal) { process.Suspend(); } @@ -605,7 +605,7 @@ private void comboBoxProcessStatus_SelectedIndexChanged(object sender, EventArgs return; } - KryptonComboBox control = (KryptonComboBox) sender; + KryptonComboBox control = (KryptonComboBox)sender; string strSelected = control.SelectedItem.ToString(); diff --git a/Elucidate/Elucidate/Elucidate.csproj b/Elucidate/Elucidate/Elucidate.csproj index 790896e..0f75498 100644 --- a/Elucidate/Elucidate/Elucidate.csproj +++ b/Elucidate/Elucidate/Elucidate.csproj @@ -23,14 +23,13 @@ True True True - False + True YearStamp.MonthStamp.Increment.DayStamp ShortYearStamp.MonthStamp.Increment.DayStamp - - + YearStamp.MonthStamp.Increment.DayStamp AssemblyVersionAttribute Properties\AssemblyInfo.cs - 2020.9.1022.1 + 2021.4.1029.4 False SettingsVersion None @@ -306,23 +305,26 @@ 2.8.0 - 4.4.1 + 4.6.2 - 4.4.1 + 4.6.2 - - 5.472.2098 + + 5.550.2103.1 + + + 5.550.2103.1 - 4.7.4 + 4.7.9 - + - + - + @@ -21,23 +21,23 @@ - + - - + + - + - - - + + + - + @@ -60,7 +60,7 @@ False - + False @@ -81,7 +81,7 @@ False - + @@ -96,8 +96,8 @@ - - + + - + diff --git a/Elucidate/Elucidate/wyDay.Controls/Windows7ProgressBar.cs b/Elucidate/Elucidate/wyDay.Controls/Windows7ProgressBar.cs index 12b8cf1..bee0b53 100644 --- a/Elucidate/Elucidate/wyDay.Controls/Windows7ProgressBar.cs +++ b/Elucidate/Elucidate/wyDay.Controls/Windows7ProgressBar.cs @@ -2,6 +2,7 @@ using System.ComponentModel.Design; using System.Drawing; using System.Windows.Forms; + using wyDay.Controls; //Windows7ProgressBar v1.0, created by Wyatt O'Day diff --git a/Elucidate/Elucidate/wyDay.Controls/Windows7Taskbar.cs b/Elucidate/Elucidate/wyDay.Controls/Windows7Taskbar.cs index 3ad5f20..671f404 100644 --- a/Elucidate/Elucidate/wyDay.Controls/Windows7Taskbar.cs +++ b/Elucidate/Elucidate/wyDay.Controls/Windows7Taskbar.cs @@ -2,6 +2,7 @@ using System; using System.Runtime.InteropServices; + using wyDay.Controls; namespace Elucidate.wyDay.Controls From 9002a4b36226c4ff887fd93465f73e83bdf76ab4 Mon Sep 17 00:00:00 2001 From: Smurf-iv Date: Sun, 4 Apr 2021 09:29:43 +0100 Subject: [PATCH 2/2] - missed a range check ! --- Elucidate/Elucidate/Elucidate.csproj | 2 +- Elucidate/Elucidate/Objects/Constants.cs | 4 ++-- Elucidate/Elucidate/Properties/AssemblyInfo.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Elucidate/Elucidate/Elucidate.csproj b/Elucidate/Elucidate/Elucidate.csproj index 0f75498..2f85af3 100644 --- a/Elucidate/Elucidate/Elucidate.csproj +++ b/Elucidate/Elucidate/Elucidate.csproj @@ -29,7 +29,7 @@ YearStamp.MonthStamp.Increment.DayStamp AssemblyVersionAttribute Properties\AssemblyInfo.cs - 2021.4.1029.4 + 2021.4.1030.4 False SettingsVersion None diff --git a/Elucidate/Elucidate/Objects/Constants.cs b/Elucidate/Elucidate/Objects/Constants.cs index 54ac1fa..5fbae3b 100644 --- a/Elucidate/Elucidate/Objects/Constants.cs +++ b/Elucidate/Elucidate/Objects/Constants.cs @@ -2,11 +2,11 @@ { public static class Constants { - public const int MinBlockSize = 256; + public const int MinBlockSize = 32; public const int MaxBlockSize = 16384; public const int DefaultBlockSize = 256; - public const int MinAutoSave = 0; + public const int MinAutoSave = 10; public const int MaxAutoSave = short.MaxValue; public const int DefaultAutoSave = 250; diff --git a/Elucidate/Elucidate/Properties/AssemblyInfo.cs b/Elucidate/Elucidate/Properties/AssemblyInfo.cs index 8c6544d..b4a6f8d 100644 --- a/Elucidate/Elucidate/Properties/AssemblyInfo.cs +++ b/Elucidate/Elucidate/Properties/AssemblyInfo.cs @@ -56,8 +56,8 @@ // Build Number - Increment // Revision - Day // -[assembly: AssemblyVersion("2021.4.1029.4")] -[assembly: AssemblyFileVersion("21.4.1029.4")] +[assembly: AssemblyVersion("2021.4.1030.4")] +[assembly: AssemblyFileVersion("21.4.1030.4")] [assembly: NeutralResourcesLanguage("en-US")] // TODO: Add more relevant hints here [assembly: Dependency("System", LoadHint.Always)]