Skip to content

Commit 11c5b7c

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into rename-file
2 parents cd3eeba + 352c0f8 commit 11c5b7c

File tree

2 files changed

+81
-79
lines changed

2 files changed

+81
-79
lines changed

‎Flow.Launcher.Core/Plugin/PluginManager.cs‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,14 @@ public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
301301
return Array.Empty<PluginPair>();
302302

303303
if (!NonGlobalPlugins.TryGetValue(query.ActionKeyword, out var plugin))
304-
return GlobalPlugins;
304+
{
305+
return GlobalPlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
306+
}
307+
308+
if (API.PluginModified(plugin.Metadata.ID))
309+
{
310+
return Array.Empty<PluginPair>();
311+
}
305312

306313
return new List<PluginPair>
307314
{
@@ -311,7 +318,7 @@ public static ICollection<PluginPair> ValidPluginsForQuery(Query query)
311318

312319
public static ICollection<PluginPair> ValidPluginsForHomeQuery()
313320
{
314-
return _homePlugins.ToList();
321+
return _homePlugins.Where(p => !PluginModified(p.Metadata.ID)).ToList();
315322
}
316323

317324
public static async Task<List<Result>> QueryForPluginAsync(PluginPair pair, Query query, CancellationToken token)
@@ -657,9 +664,9 @@ public static void InstallPlugin(UserPlugin plugin, string zipFilePath)
657664
InstallPlugin(plugin, zipFilePath, checkModified: true);
658665
}
659666

660-
public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false)
667+
public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginSettings = false)
661668
{
662-
await UninstallPluginAsync(plugin, removePluginFromSettings, removePluginSettings, true);
669+
await UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings, checkModified: true);
663670
}
664671

665672
#endregion

‎Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml‎

Lines changed: 70 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
d:DesignHeight="300"
99
d:DesignWidth="300"
1010
mc:Ignorable="d">
11-
<Grid
12-
x:Name="PreviewGrid"
13-
Margin="0 0 0 0"
14-
VerticalAlignment="Stretch">
11+
<Grid x:Name="PreviewGrid" VerticalAlignment="Stretch">
1512
<Grid.RowDefinitions>
1613
<RowDefinition />
1714
<RowDefinition Height="Auto" />
@@ -47,7 +44,7 @@
4744
TextWrapping="Wrap" />
4845
</Grid>
4946
</Grid>
50-
<StackPanel Grid.Row="2">
47+
<StackPanel Grid.Row="1">
5148
<StackPanel.Style>
5249
<Style TargetType="StackPanel">
5350
<Style.Triggers>
@@ -90,78 +87,76 @@
9087
</Style>
9188
</Rectangle.Style>
9289
</Rectangle>
93-
<StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
94-
<Grid Margin="0 10 0 10">
95-
<Grid.ColumnDefinitions>
96-
<ColumnDefinition Width="100" />
97-
<ColumnDefinition Width="*" />
98-
</Grid.ColumnDefinitions>
99-
<Grid.RowDefinitions>
100-
<RowDefinition Height="Auto" />
101-
<RowDefinition Height="Auto" />
102-
<RowDefinition Height="Auto" />
103-
</Grid.RowDefinitions>
104-
<TextBlock
105-
Grid.Row="0"
106-
Grid.Column="0"
107-
Margin="5 0 0 0"
108-
VerticalAlignment="Top"
109-
Style="{DynamicResource PreviewItemSubTitleStyle}"
110-
Text="{DynamicResource FileSize}"
111-
TextWrapping="Wrap"
112-
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
113-
<TextBlock
114-
Grid.Row="0"
115-
Grid.Column="1"
116-
Margin="0 0 13 0"
117-
HorizontalAlignment="Right"
118-
VerticalAlignment="Top"
119-
Style="{DynamicResource PreviewItemSubTitleStyle}"
120-
Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
121-
TextWrapping="Wrap"
122-
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
90+
<Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
91+
<Grid.ColumnDefinitions>
92+
<ColumnDefinition Width="100" />
93+
<ColumnDefinition Width="*" />
94+
</Grid.ColumnDefinitions>
95+
<Grid.RowDefinitions>
96+
<RowDefinition Height="Auto" />
97+
<RowDefinition Height="Auto" />
98+
<RowDefinition Height="Auto" />
99+
</Grid.RowDefinitions>
100+
<TextBlock
101+
Grid.Row="0"
102+
Grid.Column="0"
103+
Margin="5 0 0 0"
104+
VerticalAlignment="Top"
105+
Style="{DynamicResource PreviewItemSubTitleStyle}"
106+
Text="{DynamicResource FileSize}"
107+
TextWrapping="Wrap"
108+
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
109+
<TextBlock
110+
Grid.Row="0"
111+
Grid.Column="1"
112+
Margin="0 0 13 0"
113+
HorizontalAlignment="Right"
114+
VerticalAlignment="Top"
115+
Style="{DynamicResource PreviewItemSubTitleStyle}"
116+
Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
117+
TextWrapping="Wrap"
118+
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
123119

