diff --git a/src/BSH.Controls/Preview/Files/CLikeFormat.cs b/src/BSH.Controls/Preview/Files/CLikeFormat.cs index 6b69ba1..9045158 100644 --- a/src/BSH.Controls/Preview/Files/CLikeFormat.cs +++ b/src/BSH.Controls/Preview/Files/CLikeFormat.cs @@ -34,7 +34,10 @@ public abstract class CLikeFormat : CodeFormat /// protected override string CommentRegEx { - get { return @"/\*.*?\*/|//.*?(?=\r|\n)"; } + get + { + return @"/\*.*?\*/|//.*?(?=\r|\n)"; + } } /// @@ -42,7 +45,10 @@ protected override string CommentRegEx /// protected override string StringRegEx { - get { return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; } + get + { + return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; + } } } } diff --git a/src/BSH.Controls/Preview/Files/CodeFormat.cs b/src/BSH.Controls/Preview/Files/CodeFormat.cs index 6bc3005..fd4e21b 100644 --- a/src/BSH.Controls/Preview/Files/CodeFormat.cs +++ b/src/BSH.Controls/Preview/Files/CodeFormat.cs @@ -53,7 +53,10 @@ protected abstract string Keywords /// protected virtual string Preprocessors { - get { return ""; } + get + { + return ""; + } } /// @@ -85,7 +88,10 @@ protected abstract string CommentRegEx /// public virtual bool CaseSensitive { - get { return true; } + get + { + return true; + } } /// diff --git a/src/BSH.Controls/Preview/Files/MshFormat.cs b/src/BSH.Controls/Preview/Files/MshFormat.cs index 7a455cb..27984c9 100644 --- a/src/BSH.Controls/Preview/Files/MshFormat.cs +++ b/src/BSH.Controls/Preview/Files/MshFormat.cs @@ -10,7 +10,10 @@ public class MshFormat : CodeFormat /// protected override string CommentRegEx { - get { return @"#.*?(?=\r|\n)"; } + get + { + return @"#.*?(?=\r|\n)"; + } } /// @@ -18,7 +21,10 @@ protected override string CommentRegEx /// protected override string StringRegEx { - get { return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; } + get + { + return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; + } } /// diff --git a/src/BSH.Controls/Preview/Files/SourceFormat.cs b/src/BSH.Controls/Preview/Files/SourceFormat.cs index d9f6372..4da2f96 100644 --- a/src/BSH.Controls/Preview/Files/SourceFormat.cs +++ b/src/BSH.Controls/Preview/Files/SourceFormat.cs @@ -62,28 +62,40 @@ protected SourceFormat() /// The number of space characters to substitute for tab /// characters. The default is 4, unless overridden is a /// derived class. - public byte TabSpaces { get; set; } + public byte TabSpaces + { + get; set; + } /// /// Enables or disables line numbers in output. /// /// When true, line numbers are generated. /// The default is false. - public bool LineNumbers { get; set; } + public bool LineNumbers + { + get; set; + } /// /// Enables or disables alternating line background. /// /// When true, lines background is alternated. /// The default is false. - public bool Alternate { get; set; } + public bool Alternate + { + get; set; + } /// /// Enables or disables the embedded CSS style sheet. /// /// When true, the CSS <style> element is included /// in the HTML output. The default is false. - public bool EmbedStyleSheet { get; set; } + public bool EmbedStyleSheet + { + get; set; + } /// Transform source code to HTML 4.01. /// @@ -141,7 +153,10 @@ public static string GetCssString() /// /// The regular expression used to capture language tokens. /// - protected Regex CodeRegex { get; set; } + protected Regex CodeRegex + { + get; set; + } /// /// Called to evaluate the HTML fragment corresponding to each diff --git a/src/BSH.Controls/Preview/Files/TsqlFormat.cs b/src/BSH.Controls/Preview/Files/TsqlFormat.cs index 02a01d2..b06b19d 100644 --- a/src/BSH.Controls/Preview/Files/TsqlFormat.cs +++ b/src/BSH.Controls/Preview/Files/TsqlFormat.cs @@ -58,7 +58,10 @@ protected override string StringRegEx /// public override bool CaseSensitive { - get { return false; } + get + { + return false; + } } diff --git a/src/BSH.Controls/Preview/Files/VisualBasicFormat.cs b/src/BSH.Controls/Preview/Files/VisualBasicFormat.cs index 7d14f29..a85cf81 100644 --- a/src/BSH.Controls/Preview/Files/VisualBasicFormat.cs +++ b/src/BSH.Controls/Preview/Files/VisualBasicFormat.cs @@ -34,7 +34,10 @@ public class VisualBasicFormat : CodeFormat /// Always true, since VB is not case sensitive. public override bool CaseSensitive { - get { return false; } + get + { + return false; + } } /// @@ -42,7 +45,10 @@ public override bool CaseSensitive /// protected override string CommentRegEx { - get { return @"(?:'|REM\s).*?(?=\r|\n)"; } + get + { + return @"(?:'|REM\s).*?(?=\r|\n)"; + } } /// @@ -50,7 +56,10 @@ protected override string CommentRegEx /// protected override string StringRegEx { - get { return @"""""|"".*?"""; } + get + { + return @"""""|"".*?"""; + } } /// diff --git a/src/BSH.Controls/Preview/Psd/ColorModeData.cs b/src/BSH.Controls/Preview/Psd/ColorModeData.cs index 41c25ed..d20b137 100644 --- a/src/BSH.Controls/Preview/Psd/ColorModeData.cs +++ b/src/BSH.Controls/Preview/Psd/ColorModeData.cs @@ -5,9 +5,15 @@ namespace SimplePsd /// public class ColorModeData { - public int NLength { get; set; } + public int NLength + { + get; set; + } - public byte[] ColourData { get; set; } + public byte[] ColourData + { + get; set; + } public ColorModeData() { diff --git a/src/BSH.Controls/Preview/Psd/DisplayInfo.cs b/src/BSH.Controls/Preview/Psd/DisplayInfo.cs index 43982e0..433bc2a 100644 --- a/src/BSH.Controls/Preview/Psd/DisplayInfo.cs +++ b/src/BSH.Controls/Preview/Psd/DisplayInfo.cs @@ -5,15 +5,27 @@ namespace SimplePsd /// public class DisplayInfo { - public short ColourSpace { get; set; } + public short ColourSpace + { + get; set; + } public short[] Colour { get; set; } = new short[4]; - public short Opacity { get; set; } + public short Opacity + { + get; set; + } - public bool Kind { get; set; } + public bool Kind + { + get; set; + } - public byte Padding { get; set; } + public byte Padding + { + get; set; + } public DisplayInfo() { diff --git a/src/BSH.Controls/Preview/Psd/HeaderInfo.cs b/src/BSH.Controls/Preview/Psd/HeaderInfo.cs index 9bafa7b..cb0da50 100644 --- a/src/BSH.Controls/Preview/Psd/HeaderInfo.cs +++ b/src/BSH.Controls/Preview/Psd/HeaderInfo.cs @@ -5,15 +5,30 @@ namespace SimplePsd /// public class HeaderInfo { - public short NChannels { get; set; } + public short NChannels + { + get; set; + } - public int NHeight { get; set; } + public int NHeight + { + get; set; + } - public int NWidth { get; set; } + public int NWidth + { + get; set; + } - public short NBitsPerPixel { get; set; } + public short NBitsPerPixel + { + get; set; + } - public short NColourMode { get; set; } + public short NColourMode + { + get; set; + } public HeaderInfo() { diff --git a/src/BSH.Controls/Preview/Psd/ImageResource.cs b/src/BSH.Controls/Preview/Psd/ImageResource.cs index ffa00c5..e34a413 100644 --- a/src/BSH.Controls/Preview/Psd/ImageResource.cs +++ b/src/BSH.Controls/Preview/Psd/ImageResource.cs @@ -5,15 +5,27 @@ namespace SimplePsd /// public class ImageResource { - public int NLength { get; set; } + public int NLength + { + get; set; + } public byte[] OSType { get; set; } = new byte[4]; - public short NID { get; set; } + public short NID + { + get; set; + } - public byte[] Name { get; set; } + public byte[] Name + { + get; set; + } - public int NSize { get; set; } + public int NSize + { + get; set; + } public void Reset() { diff --git a/src/BSH.Controls/Preview/Psd/ResolutionInfo.cs b/src/BSH.Controls/Preview/Psd/ResolutionInfo.cs index 999af92..2b59d64 100644 --- a/src/BSH.Controls/Preview/Psd/ResolutionInfo.cs +++ b/src/BSH.Controls/Preview/Psd/ResolutionInfo.cs @@ -5,17 +5,35 @@ namespace SimplePsd /// public class ResolutionInfo { - public short HRes { get; set; } + public short HRes + { + get; set; + } - public int HResUnit { get; set; } + public int HResUnit + { + get; set; + } - public short WidthUnit { get; set; } + public short WidthUnit + { + get; set; + } - public short VRes { get; set; } + public short VRes + { + get; set; + } - public int VResUnit { get; set; } + public int VResUnit + { + get; set; + } - public short HeightUnit { get; set; } + public short HeightUnit + { + get; set; + } public ResolutionInfo() { diff --git a/src/BSH.Controls/Preview/Psd/ThumbNail.cs b/src/BSH.Controls/Preview/Psd/ThumbNail.cs index c2af97c..52c77c6 100644 --- a/src/BSH.Controls/Preview/Psd/ThumbNail.cs +++ b/src/BSH.Controls/Preview/Psd/ThumbNail.cs @@ -5,23 +5,50 @@ namespace SimplePsd /// public class ThumbNail { - public int NFormat { get; set; } + public int NFormat + { + get; set; + } - public int NWidth { get; set; } + public int NWidth + { + get; set; + } - public int NHeight { get; set; } + public int NHeight + { + get; set; + } - public int NWidthBytes { get; set; } + public int NWidthBytes + { + get; set; + } - public int NSize { get; set; } + public int NSize + { + get; set; + } - public int NCompressedSize { get; set; } + public int NCompressedSize + { + get; set; + } - public short NBitPerPixel { get; set; } + public short NBitPerPixel + { + get; set; + } - public short NPlanes { get; set; } + public short NPlanes + { + get; set; + } - public byte[] Data { get; set; } + public byte[] Data + { + get; set; + } public ThumbNail() { diff --git a/src/BSH.Controls/UI/ListViewColumnSorter.cs b/src/BSH.Controls/UI/ListViewColumnSorter.cs index bb0a8e4..8c8b5f2 100644 --- a/src/BSH.Controls/UI/ListViewColumnSorter.cs +++ b/src/BSH.Controls/UI/ListViewColumnSorter.cs @@ -111,12 +111,18 @@ public int Compare(object x, object y) /// /// Gets or sets the number of the column to which to apply the sorting operation (Defaults to '0'). /// - public int SortColumn { set; get; } + public int SortColumn + { + set; get; + } /// /// Gets or sets the order of sorting to apply (for example, 'Ascending' or 'Descending'). /// - public SortOrder Order { set; get; } + public SortOrder Order + { + set; get; + } } } \ No newline at end of file diff --git a/src/BSH.Controls/UI/LoadingCircleToolStripMenuItem.cs b/src/BSH.Controls/UI/LoadingCircleToolStripMenuItem.cs index 812e991..fe6cc6f 100644 --- a/src/BSH.Controls/UI/LoadingCircleToolStripMenuItem.cs +++ b/src/BSH.Controls/UI/LoadingCircleToolStripMenuItem.cs @@ -42,7 +42,10 @@ public class LoadingCircleToolStripMenuItem : ToolStripControlHost DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] public LoadingCircle LoadingCircleControl { - get { return Control as LoadingCircle; } + get + { + return Control as LoadingCircle; + } } /// diff --git a/src/BSH.Controls/UI/aVersionListItem.cs b/src/BSH.Controls/UI/aVersionListItem.cs index 1c8f9ed..00c1b64 100644 --- a/src/BSH.Controls/UI/aVersionListItem.cs +++ b/src/BSH.Controls/UI/aVersionListItem.cs @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine.Models; using System; using System.Drawing; +using Brightbits.BSH.Engine.Models; namespace Brightbits.BSH.Main { @@ -41,7 +41,10 @@ public bool VersionStable } } - public VersionDetails Version { get; set; } + public VersionDetails Version + { + get; set; + } public string ToolTipTitle { diff --git a/src/BSH.Engine/Services/FileCollector/IFileExclusion.cs b/src/BSH.Engine/Services/FileCollector/IFileExclusion.cs index 5fb603a..75708d4 100644 --- a/src/BSH.Engine/Services/FileCollector/IFileExclusion.cs +++ b/src/BSH.Engine/Services/FileCollector/IFileExclusion.cs @@ -1,5 +1,4 @@ using System; -using System.Configuration; using System.IO; using System.Text.RegularExpressions; using Brightbits.BSH.Engine.Contracts; diff --git a/src/BSH.Engine/Services/FileCollector/IFolderExclusion.cs b/src/BSH.Engine/Services/FileCollector/IFolderExclusion.cs index 882fa48..468bdad 100644 --- a/src/BSH.Engine/Services/FileCollector/IFolderExclusion.cs +++ b/src/BSH.Engine/Services/FileCollector/IFolderExclusion.cs @@ -2,7 +2,6 @@ using System.IO; using System.Text.RegularExpressions; using Brightbits.BSH.Engine.Contracts; -using Brightbits.BSH.Engine.Models; using Brightbits.BSH.Engine.Utils; using Serilog; diff --git a/src/BSH.Main/Dialogs/SubDialogs/frmAddSchedule.cs b/src/BSH.Main/Dialogs/SubDialogs/frmAddSchedule.cs index dc728d5..df6d5e7 100644 --- a/src/BSH.Main/Dialogs/SubDialogs/frmAddSchedule.cs +++ b/src/BSH.Main/Dialogs/SubDialogs/frmAddSchedule.cs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -using BSH.Main.Properties; using System; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/SubDialogs/frmChangeMedia.cs b/src/BSH.Main/Dialogs/SubDialogs/frmChangeMedia.cs index ff7c964..a3fc1ac 100644 --- a/src/BSH.Main/Dialogs/SubDialogs/frmChangeMedia.cs +++ b/src/BSH.Main/Dialogs/SubDialogs/frmChangeMedia.cs @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine.Storage; -using BSH.Main.Properties; using System; using System.Windows.Forms; +using Brightbits.BSH.Engine.Storage; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/SubDialogs/frmEditScheduler.cs b/src/BSH.Main/Dialogs/SubDialogs/frmEditScheduler.cs index 6dd4c01..68a5664 100644 --- a/src/BSH.Main/Dialogs/SubDialogs/frmEditScheduler.cs +++ b/src/BSH.Main/Dialogs/SubDialogs/frmEditScheduler.cs @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -using BSH.Main.Properties; -using BSH.Main.Utils; -using Humanizer; using System; using System.Data; using System.Windows.Forms; +using BSH.Main.Properties; +using BSH.Main.Utils; +using Humanizer; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/SubDialogs/frmFilter.cs b/src/BSH.Main/Dialogs/SubDialogs/frmFilter.cs index a0af895..b53764e 100644 --- a/src/BSH.Main/Dialogs/SubDialogs/frmFilter.cs +++ b/src/BSH.Main/Dialogs/SubDialogs/frmFilter.cs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using BSH.Controls.UI; -using BSH.Main.Properties; -using Humanizer; using System; using System.Diagnostics; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; +using BSH.Controls.UI; +using BSH.Main.Properties; +using Humanizer; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/SubDialogs/frmShortStatus.cs b/src/BSH.Main/Dialogs/SubDialogs/frmShortStatus.cs index 47bf690..d54b576 100644 --- a/src/BSH.Main/Dialogs/SubDialogs/frmShortStatus.cs +++ b/src/BSH.Main/Dialogs/SubDialogs/frmShortStatus.cs @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; +using System.Collections.ObjectModel; using Brightbits.BSH.Engine; using Brightbits.BSH.Engine.Jobs; using Brightbits.BSH.Engine.Models; using BSH.Main.Properties; using Humanizer; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmBrowser.cs b/src/BSH.Main/Dialogs/frmBrowser.cs index f8470a3..9d3ae07 100644 --- a/src/BSH.Main/Dialogs/frmBrowser.cs +++ b/src/BSH.Main/Dialogs/frmBrowser.cs @@ -12,15 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Controls.UI; -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Database; -using Brightbits.BSH.Engine.Jobs; -using Brightbits.BSH.Engine.Models; -using BSH.Main.Properties; -using BSH.Main.Utils; -using Humanizer; -using Serilog; using System; using System.Collections.Generic; using System.Data; @@ -30,6 +21,15 @@ using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using Brightbits.BSH.Controls.UI; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Database; +using Brightbits.BSH.Engine.Jobs; +using Brightbits.BSH.Engine.Models; +using BSH.Main.Properties; +using BSH.Main.Utils; +using Humanizer; +using Serilog; using static Brightbits.BSH.Engine.Win32Stuff; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmFileProperties.cs b/src/BSH.Main/Dialogs/frmFileProperties.cs index 4c0ca30..eeee30e 100644 --- a/src/BSH.Main/Dialogs/frmFileProperties.cs +++ b/src/BSH.Main/Dialogs/frmFileProperties.cs @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Models; -using BSH.Main.Properties; using System; using System.Diagnostics; using System.Windows.Forms; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Models; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmMain.cs b/src/BSH.Main/Dialogs/frmMain.cs index 8fbd980..69a0db3 100644 --- a/src/BSH.Main/Dialogs/frmMain.cs +++ b/src/BSH.Main/Dialogs/frmMain.cs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using AutoUpdaterDotNET; -using Brightbits.BSH.Engine.Database; -using BSH.Main.Properties; -using Serilog; using System; using System.Diagnostics; using System.Drawing; using System.Windows.Forms; +using AutoUpdaterDotNET; +using Brightbits.BSH.Engine.Database; +using BSH.Main.Properties; +using Serilog; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmMainTabs/IMainTabs.cs b/src/BSH.Main/Dialogs/frmMainTabs/IMainTabs.cs index 5f3d1ac..c377c5a 100644 --- a/src/BSH.Main/Dialogs/frmMainTabs/IMainTabs.cs +++ b/src/BSH.Main/Dialogs/frmMainTabs/IMainTabs.cs @@ -21,7 +21,16 @@ public interface IMainTabs void OpenTab(); void CloseTab(); - string Title { get; } - UserControl UserControlInstance { get; } - frmMain Super { set; } + string Title + { + get; + } + UserControl UserControlInstance + { + get; + } + frmMain Super + { + set; + } } \ No newline at end of file diff --git a/src/BSH.Main/Dialogs/frmMainTabs/ucConfig.cs b/src/BSH.Main/Dialogs/frmMainTabs/ucConfig.cs index f1340d5..9635aea 100644 --- a/src/BSH.Main/Dialogs/frmMainTabs/ucConfig.cs +++ b/src/BSH.Main/Dialogs/frmMainTabs/ucConfig.cs @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Jobs; -using Brightbits.BSH.Engine.Security; -using Brightbits.BSH.Engine.Storage; -using BSH.Controls.UI; -using BSH.Main.Properties; using System; using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Jobs; +using Brightbits.BSH.Engine.Security; +using Brightbits.BSH.Engine.Storage; +using BSH.Controls.UI; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmMainTabs/ucDoConfigure.cs b/src/BSH.Main/Dialogs/frmMainTabs/ucDoConfigure.cs index e0da58c..bb7615d 100644 --- a/src/BSH.Main/Dialogs/frmMainTabs/ucDoConfigure.cs +++ b/src/BSH.Main/Dialogs/frmMainTabs/ucDoConfigure.cs @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Security; -using Brightbits.BSH.Engine.Storage; -using BSH.Main.Properties; using System; using System.IO; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Security; +using Brightbits.BSH.Engine.Storage; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmMainTabs/ucOverview.cs b/src/BSH.Main/Dialogs/frmMainTabs/ucOverview.cs index 14cf85e..26b6e32 100644 --- a/src/BSH.Main/Dialogs/frmMainTabs/ucOverview.cs +++ b/src/BSH.Main/Dialogs/frmMainTabs/ucOverview.cs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Jobs; -using BSH.Main.Properties; -using Humanizer; using System; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Jobs; +using BSH.Main.Properties; +using Humanizer; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmStatusBackup.cs b/src/BSH.Main/Dialogs/frmStatusBackup.cs index 4378633..4fd9823 100644 --- a/src/BSH.Main/Dialogs/frmStatusBackup.cs +++ b/src/BSH.Main/Dialogs/frmStatusBackup.cs @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; using Brightbits.BSH.Engine; using Brightbits.BSH.Engine.Jobs; using BSH.Main.Properties; using Humanizer; -using System; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Dialogs/frmWaitForMedia.cs b/src/BSH.Main/Dialogs/frmWaitForMedia.cs index 3569df1..3148c05 100644 --- a/src/BSH.Main/Dialogs/frmWaitForMedia.cs +++ b/src/BSH.Main/Dialogs/frmWaitForMedia.cs @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -using BSH.Main.Properties; using System; +using BSH.Main.Properties; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Model/CommandLine/Options.cs b/src/BSH.Main/Model/CommandLine/Options.cs index f4c8da5..f958a7d 100644 --- a/src/BSH.Main/Model/CommandLine/Options.cs +++ b/src/BSH.Main/Model/CommandLine/Options.cs @@ -19,17 +19,32 @@ namespace BSH.Main.Model.CommandLine; public class Options { [Option("delayedstart", Default = false)] - public bool DelayedStart { get; set; } + public bool DelayedStart + { + get; set; + } [Option("databasefile")] - public string DatabaseFile { get; set; } + public string DatabaseFile + { + get; set; + } [Option("deleteprotocol", Default = false)] - public bool DeleteProtocol { get; set; } + public bool DeleteProtocol + { + get; set; + } [Option("config")] - public bool ShowConfig { get; set; } + public bool ShowConfig + { + get; set; + } [Option("browser")] - public bool ShowBrowser { get; set; } + public bool ShowBrowser + { + get; set; + } } diff --git a/src/BSH.Main/Model/CommandLine/StartBackupCommandOptions.cs b/src/BSH.Main/Model/CommandLine/StartBackupCommandOptions.cs index 5f72f94..2b08d43 100644 --- a/src/BSH.Main/Model/CommandLine/StartBackupCommandOptions.cs +++ b/src/BSH.Main/Model/CommandLine/StartBackupCommandOptions.cs @@ -20,17 +20,32 @@ namespace BSH.Main.Model.CommandLine; public class StartBackupCommandOptions { [Option("title", Default = "Manuelle Sicherung", HelpText = "Specifies the title of the backup.")] - public string Title { get; set; } + public string Title + { + get; set; + } [Option("description", Default = "", HelpText = "Specifies the description of the backup.")] - public string Description { get; set; } + public string Description + { + get; set; + } [Option("shutdownapp", Default = false)] - public bool ShutdownApp { get; set; } + public bool ShutdownApp + { + get; set; + } [Option("shutdownpc", Default = false)] - public bool ShutdownPC { get; set; } + public bool ShutdownPC + { + get; set; + } [Option("autodelete", Default = false)] - public bool AutoDeletion { get; set; } + public bool AutoDeletion + { + get; set; + } } diff --git a/src/BSH.Main/Modules/BackupController.cs b/src/BSH.Main/Modules/BackupController.cs index 7edc252..e84b2b7 100644 --- a/src/BSH.Main/Modules/BackupController.cs +++ b/src/BSH.Main/Modules/BackupController.cs @@ -12,6 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; using Brightbits.BSH.Engine; using Brightbits.BSH.Engine.Contracts; using Brightbits.BSH.Engine.Contracts.Services; @@ -20,12 +26,6 @@ using Brightbits.BSH.Engine.Security; using BSH.Main.Properties; using Serilog; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Threading; -using System.Threading.Tasks; -using System.Windows.Forms; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Modules/BackupLogic.cs b/src/BSH.Main/Modules/BackupLogic.cs index cab2018..9972d54 100644 --- a/src/BSH.Main/Modules/BackupLogic.cs +++ b/src/BSH.Main/Modules/BackupLogic.cs @@ -12,6 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; +using System.Collections.Generic; +using System.Data; +using System.Diagnostics; +using System.Linq; +using System.Threading.Tasks; +using System.Windows.Forms; using Brightbits.BSH.Engine; using Brightbits.BSH.Engine.Contracts; using Brightbits.BSH.Engine.Contracts.Database; @@ -25,13 +32,6 @@ using Humanizer; using Microsoft.Win32; using Serilog; -using System; -using System.Collections.Generic; -using System.Data; -using System.Diagnostics; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; namespace Brightbits.BSH.Main; @@ -667,22 +667,22 @@ public static async Task thScheduleSysRunBackup() // Priorität heruntersetzen Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.BelowNormal; - // Vollsicherung durchführen? - var FullBackup = false; - if (!string.IsNullOrEmpty(ConfigurationManager.ScheduleFullBackup)) + // Vollsicherung durchführen? + var FullBackup = false; + if (!string.IsNullOrEmpty(ConfigurationManager.ScheduleFullBackup)) + { + // Letzte Vollsicherung ermitteln + var Item = ConfigurationManager.ScheduleFullBackup.Split('|'); + if (Item[0] == "day") { - // Letzte Vollsicherung ermitteln - var Item = ConfigurationManager.ScheduleFullBackup.Split('|'); - if (Item[0] == "day") + var lastFullBackup = await QueryManager.GetLastFullBackupAsync(); + if (lastFullBackup != null) { - var lastFullBackup = await QueryManager.GetLastFullBackupAsync(); - if (lastFullBackup != null) - { - var Diff = DateTime.Now.Subtract(lastFullBackup.CreationDate); - FullBackup = Diff.Days >= Convert.ToInt32(Item[1]); - } + var Diff = DateTime.Now.Subtract(lastFullBackup.CreationDate); + FullBackup = Diff.Days >= Convert.ToInt32(Item[1]); } } + } // Backup durchführen var cancellationToken = BackupController.GetNewCancellationToken(); diff --git a/src/BSH.Main/Modules/ExceptionController.cs b/src/BSH.Main/Modules/ExceptionController.cs index 48c19b2..9786efa 100644 --- a/src/BSH.Main/Modules/ExceptionController.cs +++ b/src/BSH.Main/Modules/ExceptionController.cs @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Serilog; using System; using System.Windows.Forms; +using Serilog; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Modules/NotificationController.cs b/src/BSH.Main/Modules/NotificationController.cs index 8839b3a..a19fa67 100644 --- a/src/BSH.Main/Modules/NotificationController.cs +++ b/src/BSH.Main/Modules/NotificationController.cs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Jobs; -using BSH.Main.Properties; -using Serilog; using System; using System.Drawing; using System.Threading; using System.Windows.Forms; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Jobs; +using BSH.Main.Properties; +using Serilog; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Modules/PresentationController.cs b/src/BSH.Main/Modules/PresentationController.cs index 7c17f6b..2876f01 100644 --- a/src/BSH.Main/Modules/PresentationController.cs +++ b/src/BSH.Main/Modules/PresentationController.cs @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -using BSH.Main.Dialogs.SubDialogs; using System.Linq; using System.Threading.Tasks; using System.Windows.Forms; +using BSH.Main.Dialogs.SubDialogs; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Modules/StatusController.cs b/src/BSH.Main/Modules/StatusController.cs index 24feb6e..9a700a4 100644 --- a/src/BSH.Main/Modules/StatusController.cs +++ b/src/BSH.Main/Modules/StatusController.cs @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Drawing; +using System.Windows.Forms; using Brightbits.BSH.Engine; using Brightbits.BSH.Engine.Exceptions; using Brightbits.BSH.Engine.Jobs; using Brightbits.BSH.Engine.Models; using BSH.Main.Properties; using Humanizer; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Drawing; -using System.Windows.Forms; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Modules/WaitForMediaService.cs b/src/BSH.Main/Modules/WaitForMediaService.cs index 314928f..73888f3 100644 --- a/src/BSH.Main/Modules/WaitForMediaService.cs +++ b/src/BSH.Main/Modules/WaitForMediaService.cs @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -using Brightbits.BSH.Engine; -using Brightbits.BSH.Engine.Contracts.Services; using System.Threading; using System.Threading.Tasks; +using Brightbits.BSH.Engine; +using Brightbits.BSH.Engine.Contracts.Services; namespace Brightbits.BSH.Main; diff --git a/src/BSH.Main/Program.cs b/src/BSH.Main/Program.cs index f456664..e93b018 100644 --- a/src/BSH.Main/Program.cs +++ b/src/BSH.Main/Program.cs @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +using System; +using System.Reflection; +using System.Windows.Forms; using AutoUpdaterDotNET; using BSH.Main.Model.CommandLine; using BSH.Main.Properties; using CommandLine; using Serilog; -using System; -using System.Reflection; -using System.Windows.Forms; namespace Brightbits.BSH.Main; diff --git a/src/PreviewHandlerFramework/COMInterop/RECT.cs b/src/PreviewHandlerFramework/COMInterop/RECT.cs index a037076..e7009c2 100644 --- a/src/PreviewHandlerFramework/COMInterop/RECT.cs +++ b/src/PreviewHandlerFramework/COMInterop/RECT.cs @@ -14,6 +14,9 @@ public struct RECT public int top; public int right; public int bottom; - public Rectangle ToRectangle() { return Rectangle.FromLTRB(left, top, right, bottom); } + public Rectangle ToRectangle() + { + return Rectangle.FromLTRB(left, top, right, bottom); + } } } diff --git a/src/PreviewHandlerFramework/FileBasedPreviewHandlerControl.cs b/src/PreviewHandlerFramework/FileBasedPreviewHandlerControl.cs index a1f6b00..3c0c281 100644 --- a/src/PreviewHandlerFramework/FileBasedPreviewHandlerControl.cs +++ b/src/PreviewHandlerFramework/FileBasedPreviewHandlerControl.cs @@ -16,7 +16,10 @@ public sealed override void Load(Stream stream) const int COPY_BUFFER_SIZE = 1024; byte[] buffer = new byte[COPY_BUFFER_SIZE]; int read; - while ((read = stream.Read(buffer, 0, buffer.Length)) != 0) fs.Write(buffer, 0, read); + while ((read = stream.Read(buffer, 0, buffer.Length)) != 0) + { + fs.Write(buffer, 0, read); + } } Load(new FileInfo(tempPath)); } @@ -29,7 +32,10 @@ protected static FileInfo MakeTemporaryCopy(FileInfo file) { byte[] buffer = new byte[4096]; int read; - while ((read = from.Read(buffer, 0, buffer.Length)) > 0) to.Write(buffer, 0, read); + while ((read = from.Read(buffer, 0, buffer.Length)) > 0) + { + to.Write(buffer, 0, read); + } } return new FileInfo(tempPath); } diff --git a/src/PreviewHandlerFramework/PreviewHandler.cs b/src/PreviewHandlerFramework/PreviewHandler.cs index f6298d3..247087d 100644 --- a/src/PreviewHandlerFramework/PreviewHandler.cs +++ b/src/PreviewHandlerFramework/PreviewHandler.cs @@ -2,12 +2,12 @@ // Coded and published in January 2007 issue of MSDN Magazine // http://msdn.microsoft.com/msdnmag/issues/07/01/PreviewHandlers/default.aspx -using Microsoft.Win32; using System; using System.ComponentModel; using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; +using Microsoft.Win32; namespace C4F.DevKit.PreviewHandler.PreviewHandlerFramework { @@ -112,12 +112,19 @@ void IPreviewHandler.QueryFocus(out IntPtr phwnd) IntPtr result = IntPtr.Zero; InvokeOnPreviewThread(delegate () { result = GetFocus(); }); phwnd = result; - if (phwnd == IntPtr.Zero) throw new Win32Exception(); + if (phwnd == IntPtr.Zero) + { + throw new Win32Exception(); + } } uint IPreviewHandler.TranslateAccelerator(ref MSG pmsg) { - if (_frame != null) return _frame.TranslateAccelerator(ref pmsg); + if (_frame != null) + { + return _frame.TranslateAccelerator(ref pmsg); + } + const uint S_FALSE = 1; return S_FALSE; } diff --git a/src/PreviewHandlerFramework/PreviewHandlerAttribute.cs b/src/PreviewHandlerFramework/PreviewHandlerAttribute.cs index 15152f6..64132fc 100644 --- a/src/PreviewHandlerFramework/PreviewHandlerAttribute.cs +++ b/src/PreviewHandlerFramework/PreviewHandlerAttribute.cs @@ -13,16 +13,46 @@ public sealed class PreviewHandlerAttribute : Attribute public PreviewHandlerAttribute(string name, string extension, string appId) { - if (name == null) throw new ArgumentNullException("name"); - if (extension == null) throw new ArgumentNullException("extension"); - if (appId == null) throw new ArgumentNullException("appId"); + if (name == null) + { + throw new ArgumentNullException("name"); + } + + if (extension == null) + { + throw new ArgumentNullException("extension"); + } + + if (appId == null) + { + throw new ArgumentNullException("appId"); + } + _name = name; _extension = extension; _appId = appId; } - public string Name { get { return _name; } } - public string Extension { get { return _extension; } } - public string AppId { get { return _appId; } } + public string Name + { + get + { + return _name; + } + } + public string Extension + { + get + { + return _extension; + } + } + public string AppId + { + get + { + return _appId; + } + } } } diff --git a/src/PreviewHandlerFramework/PreviewHandlerControl.cs b/src/PreviewHandlerFramework/PreviewHandlerControl.cs index 152de47..3651620 100644 --- a/src/PreviewHandlerFramework/PreviewHandlerControl.cs +++ b/src/PreviewHandlerFramework/PreviewHandlerControl.cs @@ -20,7 +20,11 @@ protected PreviewHandlerControl() public virtual void Unload() { - foreach (Control c in Controls) c.Dispose(); + foreach (Control c in Controls) + { + c.Dispose(); + } + Controls.Clear(); } diff --git a/src/PreviewHandlerFramework/StreamBasedPreviewHandler.cs b/src/PreviewHandlerFramework/StreamBasedPreviewHandler.cs index 3854f11..33ee605 100644 --- a/src/PreviewHandlerFramework/StreamBasedPreviewHandler.cs +++ b/src/PreviewHandlerFramework/StreamBasedPreviewHandler.cs @@ -27,7 +27,11 @@ private class ReadOnlyIStreamStream : Stream public ReadOnlyIStreamStream(IStream stream) { - if (stream == null) throw new ArgumentNullException("stream"); + if (stream == null) + { + throw new ArgumentNullException("stream"); + } + _stream = stream; } @@ -37,15 +41,32 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } - private void ThrowIfDisposed() { if (_stream == null) throw new ObjectDisposedException(GetType().Name); } + private void ThrowIfDisposed() + { + if (_stream == null) + { + throw new ObjectDisposedException(GetType().Name); + } + } public unsafe override int Read(byte[] buffer, int offset, int count) { ThrowIfDisposed(); - if (buffer == null) throw new ArgumentNullException("buffer"); - if (offset < 0) throw new ArgumentNullException("offset"); - if (count < 0) throw new ArgumentNullException("count"); + if (buffer == null) + { + throw new ArgumentNullException("buffer"); + } + + if (offset < 0) + { + throw new ArgumentNullException("offset"); + } + + if (count < 0) + { + throw new ArgumentNullException("count"); + } int bytesRead = 0; if (count > 0) @@ -53,22 +74,47 @@ public unsafe override int Read(byte[] buffer, int offset, int count) IntPtr ptr = new IntPtr(&bytesRead); if (offset == 0) { - if (count > buffer.Length) throw new ArgumentOutOfRangeException("count"); + if (count > buffer.Length) + { + throw new ArgumentOutOfRangeException("count"); + } + _stream.Read(buffer, count, ptr); } else { byte[] tempBuffer = new byte[count]; _stream.Read(tempBuffer, count, ptr); - if (bytesRead > 0) Array.Copy(tempBuffer, 0, buffer, offset, bytesRead); + if (bytesRead > 0) + { + Array.Copy(tempBuffer, 0, buffer, offset, bytesRead); + } } } return bytesRead; } - public override bool CanRead { get { return _stream != null; } } - public override bool CanSeek { get { return _stream != null; } } - public override bool CanWrite { get { return false; } } + public override bool CanRead + { + get + { + return _stream != null; + } + } + public override bool CanSeek + { + get + { + return _stream != null; + } + } + public override bool CanWrite + { + get + { + return false; + } + } public override long Length { @@ -105,7 +151,10 @@ public override unsafe long Seek(long offset, SeekOrigin origin) return pos; } - public override void Flush() { ThrowIfDisposed(); } + public override void Flush() + { + ThrowIfDisposed(); + } public override void SetLength(long value) { diff --git a/src/PreviewHandlerHost/PreviewHandlerHostControl.cs b/src/PreviewHandlerHost/PreviewHandlerHostControl.cs index 4bc8398..35a0201 100644 --- a/src/PreviewHandlerHost/PreviewHandlerHostControl.cs +++ b/src/PreviewHandlerHost/PreviewHandlerHostControl.cs @@ -1,9 +1,9 @@ -using C4F.DevKit.PreviewHandler.PreviewHandlerFramework; using System; using System.ComponentModel; using System.Drawing; using System.IO; using System.Windows.Forms; +using C4F.DevKit.PreviewHandler.PreviewHandlerFramework; namespace C4F.DevKit.PreviewHandler.PreviewHandlerHost { @@ -37,18 +37,26 @@ public PreviewHandlerHostControl() /// public string FilePath { - get { return _filePath; } + get + { + return _filePath; + } set { _filePath = value; if (value != null && !IsDesignTime()) + { GeneratePreview(); + } } } public Boolean HasHandler { - get { return _hasHandler; } + get + { + return _hasHandler; + } } private bool IsDesignTime() @@ -66,7 +74,8 @@ public void Unload() } } catch - { } + { + } } /// @@ -100,7 +109,9 @@ private void GeneratePreview() { handler = ei.Handler; if (handler != null) + { break; + } } } if (handler == null) diff --git a/src/PreviewHandlerHost/PreviewHandlerRegistryAccessor.cs b/src/PreviewHandlerHost/PreviewHandlerRegistryAccessor.cs index d32f0df..101a28a 100644 --- a/src/PreviewHandlerHost/PreviewHandlerRegistryAccessor.cs +++ b/src/PreviewHandlerHost/PreviewHandlerRegistryAccessor.cs @@ -1,5 +1,5 @@ -using Microsoft.Win32; using System.Collections.Generic; +using Microsoft.Win32; namespace C4F.DevKit.PreviewHandler.PreviewHandlerHost @@ -39,9 +39,18 @@ internal static RegistrationData LoadRegistrationInformation() } handlers.Sort(delegate (PreviewHandlerInfo first, PreviewHandlerInfo second) { - if (first.Name == null) return 1; - else if (second.Name == null) return -1; - else return first.Name.CompareTo(second.Name); + if (first.Name == null) + { + return 1; + } + else if (second.Name == null) + { + return -1; + } + else + { + return first.Name.CompareTo(second.Name); + } }); // Create a lookup table of preview handler ID -> PreviewHandlerInfo @@ -67,11 +76,17 @@ internal static RegistrationData LoadRegistrationInformation() string.Format(BaseClsIDKey, extension), null, null) as string; if (id == null) + { id = Registry.GetValue( string.Format(BaseClsIdKey2, extension), null, null) as string; + } + PreviewHandlerInfo mappedHandler; - if (id != null && handlerMapping.TryGetValue(id, out mappedHandler)) info.Handler = mappedHandler; + if (id != null && handlerMapping.TryGetValue(id, out mappedHandler)) + { + info.Handler = mappedHandler; + } extensionInfos.Add(info); } @@ -97,8 +112,14 @@ internal class PreviewHandlerInfo public override string ToString() { - if (string.IsNullOrEmpty(Name)) return ID; - else return Name; + if (string.IsNullOrEmpty(Name)) + { + return ID; + } + else + { + return Name; + } } } @@ -106,6 +127,9 @@ internal class ExtensionInfo { public string Extension; public PreviewHandlerInfo Handler; - public override string ToString() { return Extension; } + public override string ToString() + { + return Extension; + } } }