mirror of
https://github.com/achiez/NebulaAuth-Steam-Desktop-Authenticator-by-Achies.git
synced 2026-07-25 06:14:31 +00:00
chore(resharper): perform resharper cleanup and add shared cleanup profile
This commit is contained in:
achiez
@@ -1,3 +1,314 @@
|
|||||||
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
|
||||||
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=CheckNamespace/@EntryIndexedValue">DO_NOT_SHOW</s:String>
|
||||||
|
<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue"><Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns">
|
||||||
|
<TypePattern DisplayName="Non-reorderable types" Priority="99999999">
|
||||||
|
<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" />
|
||||||
|
<HasAttribute Name="System.Runtime.InteropServices.StructLayoutAttribute" />
|
||||||
|
<HasAttribute Name="JetBrains.Annotations.NoReorderAttribute" />
|
||||||
|
</Or>
|
||||||
|
</TypePattern.Match>
|
||||||
|
</TypePattern>
|
||||||
|
<TypePattern DisplayName="xUnit.net Test Classes" RemoveRegions="All">
|
||||||
|
<TypePattern.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Class" />
|
||||||
|
<HasMember>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<HasAttribute Inherited="True" Name="Xunit.FactAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="Xunit.TheoryAttribute" />
|
||||||
|
</And>
|
||||||
|
</HasMember>
|
||||||
|
</And>
|
||||||
|
</TypePattern.Match>
|
||||||
|
<Entry DisplayName="Fields">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Field" />
|
||||||
|
<Not>
|
||||||
|
<Static />
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Readonly />
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Constructors">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Constructor" />
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Static />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Teardown Methods">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<ImplementsInterface Name="System.IDisposable" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="All other members" />
|
||||||
|
<Entry DisplayName="Test Methods" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<HasAttribute Name="Xunit.FactAttribute" />
|
||||||
|
<HasAttribute Name="Xunit.TheoryAttribute" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
</TypePattern>
|
||||||
|
<TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All">
|
||||||
|
<TypePattern.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Class" />
|
||||||
|
<Or>
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSourceAttribute" />
|
||||||
|
<HasMember>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestAttribute" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestCaseAttribute" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" />
|
||||||
|
</And>
|
||||||
|
</HasMember>
|
||||||
|
</Or>
|
||||||
|
</And>
|
||||||
|
</TypePattern.Match>
|
||||||
|
<Entry DisplayName="Setup/Teardown Methods">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<Or>
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.SetUpAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.TearDownAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureSetUpAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.TestFixtureTearDownAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeSetUpAttribute" />
|
||||||
|
<HasAttribute Inherited="True" Name="NUnit.Framework.OneTimeTearDownAttribute" />
|
||||||
|
</Or>
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="All other members" />
|
||||||
|
<Entry DisplayName="Test Methods" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestAttribute" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestCaseAttribute" />
|
||||||
|
<HasAttribute Name="NUnit.Framework.TestCaseSourceAttribute" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
</TypePattern>
|
||||||
|
<TypePattern DisplayName="Grains">
|
||||||
|
<TypePattern.Match>
|
||||||
|
<And>
|
||||||
|
<Or>
|
||||||
|
<ImplementsInterface Name="^Orleans\.IGrain$" />
|
||||||
|
<ImplementsInterface Name="Orleans.IGrainBase" />
|
||||||
|
<ImplementsInterface Name="Achiefy.Orleans.Tenancy.Abstractions.ITenantGrain" />
|
||||||
|
<InheritsFromType Name="Orleans.Grain" />
|
||||||
|
<InheritsFromType Name="Achiefy.Tenant.Application.Stateful.Core.TenantGrain" />
|
||||||
|
</Or>
|
||||||
|
<Not>
|
||||||
|
<Abstract />
|
||||||
|
</Not>
|
||||||
|
<Kind Is="Class" />
|
||||||
|
</And>
|
||||||
|
</TypePattern.Match>
|
||||||
|
<Entry DisplayName="Public Delegates" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Access Is="Public" />
|
||||||
|
<Kind Is="Delegate" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Public Enums" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Access Is="Public" />
|
||||||
|
<Kind Is="Enum" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Nested Records">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Record" />
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Group DisplayName="Group">
|
||||||
|
<Entry DisplayName="Static Fields and Constants">
|
||||||
|
<Entry.Match>
|
||||||
|
<Or>
|
||||||
|
<Kind Is="Constant" />
|
||||||
|
<And>
|
||||||
|
<Kind Is="Field" />
|
||||||
|
<Static />
|
||||||
|
</And>
|
||||||
|
</Or>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Kind Is="0" Order="Constant Field" />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Properties, Indexers">
|
||||||
|
<Entry.Match>
|
||||||
|
<Or>
|
||||||
|
<Kind Is="Property" />
|
||||||
|
<Kind Is="Indexer" />
|
||||||
|
</Or>
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Fields">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Field" />
|
||||||
|
<Not>
|
||||||
|
<Static />
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Readonly />
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
</Group>
|
||||||
|
<Entry DisplayName="Constructors">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Constructor" />
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Static />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Lifecycle Methods">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Method" />
|
||||||
|
<Name Is="^On(Activate|Deactivate)Async.*$" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="All other members" />
|
||||||
|
<Entry DisplayName="Nested Types">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Type" />
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
</TypePattern>
|
||||||
|
<TypePattern DisplayName="Default Pattern">
|
||||||
|
<Entry DisplayName="Public Enums" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Access Is="Public" />
|
||||||
|
<Kind Is="Enum" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Public Delegates" Priority="100">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Access Is="Public" />
|
||||||
|
<Kind Is="Delegate" />
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Nested Records">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Record" />
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Static />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Group DisplayName="Group">
|
||||||
|
<Entry DisplayName="Static Fields and Constants">
|
||||||
|
<Entry.Match>
|
||||||
|
<Or>
|
||||||
|
<Kind Is="Constant" />
|
||||||
|
<And>
|
||||||
|
<Kind Is="Field" />
|
||||||
|
<Static />
|
||||||
|
</And>
|
||||||
|
</Or>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Kind Is="0" Order="Constant Field" />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Properties, Indexers">
|
||||||
|
<Entry.Match>
|
||||||
|
<Or>
|
||||||
|
<Kind Is="Property" />
|
||||||
|
<Kind Is="Indexer" />
|
||||||
|
</Or>
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="Fields">
|
||||||
|
<Entry.Match>
|
||||||
|
<And>
|
||||||
|
<Kind Is="Field" />
|
||||||
|
<Not>
|
||||||
|
<Static />
|
||||||
|
</Not>
|
||||||
|
</And>
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Readonly />
|
||||||
|
<Name />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
</Group>
|
||||||
|
<Entry DisplayName="Constructors">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Constructor" />
|
||||||
|
</Entry.Match>
|
||||||
|
<Entry.SortBy>
|
||||||
|
<Static />
|
||||||
|
</Entry.SortBy>
|
||||||
|
</Entry>
|
||||||
|
<Entry DisplayName="All other members" />
|
||||||
|
<Entry DisplayName="Nested Types">
|
||||||
|
<Entry.Match>
|
||||||
|
<Kind Is="Type" />
|
||||||
|
</Entry.Match>
|
||||||
|
</Entry>
|
||||||
|
</TypePattern>
|
||||||
|
</Patterns></s:String>
|
||||||
<s:Boolean x:Key="/Default/UserDictionary/Words/=MAAC/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
<s:Boolean x:Key="/Default/UserDictionary/Words/=MAAC/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
|
||||||
+18
-18
@@ -63,25 +63,25 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div class="changelog-container">
|
<div class="changelog-container">
|
||||||
<div class="change">
|
<div class="change">
|
||||||
<div class="version">Version 1.8.1</div>
|
<div class="version">Version 1.8.1</div>
|
||||||
<div class="date">25.01.2026</div>
|
<div class="date">25.01.2026</div>
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<ul>
|
<ul>
|
||||||
<li><b>NEW:</b> Added Mafile Export tool with templates, batch export and flexible field filtering.</li>
|
<li><b>NEW:</b> Added Mafile Export tool with templates, batch export and flexible field filtering.</li>
|
||||||
<li><b>IMPROVEMENT:</b> Reworked auto-confirmation error handling logic (MAAC) — fewer false disables, smarter retries.</li>
|
<li><b>IMPROVEMENT:</b> Reworked auto-confirmation error handling logic (MAAC) — fewer false disables, smarter retries.</li>
|
||||||
<li><b>UPDATE:</b> Added “Unattach Proxy” option to the account context menu.</li>
|
<li><b>UPDATE:</b> Added “Unattach Proxy” option to the account context menu.</li>
|
||||||
<li><b>LOCALIZATION:</b> Added Chinese (Simplified) and French languages.</li>
|
<li><b>LOCALIZATION:</b> Added Chinese (Simplified) and French languages.</li>
|
||||||
<li><b>FIX:</b> Fixed crashes related to duplicate mafiles, timers, search filtering and import logic.</li>
|
<li><b>FIX:</b> Fixed crashes related to duplicate mafiles, timers, search filtering and import logic.</li>
|
||||||
<li>
|
<li>
|
||||||
<b>DETAILS:</b> Full patch notes:
|
<b>DETAILS:</b> Full patch notes:
|
||||||
<a href="https://teletype.in/@achies_raw/nebula-1-8-1-eng">ENG</a> |
|
<a href="https://teletype.in/@achies_raw/nebula-1-8-1-eng">ENG</a> |
|
||||||
<a href="https://teletype.in/@achies_raw/nebula-1-8-1-rus">RUS</a>
|
<a href="https://teletype.in/@achies_raw/nebula-1-8-1-rus">RUS</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -63,16 +63,16 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
||||||
<div class="changelog-container">
|
<div class="changelog-container">
|
||||||
<div class="change">
|
<div class="change">
|
||||||
<div class="version">Version 1.8.2</div>
|
<div class="version">Version 1.8.2</div>
|
||||||
<div class="date">10.02.2026</div>
|
<div class="date">10.02.2026</div>
|
||||||
<div class="description">
|
<div class="description">
|
||||||
<ul>
|
<ul>
|
||||||
<li><b>FIX:</b> AutoConfirm timer now correctly resets the status after a successful request (Warning → Ok).</li>
|
<li><b>FIX:</b> AutoConfirm timer now correctly resets the status after a successful request (Warning → Ok).</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
@@ -190,4 +190,4 @@ public static class DialogsController
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
@@ -87,4 +87,4 @@ public static class NebulaSerializer
|
|||||||
{
|
{
|
||||||
return MafileSerializer.SerializeLegacy(data, Serializer.Settings.SerializationOptions, properties);
|
return MafileSerializer.SerializeLegacy(data, Serializer.Settings.SerializationOptions, properties);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,4 +127,4 @@ public enum ThemeType
|
|||||||
Light = 2,
|
Light = 2,
|
||||||
Luxury = 3,
|
Luxury = 3,
|
||||||
Shadcn = 4
|
Shadcn = 4
|
||||||
}
|
}
|
||||||
@@ -3,20 +3,20 @@ using Newtonsoft.Json;
|
|||||||
|
|
||||||
namespace NebulaAuth.Model.Update;
|
namespace NebulaAuth.Model.Update;
|
||||||
|
|
||||||
public class ChangelogEntry
|
public class ChangelogEntry
|
||||||
{
|
{
|
||||||
[JsonProperty("version")] public string Version { get; set; } = string.Empty;
|
[JsonProperty("version")] public string Version { get; set; } = string.Empty;
|
||||||
|
|
||||||
[JsonProperty("date")] public string Date { get; set; } = string.Empty;
|
[JsonProperty("date")] public string Date { get; set; } = string.Empty;
|
||||||
|
|
||||||
[JsonProperty("changes")] public List<ChangeItem> Changes { get; set; } = new();
|
[JsonProperty("changes")] public List<ChangeItem> Changes { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
public class ChangeItem
|
public class ChangeItem
|
||||||
{
|
{
|
||||||
[JsonProperty("type")] public string Type { get; set; } = string.Empty;
|
[JsonProperty("type")] public string Type { get; set; } = string.Empty;
|
||||||
|
|
||||||
[JsonProperty("text")] public string Text { get; set; } = string.Empty;
|
[JsonProperty("text")] public string Text { get; set; } = string.Empty;
|
||||||
|
|
||||||
[JsonProperty("link")] public string? Link { get; set; }
|
[JsonProperty("link")] public string? Link { get; set; }
|
||||||
}
|
}
|
||||||
@@ -45,10 +45,10 @@
|
|||||||
CornerRadius="8"
|
CornerRadius="8"
|
||||||
BorderThickness="1">
|
BorderThickness="1">
|
||||||
<Border.Background>
|
<Border.Background>
|
||||||
<SolidColorBrush Color="{DynamicResource BaseContentColor}" Opacity="0.07"/>
|
<SolidColorBrush Color="{DynamicResource BaseContentColor}" Opacity="0.07" />
|
||||||
</Border.Background>
|
</Border.Background>
|
||||||
<Border.BorderBrush>
|
<Border.BorderBrush>
|
||||||
<SolidColorBrush Color="{DynamicResource BaseContentColor}" Opacity="0.12"/>
|
<SolidColorBrush Color="{DynamicResource BaseContentColor}" Opacity="0.12" />
|
||||||
</Border.BorderBrush>
|
</Border.BorderBrush>
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -92,14 +92,12 @@
|
|||||||
Margin="42,0,10,0"
|
Margin="42,0,10,0"
|
||||||
IsEditable="True"
|
IsEditable="True"
|
||||||
ItemsSource="{Binding Groups}"
|
ItemsSource="{Binding Groups}"
|
||||||
|
|
||||||
Text="{Binding Group, UpdateSourceTrigger=PropertyChanged}"
|
Text="{Binding Group, UpdateSourceTrigger=PropertyChanged}"
|
||||||
materialDesign:HintAssist.Hint="{Tr MafileImportDialog.GroupFieldHint}"
|
materialDesign:HintAssist.Hint="{Tr MafileImportDialog.GroupFieldHint}"
|
||||||
materialDesign:HintAssist.IsFloating="False"
|
materialDesign:HintAssist.IsFloating="False"
|
||||||
Visibility="{Binding AddToGroup, Converter={StaticResource BooleanToVisibilityConverter}}"
|
Visibility="{Binding AddToGroup, Converter={StaticResource BooleanToVisibilityConverter}}"
|
||||||
Style="{StaticResource MaterialDesignFloatingHintComboBox}"
|
Style="{StaticResource MaterialDesignFloatingHintComboBox}" />
|
||||||
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Grid Grid.Row="5" Margin="10,16,10,5">
|
<Grid Grid.Row="5" Margin="10,16,10,5">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
@@ -126,4 +124,4 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -6,4 +6,4 @@ public partial class MafileImportDialog
|
|||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -154,17 +154,18 @@
|
|||||||
</Run>
|
</Run>
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
|
|
||||||
<TextBlock Grid.Column="1" VerticalAlignment="Center" FontSize="10" Margin="0,0,2,0"
|
<TextBlock Grid.Column="1" VerticalAlignment="Center" FontSize="10"
|
||||||
|
Margin="0,0,2,0"
|
||||||
Foreground="{DynamicResource MaterialDesign.Brush.ForegroundLight}"
|
Foreground="{DynamicResource MaterialDesign.Brush.ForegroundLight}"
|
||||||
Text="{Binding Key, Converter={StaticResource ProxyAccountCountConverter}}" />
|
Text="{Binding Key, Converter={StaticResource ProxyAccountCountConverter}}" />
|
||||||
<Button Style="{StaticResource MaterialDesignIconButton}" Padding="0"
|
<Button Style="{StaticResource MaterialDesignIconButton}" Padding="0"
|
||||||
Width="24"
|
Width="24"
|
||||||
Height="24" md:RippleAssist.IsDisabled="True" Grid.Column="2"
|
Height="24" md:RippleAssist.IsDisabled="True" Grid.Column="2"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Command="{Binding DataContext.SetDefaultCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
|
Command="{Binding DataContext.SetDefaultCommand, RelativeSource={RelativeSource AncestorType=UserControl}}"
|
||||||
CommandParameter="{Binding}">
|
CommandParameter="{Binding}">
|
||||||
<md:PackIcon Height="16" Width="16" Kind="Heart" />
|
<md:PackIcon Height="16" Width="16" Kind="Heart" />
|
||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
|
|||||||
@@ -196,4 +196,4 @@
|
|||||||
</TabControl>
|
</TabControl>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -31,6 +31,8 @@ public partial class MainVM //File //TODO: Refactor
|
|||||||
bool SdaPasswordPrompted,
|
bool SdaPasswordPrompted,
|
||||||
SDAEncryptionHelper.Context? SdaContext);
|
SDAEncryptionHelper.Context? SdaContext);
|
||||||
|
|
||||||
|
private record MafileImportPlanItem(Mafile Mafile, bool RequiresRelogin, bool HasConflict);
|
||||||
|
|
||||||
public Settings Settings => Settings.Instance;
|
public Settings Settings => Settings.Instance;
|
||||||
|
|
||||||
|
|
||||||
@@ -408,11 +410,4 @@ public partial class MainVM //File //TODO: Refactor
|
|||||||
if (mafile is not Mafile maf) return false;
|
if (mafile is not Mafile maf) return false;
|
||||||
return maf.Password != null && PHandler.IsPasswordSet;
|
return maf.Password != null && PHandler.IsPasswordSet;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
private record MafileReadResult(
|
|
||||||
Mafile? Mafile,
|
|
||||||
bool SdaPasswordPrompted,
|
|
||||||
SDAEncryptionHelper.Context? SdaContext);
|
|
||||||
|
|
||||||
private record MafileImportPlanItem(Mafile Mafile, bool RequiresRelogin, bool HasConflict);
|
|
||||||
}
|
|
||||||
@@ -6,20 +6,20 @@ namespace NebulaAuth.ViewModel.Other;
|
|||||||
|
|
||||||
public partial class MafileImportDialogVM : ObservableObject
|
public partial class MafileImportDialogVM : ObservableObject
|
||||||
{
|
{
|
||||||
|
public ObservableCollection<string> Groups { get; }
|
||||||
|
public int TotalCount { get; }
|
||||||
|
public int ConflictCount { get; }
|
||||||
|
public bool HasConflicts => ConflictCount > 0;
|
||||||
|
[ObservableProperty] private bool _addToGroup;
|
||||||
|
[ObservableProperty] private string? _group;
|
||||||
|
[ObservableProperty] private bool _overwriteConflicts;
|
||||||
|
|
||||||
public MafileImportDialogVM(IEnumerable<string> groups, int totalCount, int conflictCount)
|
public MafileImportDialogVM(IEnumerable<string> groups, int totalCount, int conflictCount)
|
||||||
{
|
{
|
||||||
Groups = new ObservableCollection<string>(groups);
|
Groups = new ObservableCollection<string>(groups);
|
||||||
TotalCount = totalCount;
|
TotalCount = totalCount;
|
||||||
ConflictCount = conflictCount;
|
ConflictCount = conflictCount;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObservableCollection<string> Groups { get; }
|
|
||||||
public int TotalCount { get; }
|
|
||||||
public int ConflictCount { get; }
|
|
||||||
public bool HasConflicts => ConflictCount > 0;
|
|
||||||
[ObservableProperty] private string? _group;
|
|
||||||
[ObservableProperty] private bool _addToGroup;
|
|
||||||
[ObservableProperty] private bool _overwriteConflicts;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public record MafileImportDialogResult(string? Group, bool OverwriteConflicts);
|
public record MafileImportDialogResult(string? Group, bool OverwriteConflicts);
|
||||||
@@ -249,4 +249,4 @@ public partial class SettingsVM : ObservableObject
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user