Merge branch 'dev' into net7.0

Author: taooceros

.github/actions/spelling/excludes.txt

@@ -57,12 +57,12 @@
 ^\.github/actions/spelling/
 ^\Q.github/workflows/spelling.yml\E$
 # Custom
-(?:^|/)Languages/(?!en.xaml)
+(?:^|/)Languages/(?!en\.xaml)
 Scripts/
-Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/
-Plugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json
-Plugins/Flow.Launcher.Plugin.WebSearch/setting.json
-(?:^|/)FodyWeavers.xml
+\.resx$
+^\QPlugins/Flow.Launcher.Plugin.WindowsSettings/WindowsSettings.json\E$
+^\QPlugins/Flow.Launcher.Plugin.WebSearch/setting.json\E$
+(?:^|/)FodyWeavers\.xml
 .editorconfig
 ignore$
 \.ps1$

.github/actions/spelling/expect.txt

@@ -35,3 +35,30 @@ mscorlib
 pythonw
 dotnet
 winget
+jjw24
+wolframalpha
+gmail
+duckduckgo
+facebook
+findicon
+baidu
+pls
+websearch
+qianlifeng
+userdata
+srchadmin
+EWX
+dlgtext
+CMD
+appref-ms
+appref
+TSource
+runas
+dpi
+popup
+ptr
+pluginindicator
+TobiasSekan
+Img
+img
+resx

.github/actions/spelling/patterns.txt

@@ -109,6 +109,9 @@
 #x:Key="[^"]+"
 #{DynamicResource [^"]+}
 
+# html tag
+<\w+[^>]*>
+</\w+[^>]*>
+
 #http/https
 (?:\b(?:https?|ftp|file)://)[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]
-

.github/workflows/spelling.yml

@@ -34,12 +34,12 @@ name: Check Spelling
 #   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
 
 on:
-  push:
-    branches:
-    - '**'
-    - '!l10n_dev'
-    tags-ignore:
-    - "**"
+#   push:
+#     branches:
+#     - '**'
+#     - '!l10n_dev'
+#     tags-ignore:
+#     - "**"
   pull_request_target:
     branches:
     - '**'
@@ -65,11 +65,11 @@ jobs:
     outputs:
       followup: ${{ steps.spelling.outputs.followup }}
     runs-on: ubuntu-latest
-    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
+    if: (contains(github.event_name, 'pull_request') && github.head_ref != 'l10n_dev')
     concurrency:
       group: spelling-${{ github.event.pull_request.number || github.ref }}
       # note: If you use only_check_changed_files, you do not want cancel-in-progress
-      cancel-in-progress: true
+      cancel-in-progress: false
     steps:
     - name: check-spelling
       id: spelling
@@ -103,21 +103,21 @@ jobs:
 
 
 
-  comment-push:
-    name: Report (Push)
-    # If your workflow isn't running on push, you can remove this job
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      contents: write
-    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
-    steps:
-    - name: comment
-      uses: check-spelling/check-spelling@main
-      with:
-        checkout: true
-        spell_check_this: check-spelling/spell-check-this@main
-        task: ${{ needs.spelling.outputs.followup }}
+#   comment-push:
+#     name: Report (Push)
+#     # If your workflow isn't running on push, you can remove this job
+#     runs-on: ubuntu-latest
+#     needs: spelling
+#     permissions:
+#       contents: write
+#     if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
+#     steps:
+#     - name: comment
+#       uses: check-spelling/check-spelling@main
+#       with:
+#         checkout: true
+#         spell_check_this: check-spelling/spell-check-this@main
+#         task: ${{ needs.spelling.outputs.followup }}
 
   comment-pr:
     name: Report (PR)

Flow.Launcher.Test/Flow.Launcher.Test.csproj

@@ -50,7 +50,7 @@
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Flow.Launcher/Languages/it.xaml

@@ -336,7 +336,7 @@
     <system:String x:Key="HotkeyUpDownDesc">Indietro / Menu contestuale</system:String>
     <system:String x:Key="HotkeyLeftRightDesc">Navigazione tra le voci</system:String>
     <system:String x:Key="HotkeyShiftEnterDesc">Apri il menu di scelta rapida</system:String>
-    <system:String x:Key="HotkeyCtrlEnterDesc">Apri la cartella Contaning</system:String>
+    <system:String x:Key="HotkeyCtrlEnterDesc">Apri cartella superiore</system:String>
     <system:String x:Key="HotkeyCtrlShiftEnterDesc">Esegui come amministratore</system:String>
     <system:String x:Key="HotkeyCtrlHDesc">Cronologia Query</system:String>
     <system:String x:Key="HotkeyESCDesc">Torna al risultato nel menu contestuale</system:String>

Flow.Launcher/Languages/pt-pt.xaml

@@ -335,7 +335,7 @@ Queira por favor mover a pasta do seu perfil de {0} para {1}
     <system:String x:Key="HotkeyUpDownDesc">Recuar/Menu de contexto</system:String>
     <system:String x:Key="HotkeyLeftRightDesc">Navegação nos itens</system:String>
     <system:String x:Key="HotkeyShiftEnterDesc">Abrir menu de contexto</system:String>
-    <system:String x:Key="HotkeyCtrlEnterDesc">Abrir pasta</system:String>
+    <system:String x:Key="HotkeyCtrlEnterDesc">Abrir pasta do resultado</system:String>
     <system:String x:Key="HotkeyCtrlShiftEnterDesc">Executar como administrador</system:String>
     <system:String x:Key="HotkeyCtrlHDesc">Histórico de consultas</system:String>
     <system:String x:Key="HotkeyESCDesc">Voltar aos resultados no menu de contexto</system:String>

Flow.Launcher/Languages/tr.xaml

@@ -234,7 +234,7 @@
     <system:String x:Key="fileManager_file_arg">Arg For File</system:String>
 
     <!--  DefaultBrowser Setting Dialog  -->
-    <system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
+    <system:String x:Key="defaultBrowserTitle">Varsayılan İnternet Tarayıcısı</system:String>
     <system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
     <system:String x:Key="defaultBrowser_name">Browser</system:String>
     <system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>

Flow.Launcher/SettingWindow.xaml

@@ -3041,7 +3041,7 @@
                                                 Name="ClearLogFolderBtn"
                                                 Margin="0,0,12,0"
                                                 Click="ClearLogFolder"
-                                                Content="{Binding CheckLogFolder, UpdateSourceTrigger=PropertyChanged}" />
+                                                Content="{Binding CheckLogFolder, Mode=OneWay}" />
                                             <Button
                                                 Margin="0,0,8,0"
                                                 Content="&#xec7a;"

Flow.Launcher/SettingWindow.xaml.cs

@@ -250,7 +250,7 @@ private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
         }
         private void OpenLogFolder(object sender, RoutedEventArgs e)
         {
-            PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Logs, Constant.Version));
+            viewModel.OpenLogFolder();
         }
         private void ClearLogFolder(object sender, RoutedEventArgs e)
         {
@@ -262,8 +262,6 @@ private void ClearLogFolder(object sender, RoutedEventArgs e)
             if (confirmResult == MessageBoxResult.Yes)
             {
                 viewModel.ClearLogFolder();
-                
-                ClearLogFolderBtn.Content = viewModel.CheckLogFolder;
             }
         }