diff --git a/src/MetroTrilithon b/src/MetroTrilithon index 6b9862d..bf03b8b 160000 --- a/src/MetroTrilithon +++ b/src/MetroTrilithon @@ -1 +1 @@ -Subproject commit 6b9862dd034bb0cae4300548a67256d72760b8fe +Subproject commit bf03b8b084d22a5d30c26a54dd72b6bcffd73537 diff --git a/src/SilentSelene.sln.DotSettings b/src/SilentSelene.sln.DotSettings index 31c917a..57a189b 100644 --- a/src/SilentSelene.sln.DotSettings +++ b/src/SilentSelene.sln.DotSettings @@ -1,345 +1,6 @@  - True - SUGGESTION - SUGGESTION - SUGGESTION - SUGGESTION - SUGGESTION - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - DO_NOT_SHOW - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - HINT - SUGGESTION - SUGGESTION - SUGGESTION - <?xml version="1.0" encoding="utf-16"?><Profile name="Default"><CSReorderTypeMembers>True</CSReorderTypeMembers><CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="False" AddMissingParentheses="False" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="False" /><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><XMLReformatCode>True</XMLReformatCode></Profile> - True - Required - Required - NotRequired - Required - Shift, Bitwise, Conditional - Field, Property, Event, Method - False - True - 1 - 1 - 1 - True - NEVER - NEVER - False - False - NEVER - False - False - False - ALWAYS - False - ON_SINGLE_LINE - - - - False - True - CHOP_IF_LONG - True - False - CHOP_ALWAYS - ZeroIndent - ZeroIndent - OneStep - OnSingleLine - OnSingleLine - False - False - 2 - True - OnSingleLine - 2 - FirstAttributeOnSingleLine - False - <?xml version="1.0" encoding="utf-16"?> -<Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"> - <TypePattern DisplayName="COM interfaces or structs"> - <TypePattern.Match> - <Or> - <And> - <Kind Is="Interface" /> - <Or> - <HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /> - <HasAttribute Name="System.Runtime.InteropServices.ComImport" /> - </Or> - </And> - <Kind Is="Struct" /> - </Or> - </TypePattern.Match> - </TypePattern> - <TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasMember> - <And> - <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" Inherited="True" /> - </And> - </HasMember> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <Or> - <Kind Is="Constructor" /> - <And> - <Kind Is="Method" /> - <ImplementsInterface Name="System.IDisposable" /> - </And> - </Or> - </Entry.Match> - <Entry.SortBy> - <Kind Order="Constructor" /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="Xunit.FactAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"> - <TypePattern.Match> - <And> - <Kind Is="Class" /> - <HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /> - </And> - </TypePattern.Match> - <Entry DisplayName="Setup/Teardown Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <Or> - <HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /> - <HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /> - </Or> - </And> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members" /> - <Entry Priority="100" DisplayName="Test Methods"> - <Entry.Match> - <And> - <Kind Is="Method" /> - <HasAttribute Name="NUnit.Framework.TestAttribute" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Name /> - </Entry.SortBy> - </Entry> - </TypePattern> - <TypePattern DisplayName="Default Pattern"> - <Entry DisplayName="Namespaces"> - <Entry.Match> - <Kind Is="Namespace" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Classes"> - <Entry.Match> - <Kind Is="Class" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Structs"> - <Entry.Match> - <Kind Is="Struct" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Interfaces"> - <Entry.Match> - <Kind Is="Interface" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Delegates"> - <Entry.Match> - <Kind Is="Delegate" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Enums"> - <Entry.Match> - <Kind Is="Enum" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Constants"> - <Entry.Match> - <Kind Is="Constant" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Fields"> - <Entry.Match> - <And> - <Kind Is="Field" /> - <Not> - <Static /> - </Not> - </And> - </Entry.Match> - <Entry.SortBy> - <Static /> - <Readonly /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Indexers"> - <Entry.Match> - <And> - <Kind Is="Indexer" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Static /> - <ImplementsInterface /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Properties"> - <Entry.Match> - <And> - <Kind Is="Property" /> - </And> - </Entry.Match> - <Entry.SortBy> - <Static /> - <ImplementsInterface /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Events"> - <Entry.Match> - <Kind Is="Event" /> - </Entry.Match> - <Entry.SortBy> - <Static /> - <ImplementsInterface /> - </Entry.SortBy> - </Entry> - <Entry DisplayName="Operators"> - <Entry.Match> - <Kind Is="Operator" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Constructors"> - <Entry.Match> - <Kind Is="Constructor" /> - </Entry.Match> - </Entry> - <Entry DisplayName="Destructor"> - <Entry.Match> - <Kind Is="Destructor" /> - </Entry.Match> - </Entry> - <Entry DisplayName="All other members"> - <Entry.SortBy> - <Kind Is="Member" /> - <Static /> - <ImplementsInterface /> - </Entry.SortBy> - </Entry> - <Region Name="Implicit Implementations"> - <Entry Priority="100" DisplayName="Implicit Interface Implementations"> - <Entry.Match> - <And> - <Kind Is="Member" /> - <ImplementsInterface /> - <Access Is="Private" /> - </And> - </Entry.Match> - <Entry.SortBy> - <ImplementsInterface Immediate="True" /> - </Entry.SortBy> - </Entry> - </Region> - </TypePattern> -</Patterns> - System - System.Collections.Generic - System.Linq - System.Threading.Tasks - ID - IID - OS - UI - True - D:\Repos\@Grabacr07\ResinTimer\src\MetroTrilithon\src\MetroTrilithon.sln.DotSettings - ..\MetroTrilithon\src\MetroTrilithon.sln.DotSettings - True - 1 - True - True - True - True - True - True - True - True - True - True - True - True - (?<=\b)(?<TAG>NotImplementedException|SqlNotImplemented)(\b)(.*) - True - True - Red - True - True - True - To be determined - \bTBD\b - Edit - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True - True \ No newline at end of file + D:\Repos\@Grabacr07\ResinTimer\src\MetroTrilithon\src\MetroTrilithon.sln.DotSettings + ..\MetroTrilithon\src\MetroTrilithon.sln.DotSettings + True + True + 1 \ No newline at end of file diff --git a/src/SilentSelene/SilentSelene.csproj b/src/SilentSelene/SilentSelene.csproj index 313191f..a7ac697 100644 --- a/src/SilentSelene/SilentSelene.csproj +++ b/src/SilentSelene/SilentSelene.csproj @@ -21,14 +21,14 @@ - - + + - + - - - + + + diff --git a/src/SilentSelene/UI/Preferences/Page.Generals.xaml b/src/SilentSelene/UI/Preferences/Page.Generals.xaml index 4f73c57..9900a4a 100644 --- a/src/SilentSelene/UI/Preferences/Page.Generals.xaml +++ b/src/SilentSelene/UI/Preferences/Page.Generals.xaml @@ -72,16 +72,16 @@ VerticalAlignment="Center" /> - + - + diff --git a/src/SilentSelene/UI/Preferences/Window.xaml.cs b/src/SilentSelene/UI/Preferences/Window.xaml.cs index d85cacd..4984b01 100644 --- a/src/SilentSelene/UI/Preferences/Window.xaml.cs +++ b/src/SilentSelene/UI/Preferences/Window.xaml.cs @@ -1,5 +1,4 @@ using System.Windows; -using Wpf.Ui.Appearance; using Wpf.Ui.Controls; namespace SilentSelene.UI.Preferences; @@ -9,7 +8,6 @@ partial class Window public Window() { this.InitializeComponent(); - Watcher.Watch(this); } private void HandleRootNavigationLoaded(object sender, RoutedEventArgs e) diff --git a/src/SilentSelene/UI/Timer/Window.xaml.cs b/src/SilentSelene/UI/Timer/Window.xaml.cs index ab1b1a6..a1ce58b 100644 --- a/src/SilentSelene/UI/Timer/Window.xaml.cs +++ b/src/SilentSelene/UI/Timer/Window.xaml.cs @@ -3,7 +3,6 @@ using System.Windows.Input; using MetroTrilithon.UI.Interop; using SilentSelene.Properties; -using Wpf.Ui.Appearance; namespace SilentSelene.UI.Timer; @@ -17,7 +16,6 @@ public Window() protected override void OnSourceInitialized(EventArgs e) { base.OnSourceInitialized(e); - Watcher.Watch(this); if (UserSettings.Default.WindowPlacement != new Point(0, 0)) {