Merge branch 'dev' into explorerMerge

Author: taooceros

Flow.Launcher.Core/Resource/AvailableLanguages.cs

@@ -19,6 +19,8 @@ internal static class AvailableLanguages
         public static Language Serbian = new Language("sr", "Srpski");
         public static Language Portuguese_Portugal = new Language("pt-pt", "Português");
         public static Language Portuguese_Brazil = new Language("pt-br", "Português (Brasil)");
+        public static Language Spanish = new Language("es", "Spanish");
+        public static Language Spanish_LatinAmerica = new Language("es-419", "Spanish (Latin America)");
         public static Language Italian = new Language("it", "Italiano");
         public static Language Norwegian_Bokmal = new Language("nb-NO", "Norsk Bokmål");
         public static Language Slovak = new Language("sk", "Slovenský");
@@ -43,6 +45,8 @@ public static List<Language> GetAvailableLanguages()
                 Serbian,
                 Portuguese_Portugal,
                 Portuguese_Brazil,
+                Spanish,
+                Spanish_LatinAmerica,
                 Italian,
                 Norwegian_Bokmal,
                 Slovak,

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml

@@ -88,6 +88,7 @@
                 <Expander
                     x:Name="expExcludedPaths"
                     Margin="0,10,0,0"
+                    Collapsed="expExcludedPaths_Collapsed"
                     Expanded="expExcludedPaths_Click"
                     Header="{DynamicResource plugin_explorer_indexsearchexcludedpaths_header}">
                     <ListView

Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs

@@ -62,9 +62,7 @@ public void RefreshView()
 
             lbxExcludedPaths.Items.SortDescriptions.Add(new SortDescription("Path", ListSortDirection.Ascending));
 
-            btnDelete.Visibility = Visibility.Hidden;
-            btnEdit.Visibility = Visibility.Hidden;
-            btnAdd.Visibility = Visibility.Hidden;
+            SetButtonVisibilityToHidden();
 
             if (expAccessLinks.IsExpanded || expExcludedPaths.IsExpanded || expActionKeywords.IsExpanded)
             {
@@ -125,8 +123,8 @@ private void expActionKeywords_Click(object sender, RoutedEventArgs e)
 
         private void expActionKeywords_Collapsed(object sender, RoutedEventArgs e)
         {
-            if (!expActionKeywords.IsExpanded)
-                expActionKeywords.Height = double.NaN;
+            expActionKeywords.Height = double.NaN;
+            SetButtonVisibilityToHidden();
         }
 
         private void expAccessLinks_Click(object sender, RoutedEventArgs e)
@@ -145,8 +143,8 @@ private void expAccessLinks_Click(object sender, RoutedEventArgs e)
 
         private void expAccessLinks_Collapsed(object sender, RoutedEventArgs e)
         {
-            if (!expAccessLinks.IsExpanded)
-                expAccessLinks.Height = double.NaN;
+            expAccessLinks.Height = double.NaN;
+            SetButtonVisibilityToHidden();
         }
 
         private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
@@ -163,6 +161,11 @@ private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
             RefreshView();
         }
 
+        private void expExcludedPaths_Collapsed(object sender, RoutedEventArgs e)
+        {
+            SetButtonVisibilityToHidden();
+        }
+
         private void btnDelete_Click(object sender, RoutedEventArgs e)
         {
             var selectedRow = lbxAccessLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
@@ -311,6 +314,13 @@ private void btnOpenIndexingOptions_Click(object sender, RoutedEventArgs e)
         {
             SettingsViewModel.OpenWindowsIndexingOptions();
         }
+
+        public void SetButtonVisibilityToHidden()
+        {
+            btnDelete.Visibility = Visibility.Hidden;
+            btnEdit.Visibility = Visibility.Hidden;
+            btnAdd.Visibility = Visibility.Hidden;
+        }
     }
 
     public class ActionKeywordView

Plugins/Flow.Launcher.Plugin.Shell/Settings.cs

@@ -6,7 +6,7 @@ public class Settings
     {
         public Shell Shell { get; set; } = Shell.Cmd;
 
-        public bool ReplaceWinR { get; set; } = true;
+        public bool ReplaceWinR { get; set; } = false;
 
         public bool LeaveShellOpen { get; set; }