Skip to content

Commit c6c2007

Browse files
committed
Feat | 移除设置中的插件设置
1 parent 4a5f359 commit c6c2007

File tree

4 files changed

+1
-82
lines changed

4 files changed

+1
-82
lines changed

Diff for: ShadowViewer/Models/ShadowNavigationItem.cs

-26
This file was deleted.

Diff for: ShadowViewer/Pages/SettingsPage.xaml

+1-24
Original file line numberDiff line numberDiff line change
@@ -115,30 +115,7 @@
115115
</controls:SettingsCard.Header>
116116
<ToggleSwitch IsOn="{x:Bind ViewModel.IsDebug, Mode=TwoWay}" />
117117
</controls:SettingsCard>
118-
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{i18N:Locale Key=PluginSetting}" />
119-
<ItemsRepeater ItemsSource="{x:Bind ViewModel.Plugins, Mode=OneWay}">
120-
<ItemsRepeater.ItemTemplate>
121-
<DataTemplate x:DataType="plugin:AShadowViewerPlugin">
122-
<controls:SettingsCard
123-
x:Name="PluginSetting"
124-
ActionIcon="{ui:FontIcon Glyph=&#xE76C;}"
125-
Click="PluginSetting_OnClick"
126-
IsActionIconVisible="True"
127-
IsClickEnabled="{x:Bind SettingsPage, Converter={StaticResource EmptyObjectToBoolConverter}}"
128-
Tag="{x:Bind MetaData.Id}">
129-
<controls:SettingsCard.Header>
130-
<local2:ShadowSettingHeader Description="{x:Bind MetaData.Description}" Header="{x:Bind MetaData.Name}">
131-
<local2:PluginLogo
132-
Width="{StaticResource SettingIconWidth}"
133-
Height="{StaticResource SettingIconHeight}"
134-
FontIconSize="{StaticResource SettingIconFontIconSize}"
135-
LogoSource="{x:Bind MetaData.Logo, Mode=OneWay, Converter={StaticResource PluginPathConverter}}" />
136-
</local2:ShadowSettingHeader>
137-
</controls:SettingsCard.Header>
138-
</controls:SettingsCard>
139-
</DataTemplate>
140-
</ItemsRepeater.ItemTemplate>
141-
</ItemsRepeater>
118+
142119
<!-- About -->
143120
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{i18N:Locale Key=About}" />
144121
<controls:SettingsExpander

Diff for: ShadowViewer/Pages/SettingsPage.xaml.cs

-12
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,4 @@ private void Open_Click(object sender, RoutedEventArgs e)
5353
uri.LaunchUriAsync();
5454
}
5555

56-
/// <summary>
57-
/// 前往插件设置
58-
/// </summary>
59-
private void PluginSetting_OnClick(object sender, RoutedEventArgs e)
60-
{
61-
if (sender is FrameworkElement { Tag: string id } && PluginService.GetPlugin(id) is
62-
{
63-
SettingsPage: { } page
64-
})
65-
Frame.Navigate(page, null,
66-
new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight });
67-
}
6856
}

Diff for: ShadowViewer/ViewModels/SettingsViewModel.cs

-20
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@
44
using DryIoc;
55
using Serilog;
66
using ShadowPluginLoader.WinUI;
7-
using ShadowPluginLoader.WinUI.Args;
87
using ShadowViewer.Core.Models.Interfaces;
98
using ShadowViewer.Core;
10-
using ShadowViewer.Core.Plugins;
119
using ShadowViewer.Core.Services;
1210

1311
namespace ShadowViewer.ViewModels
@@ -28,26 +26,15 @@ public SettingsViewModel(ICallableService callableService, PluginLoader pluginSe
2826
var v = Package.Current.Id.Version;
2927
Version = $"v{v.Major}.{v.Minor}.{v.Build}.{v.Revision}";
3028
Logger = logger;
31-
pluginEventService.PluginLoaded -= PluginEventService_PluginLoaded;
32-
pluginEventService.PluginLoaded += PluginEventService_PluginLoaded;
33-
InitPlugins();
3429
InitSettingsFolders();
3530
}
3631

37-
private void PluginEventService_PluginLoaded(object? sender, PluginEventArgs e)
38-
{
39-
if (PluginService.GetPlugin(e.PluginId) is { } plugin)
40-
{
41-
Plugins.Add(plugin);
42-
}
43-
}
4432
#endregion
4533
/// <summary>
4634
/// 当前版本号
4735
/// </summary>
4836
public string Version { get; }
4937

50-
public ObservableCollection<AShadowViewerPlugin> Plugins { get; } = [];
5138
public ObservableCollection<ISettingFolder> SettingsFolders { get; } = [];
5239

5340
[ObservableProperty] private bool isDebug = CoreSettings.IsDebug;
@@ -56,13 +43,6 @@ private void PluginEventService_PluginLoaded(object? sender, PluginEventArgs e)
5643
[ObservableProperty] private string pluginsPath = CoreSettings.PluginsPath;
5744
[ObservableProperty] private string pluginsUri = CoreSettings.PluginsUri;
5845

59-
public void InitPlugins()
60-
{
61-
foreach (var plugin in PluginService.GetPlugins())
62-
{
63-
Plugins.Add(plugin);
64-
}
65-
}
6646
public void InitSettingsFolders()
6747
{
6848
SettingsFolders.Clear();

0 commit comments

Comments
 (0)