From 309006e754805e393ef2e917d9e727b0d2487981 Mon Sep 17 00:00:00 2001
From: Kevin Zhang <hongtao_zhang@outlook.com>
Date: Mon, 4 Oct 2021 17:11:44 -0500
Subject: [PATCH] Align setting control and allow localization and version bump

---
 .../Commands/BookmarkLoader.cs                |  1 -
 .../Languages/en.xaml                         |  5 +++++
 .../Models/Settings.cs                        | 14 +------------
 .../Views/SettingsControl.xaml                | 20 +++++++++----------
 .../plugin.json                               |  2 +-
 5 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
index 770717b3c..40d10b26f 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Commands/BookmarkLoader.cs
@@ -26,7 +26,6 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Commands
 
             var allBookmarks = new List<Bookmark>();
 
-            //TODO: Let the user select which browser's bookmarks are displayed
             // Add Firefox bookmarks
             allBookmarks.AddRange(mozBookmarks.GetBookmarks());
 
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
index f456e7495..10abea6da 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/en.xaml
@@ -14,4 +14,9 @@
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_choose">Choose</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_title">Copy url</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_copyurl_subtitle">Copy the bookmark's url to clipboard</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_loadBrowserFrom">Load Browser From:</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserName">Browser Name</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory">DataDirectoryPath</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_addBrowserBookmark">Add Custom Browser Bookmark</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_removeBrowserBookmark">Delete Custom Browser Bookmark</system:String>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
index a426dd9fb..5080ad301 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Models/Settings.cs
@@ -10,18 +10,6 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Models
 
         public string BrowserPath { get; set; }
 
-        public ObservableCollection<CustomBrowser> CustomChromiumBrowsers { get; set; } = new()
-        {
-            new CustomBrowser
-            {
-                Name="awefawef",
-                DataDirectoryPath="awefawef"
-            },
-            new CustomBrowser
-            {
-                Name = "awefawefawefawef",
-                DataDirectoryPath = "aweawefawfawef"
-            }
-        };
+        public ObservableCollection<CustomBrowser> CustomChromiumBrowsers { get; set; } = new();
     }
 }
\ No newline at end of file
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 2d8257d0e..46b6a0544 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -7,21 +7,21 @@
              Background="White"
              d:DesignHeight="300" d:DesignWidth="500"
              DataContext="{Binding RelativeSource={RelativeSource Self}}">
-    <Grid>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
             <RowDefinition Height="80"/>
             <RowDefinition Height="auto"/>
         </Grid.RowDefinitions>
         <StackPanel>
-            <Grid Grid.Row="0" Margin="40 20 0 0">
+            <Grid Grid.Row="0" Margin="30 20 0 0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="160" />
                     <ColumnDefinition Width="140"/>
                     <ColumnDefinition Width="100"/>
                 </Grid.ColumnDefinitions>
                 <Label Grid.Column="0" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_openBookmarks}"
-                       FontSize="15" Margin="0 5 0 0"/>
+                       FontSize="15" Margin="10 5 0 0"/>
                 <RadioButton Grid.Column="1" Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
                              Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_newWindow}"
                              Click="OnNewBrowserWindowClick" />
@@ -30,7 +30,7 @@
                              Click="OnNewTabClick" />
             </Grid>
         </StackPanel>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="25,13,0,0">
+        <StackPanel Orientation="Horizontal" VerticalAlignment="Top" Grid.Row="1" Height="60" Margin="30,20,0,0">
             <Label Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_setBrowserFromPath}"
                    Height="28" Margin="10"/>
             <TextBox x:Name="BrowserPathBox" 
@@ -44,8 +44,8 @@
             <Button x:Name="ViewButton" Content="{DynamicResource flowlauncher_plugin_browserbookmark_settings_choose}"
                     HorizontalAlignment="Left" Margin="10" Width="100" Height="30" Click="OnChooseClick" FontSize="14" />
         </StackPanel>
-        <StackPanel Grid.Row="2" Orientation="Vertical">
-            <TextBlock Text="CustomBrowsers" Margin="10"/>
+        <StackPanel Grid.Row="2" Orientation="Vertical" Margin="30,20,0,0">
+            <TextBlock Text="{DynamicResource flowlauncher_plugin_browserbookmark_loadBrowserFrom}" Margin="10"/>
             <ListView Grid.Row="2" ItemsSource="{Binding Settings.CustomChromiumBrowsers}"
                       SelectedItem="{Binding SelectedCustomBrowser}"
                       Margin="10"
@@ -57,14 +57,14 @@
                       MouseDoubleClick="MouseDoubleClickOnSelectedCustomBrowser">
                 <ListView.View>
                     <GridView>
-                        <GridViewColumn DisplayMemberBinding="{Binding Name, Mode=OneWay}" Header="Browser Name"/>
-                        <GridViewColumn DisplayMemberBinding="{Binding DataDirectoryPath, Mode=OneWay}" Header="DataDirectoryPath"/>
+                        <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>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-                <Button Content="Add Custom Browser" Margin="10" Click="NewCustomBrowser"/>
-                <Button Content="Delete Custom Browser" Margin="10" Click="DeleteCustomBrowser"/>
+                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" Margin="10" Click="NewCustomBrowser"/>
+                <Button Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" Margin="10" Click="DeleteCustomBrowser"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
index 884621b9f..d1792dc3b 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Browser Bookmarks",
   "Description": "Search your browser bookmarks",
   "Author": "qianlifeng, Ioannis G.",
-  "Version": "1.4.4",
+  "Version": "1.5.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",