124-
<TextBlock
125-
Grid.Row="1"
126-
Grid.Column="0"
127-
Margin="5 0 8 0"
128-
VerticalAlignment="Top"
129-
Style="{DynamicResource PreviewItemSubTitleStyle}"
130-
Text="{DynamicResource Created}"
131-
TextWrapping="Wrap"
132-
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
133-
<TextBlock
134-
Grid.Row="1"
135-
Grid.Column="1"
136-
Margin="0 0 13 0"
137-
HorizontalAlignment="Right"
138-
VerticalAlignment="Top"
139-
Style="{DynamicResource PreviewItemSubTitleStyle}"
140-
Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
141-
TextWrapping="Wrap"
142-
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
120+
<TextBlock
121+
Grid.Row="1"
122+
Grid.Column="0"
123+
Margin="5 0 8 0"
124+
VerticalAlignment="Top"
125+
Style="{DynamicResource PreviewItemSubTitleStyle}"
126+
Text="{DynamicResource Created}"
127+
TextWrapping="Wrap"
128+
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
129+
<TextBlock
130+
Grid.Row="1"
131+
Grid.Column="1"
132+
Margin="0 0 13 0"
133+
HorizontalAlignment="Right"
134+
VerticalAlignment="Top"
135+
Style="{DynamicResource PreviewItemSubTitleStyle}"
136+
Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
137+
TextWrapping="Wrap"
138+
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
143139

144-
<TextBlock
145-
Grid.Row="2"
146-
Grid.Column="0"
147-
Margin="5 0 8 0"
148-
VerticalAlignment="Top"
149-
Style="{DynamicResource PreviewItemSubTitleStyle}"
150-
Text="{DynamicResource LastModified}"
151-
TextWrapping="Wrap"
152-
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
153-
<TextBlock
154-
Grid.Row="2"
155-
Grid.Column="1"
156-
Margin="0 0 13 0"
157-
HorizontalAlignment="Right"
158-
VerticalAlignment="Top"
159-
Style="{DynamicResource PreviewItemSubTitleStyle}"
160-
Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
161-
TextWrapping="Wrap"
162-
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
163-
</Grid>
164-
</StackPanel>
140+
<TextBlock
141+
Grid.Row="2"
142+
Grid.Column="0"
143+
Margin="5 0 8 0"
144+
VerticalAlignment="Top"
145+
Style="{DynamicResource PreviewItemSubTitleStyle}"
146+
Text="{DynamicResource LastModified}"
147+
TextWrapping="Wrap"
148+
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
149+
<TextBlock
150+
Grid.Row="2"
151+
Grid.Column="1"
152+
Margin="0 0 13 0"
153+
HorizontalAlignment="Right"
154+
VerticalAlignment="Top"
155+
Style="{DynamicResource PreviewItemSubTitleStyle}"
156+
Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
157+
TextWrapping="Wrap"
158+
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
159+
</Grid>
165160
</StackPanel>
166161
</Grid>
167162
</UserControl>

0 commit comments

Comments
 (0)