Merge branch 'BrowserBookmark-Advanced' of https://github.com/dcog989/Flow.Launcher into BrowserBookmark-Advanced

Author: dcog989

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Flow.Launcher.Plugin.BrowserBookmark.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
@@ -84,28 +84,22 @@
   </Target>
 
   <ItemGroup>
-    <None Update="plugin.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Languages\en.xaml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\bookmark.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Images\copylink.png">
+    <None Include="plugin.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  
+
   <ItemGroup>
-    <Content Include="Languages\*.xaml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Flow.Launcher.Plugin\Flow.Launcher.Plugin.csproj" />
+    <Content Include="Images\*.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Languages\*.xaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/BaseModel.cs

@@ -1,13 +1,11 @@
-using Flow.Launcher.Plugin.BrowserBookmark.Models;
+using Flow.Launcher.Plugin.BrowserBookmark.Models;
 using Flow.Launcher.Plugin.BrowserBookmark.ViewModels;
 using System.Windows;
+using System.Windows.Input;
 using KeyEventArgs = System.Windows.Input.KeyEventArgs;
 
 namespace Flow.Launcher.Plugin.BrowserBookmark.Views;
 
-/// <summary>
-/// Interaction logic for CustomBrowserSetting.xaml
-/// </summary>
 public partial class CustomBrowserSetting : Window
 {
     private readonly CustomBrowserSettingViewModel _viewModel;
@@ -25,14 +23,14 @@ public CustomBrowserSetting(CustomBrowser browser)
 
     private void WindowKeyDown(object sender, KeyEventArgs e)
     {
-        if (e.Key == System.Windows.Input.Key.Enter)
+        if (e.Key == Key.Enter)
         {
             if (_viewModel.SaveCommand.CanExecute(null))
             {
                 _viewModel.SaveCommand.Execute(null);
             }
         }
-        else if (e.Key == System.Windows.Input.Key.Escape)
+        else if (e.Key == Key.Escape)
         {
             _viewModel.CancelCommand.Execute(null);
         }

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml.cs

@@ -14,7 +14,7 @@
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <StackPanel
+        <WrapPanel
             Grid.Row="0"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             Orientation="Horizontal">
@@ -42,7 +42,7 @@
                 Margin="{StaticResource SettingPanelItemRightMargin}"
                 Click="Others_Click"
                 Content="{DynamicResource flowlauncher_plugin_browserbookmark_others}" />
-        </StackPanel>
+        </WrapPanel>
         <StackPanel
             Name="CustomBrowsersList"
             Grid.Row="1"
@@ -59,11 +59,8 @@
                 Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
                 <ListView.View>
                     <GridView>
-                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}"
-                            Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
-                        <GridViewColumn
-                            DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}"
-                            Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
                     </GridView>
                 </ListView.View>
             </ListView>
@@ -84,9 +81,7 @@
                         <Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button">
                             <Setter Property="IsEnabled" Value="true" />
                             <Style.Triggers>
-                                <DataTrigger
-                                    Binding="{Binding ElementName=CustomBrowsers, Path=SelectedItems.Count}"
-                                    Value="0">
+                                <DataTrigger Binding="{Binding ElementName=CustomBrowsers, Path=SelectedItems.Count}" Value="0">
                                     <Setter Property="IsEnabled" Value="false" />
                                 </DataTrigger>
                             </Style.Triggers>

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml

@@ -1,13 +1,12 @@
 {
-    "ID": "0ECADE17459B49F587BF81DC3A125110",
-    "ActionKeyword": "b",
-    "Name": "Browser Bookmarks",
-    "Description": "Search your browser bookmarks, optionally retrieve missing favicons from the web.",
-    "Author": "dcog989",
-    "Version": "1.0.0",
-    "Language": "csharp",
-    "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
-    "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
-    "IcoPath": "Images\\bookmark.png",
-    "Languages": "Languages"
+  "ID": "0ECADE17459B49F587BF81DC3A125110",
+  "ActionKeyword": "b",
+  "Name": "Browser Bookmarks",
+  "Description": "Search your browser bookmarks, optionally retrieve missing favicons from the web.",
+  "Author": "dcog989",
+  "Version": "1.0.0",
+  "Language": "csharp",
+  "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
+  "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",
+  "IcoPath": "Images\\bookmark.png"
 }