prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'dev' into plugin_store_item_vm_null

Browse source
This commit is contained in:
Jeremy Wu 2025-07-01 09:28:34 +10:00 committed by GitHub
commit 4e4b59ebda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 72 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher.Core/Plugin/PluginManager.cs
View file

@ -553,9 +553,9 @@ namespace Flow.Launcher.Core.Plugin
InstallPlugin(plugin, zipFilePath, checkModified: true); InstallPlugin(plugin, zipFilePath, checkModified: true);
} }
public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginFromSettings = true, bool removePluginSettings = false) public static async Task UninstallPluginAsync(PluginMetadata plugin, bool removePluginSettings = false)
{ {
await UninstallPluginAsync(plugin, removePluginFromSettings, removePluginSettings, true); await UninstallPluginAsync(plugin, removePluginFromSettings: true, removePluginSettings: removePluginSettings, checkModified: true);
} }
#endregion #endregion

145
Plugins/Flow.Launcher.Plugin.Explorer/Views/PreviewPanel.xaml
View file

@ -8,10 +8,7 @@
d:DesignHeight="300" d:DesignHeight="300"
d:DesignWidth="300" d:DesignWidth="300"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid <Grid x:Name="PreviewGrid" VerticalAlignment="Stretch">
x:Name="PreviewGrid"
Margin="0 0 0 0"
VerticalAlignment="Stretch">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition /> <RowDefinition />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
@ -47,7 +44,7 @@
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</Grid> </Grid>
</Grid> </Grid>
<StackPanel Grid.Row="2"> <StackPanel Grid.Row="1">
<StackPanel.Style> <StackPanel.Style>
<Style TargetType="StackPanel"> <Style TargetType="StackPanel">
<Style.Triggers> <Style.Triggers>
@ -90,78 +87,76 @@
</Style> </Style>
</Rectangle.Style> </Rectangle.Style>
</Rectangle> </Rectangle>
<StackPanel Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"> <Grid Margin="0 10 0 0" Visibility="{Binding FileInfoVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}">
<Grid Margin="0 10 0 10"> <Grid.ColumnDefinitions>
<Grid.ColumnDefinitions> <ColumnDefinition Width="100" />
<ColumnDefinition Width="100" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="*" /> </Grid.ColumnDefinitions>
</Grid.ColumnDefinitions> <Grid.RowDefinitions>
<Grid.RowDefinitions> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> </Grid.RowDefinitions>
</Grid.RowDefinitions> <TextBlock
<TextBlock Grid.Row="0"
Grid.Row="0" Grid.Column="0"
Grid.Column="0" Margin="5 0 0 0"
Margin="5 0 0 0" VerticalAlignment="Top"
VerticalAlignment="Top" Style="{DynamicResource PreviewItemSubTitleStyle}"
Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{DynamicResource FileSize}"
Text="{DynamicResource FileSize}" TextWrapping="Wrap"
TextWrapping="Wrap" Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" /> <TextBlock
<TextBlock Grid.Row="0"
Grid.Row="0" Grid.Column="1"
Grid.Column="1" Margin="0 0 13 0"
Margin="0 0 13 0" HorizontalAlignment="Right"
HorizontalAlignment="Right" VerticalAlignment="Top"
VerticalAlignment="Top" Style="{DynamicResource PreviewItemSubTitleStyle}"
Style="{DynamicResource PreviewItemSubTitleStyle}" Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}"
Text="{Binding FileSize, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}, Mode=OneWay}" TextWrapping="Wrap"
TextWrapping="Wrap" Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
Visibility="{Binding FileSizeVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Margin="5 0 8 0" Margin="5 0 8 0"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{DynamicResource Created}" Text="{DynamicResource Created}"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" /> Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
<TextBlock <TextBlock
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Margin="0 0 13 0" Margin="0 0 13 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Text="{Binding CreatedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" /> Visibility="{Binding CreatedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="0" Grid.Column="0"
Margin="5 0 8 0" Margin="5 0 8 0"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{DynamicResource LastModified}" Text="{DynamicResource LastModified}"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" /> Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
<TextBlock <TextBlock
Grid.Row="2" Grid.Row="2"
Grid.Column="1" Grid.Column="1"
Margin="0 0 13 0" Margin="0 0 13 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Style="{DynamicResource PreviewItemSubTitleStyle}" Style="{DynamicResource PreviewItemSubTitleStyle}"
Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" Text="{Binding LastModifiedAt, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" /> Visibility="{Binding LastModifiedAtVisibility, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}" />
</Grid> </Grid>
</StackPanel>
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>